praisonaiagents 0.0.121__py3-none-any.whl → 0.0.123__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -1274,27 +1274,40 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                     messages.append({"role": "user", "content": reflection_prompt})
 
                     try:
-                        # Check if OpenAI client is available
-                        if self._openai_client is None:
-                            # For custom LLMs, self-reflection with structured output is not supported
-                            if self.verbose:
-                                display_self_reflection(f"Agent {self.name}: Self-reflection with structured output is not supported for custom LLM providers. Skipping reflection.", console=self.console)
-                            # Return the original response without reflection
-                            self.chat_history.append({"role": "user", "content": prompt})
-                            self.chat_history.append({"role": "assistant", "content": response_text})
-                            # Only display interaction if not using custom LLM (to avoid double output) and verbose is True
-                            if self.verbose and not self._using_custom_llm:
-                                display_interaction(prompt, response_text, markdown=self.markdown, generation_time=time.time() - start_time, console=self.console)
-                            return response_text
-                        
-                        reflection_response = self._openai_client.sync_client.beta.chat.completions.parse(
-                            model=self.reflect_llm if self.reflect_llm else self.llm,
-                            messages=messages,
-                            temperature=temperature,
-                            response_format=ReflectionOutput
-                        )
+                        # Check if we're using a custom LLM (like Gemini)
+                        if self._using_custom_llm or self._openai_client is None:
+                            # For custom LLMs, we need to handle reflection differently
+                            # Use non-streaming to get complete JSON response
+                            reflection_response = self._chat_completion(messages, temperature=temperature, tools=None, stream=False, reasoning_steps=False)
+                            
+                            if not reflection_response or not reflection_response.choices:
+                                raise Exception("No response from reflection request")
+                            
+                            reflection_text = reflection_response.choices[0].message.content.strip()
+                            
+                            # Clean the JSON output
+                            cleaned_json = self.clean_json_output(reflection_text)
+                            
+                            # Parse the JSON manually
+                            reflection_data = json.loads(cleaned_json)
+                            
+                            # Create a reflection output object manually
+                            class CustomReflectionOutput:
+                                def __init__(self, data):
+                                    self.reflection = data.get('reflection', '')
+                                    self.satisfactory = data.get('satisfactory', 'no').lower()
+                            
+                            reflection_output = CustomReflectionOutput(reflection_data)
+                        else:
+                            # Use OpenAI's structured output for OpenAI models
+                            reflection_response = self._openai_client.sync_client.beta.chat.completions.parse(
+                                model=self.reflect_llm if self.reflect_llm else self.llm,
+                                messages=messages,
+                                temperature=temperature,
+                                response_format=ReflectionOutput
+                            )
 
-                        reflection_output = reflection_response.choices[0].message.parsed
+                            reflection_output = reflection_response.choices[0].message.parsed
 
                         if self.verbose:
                             display_self_reflection(f"Agent {self.name} self reflection (using {self.reflect_llm if self.reflect_llm else self.llm}): reflection='{reflection_output.reflection}' satisfactory='{reflection_output.satisfactory}'", console=self.console)
@@ -1337,7 +1350,9 @@ 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=self.stream)
+                        # For custom LLMs during reflection, always use non-streaming to ensure complete responses
+                        use_stream = self.stream if not self._using_custom_llm else False
+                        response = self._chat_completion(messages, temperature=temperature, tools=None, stream=use_stream)
                         response_text = response.choices[0].message.content.strip()
                         reflection_count += 1
                         continue  # Continue the loop for more reflections

praisonaiagents/agents/autoagents.py

