mbxai 0.5.4__py3-none-any.whl → 0.5.6__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.4" 
+__version__ = "0.5.6" 

mbxai/mcp/client.py

@@ -24,10 +24,12 @@ class MCPTool(Tool):
     def to_openai_function(self) -> dict[str, Any]:
         """Convert the tool to an OpenAI function definition."""
         return {
-            "name": self.name,
-            "description": self.description,
-            "parameters": self._convert_to_openai_schema(self.input_schema),
-            "type": "function"
+            "type": "function",
+            "function": {
+                "name": self.name,
+                "description": self.description,
+                "parameters": self._convert_to_openai_schema(self.input_schema)
+            }
         }
 
     def _convert_to_openai_schema(self, mcp_schema: dict[str, Any]) -> dict[str, Any]:

mbxai/mcp/server.py

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

mbxai/tools/client.py

@@ -3,10 +3,13 @@ ToolClient implementation for MBX AI.
 """
 
 from typing import Any, Callable, TypeVar, cast
+import logging
 from pydantic import BaseModel
 from ..openrouter import OpenRouterClient
 from .types import Tool, ToolCall
 
+logger = logging.getLogger(__name__)
+
 T = TypeVar("T", bound=BaseModel)
 
 class ToolClient:
@@ -43,6 +46,7 @@ class ToolClient:
             schema=schema,
         )
         self._tools[name] = tool
+        logger.debug(f"Registered tool: {name}")
 
     def chat(
         self,
@@ -65,12 +69,12 @@ class ToolClient:
         """
         tools = [tool.to_openai_function() for tool in self._tools.values()]
         
+        if tools:
+            logger.debug(f"Using tools: {tools}")
+            kwargs["tools"] = tools
+            kwargs["tool_choice"] = "auto"
+        
         while True:
-            # Add tools to the request if we have any
-            if tools:
-                kwargs["tools"] = tools
-                kwargs["tool_choice"] = "auto"
-
             # Get the model's response
             response = self._client.chat_completion(
                 messages=messages,
@@ -91,12 +95,33 @@ class ToolClient:
 
             # Handle each tool call
             for tool_call in message.tool_calls:
+                logger.debug(f"Processing tool call: {tool_call}")
+                logger.debug(f"Tool call ID: {tool_call.id}")
+                logger.debug(f"Tool call function: {tool_call.function}")
+                logger.debug(f"Tool call arguments: {tool_call.function.arguments}")
+
                 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
+                logger.debug(f"Raw arguments type: {type(arguments)}")
+                logger.debug(f"Raw arguments: {arguments}")
+
+                if isinstance(arguments, str):
+                    import json
+                    try:
+                        arguments = json.loads(arguments)
+                        logger.debug(f"Parsed arguments: {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
-                result = tool.function(**tool_call.function.arguments)
+                logger.debug(f"Calling tool {tool.name} with arguments: {arguments}")
+                result = tool.function(**arguments)
+                logger.debug(f"Tool result: {result}")
 
                 # Add the tool response to the messages
                 messages.append({
@@ -129,12 +154,12 @@ class ToolClient:
         """
         tools = [tool.to_openai_function() for tool in self._tools.values()]
         
+        if tools:
+            logger.debug(f"Using tools: {tools}")
+            kwargs["tools"] = tools
+            kwargs["tool_choice"] = "auto"
+        
         while True:
-            # Add tools to the request if we have any
-            if tools:
-                kwargs["tools"] = tools
-                kwargs["tool_choice"] = "auto"
-
             # Get the model's response
             response = self._client.chat_completion_parse(
                 messages=messages,
@@ -156,12 +181,33 @@ class ToolClient:
 
             # Handle each tool call
             for tool_call in message.tool_calls:
+                logger.debug(f"Processing tool call: {tool_call}")
+                logger.debug(f"Tool call ID: {tool_call.id}")
+                logger.debug(f"Tool call function: {tool_call.function}")
+                logger.debug(f"Tool call arguments: {tool_call.function.arguments}")
+
                 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
+                logger.debug(f"Raw arguments type: {type(arguments)}")
+                logger.debug(f"Raw arguments: {arguments}")
+
+                if isinstance(arguments, str):
+                    import json
+                    try:
+                        arguments = json.loads(arguments)
+                        logger.debug(f"Parsed arguments: {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
-                result = tool.function(**tool_call.function.arguments)
+                logger.debug(f"Calling tool {tool.name} with arguments: {arguments}")
+                result = tool.function(**arguments)
+                logger.debug(f"Tool result: {result}")
 
                 # Add the tool response to the messages
                 messages.append({

mbxai/tools/types.py

@@ -2,15 +2,9 @@
 Type definitions for the tools package.
 """
 
-from typing import Any, Callable, TypedDict, NotRequired
+from typing import Any, Callable
 from pydantic import BaseModel
 
-class ToolFunction(TypedDict):
-    """OpenAI function definition for a tool."""
-    name: str
-    description: str
-    parameters: dict[str, Any]
-
 class ToolCall(BaseModel):
     """A tool call from the model."""
     id: str
@@ -24,10 +18,13 @@ class Tool(BaseModel):
     function: Callable[..., Any]
     schema: dict[str, Any]
 
-    def to_openai_function(self) -> ToolFunction:
+    def to_openai_function(self) -> dict[str, Any]:
         """Convert the tool to an OpenAI function definition."""
         return {
-            "name": self.name,
-            "description": self.description,
-            "parameters": self.schema,
+            "type": "function",
+            "function": {
+                "name": self.name,
+                "description": self.description,
+                "parameters": self.schema
+            }
         } 

{mbxai-0.5.4.dist-info → mbxai-0.5.6.dist-info}/METADATA

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

{mbxai-0.5.4.dist-info → mbxai-0.5.6.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=mHHJctp0RFeYJNkKCjLuVG5e4zq4RRmUgXfgOLRUoDA,47
+mbxai/__init__.py,sha256=3cCdE3UF7hWaEKRs2Ftl0x1qU4zqaFY1bNSZR5-JcZ0,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=tQizVWAqfFelz8KGl4KbMgSvQss4bk8PTNtEQ6VlkQk,5538
+mbxai/mcp/client.py,sha256=QxVeQRBQryeEGXDU8X_9qQBfT-ubDd9L9KSc5-P354U,5590
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=2_b5dVQBKWaZixhyRav9q-WHkeMv67mToBTm4PfU8NQ,3462
+mbxai/mcp/server.py,sha256=LGhjJvUg2CiQ5i0C0aAqeXRghboz5sn7YBOEIaoSPXc,3462
 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=PDkDTvpwAs8-F8CcF6wjjq2Z-VhYpjA9RXTK64Rwa3Y,5418
+mbxai/tools/client.py,sha256=f4i4lyLWeI81NPwnV8Rz1cO5bGh6kLHcxahNijUrTxw,7718
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
-mbxai/tools/types.py,sha256=ZHnmiDXpH6wZhiZ-Tj9PiPMJaW1aiDAq5It2gpiwNp0,831
-mbxai-0.5.4.dist-info/METADATA,sha256=haQNIBojjjnMZcMOEwfrxisNIvvshApXyYrvol3rkwU,4107
-mbxai-0.5.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.4.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.4.dist-info/RECORD,,
+mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
+mbxai-0.5.6.dist-info/METADATA,sha256=Y4o8ab_4BJvwsAvlrWD72eLkyg8S5v4LfWmeH6hsGBo,4107
+mbxai-0.5.6.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.5.6.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.5.6.dist-info/RECORD,,