praisonaiagents 0.0.68__py3-none-any.whl → 0.0.70__py3-none-any.whl

praisonaiagents/llm/llm.py

@@ -436,15 +436,56 @@ class LLM:
                     
                     # Handle tool calls
                     if tool_calls and execute_tool_fn:
+                        # Convert tool_calls to a serializable format for all providers
+                        serializable_tool_calls = []
+                        for tc in tool_calls:
+                            if isinstance(tc, dict):
+                                serializable_tool_calls.append(tc)  # Already a dict
+                            else:
+                                # Convert object to dict
+                                serializable_tool_calls.append({
+                                    "id": tc.id,
+                                    "type": getattr(tc, 'type', "function"),
+                                    "function": {
+                                        "name": tc.function.name,
+                                        "arguments": tc.function.arguments
+                                    }
+                                })
                         messages.append({
                             "role": "assistant",
                             "content": response_text,
-                            "tool_calls": tool_calls
+                            "tool_calls": serializable_tool_calls
                         })
                         
                         for tool_call in tool_calls:
-                            function_name = tool_call["function"]["name"]
-                            arguments = json.loads(tool_call["function"]["arguments"])
+                            # Handle both object and dict access patterns
+                            if isinstance(tool_call, dict):
+                                # Special handling for Ollama provider which may have a different structure
+                                if self.model and self.model.startswith("ollama/"):
+                                    try:
+                                        # Try standard format first
+                                        if "function" in tool_call and isinstance(tool_call["function"], dict):
+                                            function_name = tool_call["function"]["name"]
+                                            arguments = json.loads(tool_call["function"]["arguments"])
+                                        else:
+                                            # Try alternative format that Ollama might return
+                                            function_name = tool_call.get("name", "unknown_function")
+                                            arguments = json.loads(tool_call.get("arguments", "{}"))
+                                        tool_call_id = tool_call.get("id", f"tool_{id(tool_call)}")
+                                    except Exception as e:
+                                        logging.error(f"Error processing Ollama tool call: {e}")
+                                        function_name = "unknown_function"
+                                        arguments = {}
+                                        tool_call_id = f"tool_{id(tool_call)}"
+                                else:
+                                    # Standard format for other providers
+                                    function_name = tool_call["function"]["name"]
+                                    arguments = json.loads(tool_call["function"]["arguments"])
+                                    tool_call_id = tool_call["id"]
+                            else:
+                                function_name = tool_call.function.name
+                                arguments = json.loads(tool_call.function.arguments)
+                                tool_call_id = tool_call.id
 
                             logging.debug(f"[TOOL_EXEC_DEBUG] About to execute tool {function_name} with args: {arguments}")
                             tool_result = execute_tool_fn(function_name, arguments)
@@ -462,21 +503,61 @@ class LLM:
                                 logging.debug(f"[TOOL_EXEC_DEBUG] About to display tool call with message: {display_message}")
                                 display_tool_call(display_message, console=console)
                                 
-                                messages.append({
-                                    "role": "tool",
-                                    "tool_call_id": tool_call["id"],
-                                    "content": json.dumps(tool_result)
-                                })
-                            else:
-                                logging.debug("[TOOL_EXEC_DEBUG] Verbose mode off, not displaying tool call")
-                                messages.append({
-                                    "role": "tool",
-                                    "tool_call_id": tool_call["id"],
-                                    "content": "Function returned an empty output"
-                                })
+                            messages.append({
+                                "role": "tool",
+                                "tool_call_id": tool_call_id,
+                                "content": json.dumps(tool_result) if tool_result is not None else "Function returned an empty output"
+                            })
 
+                        # Special handling for Ollama models that don't automatically process tool results
+                        if self.model and self.model.startswith("ollama/") and tool_result:
+                            # For Ollama models, we need to explicitly ask the model to process the tool results
+                            # First, check if the response is just a JSON tool call
+                            try:
+                                # If the response_text is a valid JSON that looks like a tool call,
+                                # we need to make a follow-up call to process the results
+                                json_response = json.loads(response_text.strip())
+                                if ('name' in json_response or 'function' in json_response) and not any(word in response_text.lower() for word in ['summary', 'option', 'result', 'found']):
+                                    logging.debug("Detected Ollama returning only tool call JSON, making follow-up call to process results")
+                                    
+                                    # Create a prompt that asks the model to process the tool results
+                                    follow_up_prompt = f"I've searched for apartments and found these results. Please analyze them and provide a summary of the best options:\n\n{json.dumps(tool_result, indent=2)}\n\nPlease format your response as a nice summary with the top options."
+                                    
+                                    # Make a follow-up call to process the results
+                                    follow_up_messages = [
+                                        {"role": "user", "content": follow_up_prompt}
+                                    ]
+                                    
+                                    # Get response with streaming
+                                    if verbose:
+                                        with Live(display_generating("", start_time), console=console, refresh_per_second=4) as live:
+                                            response_text = ""
+                                            for chunk in litellm.completion(
+                                                model=self.model,
+                                                messages=follow_up_messages,
+                                                temperature=temperature,
+                                                stream=True
+                                            ):
+                                                if chunk and chunk.choices and chunk.choices[0].delta.content:
+                                                    content = chunk.choices[0].delta.content
+                                                    response_text += content
+                                                    live.update(display_generating(response_text, start_time))
+                                    else:
+                                        response_text = ""
+                                        for chunk in litellm.completion(
+                                            model=self.model,
+                                            messages=follow_up_messages,
+                                            temperature=temperature,
+                                            stream=True
+                                        ):
+                                            if chunk and chunk.choices and chunk.choices[0].delta.content:
+                                                response_text += chunk.choices[0].delta.content
+                            except (json.JSONDecodeError, KeyError):
+                                # Not a JSON response or not a tool call format, continue normally
+                                pass
+                        
                         # If reasoning_steps is True, do a single non-streaming call