@@ -214,9 +214,37 @@ Tools: {', '.join(agent_tools)}"""
             
         return assigned_tools
 
+    def _validate_config(self, config: AutoAgentsConfig) -> tuple[bool, str]:
+        """
+        Validate that the configuration has proper TaskConfig objects.
+        
+        Returns:
+            Tuple of (is_valid, error_message)
+        """
+        for agent_idx, agent in enumerate(config.agents):
+            if not hasattr(agent, 'tasks') or not agent.tasks:
+                return False, f"Agent '{agent.name}' has no tasks defined"
+            
+            for task_idx, task in enumerate(agent.tasks):
+                # Check if task is a proper TaskConfig instance
+                if not isinstance(task, TaskConfig):
+                    return False, f"Task at index {task_idx} for agent '{agent.name}' is not a proper TaskConfig object"
+                
+                # Check required fields
+                if not task.name:
+                    return False, f"Task at index {task_idx} for agent '{agent.name}' has no name"
+                if not task.description:
+                    return False, f"Task at index {task_idx} for agent '{agent.name}' has no description"
+                if not task.expected_output:
+                    return False, f"Task at index {task_idx} for agent '{agent.name}' has no expected_output"
+                if task.tools is None:
+                    return False, f"Task at index {task_idx} for agent '{agent.name}' has no tools field"
+        
+        return True, ""
+
     def _generate_config(self) -> AutoAgentsConfig:
-        """Generate the configuration for agents and tasks"""
-        prompt = f"""
+        """Generate the configuration for agents and tasks with retry logic"""
+        base_prompt = f"""
 Generate a configuration for AI agents to accomplish this task: "{self.instructions}"
 
 The configuration should include:
@@ -237,84 +265,161 @@ Requirements:
 4. The process type should match the task requirements
 5. Generate maximum {self.max_agents} agents to handle this task efficiently
 
-Return the configuration in a structured JSON format matching the AutoAgentsConfig schema.
+Return the configuration in a structured JSON format matching this exact schema:
+{{
+  "main_instruction": "Overall goal description",
+  "process_type": "sequential|workflow|hierarchical",
+  "agents": [
+    {{
+      "name": "Agent Name",
+      "role": "Agent Role",
+      "goal": "Agent Goal",
+      "backstory": "Agent Backstory",
+      "tools": ["tool1", "tool2"],
+      "tasks": [
+        {{
+          "name": "Task Name",
+          "description": "Detailed task description",
+          "expected_output": "What the task should produce",
+          "tools": ["tool1", "tool2"]
+        }}
+      ]
+    }}
+  ]
+}}
+
+IMPORTANT: Each task MUST be an object with name, description, expected_output, and tools fields, NOT a simple string.
 """
         
-        try:
-            # Try to use OpenAI's structured output if available
+        max_retries = 3
+        last_response = None
+        last_error = None
+        
+        for attempt in range(max_retries):
+            # Initialize variables for this attempt
             use_openai_structured = False
             client = None
             
+            # Prepare prompt for this attempt
+            if attempt > 0 and last_response and last_error:
+                # On retry, include the previous response and error
+                prompt = f"""{base_prompt}
+
+PREVIOUS ATTEMPT FAILED!
+Your previous response was:
+```json
+{last_response}
+```
+
+Error: {last_error}
+
+REMEMBER: Tasks MUST be objects with the following structure:
+{{
+  "name": "Task Name",
+  "description": "Task Description",
+  "expected_output": "Expected Output",
+  "tools": ["tool1", "tool2"]
+}}
+
+DO NOT use strings for tasks. Each task MUST be a complete object with all four fields."""
+            else:
+                prompt = base_prompt
+            
             try:
                 # Check if we have OpenAI API and the model supports structured output
-                if self.llm and (self.llm.startswith('gpt-') or self.llm.startswith('o1-') or self.llm.startswith('o3-')):
-                    # Create a new client instance if custom parameters are provided
-                    if self.api_key or self.base_url:
-                        client = OpenAIClient(api_key=self.api_key, base_url=self.base_url)
-                    else:
-                        client = get_openai_client()
+                from ..llm import supports_structured_outputs
+                if self.llm and supports_structured_outputs(self.llm):
+                    client = get_openai_client()
                     use_openai_structured = True
             except:
                 # If OpenAI client is not available, we'll use the LLM class
                 pass
             
