mbxai 0.5.19__tar.gz → 0.5.21__tar.gz

{mbxai-0.5.19 → mbxai-0.5.21}/PKG-INFO

@@ -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 → mbxai-0.5.21}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mbxai"
-version = "0.5.19"
+version = "0.5.21"
 authors = [
     { name = "MBX AI" }
 ]

{mbxai-0.5.19 → mbxai-0.5.21}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="mbxai",
-    version="0.5.19",
+    version="0.5.21",
     author="MBX AI",
     description="MBX AI SDK",
     long_description=open("README.md").read(),

{mbxai-0.5.19 → mbxai-0.5.21}/src/mbxai/__init__.py

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

{mbxai-0.5.19 → mbxai-0.5.21}/src/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-0.5.19 → mbxai-0.5.21}/src/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-0.5.19 → mbxai-0.5.21}/src/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 → mbxai-0.5.21}/uv.lock

@@ -292,11 +292,11 @@ wheels = [
 
 [[package]]
 name = "httpx-sse"
-version = "0.5.19"
+version = "0.5.21"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.5.19.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.5.21.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.5.19-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
+    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.5.21-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
 ]
 
 [[package]]
@@ -446,7 +446,7 @@ wheels = [
 
 [[package]]
 name = "mbxai"
-version = "0.5.19"
+version = "0.5.21"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },
@@ -980,14 +980,14 @@ wheels = [
 
 [[package]]
 name = "typing-inspection"
-version = "0.5.19"
+version = "0.5.21"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.5.19.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
+sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.5.21.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.5.19-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
+    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.5.21-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
 ]
 
 [[package]]