praisonaiagents 0.0.140__tar.gz → 0.0.141__tar.gz

{praisonaiagents-0.0.140 → praisonaiagents-0.0.141}/PKG-INFO

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

{praisonaiagents-0.0.140 → praisonaiagents-0.0.141}/praisonaiagents/agent/agent.py

@@ -653,7 +653,7 @@ Your Goal: {self.goal}
                 error=f"Agent guardrail validation error: {str(e)}"
             )
 
-    def _apply_guardrail_with_retry(self, response_text, prompt, temperature=0.2, tools=None):
+    def _apply_guardrail_with_retry(self, response_text, prompt, temperature=0.2, tools=None, task_name=None, task_description=None, task_id=None):
         """Apply guardrail validation with retry logic.
         
         Args:
@@ -707,7 +707,7 @@ Your Goal: {self.goal}
             # Regenerate response for retry
             try:
                 retry_prompt = f"{prompt}\n\nNote: Previous response failed validation due to: {guardrail_result.error}. Please provide an improved response."
-                response = self._chat_completion([{"role": "user", "content": retry_prompt}], temperature, tools)
+                response = self._chat_completion([{"role": "user", "content": retry_prompt}], temperature, tools, task_name=task_name, task_description=task_description, task_id=task_id)
                 if response and response.choices:
                     current_response = response.choices[0].message.content.strip()
                 else:
@@ -1072,7 +1072,7 @@ Your Goal: {self.goal}"""
             reasoning_steps=reasoning_steps
         )
 
-    def _chat_completion(self, messages, temperature=0.2, tools=None, stream=True, reasoning_steps=False):
+    def _chat_completion(self, messages, temperature=0.2, tools=None, stream=True, reasoning_steps=False, task_name=None, task_description=None, task_id=None):
         start_time = time.time()
         logging.debug(f"{self.name} sending messages to LLM: {messages}")
 
@@ -1128,11 +1128,6 @@ Your Goal: {self.goal}"""
                     )
             else:
                 # Use the standard OpenAI client approach with tool support
-                def custom_display_fn(text, start_time):
-                    if self.verbose:
-                        return display_generating(text, start_time)
-                    return ""
-                
                 # Note: openai_client expects tools in various formats and will format them internally
                 # But since we already have formatted_tools, we can pass them directly
                 if self._openai_client is None:
@@ -1145,8 +1140,8 @@ Your Goal: {self.goal}"""
                     tools=formatted_tools,  # Already formatted for OpenAI
                     execute_tool_fn=self.execute_tool,
                     stream=stream,
-                    console=self.console if self.verbose else None,
-                    display_fn=display_generating if stream and self.verbose else None,
+                    console=self.console if (self.verbose or stream) else None,
+                    display_fn=display_generating if stream else None,
                     reasoning_steps=reasoning_steps,
                     verbose=self.verbose,
                     max_iterations=10
@@ -1158,7 +1153,7 @@ Your Goal: {self.goal}"""
             display_error(f"Error in chat completion: {e}")
             return None
     
-    def _execute_callback_and_display(self, prompt: str, response: str, generation_time: float):
+    def _execute_callback_and_display(self, prompt: str, response: str, generation_time: float, task_name=None, task_description=None, task_id=None):
         """Helper method to execute callbacks and display interaction.
         
         This centralizes the logic for callback execution and display to avoid duplication.
@@ -1174,9 +1169,9 @@ Your Goal: {self.goal}"""
                 agent_name=self.name,
                 agent_role=self.role,
                 agent_tools=[t.__name__ for t in self.tools] if self.tools else None,
-                task_name=None,  # Not available in this context
-                task_description=None,  # Not available in this context 
-                task_id=None  # Not available in this context
+                task_name=task_name,
+                task_description=task_description, 
+                task_id=task_id
             )
         # 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:
@@ -1185,9 +1180,9 @@ Your Goal: {self.goal}"""
                               agent_name=self.name,
                               agent_role=self.role,
                               agent_tools=[t.__name__ for t in self.tools] if self.tools else None,
-                              task_name=None,  # Not available in this context
-                              task_description=None,  # Not available in this context
-                              task_id=None)  # Not available in this context
+                              task_name=task_name,
+                              task_description=task_description,
+                              task_id=task_id)
 
     def chat(self, prompt, temperature=0.2, tools=None, output_json=None, output_pydantic=None, reasoning_steps=False, stream=True, task_name=None, task_description=None, task_id=None):
         # Log all parameter values when in debug mode