-            if use_openai_structured and client:
-                # Use OpenAI's structured output for OpenAI models (backward compatibility)
-                config = client.parse_structured_output(
-                    messages=[
-                        {"role": "system", "content": "You are a helpful assistant designed to generate AI agent configurations."},
-                        {"role": "user", "content": prompt}
-                    ],
-                    response_format=AutoAgentsConfig,
-                    model=self.llm
-                )
-            else:
-                # Use LLM class for all other providers (Gemini, Anthropic, etc.)
-                llm_instance = LLM(
-                    model=self.llm,
-                    base_url=self.base_url,
-                    api_key=self.api_key
-                )
+            try:
+                if use_openai_structured and client:
+                    # Use OpenAI's structured output for OpenAI models (backward compatibility)
+                    config = client.parse_structured_output(
+                        messages=[
+                            {"role": "system", "content": "You are a helpful assistant designed to generate AI agent configurations."},
+                            {"role": "user", "content": prompt}
+                        ],
+                        response_format=AutoAgentsConfig,
+                        model=self.llm
+                    )
+                    # Store the response for potential retry
+                    last_response = json.dumps(config.model_dump(), indent=2)
+                else:
+                    # Use LLM class for all other providers (Gemini, Anthropic, etc.)
+                    llm_instance = LLM(
+                        model=self.llm,
+                        base_url=self.base_url,
+                        api_key=self.api_key
+                    )
+                    
+                    response_text = llm_instance.get_response(
+                        prompt=prompt,
+                        system_prompt="You are a helpful assistant designed to generate AI agent configurations.",
+                        output_pydantic=AutoAgentsConfig,
+                        temperature=0.7,
+                        stream=False,
+                        verbose=False
+                    )
+                    
+                    # Store the raw response for potential retry
+                    last_response = response_text
+                    
+                    # Parse the JSON response
+                    try:
+                        # First try to parse as is
+                        config_dict = json.loads(response_text)
+                        config = AutoAgentsConfig(**config_dict)
+                    except json.JSONDecodeError:
+                        # If that fails, try to extract JSON from the response
+                        # Handle cases where the model might wrap JSON in markdown blocks
+                        cleaned_response = response_text.strip()
+                        if cleaned_response.startswith("```json"):
+                            cleaned_response = cleaned_response[7:]
+                        if cleaned_response.startswith("```"):
+                            cleaned_response = cleaned_response[3:]
+                        if cleaned_response.endswith("```"):
+                            cleaned_response = cleaned_response[:-3]
+                        cleaned_response = cleaned_response.strip()
+                        
+                        config_dict = json.loads(cleaned_response)
+                        config = AutoAgentsConfig(**config_dict)
                 
-                response_text = llm_instance.response(
-                    prompt=prompt,
-                    system_prompt="You are a helpful assistant designed to generate AI agent configurations.",
-                    output_pydantic=AutoAgentsConfig,
-                    temperature=0.7,
-                    stream=False,
-                    verbose=False
-                )
+                # Validate the configuration
+                is_valid, error_msg = self._validate_config(config)
+                if not is_valid:
+                    last_error = error_msg
+                    if attempt < max_retries - 1:
+                        logging.warning(f"Configuration validation failed (attempt {attempt + 1}/{max_retries}): {error_msg}")
+                        continue
+                    else:
+                        raise ValueError(f"Configuration validation failed after {max_retries} attempts: {error_msg}")
                 
-                # Parse the JSON response
-                try:
-                    # First try to parse as is
-                    config_dict = json.loads(response_text)
-                    config = AutoAgentsConfig(**config_dict)
-                except json.JSONDecodeError:
-                    # If that fails, try to extract JSON from the response
-                    # Handle cases where the model might wrap JSON in markdown blocks
-                    cleaned_response = response_text.strip()
-                    if cleaned_response.startswith("```json"):
-                        cleaned_response = cleaned_response[7:]
-                    if cleaned_response.startswith("```"):
-                        cleaned_response = cleaned_response[3:]
-                    if cleaned_response.endswith("```"):
-                        cleaned_response = cleaned_response[:-3]
-                    cleaned_response = cleaned_response.strip()
-                    
-                    config_dict = json.loads(cleaned_response)
-                    config = AutoAgentsConfig(**config_dict)
-            
-            # Ensure we have exactly max_agents number of agents
-            if len(config.agents) > self.max_agents:
-                config.agents = config.agents[:self.max_agents]
-            elif len(config.agents) < self.max_agents:
-                logging.warning(f"Generated {len(config.agents)} agents, expected {self.max_agents}")
-            
-            return config
-        except Exception as e:
-            logging.error(f"Error generating configuration: {e}")
-            raise
+                # Ensure we have exactly max_agents number of agents
+                if len(config.agents) > self.max_agents:
+                    config.agents = config.agents[:self.max_agents]
+                elif len(config.agents) < self.max_agents:
+                    logging.warning(f"Generated {len(config.agents)} agents, expected {self.max_agents}")
+                
+                return config
+                
+            except ValueError as e:
+                # Re-raise validation errors
+                raise
+            except Exception as e:
+                last_error = str(e)
+                if attempt < max_retries - 1:
+                    logging.warning(f"Error generating configuration (attempt {attempt + 1}/{max_retries}): {e}")
+                    continue
+                else:
+                    logging.error(f"Error generating configuration after {max_retries} attempts: {e}")
+                    raise
+        
+        # This should never be reached due to the raise statements above
+        raise RuntimeError(f"Failed to generate valid configuration after {max_retries} attempts")
 
     def _create_agents_and_tasks(self, config: AutoAgentsConfig) -> Tuple[List[Agent], List[Task]]:
         """Create agents and tasks from configuration"""