-                        if reasoning_steps:
+                        elif reasoning_steps:
                             resp = litellm.completion(
                                 model=self.model,
                                 messages=messages,
@@ -930,15 +1011,56 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                 tool_calls = tool_response.choices[0].message.get("tool_calls")
                 
                 if tool_calls:
+                    # Convert tool_calls to a serializable format for all providers
+                    serializable_tool_calls = []
+                    for tc in tool_calls:
+                        if isinstance(tc, dict):
+                            serializable_tool_calls.append(tc)  # Already a dict
+                        else:
+                            # Convert object to dict
+                            serializable_tool_calls.append({
+                                "id": tc.id,
+                                "type": getattr(tc, 'type', "function"),
+                                "function": {
+                                    "name": tc.function.name,
+                                    "arguments": tc.function.arguments
+                                }
+                            })
                     messages.append({
                         "role": "assistant",
                         "content": response_text,
-                        "tool_calls": tool_calls
+                        "tool_calls": serializable_tool_calls
                     })
                     
                     for tool_call in tool_calls:
-                        function_name = tool_call.function.name
-                        arguments = json.loads(tool_call.function.arguments)
+                        # Handle both object and dict access patterns
+                        if isinstance(tool_call, dict):
+                            # Special handling for Ollama provider which may have a different structure
+                            if self.model and self.model.startswith("ollama/"):
+                                try:
+                                    # Try standard format first
+                                    if "function" in tool_call and isinstance(tool_call["function"], dict):
+                                        function_name = tool_call["function"]["name"]
+                                        arguments = json.loads(tool_call["function"]["arguments"])
+                                    else:
+                                        # Try alternative format that Ollama might return
+                                        function_name = tool_call.get("name", "unknown_function")
+                                        arguments = json.loads(tool_call.get("arguments", "{}"))
+                                    tool_call_id = tool_call.get("id", f"tool_{id(tool_call)}")
+                                except Exception as e:
+                                    logging.error(f"Error processing Ollama tool call: {e}")
+                                    function_name = "unknown_function"
+                                    arguments = {}
+                                    tool_call_id = f"tool_{id(tool_call)}"
+                            else:
+                                # Standard format for other providers
+                                function_name = tool_call["function"]["name"]
+                                arguments = json.loads(tool_call["function"]["arguments"])
+                                tool_call_id = tool_call["id"]
+                        else:
+                            function_name = tool_call.function.name
+                            arguments = json.loads(tool_call.function.arguments)
+                            tool_call_id = tool_call.id
 
                         tool_result = await execute_tool_fn(function_name, arguments)
 
@@ -949,21 +1071,64 @@ Output MUST be JSON with 'reflection' and 'satisfactory'.
                             else:
                                 display_message += "Function returned no output"
                             display_tool_call(display_message, console=console)
-                            messages.append({
-                                "role": "tool",
-                                "tool_call_id": tool_call.id,
-                                "content": json.dumps(tool_result)
-                            })
-                        else:
-                            messages.append({
-                                "role": "tool",
-                                "tool_call_id": tool_call.id,
-                                "content": "Function returned an empty output"
-                            })
+                        messages.append({
+                            "role": "tool",
+                            "tool_call_id": tool_call_id,
+                            "content": json.dumps(tool_result) if tool_result is not None else "Function returned an empty output"
+                        })
 
                     # Get response after tool calls
                     response_text = ""
-                    if reasoning_steps:
+                    
+                    # Special handling for Ollama models that don't automatically process tool results
+                    if self.model and self.model.startswith("ollama/") and tool_result:
+                        # For Ollama models, we need to explicitly ask the model to process the tool results
+                        # First, check if the response is just a JSON tool call
+                        try:
+                            # If the response_text is a valid JSON that looks like a tool call,
+                            # we need to make a follow-up call to process the results
+                            json_response = json.loads(response_text.strip())
+                            if ('name' in json_response or 'function' in json_response) and not any(word in response_text.lower() for word in ['summary', 'option', 'result', 'found']):
+                                logging.debug("Detected Ollama returning only tool call JSON in async mode, making follow-up call to process results")
+                                
+                                # Create a prompt that asks the model to process the tool results
+                                follow_up_prompt = f"I've searched for apartments and found these results. Please analyze them and provide a summary of the best options:\n\n{json.dumps(tool_result, indent=2)}\n\nPlease format your response as a nice summary with the top options."
+                                
+                                # Make a follow-up call to process the results
+                                follow_up_messages = [
+                                    {"role": "user", "content": follow_up_prompt}
+                                ]
+                                
+                                # Get response with streaming
+                                if verbose:
+                                    response_text = ""
+                                    async for chunk in await litellm.acompletion(
+                                        model=self.model,
+                                        messages=follow_up_messages,
+                                        temperature=temperature,
+                                        stream=True
+                                    ):
+                                        if chunk and chunk.choices and chunk.choices[0].delta.content:
+                                            content = chunk.choices[0].delta.content
+                                            response_text += content
+                                            print("\033[K", end="\r")
+                                            print(f"Processing results... {time.time() - start_time:.1f}s", end="\r")
+                                else:
+                                    response_text = ""
+                                    async for chunk in await litellm.acompletion(
+                                        model=self.model,
+                                        messages=follow_up_messages,
+                                        temperature=temperature,
+                                        stream=True
+                                    ):
+                                        if chunk and chunk.choices and chunk.choices[0].delta.content:
+                                            response_text += chunk.choices[0].delta.content
+                        except (json.JSONDecodeError, KeyError):
+                            # Not a JSON response or not a tool call format, continue normally
+                            pass
+                    
+                    # If no special handling was needed or if it's not an Ollama model
+                    elif reasoning_steps:
                         # Non-streaming call to capture reasoning
                         resp = await litellm.acompletion(
                             model=self.model,

{praisonaiagents-0.0.68.dist-info → praisonaiagents-0.0.70.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: praisonaiagents
-Version: 0.0.68
+Version: 0.0.70
 Summary: Praison AI agents for completing complex tasks with Self Reflection Agents
 Author: Mervin Praison
 Requires-Dist: pydantic

{praisonaiagents-0.0.68.dist-info → praisonaiagents-0.0.70.dist-info}/RECORD

@@ -10,7 +10,7 @@ praisonaiagents/knowledge/__init__.py,sha256=xL1Eh-a3xsHyIcU4foOWF-JdWYIYBALJH9b
 praisonaiagents/knowledge/chunking.py,sha256=FzoNY0q8MkvG4gADqk4JcRhmH3lcEHbRdonDgitQa30,6624
 praisonaiagents/knowledge/knowledge.py,sha256=fQNREDiwdoisfIxJBLVkteXgq_8Gbypfc3UaZbxf5QY,13210
 praisonaiagents/llm/__init__.py,sha256=ttPQQJQq6Tah-0updoEXDZFKWtJAM93rBWRoIgxRWO8,689
-praisonaiagents/llm/llm.py,sha256=l7Z2QjD9eFy0Zq5bwTVK7VOUHxeTyx866YWt3fS3vz8,74606
+praisonaiagents/llm/llm.py,sha256=tOdTbssYSBe-o0mA03Ocq_nJPisDZyD1K71qtzCoBRA,87065
 praisonaiagents/mcp/__init__.py,sha256=IkYdrAK1bDQDm_0t3Wjt63Zwv3_IJgqz84Wqz9GH2iQ,111
 praisonaiagents/mcp/mcp.py,sha256=BPPf5AIPXx28PaJJqOg6T3NRyymQH9YAD-Km7Ma9-KA,13681
 praisonaiagents/memory/memory.py,sha256=I8dOTkrl1i-GgQbDcrFOsSruzJ7MiI6Ys37DK27wrUs,35537
@@ -39,7 +39,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.68.dist-info/METADATA,sha256=wMy9WDu6aGcQWrQIFT1UMOfB-wcvrGqpeDwXqbQXIvM,856
-praisonaiagents-0.0.68.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
-praisonaiagents-0.0.68.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
-praisonaiagents-0.0.68.dist-info/RECORD,,
+praisonaiagents-0.0.70.dist-info/METADATA,sha256=tHQAMvxoSDYguBJ3YDzjkHhHU1vUV6EzdPZ9btlk_Lo,856
+praisonaiagents-0.0.70.dist-info/WHEEL,sha256=CmyFI0kx5cdEMTLiONQRbGQwjIoR1aIYB7eCAQ4KPJ0,91
+praisonaiagents-0.0.70.dist-info/top_level.txt,sha256=_HsRddrJ23iDx5TTqVUVvXG2HeHBL5voshncAMDGjtA,16
+praisonaiagents-0.0.70.dist-info/RECORD,,