Merge pull request MervinPraison#534 from MervinPraison/develop

2.2.18

Author: MervinPraison

.github/workflows/test-core.yml

@@ -133,39 +133,61 @@ jobs:
         import sys
         sys.path.insert(0, '.')
         
+        # Attempt to import SecretStr, otherwise use a dummy class
+        try:
+            from pydantic.types import SecretStr
+        except ImportError:
+            class SecretStr:  # Dummy class if pydantic is not available in this minimal context
+                def __init__(self, value): self._value = value
+                def get_secret_value(self): return self._value
+
+        def get_key_display_value(key_value):
+            if isinstance(key_value, SecretStr):
+                return key_value.get_secret_value()[:10] if key_value.get_secret_value() else 'EMPTY_SECRET'
+            elif isinstance(key_value, str):
+                return key_value[:10] if key_value != 'nokey' and key_value != 'NOT_SET' else key_value
+            return 'INVALID_TYPE'
+
         print('🔧 Direct PraisonAI API Key Check:')
-        print(f'Environment OPENAI_API_KEY: {os.environ.get(\"OPENAI_API_KEY\", \"NOT_SET\")[:10]}...')
+        env_api_key = os.environ.get(\\"OPENAI_API_KEY\\", \\"NOT_SET\\")
+        print(f'Environment OPENAI_API_KEY: {get_key_display_value(env_api_key)}...')
         
-        # Test PraisonAI initialization
         from praisonai import PraisonAI
         praisonai = PraisonAI()
         
         print(f'PraisonAI config_list: {praisonai.config_list}')
         api_key_from_config = praisonai.config_list[0].get('api_key', 'NOT_SET')
-        print(f'API key from PraisonAI config: {api_key_from_config[:10] if api_key_from_config != \"NOT_SET\" else \"NOT_SET\"}...')
+        print(f'API key from PraisonAI config: {get_key_display_value(api_key_from_config)}...')
         
-        # Test PraisonAIModel with explicit API key (the way CrewAI will use it)
         from praisonai.inc.models import PraisonAIModel
         
-        print('\\n🧪 Testing PraisonAIModel with explicit API key (CrewAI method):')
+        print('\\\\n🧪 Testing PraisonAIModel with explicit API key (CrewAI method):')
         model_with_explicit_key = PraisonAIModel(
             model='openai/gpt-4o-mini',
             base_url=praisonai.config_list[0].get('base_url'),
-            api_key=praisonai.config_list[0].get('api_key')
+            api_key=api_key_from_config # This will be a string from praisonai.config_list
         )
         print(f'  Model: {model_with_explicit_key.model}')
         print(f'  Model name: {model_with_explicit_key.model_name}')
         print(f'  API key var: {model_with_explicit_key.api_key_var}')
-        print(f'  API key (explicit): {model_with_explicit_key.api_key[:10] if model_with_explicit_key.api_key != \"nokey\" else \"NOT_SET\"}...')
+        # model_with_explicit_key.api_key is now a string, or 'nokey'
+        print(f'  API key (explicitly passed to PraisonAIModel): {get_key_display_value(model_with_explicit_key.api_key)}...')
         print(f'  Base URL: {model_with_explicit_key.base_url}')
         
-        # Test if the model can be created without errors
         try:
             llm_instance = model_with_explicit_key.get_model()
             print(f'  ✅ LLM instance created successfully: {type(llm_instance).__name__}')
-            print(f'  LLM instance API key: {getattr(llm_instance, \"openai_api_key\", \"NOT_FOUND\")[:10] if hasattr(llm_instance, \"openai_api_key\") else \"NO_API_KEY_ATTR\"}...')
+            
+            # langchain_openai.ChatOpenAI stores the key in openai_api_key as SecretStr
+            llm_api_key_attr = getattr(llm_instance, 'openai_api_key', 'NOT_FOUND')
+            if llm_api_key_attr != 'NOT_FOUND':
+                 print(f'  LLM instance API key: {get_key_display_value(llm_api_key_attr)}...')
+            else:
+                print(f'  LLM instance API key attribute not found.')
         except Exception as e:
             print(f'  ❌ Failed to create LLM instance: {e}')
+            import traceback
+            traceback.print_exc()
         "
       continue-on-error: true
 