praisonaiagents/llm/__init__.py

@@ -32,6 +32,10 @@ from .openai_client import (
     ToolCall,
     process_stream_chunks
 )
+from .model_capabilities import (
+    supports_structured_outputs,
+    supports_streaming_with_tools
+)
 
 # Ensure telemetry is disabled after import as well
 try:
@@ -52,5 +56,7 @@ __all__ = [
     "CompletionUsage",
     "ChatCompletion",
     "ToolCall",
-    "process_stream_chunks"
+    "process_stream_chunks",
+    "supports_structured_outputs",
+    "supports_streaming_with_tools"
 ]

praisonaiagents/llm/llm.py

@@ -386,8 +386,11 @@ class LLM:
         if self._is_ollama_provider():
             return False
         
-        # OpenAI models support streaming with tools
-        if any(self.model.startswith(prefix) for prefix in ["gpt-", "o1-", "o3-"]):
+        # Import the capability check function
+        from .model_capabilities import supports_streaming_with_tools
+        
+        # Check if this model supports streaming with tools
+        if supports_streaming_with_tools(self.model):
             return True
         
         # Anthropic Claude models support streaming with tools

praisonaiagents/llm/model_capabilities.py

@@ -0,0 +1,90 @@
+"""
+Model capabilities configuration for different LLM providers.
+This module defines which models support specific features like structured outputs.
+"""
+
+# Models that support OpenAI-style structured outputs (response_format with Pydantic models)
+MODELS_SUPPORTING_STRUCTURED_OUTPUTS = {
+    # OpenAI models
+    "gpt-4o",
+    "gpt-4o-mini",
+    "gpt-4-turbo",
+    "gpt-4-turbo-preview",
+    "gpt-4-turbo-2024-04-09",
+    "gpt-4-1106-preview",
+    "gpt-4-0125-preview",
+    "gpt-3.5-turbo",
+    "gpt-3.5-turbo-1106",
+    "gpt-3.5-turbo-0125",
+    
+    # New/Future OpenAI models (as mentioned by user)
+    "codex-mini",
+    "o3-pro",
+    "gpt-4.5-preview",
+    "o3-mini",
+    "o1",
+    "o1-preview",
+    "o1-mini",
+    "gpt-4.1",
+    "gpt-4.1-nano",
+    "gpt-4.1-mini",
+    "o4-mini",
+    "o3",
+}
+
+# Models that explicitly DON'T support structured outputs
+MODELS_NOT_SUPPORTING_STRUCTURED_OUTPUTS = {
+    # Audio preview models
+    "gpt-4o-audio-preview",
+    "gpt-4o-mini-audio-preview",
+    
+    # Legacy o1 models (don't support system messages either)
+    "o1-preview-2024-09-12",
+    "o1-mini-2024-09-12",
+}
+
+
+def supports_structured_outputs(model_name: str) -> bool:
+    """
+    Check if a model supports OpenAI-style structured outputs.
+    
+    Args:
+        model_name: The name of the model to check
+        
+    Returns:
+        bool: True if the model supports structured outputs, False otherwise
+    """
+    if not model_name:
+        return False
+    
+    # First check if it's explicitly in the NOT supporting list
+    if model_name in MODELS_NOT_SUPPORTING_STRUCTURED_OUTPUTS:
+        return False
+    
+    # Then check if it's in the supporting list
+    if model_name in MODELS_SUPPORTING_STRUCTURED_OUTPUTS:
+        return True
+    
+    # For models with version suffixes, check the base model name
+    base_model = model_name.split('-2024-')[0].split('-2025-')[0]
+    if base_model in MODELS_SUPPORTING_STRUCTURED_OUTPUTS:
+        return True
+    
+    # Default to False for unknown models
+    return False
+
+
+def supports_streaming_with_tools(model_name: str) -> bool:
+    """
+    Check if a model supports streaming when tools are provided.
+    Most models that support structured outputs also support streaming with tools.
+    
+    Args:
+        model_name: The name of the model to check
+        
+    Returns:
+        bool: True if the model supports streaming with tools, False otherwise
+    """
+    # For now, use the same logic as structured outputs
+    # In the future, this could be a separate list if needed
+    return supports_structured_outputs(model_name)

{praisonaiagents-0.0.121.dist-info → praisonaiagents-0.0.123.dist-info}/METADATA

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

