praisonaiagents 0.0.137__py3-none-any.whl → 0.0.139__py3-none-any.whl

praisonaiagents/agent/agent.py

@@ -1536,7 +1536,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
             cleaned = cleaned[:-3].strip()
         return cleaned  
 
-    async def achat(self, prompt: str, temperature=0.2, tools=None, output_json=None, output_pydantic=None, reasoning_steps=False):
+    async def achat(self, prompt: str, temperature=0.2, tools=None, output_json=None, output_pydantic=None, reasoning_steps=False, task_name=None, task_description=None, task_id=None):
         """Async version of chat method with self-reflection support.""" 
         # Log all parameter values when in debug mode
         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
@@ -1944,7 +1944,11 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
             prompt = task
         else:
             prompt = str(task)
-        return await self.achat(prompt)
+        # Extract task info if available
+        task_name = getattr(task, 'name', None)
+        task_description = getattr(task, 'description', None)
+        task_id = getattr(task, 'id', None)
+        return await self.achat(prompt, task_name=task_name, task_description=task_description, task_id=task_id)
 
     async def execute_tool_async(self, function_name: str, arguments: Dict[str, Any]) -> Any:
         """Async version of execute_tool"""
@@ -2113,7 +2117,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                 try:
                     # Use async version if available, otherwise use sync version
                     if asyncio.iscoroutinefunction(self.chat):
-                        response = await self.achat(query)
+                        response = await self.achat(query, task_name=None, task_description=None, task_id=None)
                     else:
                         # Run sync function in a thread to avoid blocking
                         loop = asyncio.get_event_loop()
@@ -2234,7 +2238,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                 try:
                     # Ensure self.achat is used as it's the async version and pass its tools
                     if hasattr(self, 'achat') and asyncio.iscoroutinefunction(self.achat):
-                        response = await self.achat(prompt, tools=self.tools)
+                        response = await self.achat(prompt, tools=self.tools, task_name=None, task_description=None, task_id=None)
                     elif hasattr(self, 'chat'): # Fallback for synchronous chat
                         loop = asyncio.get_event_loop()
                         response = await loop.run_in_executor(None, lambda p=prompt: self.chat(p, tools=self.tools))

praisonaiagents/agents/agents.py

@@ -362,14 +362,20 @@ Context:
                 _get_multimodal_message(task_prompt, task.images),
                 tools=tools,
                 output_json=task.output_json,
-                output_pydantic=task.output_pydantic
+                output_pydantic=task.output_pydantic,
+                task_name=task.name,
+                task_description=task.description,
+                task_id=task.id
             )
         else:
             agent_output = await executor_agent.achat(
                 task_prompt,
                 tools=tools,
                 output_json=task.output_json,
-                output_pydantic=task.output_pydantic
+                output_pydantic=task.output_pydantic,
+                task_name=task.name,
+                task_description=task.description,
+                task_id=task.id
             )
 
         if agent_output:
@@ -1138,7 +1144,7 @@ Context:
                         try:
                             # Use async version if available, otherwise use sync version
                             if asyncio.iscoroutinefunction(agent_instance.chat):
-                                response = await agent_instance.achat(current_input)
+                                response = await agent_instance.achat(current_input, task_name=None, task_description=None, task_id=None)
                             else:
                                 # Run sync function in a thread to avoid blocking
                                 loop = asyncio.get_running_loop()
@@ -1294,7 +1300,7 @@ Context:
                     try:
                         logging.debug(f"Processing with agent: {agent_instance.name}")
                         if hasattr(agent_instance, 'achat') and asyncio.iscoroutinefunction(agent_instance.achat):
-                            response = await agent_instance.achat(current_input, tools=agent_instance.tools)
+                            response = await agent_instance.achat(current_input, tools=agent_instance.tools, task_name=None, task_description=None, task_id=None)
                         elif hasattr(agent_instance, 'chat'): # Fallback to sync chat if achat not suitable
                             loop = asyncio.get_running_loop()
                             response = await loop.run_in_executor(None, lambda ci=current_input: agent_instance.chat(ci, tools=agent_instance.tools))

praisonaiagents/llm/llm.py

@@ -93,6 +93,9 @@ class LLM:
     # Ollama-specific prompt constants
     OLLAMA_TOOL_USAGE_PROMPT = "Please analyze the request and use the available tools to help answer the question. Start by identifying what information you need."
     OLLAMA_FINAL_ANSWER_PROMPT = "Based on the tool results above, please provide the final answer to the original question."
