praisonaiagents 0.0.107__py3-none-any.whl → 0.0.109__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -364,6 +364,7 @@ class Agent:
         knowledge_config: Optional[Dict[str, Any]] = None,
         use_system_prompt: Optional[bool] = True,
         markdown: bool = True,
+        stream: bool = True,
         self_reflect: bool = False,
         max_reflect: int = 3,
         min_reflect: int = 1,
@@ -372,7 +373,9 @@ class Agent:
         user_id: Optional[str] = None,
         reasoning_steps: bool = False,
         guardrail: Optional[Union[Callable[['TaskOutput'], Tuple[bool, Any]], str]] = None,
-        max_guardrail_retries: int = 3
+        max_guardrail_retries: int = 3,
+        base_url: Optional[str] = None,
+        api_key: Optional[str] = None
     ):
         """Initialize an Agent instance.
 
@@ -435,6 +438,8 @@ class Agent:
                 conversations to establish agent behavior and context. Defaults to True.
             markdown (bool, optional): Enable markdown formatting in agent responses for better
                 readability and structure. Defaults to True.
+            stream (bool, optional): Enable streaming responses from the language model. Set to False
+                for LLM providers that don't support streaming. Defaults to True.
             self_reflect (bool, optional): Enable self-reflection capabilities where the agent
                 evaluates and improves its own responses. Defaults to False.
             max_reflect (int, optional): Maximum number of self-reflection iterations to prevent
@@ -454,6 +459,10 @@ class Agent:
                 description string for LLM-based validation. Defaults to None.
             max_guardrail_retries (int, optional): Maximum number of retry attempts when guardrail
                 validation fails before giving up. Defaults to 3.
+            base_url (Optional[str], optional): Base URL for custom LLM endpoints (e.g., Ollama).
+                If provided, automatically creates a custom LLM instance. Defaults to None.
+            api_key (Optional[str], optional): API key for LLM provider. If not provided,
+                falls back to environment variables. Defaults to None.
 
         Raises:
             ValueError: If all of name, role, goal, backstory, and instructions are None.
@@ -500,10 +509,40 @@ class Agent:
         # Check for model name in environment variable if not provided
         self._using_custom_llm = False
 
+        # If base_url is provided, always create a custom LLM instance
+        if base_url:
+            try:
+                from ..llm.llm import LLM
+                # Handle different llm parameter types with base_url
+                if isinstance(llm, dict):
+                    # Merge base_url and api_key into the dict
+                    llm_config = llm.copy()
+                    llm_config['base_url'] = base_url
+                    if api_key:
+                        llm_config['api_key'] = api_key
+                    self.llm_instance = LLM(**llm_config)
+                else:
+                    # Create LLM with model string and base_url
+                    model_name = llm or os.getenv('OPENAI_MODEL_NAME', 'gpt-4o')
+                    self.llm_instance = LLM(
+                        model=model_name,
+                        base_url=base_url,
+                        api_key=api_key
+                    )
+                self._using_custom_llm = True
+            except ImportError as e:
+                raise ImportError(
+                    "LLM features requested but dependencies not installed. "
+                    "Please install with: pip install \"praisonaiagents[llm]\""
+                ) from e
         # If the user passes a dictionary (for advanced configuration)
-        if isinstance(llm, dict) and "model" in llm:
+        elif isinstance(llm, dict) and "model" in llm:
             try:
                 from ..llm.llm import LLM
+                # Add api_key if provided and not in dict
+                if api_key and 'api_key' not in llm:
+                    llm = llm.copy()
+                    llm['api_key'] = api_key
                 self.llm_instance = LLM(**llm)  # Pass all dict items as kwargs
                 self._using_custom_llm = True
             except ImportError as e:
@@ -516,7 +555,10 @@ class Agent:
             try:
                 from ..llm.llm import LLM
                 # Pass the entire string so LiteLLM can parse provider/model
-                self.llm_instance = LLM(model=llm)
+                llm_params = {'model': llm}
+                if api_key:
+                    llm_params['api_key'] = api_key
+                self.llm_instance = LLM(**llm_params)
                 self._using_custom_llm = True
                 
                 # Ensure tools are properly accessible when using custom LLM
@@ -554,6 +596,7 @@ class Agent:
         self.use_system_prompt = use_system_prompt
         self.chat_history = []
         self.markdown = markdown
+        self.stream = stream
         self.max_reflect = max_reflect
         self.min_reflect = min_reflect
         self.reflect_prompt = reflect_prompt
@@ -1002,7 +1045,7 @@ Your Goal: {self.goal}
                         tools=formatted_tools if formatted_tools else None,
                         verbose=self.verbose,
                         markdown=self.markdown,
-                        stream=True,
+                        stream=stream,
                         console=self.console,
                         execute_tool_fn=self.execute_tool,
                         agent_name=self.name,
@@ -1018,7 +1061,7 @@ Your Goal: {self.goal}
                         tools=formatted_tools if formatted_tools else None,
                         verbose=self.verbose,
                         markdown=self.markdown,
-                        stream=False,
+                        stream=stream,
                         console=self.console,
                         execute_tool_fn=self.execute_tool,
                         agent_name=self.name,
@@ -1276,7 +1319,7 @@ Your Goal: {self.goal}
                                 agent_tools=agent_tools
                             )
 
-                    response = self._chat_completion(messages, temperature=temperature, tools=tools if tools else None, reasoning_steps=reasoning_steps, stream=stream)
+                    response = self._chat_completion(messages, temperature=temperature, tools=tools if tools else None, reasoning_steps=reasoning_steps, stream=self.stream)
                     if not response:
                         return None
 
@@ -1371,7 +1414,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
 
                         logging.debug(f"{self.name} reflection count {reflection_count + 1}, continuing reflection process")
                         messages.append({"role": "user", "content": "Now regenerate your response using the reflection you made"})
-                        response = self._chat_completion(messages, temperature=temperature, tools=None, stream=stream)
+                        response = self._chat_completion(messages, temperature=temperature, tools=None, stream=self.stream)
                         response_text = response.choices[0].message.content.strip()
                         reflection_count += 1
                         continue  # Continue the loop for more reflections

praisonaiagents/llm/llm.py

@@ -296,6 +296,7 @@ class LLM:
         agent_role: Optional[str] = None,
         agent_tools: Optional[List[str]] = None,
         execute_tool_fn: Optional[Callable] = None,
+        stream: bool = True,
         **kwargs
     ) -> str:
         """Enhanced get_response with all OpenAI-like features"""
@@ -487,7 +488,7 @@ class LLM:
                                         messages=messages,
                                         tools=formatted_tools,
                                         temperature=temperature,
-                                        stream=True,
+                                        stream=stream,
                                         **kwargs
                                     )
                                 ):
@@ -503,7 +504,7 @@ class LLM:
                                     messages=messages,
                                     tools=formatted_tools,
                                     temperature=temperature,
-                                    stream=True,
+                                    stream=stream,
                                     **kwargs
                                 )
                             ):
@@ -655,7 +656,7 @@ class LLM:
                                                 **self._build_completion_params(
                                                     messages=follow_up_messages,
                                                     temperature=temperature,
-                                                    stream=True
+                                                    stream=stream
                                                 )
                                             ):
                                                 if chunk and chunk.choices and chunk.choices[0].delta.content:
@@ -668,7 +669,7 @@ class LLM:
                                             **self._build_completion_params(
                                                 messages=follow_up_messages,
                                                 temperature=temperature,
-                                                stream=True
+                                                stream=stream
                                             )
                                         ):
                                             if chunk and chunk.choices and chunk.choices[0].delta.content:
@@ -755,7 +756,7 @@ class LLM:
                                         messages=messages,
                                         tools=formatted_tools,
                                         temperature=temperature,
-                                        stream=True,
+                                        stream=stream,
                                         **kwargs
                                     )
                                 ):
@@ -873,7 +874,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 **self._build_completion_params(
                                     messages=reflection_messages,
                                     temperature=temperature,
-                                    stream=True,
+                                    stream=stream,
                                     response_format={"type": "json_object"},
                                     **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                                 )
@@ -888,7 +889,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             **self._build_completion_params(
                                 messages=reflection_messages,
                                 temperature=temperature,
-                                stream=True,
+                                stream=stream,
                                 response_format={"type": "json_object"},
                                 **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                             )
@@ -1004,6 +1005,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
         agent_role: Optional[str] = None,
         agent_tools: Optional[List[str]] = None,
         execute_tool_fn: Optional[Callable] = None,
+        stream: bool = True,
         **kwargs
     ) -> str:
         """Async version of get_response with identical functionality."""
@@ -1204,7 +1206,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         **self._build_completion_params(
                             messages=messages,
                             temperature=temperature,
-                            stream=True,
+                            stream=stream,
                             **kwargs
                         )
                     ):
@@ -1218,7 +1220,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         **self._build_completion_params(
                             messages=messages,
                             temperature=temperature,
-                            stream=True,
+                            stream=stream,
                             **kwargs
                         )
                     ):
@@ -1355,7 +1357,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                         **self._build_completion_params(
                                             messages=follow_up_messages,
                                             temperature=temperature,
-                                            stream=True
+                                            stream=stream
                                         )
                                     ):
                                         if chunk and chunk.choices and chunk.choices[0].delta.content:
@@ -1369,7 +1371,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                         **self._build_completion_params(
                                             messages=follow_up_messages,
                                             temperature=temperature,
-                                            stream=True
+                                            stream=stream
                                         )
                                     ):
                                         if chunk and chunk.choices and chunk.choices[0].delta.content:
@@ -1437,7 +1439,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 **self._build_completion_params(
                                     messages=messages,
                                     temperature=temperature,
-                                    stream=True,
+                                    stream=stream,
                                     tools=formatted_tools,
                                     **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                                 )
@@ -1453,7 +1455,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 **self._build_completion_params(
                                     messages=messages,
                                     temperature=temperature,
-                                    stream=True,
+                                    stream=stream,
                                     **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                                 )
                             ):
@@ -1534,7 +1536,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             **self._build_completion_params(
                                 messages=reflection_messages,
                                 temperature=temperature,
-                                stream=True,
+                                stream=stream,
                                 response_format={"type": "json_object"},
                                 **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                             )
@@ -1549,7 +1551,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         **self._build_completion_params(
                             messages=reflection_messages,
                             temperature=temperature,
-                            stream=True,
+                            stream=stream,
                             response_format={"type": "json_object"},
                             **{k:v for k,v in kwargs.items() if k != 'reasoning_steps'}
                         )

praisonaiagents/mcp/mcp.py

@@ -379,6 +379,43 @@ class MCP:
         """
         return iter(self._tools)
     