{praisonaiagents-0.0.121.dist-info → praisonaiagents-0.0.123.dist-info}/RECORD

@@ -3,20 +3,21 @@ praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9
 praisonaiagents/main.py,sha256=bamnEu5PaekloGi52VqAFclm-HzjEVeKtWF0Zpdmfzs,15479
 praisonaiagents/session.py,sha256=d-CZPYikOHb0q-H9f_IWKJsypnQfz1YKeLLkyxs6oDo,15532
 praisonaiagents/agent/__init__.py,sha256=IhIDtAkfJ99cxbttwou52coih_AejS2-jpazsX6LbDY,350
-praisonaiagents/agent/agent.py,sha256=_ROVyOTPBMB5Porv4YvZ4-kKWr4-tGMbSN7V8uDWZgk,109619
+praisonaiagents/agent/agent.py,sha256=BZx0iCP4hHfKFlfGlkZtanBJDDBDZe54dhf4Oskhmhw,110427
 praisonaiagents/agent/handoff.py,sha256=Saq0chqfvC6Zf5UbXvmctybbehqnotrXn72JsS-76Q0,13099
 praisonaiagents/agent/image_agent.py,sha256=-5MXG594HVwSpFMcidt16YBp7udtik-Cp7eXlzLE1fY,8696
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
 praisonaiagents/agents/agents.py,sha256=WnptTEMSDMAM30Ka6rOAu6rBD-ZLev3qphb1a3BbP1g,63301
-praisonaiagents/agents/autoagents.py,sha256=gLzNsYkvefY667p3xbbvgEBLu4VzEZeyh3a_3yxt1e8,16478
+praisonaiagents/agents/autoagents.py,sha256=GHHCGjrKFIFkmz6bhiKqaGKWJCbHHcF_RSGmRnc5PlA,20766
 praisonaiagents/guardrails/__init__.py,sha256=HA8zhp-KRHTxo0194MUwXOUJjPyjOu7E3d7xUIKYVVY,310
 praisonaiagents/guardrails/guardrail_result.py,sha256=2K1WIYRyT_s1H6vBGa-7HEHzXCFIyZXZVY4f0hnQyWc,1352
 praisonaiagents/guardrails/llm_guardrail.py,sha256=MTTqmYDdZX-18QN9T17T5P_6H2qnV8GVgymJufW1WuM,3277
 praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9bge0Ujuto,246
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
 praisonaiagents/knowledge/knowledge.py,sha256=OKPar-XGyAp1ndmbOOdCgqFnTCqpOThYVSIZRxZyP58,15683
-praisonaiagents/llm/__init__.py,sha256=6lTeQ8jWi1-KiwjCDCmkHo2e-bRLq2dP0s5iJWqjO3s,1421
-praisonaiagents/llm/llm.py,sha256=8cDahPVMPI882J0psA1cXreJGXvO33eSOpMNy7FLCS4,107383
+praisonaiagents/llm/__init__.py,sha256=2rCx-Vfgg881XhVnOSDIt8mDab3Nj_BkHwDP4Bbbudc,1596
+praisonaiagents/llm/llm.py,sha256=pP8mu9E4oWYFmjH4OJjvD0SlFz8AxpP2WUOuGN2oiL8,107486
+praisonaiagents/llm/model_capabilities.py,sha256=poxOxATUOi9XPTx3v6BPnXvSfikWSA9NciWQVuPU7Zg,2586
 praisonaiagents/llm/openai_client.py,sha256=0JvjCDHoH8I8kIt5vvObARkGdVaPWdTIv_FoEQ5EQPA,48973
 praisonaiagents/mcp/__init__.py,sha256=ibbqe3_7XB7VrIcUcetkZiUZS1fTVvyMy_AqCSFG8qc,240
 praisonaiagents/mcp/mcp.py,sha256=-fFx4MHffnN2woLnnV7Pzx3-1SFkn2j8Gp5F5ZIwKJ0,19698
@@ -53,7 +54,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.121.dist-info/METADATA,sha256=okAbJt5iVUK3GgBI66uk_0sKZSSs2orSgKepbSpQb-8,1669
-praisonaiagents-0.0.121.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.121.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.121.dist-info/RECORD,,
+praisonaiagents-0.0.123.dist-info/METADATA,sha256=gTnevKwNN3D6hq-AlVNWPcvyKZAGABLsHYbKkSj5YLQ,1669
+praisonaiagents-0.0.123.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.123.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.123.dist-info/RECORD,,