@@ -234,6 +256,9 @@ jobs:
         echo "  OPENAI_API_KEY set: $([ -n "$OPENAI_API_KEY" ] && echo 'YES' || echo 'NO')"
         echo "  OPENAI_API_KEY length: ${#OPENAI_API_KEY}"
         echo "  OPENAI_API_KEY starts with sk-: $(echo "$OPENAI_API_KEY" | grep -q '^sk-' && echo 'YES' || echo 'NO')"
+        export OPENAI_API_KEY="$OPENAI_API_KEY"
+        export OPENAI_API_BASE="$OPENAI_API_BASE"
+        export OPENAI_MODEL_NAME="$OPENAI_MODEL_NAME"
         cd src/praisonai && python -m pytest tests/test.py -v --tb=short --disable-warnings
 
     - name: Upload Coverage Reports

docker/Dockerfile

@@ -1,6 +1,6 @@
 FROM python:3.11-slim
 WORKDIR /app
 COPY . .
-RUN pip install flask praisonai==2.2.17 gunicorn markdown
+RUN pip install flask praisonai==2.2.18 gunicorn markdown
 EXPOSE 8080
 CMD ["gunicorn", "-b", "0.0.0.0:8080", "api:app"]

docker/Dockerfile.chat

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip install --no-cache-dir \
     praisonaiagents>=0.0.4 \
     praisonai_tools \
-    "praisonai==2.2.17" \
+    "praisonai==2.2.18" \
     "praisonai[chat]" \
     "embedchain[github,youtube]"
 

docker/Dockerfile.dev

@@ -15,7 +15,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip install --no-cache-dir \
     praisonaiagents>=0.0.4 \
     praisonai_tools \
-    "praisonai==2.2.17" \
+    "praisonai==2.2.18" \
     "praisonai[ui]" \
     "praisonai[chat]" \
     "praisonai[realtime]" \

docker/Dockerfile.ui

@@ -13,7 +13,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
 RUN pip install --no-cache-dir \
     praisonaiagents>=0.0.4 \
     praisonai_tools \
-    "praisonai==2.2.17" \
+    "praisonai==2.2.18" \
     "praisonai[ui]" \
     "praisonai[crewai]"
 

docs/api/praisonai/deploy.html

@@ -110,7 +110,7 @@ <h2 id="raises">Raises</h2>
             file.write(&#34;FROM python:3.11-slim\n&#34;)
             file.write(&#34;WORKDIR /app\n&#34;)
             file.write(&#34;COPY . .\n&#34;)
-            file.write(&#34;RUN pip install flask praisonai==2.2.17 gunicorn markdown\n&#34;)
+            file.write(&#34;RUN pip install flask praisonai==2.2.18 gunicorn markdown\n&#34;)
             file.write(&#34;EXPOSE 8080\n&#34;)
             file.write(&#39;CMD [&#34;gunicorn&#34;, &#34;-b&#34;, &#34;0.0.0.0:8080&#34;, &#34;api:app&#34;]\n&#39;)
 

docs/developers/local-development.mdx

@@ -27,7 +27,7 @@ WORKDIR /app
 
 COPY . .
 
-RUN pip install flask praisonai==2.2.17 watchdog
+RUN pip install flask praisonai==2.2.18 watchdog
 
 EXPOSE 5555
 

docs/ui/chat.mdx

@@ -155,7 +155,7 @@ To facilitate local development with live reload, you can use Docker. Follow the
 
     COPY . .
 
-    RUN pip install flask praisonai==2.2.17 watchdog
+    RUN pip install flask praisonai==2.2.18 watchdog
 
     EXPOSE 5555
 

docs/ui/code.mdx

@@ -208,7 +208,7 @@ To facilitate local development with live reload, you can use Docker. Follow the
 
     COPY . .
 
-    RUN pip install flask praisonai==2.2.17 watchdog
+    RUN pip install flask praisonai==2.2.18 watchdog
 
     EXPOSE 5555
 

src/praisonai-agents/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "praisonaiagents"
-version = "0.0.90"
+version = "0.0.91"
 description = "Praison AI agents for completing complex tasks with Self Reflection Agents"
 requires-python = ">=3.10"
 authors = [
@@ -25,13 +25,13 @@ mcp = [
 ]
 
 memory = [
-    "chromadb>=0.5.23"
+    "chromadb>=1.0.0"
 ]
 
 knowledge = [
     "mem0ai>=0.1.0",
-    "chromadb==0.5.23",
-    "markitdown[all]",
+    "chromadb>=1.0.0",
+    "markitdown[all]>=0.1.0",
     "chonkie>=1.0.2"
 ]