mbxai 0.5.19__py3-none-any.whl → 0.5.21__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.19" 
+__version__ = "0.5.21" 

mbxai/mcp/client.py

@@ -90,7 +90,8 @@ class MCPClient(ToolClient):
             # Make the HTTP request to the tool's URL
             response = await self._http_client.post(
                 url,
-                json={"input": kwargs} if tool.strict else kwargs
+                json={"input": kwargs} if tool.strict else kwargs,
+                timeout=300.0  # 5 minutes timeout
             )
             return response.json()
         

mbxai/mcp/server.py

@@ -31,7 +31,7 @@ class MCPServer:
         self.app = FastAPI(
             title=self.name,
             description=self.description,
-            version="0.5.19",
+            version="0.5.21",
         )
         
         # Initialize MCP server

mbxai/tools/client.py

@@ -9,6 +9,7 @@ import json
 from pydantic import BaseModel
 from ..openrouter import OpenRouterClient
 from .types import Tool, ToolCall
+import asyncio
 
 logger = logging.getLogger(__name__)
 
@@ -139,6 +140,62 @@ class ToolClient:
         # Validate message sequence
         self._validate_message_sequence(messages, validate_responses)
 
+    async def _process_tool_calls(self, message: Any, messages: list[dict[str, Any]]) -> None:
+        """Process all tool calls in a message.
+        
+        Args:
+            message: The message containing tool calls
+            messages: The list of messages to add responses to
+        """
+        if not message.tool_calls:
+            return
+
+        # Process all tool calls first
+        tool_responses = []
+        for tool_call in message.tool_calls:
+            tool = self._tools.get(tool_call.function.name)
+            if not tool:
+                raise ValueError(f"Unknown tool: {tool_call.function.name}")
+
+            # Parse arguments if they're a string
+            arguments = tool_call.function.arguments
+            if isinstance(arguments, str):
+                try:
+                    arguments = json.loads(arguments)
+                except json.JSONDecodeError as e:
+                    logger.error(f"Failed to parse tool arguments: {e}")
+                    raise ValueError(f"Invalid tool arguments format: {arguments}")
+
+            # Call the tool
+            logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
+            if inspect.iscoroutinefunction(tool.function):
+                result = await tool.function(**arguments)
+            else:
+                result = tool.function(**arguments)
+
+            # Convert result to JSON string if it's not already
+            if not isinstance(result, str):
+                result = json.dumps(result)
+
+            # Create the tool response
+            tool_response = {
+                "role": "tool",
+                "tool_call_id": tool_call.id,
+                "content": result,
+            }
+            tool_responses.append(tool_response)
+            logger.info(f"Created tool response for call ID {tool_call.id}")
+
+        # Add all tool responses to the messages
+        messages.extend(tool_responses)
+        logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
+
+        # Validate the message sequence
+        self._validate_message_sequence(messages, validate_responses=True)
+
+        # Log the messages we're about to send
+        self._log_messages(messages, validate_responses=False)
+
     async def chat(
         self,
         messages: list[dict[str, Any]],
@@ -186,13 +243,13 @@ class ToolClient:
                     for tool_call in message.tool_calls
                 ]
             messages.append(assistant_message)
