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

praisonaiagents/llm/llm.py

@@ -302,6 +302,42 @@ class LLM:
         
         return False
 
+    def _generate_ollama_tool_summary(self, tool_results: List[Any], response_text: str) -> Optional[str]:
+        """
+        Generate a summary from tool results for Ollama to prevent infinite loops.
+        
+        This prevents infinite loops where Ollama provides an empty response after a
+        tool call, expecting the user to prompt for a summary.
+
+        Args:
+            tool_results: The list of results from tool execution.
+            response_text: The text response from the LLM.
+
+        Returns:
+            A summary string if conditions are met, otherwise None.
+        """
+        # Constant for minimal response length check
+        OLLAMA_MIN_RESPONSE_LENGTH = 10
+        
+        # Only generate summary for Ollama with tool results
+        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
+            
+        # Build tool summary efficiently
+        summary_lines = ["Based on the tool execution results:"]
+        for i, result in enumerate(tool_results):
+            if isinstance(result, dict) and 'result' in result:
+                function_name = result.get('function_name', 'Tool')
+                summary_lines.append(f"- {function_name}: {result['result']}")
+            else:
+                summary_lines.append(f"- Tool {i+1}: {result}")
+        
+        return "\n".join(summary_lines)
+
     def _format_ollama_tool_result_message(self, function_name: str, tool_result: Any) -> Dict[str, str]:
         """
         Format tool result message for Ollama provider.
@@ -1072,13 +1108,19 @@ class LLM:
                             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
+                            break
+                        
                         # Otherwise, continue the loop to check if more tools are needed
                         iteration_count += 1
                         continue
                     else:
                         # No tool calls, we're done with this iteration
                         # If we've executed tools in previous iterations, this response contains the final answer
-                        if iteration_count > 0:
+                        if iteration_count > 0 and not final_response_text:
                             final_response_text = response_text.strip() if response_text else ""
                         break
                         
@@ -1815,13 +1857,19 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                         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
+                        break
+                    
                     # Continue the loop to check if more tools are needed
                     iteration_count += 1
                     continue
                 else:
                     # No tool calls, we're done with this iteration
                     # If we've executed tools in previous iterations, this response contains the final answer
-                    if iteration_count > 0:
+                    if iteration_count > 0 and not final_response_text:
                         final_response_text = response_text.strip()
                     break
 

praisonaiagents/session.py

@@ -78,7 +78,7 @@ class Session:
         if not self.is_remote:
             default_memory_config = {
                 "provider": "rag",
-                "use_embedding": True,
+                "use_embedding": False,  # Disable embeddings to avoid OpenAI API key requirement
                 "rag_db_path": f".praison/sessions/{self.session_id}/chroma_db"
             }
             if memory_config:
@@ -96,6 +96,7 @@ class Session:
             self._memory = None
             self._knowledge = None
             self._agents_instance = None
+            self._agents = {}  # Track agents and their chat histories
         else:
             # For remote sessions, disable local memory/knowledge
             self.memory_config = {}
@@ -103,6 +104,7 @@ class Session:
             self._memory = None
             self._knowledge = None
             self._agents_instance = None
+            self._agents = {}  # Track agents and their chat histories
 
     @property
     def memory(self) -> Memory:
@@ -170,7 +172,23 @@ class Session:
             agent_kwargs["knowledge"] = knowledge
             agent_kwargs["knowledge_config"] = self.knowledge_config
 
-        return Agent(**agent_kwargs)
+        agent = Agent(**agent_kwargs)
+        
+        # Create a unique key for this agent (using name and role)
+        agent_key = f"{name}:{role}"
+        
+        # Restore chat history if it exists from previous sessions
+        if agent_key in self._agents:
+            agent.chat_history = self._agents[agent_key].get("chat_history", [])
+        else:
+            # Try to restore from memory for backward compatibility
+            restored_history = self._restore_agent_chat_history(agent_key)
+            agent.chat_history = restored_history
+        
+        # Track the agent
+        self._agents[agent_key] = {"agent": agent, "chat_history": agent.chat_history}
+        
+        return agent
 
     # Keep create_agent for backward compatibility
     def create_agent(self, *args, **kwargs) -> Agent:
@@ -189,6 +207,11 @@ class Session:
         """
         if self.is_remote:
             raise ValueError("State operations are not available for remote agent sessions")