@@ -1297,7 +1292,7 @@ Your Goal: {self.goal}"""
 
                     # Apply guardrail validation for custom LLM response
                     try:
-                        validated_response = self._apply_guardrail_with_retry(response_text, prompt, temperature, tools)
+                        validated_response = self._apply_guardrail_with_retry(response_text, prompt, temperature, tools, task_name, task_description, task_id)
                         return validated_response
                     except Exception as e:
                         logging.error(f"Agent {self.name}: Guardrail validation failed for custom LLM: {e}")
@@ -1357,7 +1352,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=self.stream)
+                        response = self._chat_completion(messages, temperature=temperature, tools=tools if tools else None, reasoning_steps=reasoning_steps, stream=self.stream, task_name=task_name, task_description=task_description, task_id=task_id)
                         if not response:
                             # Rollback chat history on response failure
                             self.chat_history = self.chat_history[:chat_history_length]
@@ -1372,9 +1367,9 @@ Your Goal: {self.goal}"""
                             self.chat_history.append({"role": "assistant", "content": response_text})
                             # Apply guardrail validation even for JSON output
                             try:
-                                validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools)
+                                validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools, task_name, task_description, task_id)
                                 # Execute callback after validation
-                                self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time)
+                                self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time, task_name, task_description, task_id)
                                 return validated_response
                             except Exception as e:
                                 logging.error(f"Agent {self.name}: Guardrail validation failed for JSON output: {e}")
@@ -1391,9 +1386,9 @@ Your Goal: {self.goal}"""
                             if reasoning_steps and hasattr(response.choices[0].message, 'reasoning_content'):
                                 # Apply guardrail to reasoning content
                                 try:
-                                    validated_reasoning = self._apply_guardrail_with_retry(response.choices[0].message.reasoning_content, original_prompt, temperature, tools)
+                                    validated_reasoning = self._apply_guardrail_with_retry(response.choices[0].message.reasoning_content, original_prompt, temperature, tools, task_name, task_description, task_id)
                                     # Execute callback after validation
-                                    self._execute_callback_and_display(original_prompt, validated_reasoning, time.time() - start_time)
+                                    self._execute_callback_and_display(original_prompt, validated_reasoning, time.time() - start_time, task_name, task_description, task_id)
                                     return validated_reasoning
                                 except Exception as e:
                                     logging.error(f"Agent {self.name}: Guardrail validation failed for reasoning content: {e}")
@@ -1402,9 +1397,9 @@ Your Goal: {self.goal}"""
                                     return None
                             # Apply guardrail to regular response
                             try:
-                                validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools)
+                                validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools, task_name, task_description, task_id)
                                 # Execute callback after validation
-                                self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time)
+                                self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time, task_name, task_description, task_id)
                                 return validated_response
                             except Exception as e:
                                 logging.error(f"Agent {self.name}: Guardrail validation failed: {e}")
@@ -1426,7 +1421,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             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)
+                                reflection_response = self._chat_completion(messages, temperature=temperature, tools=None, stream=False, reasoning_steps=False, task_name=task_name, task_description=task_description, task_id=task_id)
                                 
                                 if not reflection_response or not reflection_response.choices:
                                     raise Exception("No response from reflection request")
@@ -1470,9 +1465,9 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 self.chat_history.append({"role": "assistant", "content": response_text})
                                 # Apply guardrail validation after satisfactory reflection
                                 try:
-                                    validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools)
+                                    validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools, task_name, task_description, task_id)
                                     # Execute callback after validation
-                                    self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time)
+                                    self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time, task_name, task_description, task_id)
                                     return validated_response
                                 except Exception as e:
                                     logging.error(f"Agent {self.name}: Guardrail validation failed after reflection: {e}")
@@ -1488,9 +1483,9 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                                 self.chat_history.append({"role": "assistant", "content": response_text})
                                 # Apply guardrail validation after max reflections
                                 try:
-                                    validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools)
+                                    validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools, task_name, task_description, task_id)
                                     # Execute callback after validation
-                                    self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time)
+                                    self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time, task_name, task_description, task_id)
                                     return validated_response
                                 except Exception as e:
                                     logging.error(f"Agent {self.name}: Guardrail validation failed after max reflections: {e}")