+    
+    # Ollama iteration threshold for summary generation
+    OLLAMA_SUMMARY_ITERATION_THRESHOLD = 3
 
     def _log_llm_config(self, method_name: str, **config):
         """Centralized debug logging for LLM configuration and parameters.
@@ -323,9 +326,8 @@ class LLM:
         if not (self._is_ollama_provider() and tool_results):
             return None
 
-        # If response is substantial, no summary needed
-        if response_text and len(response_text.strip()) > OLLAMA_MIN_RESPONSE_LENGTH:
-            return None
+        # For Ollama, always generate summary when we have tool results
+        # This prevents infinite loops caused by empty/minimal responses
             
         # Build tool summary efficiently
         summary_lines = ["Based on the tool execution results:"]
@@ -827,6 +829,7 @@ class LLM:
             iteration_count = 0
             final_response_text = ""
             stored_reasoning_content = None  # Store reasoning content from tool execution
+            accumulated_tool_results = []  # Store all tool results across iterations
 
             while iteration_count < max_iterations:
                 try:
@@ -894,7 +897,13 @@ class LLM:
                                 message=original_prompt,
                                 response=response_content,
                                 markdown=markdown,
-                                generation_time=generation_time_val
+                                generation_time=generation_time_val,
+                                agent_name=agent_name,
+                                agent_role=agent_role,
+                                agent_tools=agent_tools,
+                                task_name=task_name,
+                                task_description=task_description,
+                                task_id=task_id
                             )
                             callback_executed = True
                     
@@ -963,7 +972,13 @@ class LLM:
                                     message=original_prompt,
                                     response=response_text,
                                     markdown=markdown,
-                                    generation_time=time.time() - current_time
+                                    generation_time=time.time() - current_time,
+                                    agent_name=agent_name,
+                                    agent_role=agent_role,
+                                    agent_tools=agent_tools,
+                                    task_name=task_name,
+                                    task_description=task_description,
+                                    task_id=task_id
                                 )
                                 callback_executed = True
 
@@ -1017,7 +1032,13 @@ class LLM:
                                     message=original_prompt,
                                     response=response_text,
                                     markdown=markdown,
-                                    generation_time=time.time() - current_time
+                                    generation_time=time.time() - current_time,
+                                    agent_name=agent_name,
+                                    agent_role=agent_role,
+                                    agent_tools=agent_tools,
+                                    task_name=task_name,
+                                    task_description=task_description,
+                                    task_id=task_id
                                 )
                                 callback_executed = True
                     
@@ -1052,7 +1073,7 @@ class LLM:
                             })
                         
                         should_continue = False
-                        tool_results = []  # Store all tool results
+                        tool_results = []  # Store current iteration tool results
                         for tool_call in tool_calls:
                             # Handle both object and dict access patterns
                             is_ollama = self._is_ollama_provider()
@@ -1066,6 +1087,7 @@ class LLM:
                             tool_result = execute_tool_fn(function_name, arguments)
                             logging.debug(f"[TOOL_EXEC_DEBUG] Tool execution result: {tool_result}")
                             tool_results.append(tool_result)  # Store the result
+                            accumulated_tool_results.append(tool_result)  # Accumulate across iterations
 
                             if verbose:
                                 display_message = f"Agent {agent_name} called function '{function_name}' with arguments: {arguments}\n"
@@ -1103,15 +1125,25 @@ class LLM:
 
                         # Check if the LLM provided a final answer alongside the tool calls
                         # If response_text contains substantive content, treat it as the final answer
-                        if response_text and response_text.strip() and len(response_text.strip()) > 10:
+                        if response_text and len(response_text.strip()) > 10:
                             # LLM provided a final answer after tool execution, don't continue
                             final_response_text = response_text.strip()
                             break
                         
                         # Special handling for Ollama to prevent infinite loops
-                        tool_summary = self._generate_ollama_tool_summary(tool_results, response_text)
-                        if tool_summary:
-                            final_response_text = tool_summary
+                        # Only generate summary after multiple iterations to allow sequential execution
+                        if iteration_count >= self.OLLAMA_SUMMARY_ITERATION_THRESHOLD:
+                            tool_summary = self._generate_ollama_tool_summary(accumulated_tool_results, response_text)
+                            if tool_summary:
+                                final_response_text = tool_summary
+                                break
+                        
+                        # Safety check: prevent infinite loops for any provider
+                        if iteration_count >= 5:
+                            if tool_results:
+                                final_response_text = "Task completed successfully based on tool execution results."
+                            else:
+                                final_response_text = response_text.strip() if response_text else "Task completed."
                             break
                         
                         # Otherwise, continue the loop to check if more tools are needed
@@ -1175,7 +1207,13 @@ class LLM:
                     message=original_prompt,
                     response=response_content,
                     markdown=markdown,
-                    generation_time=generation_time_val
+                    generation_time=generation_time_val,
+                    agent_name=agent_name,
+                    agent_role=agent_role,
+                    agent_tools=agent_tools,
+                    task_name=task_name,
+                    task_description=task_description,
+                    task_id=task_id
                 )
                 callback_executed = True
             
@@ -1204,7 +1242,13 @@ class LLM:
                         message=original_prompt,
                         response=response_text,
                         markdown=markdown,
-                        generation_time=time.time() - start_time
+                        generation_time=time.time() - start_time,
+                        agent_name=agent_name,
+                        agent_role=agent_role,
+                        agent_tools=agent_tools,
+                        task_name=task_name,
+                        task_description=task_description,
+                        task_id=task_id
                     )
                     callback_executed = True
                 return response_text
@@ -1224,7 +1268,13 @@ class LLM:
                         message=original_prompt,
                         response=response_text,
                         markdown=markdown,
-                        generation_time=time.time() - start_time
+                        generation_time=time.time() - start_time,
+                        agent_name=agent_name,
+                        agent_role=agent_role,
+                        agent_tools=agent_tools,
+                        task_name=task_name,
+                        task_description=task_description,
+                        task_id=task_id
                     )
                     callback_executed = True
                 
@@ -1543,6 +1593,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
             iteration_count = 0
             final_response_text = ""
             stored_reasoning_content = None  # Store reasoning content from tool execution
+            accumulated_tool_results = []  # Store all tool results across iterations
 
             while iteration_count < max_iterations:
                 response_text = ""
@@ -1713,7 +1764,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             "tool_calls": serializable_tool_calls
                         })
                     
-                    tool_results = []  # Store all tool results
+                    tool_results = []  # Store current iteration tool results
                     for tool_call in tool_calls:
                         # Handle both object and dict access patterns
                         is_ollama = self._is_ollama_provider()
@@ -1725,6 +1776,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
 
                         tool_result = await execute_tool_fn(function_name, arguments)
                         tool_results.append(tool_result)  # Store the result
+                        accumulated_tool_results.append(tool_result)  # Accumulate across iterations
 
                         if verbose:
                             display_message = f"Agent {agent_name} called function '{function_name}' with arguments: {arguments}\n"
@@ -1852,15 +1904,25 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                     
                     # Check if the LLM provided a final answer alongside the tool calls
                     # If response_text contains substantive content, treat it as the final answer
-                    if response_text and response_text.strip() and len(response_text.strip()) > 10:
+                    if response_text and len(response_text.strip()) > 10:
                         # LLM provided a final answer after tool execution, don't continue
                         final_response_text = response_text.strip()
                         break
                     
                     # Special handling for Ollama to prevent infinite loops
-                    tool_summary = self._generate_ollama_tool_summary(tool_results, response_text)
-                    if tool_summary:
-                        final_response_text = tool_summary
+                    # Only generate summary after multiple iterations to allow sequential execution
+                    if iteration_count >= self.OLLAMA_SUMMARY_ITERATION_THRESHOLD:
+                        tool_summary = self._generate_ollama_tool_summary(accumulated_tool_results, response_text)
+                        if tool_summary:
+                            final_response_text = tool_summary
+                            break
+                    
+                    # Safety check: prevent infinite loops for any provider
+                    if iteration_count >= 5:
+                        if tool_results:
+                            final_response_text = "Task completed successfully based on tool execution results."
+                        else:
+                            final_response_text = response_text.strip() if response_text else "Task completed."
                         break
                     
                     # Continue the loop to check if more tools are needed

{praisonaiagents-0.0.137.dist-info → praisonaiagents-0.0.139.dist-info}/METADATA

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

{praisonaiagents-0.0.137.dist-info → praisonaiagents-0.0.139.dist-info}/RECORD

@@ -3,12 +3,12 @@ praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9
 praisonaiagents/main.py,sha256=b5dKlkf6NMeumSzixreHB9ui90f8YMAi5r1fCbTpQVw,17225
 praisonaiagents/session.py,sha256=FHWButPBaFGA4x1U_2gImroQChHnFy231_aAa_n5KOQ,20364
 praisonaiagents/agent/__init__.py,sha256=FkjW6f3EU8heQ9tvctfLbOWV9_dOXmS1PcFNgcStns8,403
-praisonaiagents/agent/agent.py,sha256=1m9s6irqenYatuoGHHS1DX913rm9QpjcJHJjvPH6_QE,123338
+praisonaiagents/agent/agent.py,sha256=oig3vY0mlsTmxJl6QyvWWGA4srPjFlRVR6Dd8CseFhc,123765
 praisonaiagents/agent/handoff.py,sha256=Saq0chqfvC6Zf5UbXvmctybbehqnotrXn72JsS-76Q0,13099
 praisonaiagents/agent/image_agent.py,sha256=Bbwg_h3qhjhG7gMH8sdcQXhcOFgE_wSvcdhtqH5f2UM,9145
 praisonaiagents/agent/router_agent.py,sha256=a_b6w5Ti05gvK80uKGMIcT14fiCTKv8rCQPCWAUfIiE,12713
 praisonaiagents/agents/__init__.py,sha256=_1d6Pqyk9EoBSo7E68sKyd1jDRlN1vxvVIRpoMc0Jcw,168
-praisonaiagents/agents/agents.py,sha256=WfzlnwiqiEdU6z-6j_Xp0LyhIApKNj0G6L0Hlr418yE,64420
+praisonaiagents/agents/agents.py,sha256=DkBgdE6hK22qkJjufYXNGDXTM1vsAv-nf4RyhPX6sEs,64768
 praisonaiagents/agents/autoagents.py,sha256=v5pJfTgHnFzG5K2gHwfRA0nZ7Ikptir6hUNvOZ--E44,20777
 praisonaiagents/guardrails/__init__.py,sha256=HA8zhp-KRHTxo0194MUwXOUJjPyjOu7E3d7xUIKYVVY,310
 praisonaiagents/guardrails/guardrail_result.py,sha256=2K1WIYRyT_s1H6vBGa-7HEHzXCFIyZXZVY4f0hnQyWc,1352
@@ -17,7 +17,7 @@ praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9b
 praisonaiagents/knowledge/chunking.py,sha256=G6wyHa7_8V0_7VpnrrUXbEmUmptlT16ISJYaxmkSgmU,7678
 praisonaiagents/knowledge/knowledge.py,sha256=-di_h9HxXQfAhTMMerhK16tfw8DtUndp44TGkBOzkZs,15539
 praisonaiagents/llm/__init__.py,sha256=tHvWq5mv4K4MhWr0s6rqox8UnJ5RK0kXhYuD40WkZQA,1747
-praisonaiagents/llm/llm.py,sha256=-4wADWAR5DHn9Ja-XgVOc7wl2Wh60KWDHEE7aGqvx3I,128441
+praisonaiagents/llm/llm.py,sha256=7TMGPTjNvYVgUEvjtnpSImAI6pM_rQiin9j_DqYCN24,132172
 praisonaiagents/llm/model_capabilities.py,sha256=cxOvZcjZ_PIEpUYKn3S2FMyypfOSfbGpx4vmV7Y5vhI,3967
 praisonaiagents/llm/model_router.py,sha256=Jy2pShlkLxqXF3quz-MRB3-6L9vaUSgUrf2YJs_Tsg0,13995
 praisonaiagents/llm/openai_client.py,sha256=EgWjkDjVpnLKCp1gBFjccDGyqR1anOcSYJYCo45fuEI,46046
@@ -57,7 +57,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.137.dist-info/METADATA,sha256=a_1VYrge8bQjC5ysjayhFMbgB_2BoHAmrFabr3tR7zI,1673
-praisonaiagents-0.0.137.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.137.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.137.dist-info/RECORD,,
+praisonaiagents-0.0.139.dist-info/METADATA,sha256=2kOFXS7fONbsMZdzkrvPwvicvQqtnuLFurYH4G8YIZ0,1673
+praisonaiagents-0.0.139.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+praisonaiagents-0.0.139.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.139.dist-info/RECORD,,