-            logger.info(f"Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
+            logger.info(f"Message count: {len(messages)}, Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
 
             # If there are no tool calls, we're done
             if not message.tool_calls:
                 return response
 
-            # Process all tool calls first
+            # Process all tool calls
             tool_responses = []
             for tool_call in message.tool_calls:
                 tool = self._tools.get(tool_call.function.name)
@@ -210,10 +267,18 @@ class ToolClient:
 
                 # Call the tool
                 logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
-                if inspect.iscoroutinefunction(tool.function):
-                    result = await tool.function(**arguments)
-                else:
-                    result = tool.function(**arguments)
+                try:
+                    if inspect.iscoroutinefunction(tool.function):
+                        result = await asyncio.wait_for(tool.function(**arguments), timeout=300.0)  # 5 minutes timeout
+                    else:
+                        result = tool.function(**arguments)
+                    logger.info(f"Tool {tool.name} completed successfully")
+                except asyncio.TimeoutError:
+                    logger.error(f"Tool {tool.name} timed out after 5 minutes")
+                    result = {"error": "Tool execution timed out after 5 minutes"}
+                except Exception as e:
+                    logger.error(f"Error calling tool {tool.name}: {str(e)}")
+                    result = {"error": f"Tool execution failed: {str(e)}"}
 
                 # Convert result to JSON string if it's not already
                 if not isinstance(result, str):
@@ -230,7 +295,7 @@ class ToolClient:
 
             # Add all tool responses to the messages
             messages.extend(tool_responses)
-            logger.info(f"Added {len(tool_responses)} tool responses to messages")
+            logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
 
             # Validate the message sequence
             self._validate_message_sequence(messages, validate_responses=True)
@@ -238,41 +303,8 @@ class ToolClient:
             # Log the messages we're about to send
             self._log_messages(messages, validate_responses=False)
 
-            # Get a new response from the model with all tool results
-            response = self._client.chat_completion(
-                messages=messages,
-                model=model,
-                stream=stream,
-                **kwargs,
-            )
-
-            if stream:
-                return response
-
-            message = response.choices[0].message
-            # Add the assistant's message with tool calls
-            assistant_message = {
-                "role": "assistant",
-                "content": message.content or None,  # Ensure content is None if empty
-            }
-            if message.tool_calls:
-                assistant_message["tool_calls"] = [
-                    {
-                        "id": tool_call.id,
-                        "type": "function",
-                        "function": {
-                            "name": tool_call.function.name,
-                            "arguments": tool_call.function.arguments,
-                        },
-                    }
-                    for tool_call in message.tool_calls
-                ]
-            messages.append(assistant_message)
-            logger.info(f"Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
-
-            # If there are no more tool calls, we're done
-            if not message.tool_calls:
-                return response
+            # Continue the loop to get the next response
+            continue
 
     async def parse(
         self,
@@ -337,13 +369,14 @@ class ToolClient:
                     for tool_call in message.tool_calls
                 ]
             messages.append(assistant_message)
-            logger.info(f"Assistant message: content='{self._truncate_content(message.content)}', tool_calls={[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
+            logger.info(f"Message count: {len(messages)}, Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
 
             # If there are no tool calls, we're done
             if not message.tool_calls:
                 return response
 
-            # Handle all tool calls before getting the next model response
+            # Process all tool calls
+            tool_responses = []
             for tool_call in message.tool_calls:
                 tool = self._tools.get(tool_call.function.name)
                 if not tool:
@@ -369,48 +402,24 @@ class ToolClient:
                 if not isinstance(result, str):
                     result = json.dumps(result)
 
-                # Create and add the tool response immediately
+                # Create the tool response
                 tool_response = {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
                     "content": result,
                 }
-                messages.append(tool_response)
-                logger.info(f"Tool response for call ID {tool_call.id}: {self._truncate_content(result)}")
+                tool_responses.append(tool_response)
+                logger.info(f"Created tool response for call ID {tool_call.id}")
 
-            # Get a new response from the model with all tool results
-            response = self._client.chat_completion_parse(
-                messages=messages,
-                response_format=response_format,
-                model=model,
-                stream=stream,
-                **kwargs,
-            )
+            # Add all tool responses to the messages
+            messages.extend(tool_responses)
+            logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
 
-            if stream:
-                return response
+            # Validate the message sequence
+            self._validate_message_sequence(messages, validate_responses=True)
 
-            message = response.choices[0].message
-            # Add the assistant's message with tool calls
-            assistant_message = {
-                "role": "assistant",
-                "content": message.content or None,  # Ensure content is None if empty
-            }
-            if message.tool_calls:
-                assistant_message["tool_calls"] = [
-                    {
-                        "id": tool_call.id,
-                        "type": "function",
-                        "function": {
-                            "name": tool_call.function.name,
-                            "arguments": tool_call.function.arguments,
-                        },
-                    }
-                    for tool_call in message.tool_calls
-                ]
-            messages.append(assistant_message)
-            logger.info(f"Assistant message: content='{self._truncate_content(message.content)}', tool_calls={[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
+            # Log the messages we're about to send
+            self._log_messages(messages, validate_responses=False)
 
-            # If there are no more tool calls, we're done
-            if not message.tool_calls:
-                return response 
+            # Continue the loop to get the next response
+            continue 

{mbxai-0.5.19.dist-info → mbxai-0.5.21.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbxai
-Version: 0.5.19
+Version: 0.5.21
 Summary: MBX AI SDK
 Project-URL: Homepage, https://www.mibexx.de
 Project-URL: Documentation, https://www.mibexx.de

{mbxai-0.5.19.dist-info → mbxai-0.5.21.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=fBHYV_6ZmWukpBBQkb6diHAP4h69-vDoHNwmywdi4G4,48
+mbxai/__init__.py,sha256=_iYdYXR15WHhK5UJKTKwj9MTpmhkiwKKaIJAdJAPsM4,48
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=hEAVWIrIq758C1zm9aWGf-FiITB3LxtuxZEZ0CcjJ4s,5343
+mbxai/mcp/client.py,sha256=sUdup2ts_Anr5o27y-BZW2hE_xw-2T7Sstds7cZexCw,5395
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=rjDCSR3IZOm5Xb-A2eMm-aMuJANSuRmq8uHmy85hjT8,3463
+mbxai/mcp/server.py,sha256=hGlo5m_HdX0pTqxp-DmecCSo_830zVUFZcjvGhe9pVM,3463
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
 mbxai/openrouter/client.py,sha256=XLRMRNRJH96Jl6_af0KkzRDdLJnixh8I3RvEEcFuXyg,10840
 mbxai/openrouter/config.py,sha256=MTX_YHsFrM7JYqovJSkEF6JzVyIdajeI5Dja2CALH58,2874
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/tools/__init__.py,sha256=QUFaXhDm-UKcuAtT1rbKzhBkvyRBVokcQIOf9cxIuwc,160
-mbxai/tools/client.py,sha256=6FWaM80OFeHR2tI6vhsUcqln8dObfglRiM36vPAyUB8,16733
+mbxai/tools/client.py,sha256=t7rdITqgCbDXQPFOZhGj6VDDPAwqdilJMKPfCOcJaFo,17279
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.19.dist-info/METADATA,sha256=CZyWoVf5vd8iu0_kgCDNYWypoD_MyxggF3xYe9Xy6BE,4108
-mbxai-0.5.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.19.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.19.dist-info/RECORD,,
+mbxai-0.5.21.dist-info/METADATA,sha256=vXEAsDBTc5drMfXx2mo9PXvG-BikBYz293NAclpyl54,4108
+mbxai-0.5.21.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.5.21.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.5.21.dist-info/RECORD,,