@@ -1503,7 +1498,7 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             messages.append({"role": "user", "content": "Now regenerate your response using the reflection you made"})
                             # 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 = self._chat_completion(messages, temperature=temperature, tools=None, stream=use_stream, task_name=task_name, task_description=task_description, task_id=task_id)
                             response_text = response.choices[0].message.content.strip()
                             reflection_count += 1
                             continue  # Continue the loop for more reflections
@@ -1620,7 +1615,9 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                     
                     # Apply guardrail validation for custom LLM response
                     try:
-                        validated_response = self._apply_guardrail_with_retry(response_text, prompt, temperature, tools)
+                        validated_response = self._apply_guardrail_with_retry(response_text, prompt, temperature, tools, task_name, task_description, task_id)
+                        # Execute callback after validation
+                        self._execute_callback_and_display(normalized_content, validated_response, time.time() - start_time, task_name, task_description, task_id)
                         return validated_response
                     except Exception as e:
                         logging.error(f"Agent {self.name}: Guardrail validation failed for custom LLM: {e}")
@@ -1697,6 +1694,8 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
                             total_time = time.time() - start_time
                             logging.debug(f"Agent.achat completed in {total_time:.2f} seconds")
+                        # Execute callback after tool completion
+                        self._execute_callback_and_display(original_prompt, result, time.time() - start_time, task_name, task_description, task_id)
                         return result
                     elif output_json or output_pydantic:
                         response = await self._openai_client.async_client.chat.completions.create(
@@ -1705,11 +1704,13 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             temperature=temperature,
                             response_format={"type": "json_object"}
                         )
-                        # Return the raw response
+                        response_text = response.choices[0].message.content
                         if logging.getLogger().getEffectiveLevel() == logging.DEBUG:
                             total_time = time.time() - start_time
                             logging.debug(f"Agent.achat completed in {total_time:.2f} seconds")
-                        return response.choices[0].message.content
+                        # Execute callback after JSON/Pydantic completion
+                        self._execute_callback_and_display(original_prompt, response_text, time.time() - start_time, task_name, task_description, task_id)
+                        return response_text
                     else:
                         response = await self._openai_client.async_client.chat.completions.create(
                             model=self.llm,
@@ -1804,7 +1805,9 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         
                         # Apply guardrail validation for OpenAI client response
                         try:
-                            validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools)
+                            validated_response = self._apply_guardrail_with_retry(response_text, original_prompt, temperature, tools, task_name, task_description, task_id)
+                            # Execute callback after validation
+                            self._execute_callback_and_display(original_prompt, validated_response, time.time() - start_time, task_name, task_description, task_id)
                             return validated_response
                         except Exception as e:
                             logging.error(f"Agent {self.name}: Guardrail validation failed for OpenAI client: {e}")

{praisonaiagents-0.0.140 → praisonaiagents-0.0.141}/praisonaiagents/llm/llm.py

@@ -477,6 +477,49 @@ class LLM:
             logging.debug(f"[OLLAMA_FIX] Error validating arguments for {function_name}: {e}")
             return arguments
 
+    def _handle_ollama_sequential_logic(self, iteration_count: int, accumulated_tool_results: List[Any], 
+                                      response_text: str, messages: List[Dict]) -> tuple:
+        """
+        Handle Ollama sequential tool execution logic to prevent premature tool summary generation.
+        
+        This method implements the two-step process:
+        1. After reaching threshold with tool results, add explicit final answer prompt
+        2. Only generate tool summary if LLM still doesn't respond after explicit prompt
+        
+        Args:
+            iteration_count: Current iteration count
+            accumulated_tool_results: List of tool results from all iterations
+            response_text: Current LLM response text
+            messages: Message history list to potentially modify
+            
+        Returns:
+            tuple: (should_break, final_response_text, iteration_count)
+                - should_break: Whether to break the iteration loop
+                - final_response_text: Text to use as final response (None if continuing)
+                - iteration_count: Updated iteration count
+        """
+        if not (self._is_ollama_provider() and iteration_count >= self.OLLAMA_SUMMARY_ITERATION_THRESHOLD):
+            return False, None, iteration_count
+            
+        # For Ollama: if we have meaningful tool results but empty responses,
+        # give LLM one final chance with explicit prompt for final answer
+        if accumulated_tool_results and iteration_count == self.OLLAMA_SUMMARY_ITERATION_THRESHOLD:
+            # Add explicit prompt asking for final answer
+            messages.append({
+                "role": "user", 
+                "content": self.OLLAMA_FINAL_ANSWER_PROMPT
+            })
+            # Continue to next iteration to get the final response
+            iteration_count += 1
+            return False, None, iteration_count
+        else:
+            # If still no response after final answer prompt, generate summary
+            tool_summary = self._generate_ollama_tool_summary(accumulated_tool_results, response_text)
+            if tool_summary:
+                return True, tool_summary, iteration_count
+                
+        return False, None, iteration_count
+
     def _needs_system_message_skip(self) -> bool:
         """Check if this model requires skipping system messages"""
         if not self.model:
