Skip to content

Commit bab18e6

Browse files
Merge pull request #508 from MervinPraison/develop
Develop
2 parents 226c173 + 2af4040 commit bab18e6

File tree

14 files changed

+40
-23
lines changed

14 files changed

+40
-23
lines changed

.github/workflows/unittest.yml

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,23 @@ jobs:
3333
echo "OPENAI_MODEL_NAME=${{ secrets.OPENAI_MODEL_NAME || 'gpt-4o-mini' }}" >> $GITHUB_ENV
3434
echo "PYTHONPATH=${{ github.workspace }}/src/praisonai-agents:$PYTHONPATH" >> $GITHUB_ENV
3535
36+
- name: Debug API Key Status
37+
run: |
38+
echo "🔍 Checking API key availability..."
39+
if [ -n "${{ secrets.OPENAI_API_KEY }}" ]; then
40+
echo "✅ GitHub secret OPENAI_API_KEY is available"
41+
echo "🔑 API key starts with: $(echo "$OPENAI_API_KEY" | cut -c1-7)..."
42+
else
43+
echo "⚠️ GitHub secret OPENAI_API_KEY is NOT set - using fallback"
44+
echo "🔑 Using fallback key: sk-test-key..."
45+
fi
46+
echo "🌐 API Base: $OPENAI_API_BASE"
47+
echo "🤖 Model: $OPENAI_MODEL_NAME"
48+
echo "📊 Environment Check:"
49+
echo " - OPENAI_API_KEY length: ${#OPENAI_API_KEY}"
50+
echo " - OPENAI_API_BASE: $OPENAI_API_BASE"
51+
echo " - OPENAI_MODEL_NAME: $OPENAI_MODEL_NAME"
52+
3653
- name: Run Fast Tests
3754
run: |
3855
# Run the fastest, most essential tests

docker/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
FROM python:3.11-slim
22
WORKDIR /app
33
COPY . .
4-
RUN pip install flask praisonai==2.2.8 gunicorn markdown
4+
RUN pip install flask praisonai==2.2.9 gunicorn markdown
55
EXPOSE 8080
66
CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]

docker/Dockerfile.chat

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
RUN pip install --no-cache-dir \
1414
praisonaiagents>=0.0.4 \
1515
praisonai_tools \
16-
"praisonai==2.2.8" \
16+
"praisonai==2.2.9" \
1717
"praisonai[chat]" \
1818
"embedchain[github,youtube]"
1919

docker/Dockerfile.dev

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1515
RUN pip install --no-cache-dir \
1616
praisonaiagents>=0.0.4 \
1717
praisonai_tools \
18-
"praisonai==2.2.8" \
18+
"praisonai==2.2.9" \
1919
"praisonai[ui]" \
2020
"praisonai[chat]" \
2121
"praisonai[realtime]" \

docker/Dockerfile.ui

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
1313
RUN pip install --no-cache-dir \
1414
praisonaiagents>=0.0.4 \
1515
praisonai_tools \
16-
"praisonai==2.2.8" \
16+
"praisonai==2.2.9" \
1717
"praisonai[ui]" \
1818
"praisonai[crewai]"
1919

docs/api/praisonai/deploy.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,7 @@ <h2 id="raises">Raises</h2>
110110
file.write(&#34;FROM python:3.11-slim\n&#34;)
111111
file.write(&#34;WORKDIR /app\n&#34;)
112112
file.write(&#34;COPY . .\n&#34;)
113-
file.write(&#34;RUN pip install flask praisonai==2.2.8 gunicorn markdown\n&#34;)
113+
file.write(&#34;RUN pip install flask praisonai==2.2.9 gunicorn markdown\n&#34;)
114114
file.write(&#34;EXPOSE 8080\n&#34;)
115115
file.write(&#39;CMD [&#34;gunicorn&#34;, &#34;-b&#34;, &#34;0.0.0.0:8080&#34;, &#34;api:app&#34;]\n&#39;)
116116

docs/developers/local-development.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ WORKDIR /app
2727

2828
COPY . .
2929

30-
RUN pip install flask praisonai==2.2.8 watchdog
30+
RUN pip install flask praisonai==2.2.9 watchdog
3131

3232
EXPOSE 5555
3333

docs/ui/chat.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -155,7 +155,7 @@ To facilitate local development with live reload, you can use Docker. Follow the
155155

156156
COPY . .
157157

158-
RUN pip install flask praisonai==2.2.8 watchdog
158+
RUN pip install flask praisonai==2.2.9 watchdog
159159

160160
EXPOSE 5555
161161

docs/ui/code.mdx

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -208,7 +208,7 @@ To facilitate local development with live reload, you can use Docker. Follow the
208208

209209
COPY . .
210210

211-
RUN pip install flask praisonai==2.2.8 watchdog
211+
RUN pip install flask praisonai==2.2.9 watchdog
212212

213213
EXPOSE 5555
214214

praisonai/agents_generator.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -437,7 +437,7 @@ def _run_crewai(self, config, topic, tools_dict):
437437
llm_model = details.get('llm')
438438
if llm_model:
439439
llm = PraisonAIModel(
440-
model=llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
440+
model=llm_model.get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
441441
).get_model()
442442
else:
443443
llm = PraisonAIModel().get_model()
@@ -446,7 +446,7 @@ def _run_crewai(self, config, topic, tools_dict):
446446
function_calling_llm_model = details.get('function_calling_llm')
447447
if function_calling_llm_model:
448448
function_calling_llm = PraisonAIModel(
449-
model=function_calling_llm_model.get("model", os.environ.get("MODEL_NAME", "openai/gpt-4o")),
449+
model=function_calling_llm_model.get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
450450
).get_model()
451451
else:
452452
function_calling_llm = PraisonAIModel().get_model()
@@ -557,8 +557,8 @@ def _run_praisonai(self, config, topic, tools_dict):
557557
backstory=backstory_filled,
558558
tools=tools_list, # Pass the entire tools list to the agent
559559
allow_delegation=details.get('allow_delegation', False),
560-
llm=details.get('llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
561-
function_calling_llm=details.get('function_calling_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
560+
llm=details.get('llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
561+
function_calling_llm=details.get('function_calling_llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
562562
max_iter=details.get('max_iter', 15),
563563
max_rpm=details.get('max_rpm'),
564564
max_execution_time=details.get('max_execution_time'),
@@ -567,7 +567,7 @@ def _run_praisonai(self, config, topic, tools_dict):
567567
system_template=details.get('system_template'),
568568
prompt_template=details.get('prompt_template'),
569569
response_template=details.get('response_template'),
570-
reflect_llm=details.get('reflect_llm', {}).get("model", os.environ.get("MODEL_NAME", "gpt-4o")),
570+
reflect_llm=details.get('reflect_llm', {}).get("model") or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
571571
min_reflect=details.get('min_reflect', 1),
572572
max_reflect=details.get('max_reflect', 3),
573573
)
@@ -623,7 +623,7 @@ def _run_praisonai(self, config, topic, tools_dict):
623623
tasks=tasks,
624624
verbose=True,
625625
process="hierarchical",
626-
manager_llm=config.get('manager_llm', 'gpt-4o'),
626+
manager_llm=config.get('manager_llm') or os.environ.get("MODEL_NAME") or "openai/gpt-4o",
627627
memory=memory
628628
)
629629
else:

0 commit comments

Comments
 (0)