+    def _fix_array_schemas(self, schema):
+        """
+        Fix array schemas by adding missing 'items' attribute required by OpenAI.
+        
+        This ensures compatibility with OpenAI's function calling format which
+        requires array types to specify the type of items they contain.
+        
+        Args:
+            schema: The schema dictionary to fix
+            
+        Returns:
+            dict: The fixed schema
+        """
+        if not isinstance(schema, dict):
+            return schema
+            
+        # Create a copy to avoid modifying the original
+        fixed_schema = schema.copy()
+        
+        # Fix array types at the current level
+        if fixed_schema.get("type") == "array" and "items" not in fixed_schema:
+            # Add a default items schema for arrays without it
+            fixed_schema["items"] = {"type": "string"}
+            
+        # Recursively fix nested schemas
+        if "properties" in fixed_schema:
+            fixed_properties = {}
+            for prop_name, prop_schema in fixed_schema["properties"].items():
+                fixed_properties[prop_name] = self._fix_array_schemas(prop_schema)
+            fixed_schema["properties"] = fixed_properties
+            
+        # Fix items schema if it exists
+        if "items" in fixed_schema:
+            fixed_schema["items"] = self._fix_array_schemas(fixed_schema["items"])
+            
+        return fixed_schema
+    
     def to_openai_tool(self):
         """Convert the MCP tool to an OpenAI-compatible tool definition.
         
@@ -404,7 +441,8 @@ class MCP:
             # Create OpenAI tool definition
             parameters = {}
             if hasattr(tool, 'inputSchema') and tool.inputSchema:
-                parameters = tool.inputSchema
+                # Fix array schemas to include 'items' attribute
+                parameters = self._fix_array_schemas(tool.inputSchema)
             else:
                 # Create a minimal schema if none exists
                 parameters = {

praisonaiagents/mcp/mcp_sse.py

@@ -88,14 +88,54 @@ class SSEMCPTool:
             logger.error(f"Error in _async_call for {self.name}: {e}")
             raise
     
+    def _fix_array_schemas(self, schema):
+        """
+        Fix array schemas by adding missing 'items' attribute required by OpenAI.
+        
+        This ensures compatibility with OpenAI's function calling format which
+        requires array types to specify the type of items they contain.
+        
+        Args:
+            schema: The schema dictionary to fix
+            
+        Returns:
+            dict: The fixed schema
+        """
+        if not isinstance(schema, dict):
+            return schema
+            
+        # Create a copy to avoid modifying the original
+        fixed_schema = schema.copy()
+        
+        # Fix array types at the current level
+        if fixed_schema.get("type") == "array" and "items" not in fixed_schema:
+            # Add a default items schema for arrays without it
+            fixed_schema["items"] = {"type": "string"}
+            
+        # Recursively fix nested schemas
+        if "properties" in fixed_schema:
+            fixed_properties = {}
+            for prop_name, prop_schema in fixed_schema["properties"].items():
+                fixed_properties[prop_name] = self._fix_array_schemas(prop_schema)
+            fixed_schema["properties"] = fixed_properties
+            
+        # Fix items schema if it exists
+        if "items" in fixed_schema:
+            fixed_schema["items"] = self._fix_array_schemas(fixed_schema["items"])
+            
+        return fixed_schema
+    
     def to_openai_tool(self):
         """Convert the tool to OpenAI format."""
+        # Fix array schemas to include 'items' attribute
+        fixed_schema = self._fix_array_schemas(self.input_schema)
+        
         return {
             "type": "function",
             "function": {
                 "name": self.name,
                 "description": self.description,
-                "parameters": self.input_schema
+                "parameters": fixed_schema
             }
         }
 

{praisonaiagents-0.0.107.dist-info → praisonaiagents-0.0.109.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.107
+Version: 0.0.109
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Python: >=3.10

{praisonaiagents-0.0.107.dist-info → praisonaiagents-0.0.109.dist-info}/RECORD

@@ -3,7 +3,7 @@ praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9
 praisonaiagents/main.py,sha256=_-XE7_Y7ChvtLQMivfNFrrnAhv4wSSDhH9WJMWlkS0w,16315
 praisonaiagents/session.py,sha256=d-CZPYikOHb0q-H9f_IWKJsypnQfz1YKeLLkyxs6oDo,15532
 praisonaiagents/agent/__init__.py,sha256=j0T19TVNbfZcClvpbZDDinQxZ0oORgsMrMqx16jZ-bA,128
-praisonaiagents/agent/agent.py,sha256=pyHW34UkqlMaiPg5e8mzLJZoI8mi9D5WnFEBd6pJ9UE,109857
+praisonaiagents/agent/agent.py,sha256=VILZRrFbUJFF_gtATMfx-fpqoBMMwyiRmvBWo9592Ds,112093
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
 praisonaiagents/agents/agents.py,sha256=C_yDdJB4XUuwKA9DrysAtAj3zSYT0IKtfCT4Pxo0oyI,63309
@@ -15,10 +15,10 @@ praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9b
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
 praisonaiagents/knowledge/knowledge.py,sha256=OKPar-XGyAp1ndmbOOdCgqFnTCqpOThYVSIZRxZyP58,15683
 praisonaiagents/llm/__init__.py,sha256=bSywIHBHH0YUf4hSx-FmFXkRv2g1Rlhuk-gjoImE8j8,925
-praisonaiagents/llm/llm.py,sha256=JiUOobhPxs3m5Xs7pliNQOVjETqmW8vdM8HIPsZ5DfA,104417
+praisonaiagents/llm/llm.py,sha256=NfsJNSScR_kS2sLeU1Ah41IXYN804cOQEMuxpt59zuM,104505
 praisonaiagents/mcp/__init__.py,sha256=ibbqe3_7XB7VrIcUcetkZiUZS1fTVvyMy_AqCSFG8qc,240
-praisonaiagents/mcp/mcp.py,sha256=_gfp8hrSVT9aPqEDDfU8MiCdg0-3dVQpEQUE6AbrJlo,17243
-praisonaiagents/mcp/mcp_sse.py,sha256=DLh3F_aoVRM1X-7hgIOWOw4FQ1nGmn9YNbQTesykzn4,6792
+praisonaiagents/mcp/mcp.py,sha256=qr9xbTfM3V6ZQgs3o9mGv6pDiJPnfbI24nUK_vUnGOI,18771
+praisonaiagents/mcp/mcp_sse.py,sha256=z8TMFhW9xuLQ7QnpOa3n1-nSHt0-Bf27qso0u4qxYSY,8357
 praisonaiagents/memory/__init__.py,sha256=aEFdhgtTqDdMhc_JCWM-f4XI9cZIj7Wz5g_MUa-0amg,397
 praisonaiagents/memory/memory.py,sha256=eYXVvuXrvt4LaEJ-AAbAiwpFUCuS5LH5F7Z0cBW5_gQ,42186
 praisonaiagents/process/__init__.py,sha256=lkYbL7Hn5a0ldvJtkdH23vfIIZLIcanK-65C0MwaorY,52
@@ -51,7 +51,7 @@ praisonaiagents/tools/xml_tools.py,sha256=iYTMBEk5l3L3ryQ1fkUnNVYK-Nnua2Kx2S0dxN
 praisonaiagents/tools/yaml_tools.py,sha256=uogAZrhXV9O7xvspAtcTfpKSQYL2nlOTvCQXN94-G9A,14215
 praisonaiagents/tools/yfinance_tools.py,sha256=s2PBj_1v7oQnOobo2fDbQBACEHl61ftG4beG6Z979ZE,8529
 praisonaiagents/tools/train/data/generatecot.py,sha256=H6bNh-E2hqL5MW6kX3hqZ05g9ETKN2-kudSjiuU_SD8,19403
-praisonaiagents-0.0.107.dist-info/METADATA,sha256=EulBpJyK-yS6wHQx7VCOCOqk2DSlNcexjNo08mYm3MA,1669
-praisonaiagents-0.0.107.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.107.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.107.dist-info/RECORD,,
+praisonaiagents-0.0.109.dist-info/METADATA,sha256=978n4Xm55N1ZwIQYE4vtLBVqsIuCylWFOEW1bWZTa6g,1669
+praisonaiagents-0.0.109.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.109.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.109.dist-info/RECORD,,