+            
+        # Save agent chat histories first
+        self._save_agent_chat_histories()
+        
+        # Save session state
         state_text = f"Session state: {state_data}"
         self.memory.store_short_term(
             text=state_text,
@@ -212,12 +235,15 @@ class Session:
         """
         if self.is_remote:
             raise ValueError("State operations are not available for remote agent sessions")
-        # Use metadata-based search for better SQLite compatibility
+        # Use content-based search for better SQLite compatibility
         results = self.memory.search_short_term(
-            query=f"type:session_state",
+            query="Session state:",
             limit=10  # Get more results to filter by session_id
         )
 
+        # Restore agent chat histories first
+        self._restore_agent_chat_histories()
+        
         # Filter results by session_id in metadata
         for result in results:
             metadata = result.get("metadata", {})
@@ -230,6 +256,97 @@ class Session:
 
         return {}
 
+    def _restore_agent_chat_history(self, agent_key: str) -> List[Dict[str, Any]]:
+        """
+        Restore agent chat history from memory.
+        
+        Args:
+            agent_key: Unique identifier for the agent
+            
+        Returns:
+            List of chat history messages or empty list if not found
+        """
+        if self.is_remote:
+            return []
+        
+        # Search for agent chat history in memory
+        results = self.memory.search_short_term(
+            query="Agent chat history for",
+            limit=10
+        )
+        
+        # Filter results by session_id and agent_key
+        for result in results:
+            metadata = result.get("metadata", {})
+            if (metadata.get("type") == "agent_chat_history" and 
+                metadata.get("session_id") == self.session_id and
+                metadata.get("agent_key") == agent_key):
+                # Extract chat history from metadata
+                chat_history = metadata.get("chat_history", [])
+                return chat_history
+        
+        return []
+
+    def _restore_agent_chat_histories(self) -> None:
+        """
+        Restore all agent chat histories from memory.
+        """
+        if self.is_remote:
+            return
+        
+        # Search for all agent chat histories in memory
+        results = self.memory.search_short_term(
+            query="Agent chat history for",
+            limit=50  # Get many results to find all agents
+        )
+        
+        # Filter and restore chat histories for this session
+        for result in results:
+            metadata = result.get("metadata", {})
+            if (metadata.get("type") == "agent_chat_history" and 
+                metadata.get("session_id") == self.session_id):
+                agent_key = metadata.get("agent_key")
+                chat_history = metadata.get("chat_history", [])
+                
+                if agent_key and chat_history:
+                    # Store in _agents dict for later retrieval
+                    self._agents[agent_key] = {
+                        "agent": None,  # Will be populated when Agent is created
+                        "chat_history": chat_history
+                    }
+
+    def _save_agent_chat_histories(self) -> None:
+        """
+        Save all agent chat histories to memory.
+        """
+        if self.is_remote:
+            return
+        
+        for agent_key, agent_data in self._agents.items():
+            agent = agent_data.get("agent")
+            chat_history = None
+            
+            # Prioritize history from the live agent object, but fall back to restored history
+            if agent and hasattr(agent, 'chat_history'):
+                chat_history = agent.chat_history
+                agent_data["chat_history"] = chat_history  # Ensure tracked history is up-to-date
+            else:
+                chat_history = agent_data.get("chat_history")
+            
+            if chat_history is not None:
+                # Save to memory
+                history_text = f"Agent chat history for {agent_key}"
+                self.memory.store_short_term(
+                    text=history_text,
+                    metadata={
+                        "type": "agent_chat_history",
+                        "session_id": self.session_id,
+                        "user_id": self.user_id,
+                        "agent_key": agent_key,
+                        "chat_history": chat_history
+                    }
+                )
+
     def get_state(self, key: str, default: Any = None) -> Any:
         """Get a specific state value"""
         state = self.restore_state()
@@ -241,6 +358,11 @@ class Session:
         current_state[key] = value
         self.save_state(current_state)
 
+    def increment_state(self, key: str, increment: int = 1, default: int = 0) -> None:
+        """Increment a numeric state value"""
+        current_value = self.get_state(key, default)
+        self.set_state(key, current_value + increment)
+
     def add_memory(self, text: str, memory_type: str = "long", **metadata) -> None:
         """
         Add information to session memory.

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

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

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

@@ -1,7 +1,7 @@
 praisonaiagents/__init__.py,sha256=7DZJjhHa1_OeP0aiR5_iXINXYiug_gtbOuh_ylad6Uc,3847
 praisonaiagents/approval.py,sha256=UJ4OhfihpFGR5CAaMphqpSvqdZCHi5w2MGw1MByZ1FQ,9813
 praisonaiagents/main.py,sha256=b5dKlkf6NMeumSzixreHB9ui90f8YMAi5r1fCbTpQVw,17225
-praisonaiagents/session.py,sha256=d-CZPYikOHb0q-H9f_IWKJsypnQfz1YKeLLkyxs6oDo,15532
+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/handoff.py,sha256=Saq0chqfvC6Zf5UbXvmctybbehqnotrXn72JsS-76Q0,13099
@@ -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=trPfrRKfwG4z2bx26gAbdfDrAIIqU7Vdqq3pAyCqO-g,126191
+praisonaiagents/llm/llm.py,sha256=-4wADWAR5DHn9Ja-XgVOc7wl2Wh60KWDHEE7aGqvx3I,128441
 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.135.dist-info/METADATA,sha256=NsRPw0-Eabr1fhnHuTCH4yWtpwSX8sRfpFfeC6tor-o,1673
-praisonaiagents-0.0.135.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-praisonaiagents-0.0.135.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.135.dist-info/RECORD,,
+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,,