@@ -1132,11 +1175,15 @@ class LLM:
                         
                         # Special handling for Ollama to prevent infinite loops
                         # 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
+                        should_break, tool_summary_text, iteration_count = self._handle_ollama_sequential_logic(
+                            iteration_count, accumulated_tool_results, response_text, messages
+                        )
+                        if should_break:
+                            final_response_text = tool_summary_text
+                            break
+                        elif tool_summary_text is None and iteration_count > self.OLLAMA_SUMMARY_ITERATION_THRESHOLD:
+                            # Continue iteration after adding final answer prompt
+                            continue
                         
                         # Safety check: prevent infinite loops for any provider
                         if iteration_count >= 5:
@@ -1911,11 +1958,15 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                     
                     # Special handling for Ollama to prevent infinite loops
                     # 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
+                    should_break, tool_summary_text, iteration_count = self._handle_ollama_sequential_logic(
+                        iteration_count, accumulated_tool_results, response_text, messages
+                    )
+                    if should_break:
+                        final_response_text = tool_summary_text
+                        break
+                    elif tool_summary_text is None and iteration_count > self.OLLAMA_SUMMARY_ITERATION_THRESHOLD:
+                        # Continue iteration after adding final answer prompt
+                        continue
                     
                     # Safety check: prevent infinite loops for any provider
                     if iteration_count >= 5:
@@ -2417,18 +2468,14 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
             )
             
             if stream:
-                if verbose:
-                    with Live(display_generating("", start_time), console=console or self.console, refresh_per_second=4) as live:
-                        for chunk in litellm.completion(**completion_params):
-                            content = self._process_streaming_chunk(chunk)
-                            if content:
-                                response_text += content
-                                live.update(display_generating(response_text, start_time))
-                else:
+                with Live(display_generating("", start_time), console=console or self.console, refresh_per_second=4) as live:
                     for chunk in litellm.completion(**completion_params):
                         content = self._process_streaming_chunk(chunk)
                         if content:
                             response_text += content
+                            live.update(display_generating(response_text, start_time))
+                        if content:
+                            response_text += content
             else:
                 response = litellm.completion(**completion_params)
                 response_text = response.choices[0].message.content.strip() if response.choices[0].message.content else ""
@@ -2517,18 +2564,14 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
             )
             
             if stream:
-                if verbose:
-                    with Live(display_generating("", start_time), console=console or self.console, refresh_per_second=4) as live:
-                        async for chunk in await litellm.acompletion(**completion_params):
-                            content = self._process_streaming_chunk(chunk)
-                            if content:
-                                response_text += content
-                                live.update(display_generating(response_text, start_time))
-                else:
+                with Live(display_generating("", start_time), console=console or self.console, refresh_per_second=4) as live:
                     async for chunk in await litellm.acompletion(**completion_params):
                         content = self._process_streaming_chunk(chunk)
                         if content:
                             response_text += content
+                            live.update(display_generating(response_text, start_time))
+                        if content:
+                            response_text += content
             else:
                 response = await litellm.acompletion(**completion_params)
                 response_text = response.choices[0].message.content.strip() if response.choices[0].message.content else ""

{praisonaiagents-0.0.140 → praisonaiagents-0.0.141}/praisonaiagents.egg-info/PKG-INFO

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

{praisonaiagents-0.0.140 → praisonaiagents-0.0.141}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "praisonaiagents"
-version = "0.0.140"
+version = "0.0.141"
 description = "Praison AI agents for completing complex tasks with Self Reflection Agents"
 requires-python = ">=3.10"
 authors = [