mbxai 0.5.4__tar.gz → 0.5.6__tar.gz

{mbxai-0.5.4 → mbxai-0.5.6}/.vscode/PythonImportHelper-v2-Completion.json

@@ -187,22 +187,6 @@
         "detail": "typing",
         "documentation": {}
     },
-    {
-        "label": "TypedDict",
-        "importPath": "typing",
-        "description": "typing",
-        "isExtraImport": true,
-        "detail": "typing",
-        "documentation": {}
-    },
-    {
-        "label": "NotRequired",
-        "importPath": "typing",
-        "description": "typing",
-        "isExtraImport": true,
-        "detail": "typing",
-        "documentation": {}
-    },
     {
         "label": "Any",
         "importPath": "typing",
@@ -592,14 +576,6 @@
         "detail": "mbxai.openrouter",
         "documentation": {}
     },
-    {
-        "label": "OpenRouterModel",
-        "importPath": "mbxai.openrouter",
-        "description": "mbxai.openrouter",
-        "isExtraImport": true,
-        "detail": "mbxai.openrouter",
-        "documentation": {}
-    },
     {
         "label": "load_dotenv",
         "importPath": "dotenv",
@@ -632,6 +608,14 @@
         "detail": "mbxai.tools",
         "documentation": {}
     },
+    {
+        "label": "ToolCall",
+        "importPath": "mbxai.tools",
+        "description": "mbxai.tools",
+        "isExtraImport": true,
+        "detail": "mbxai.tools",
+        "documentation": {}
+    },
     {
         "label": "setup",
         "importPath": "setuptools",
@@ -900,6 +884,15 @@
         "detail": "src.mbxai.tools.client",
         "documentation": {}
     },
+    {
+        "label": "logger",
+        "kind": 5,
+        "importPath": "src.mbxai.tools.client",
+        "description": "src.mbxai.tools.client",
+        "peekOfCode": "logger = logging.getLogger(__name__)\nT = TypeVar(\"T\", bound=BaseModel)\nclass ToolClient:\n    \"\"\"Client for handling tool calls with OpenRouter.\"\"\"\n    def __init__(self, openrouter_client: OpenRouterClient) -> None:\n        \"\"\"Initialize the ToolClient.\n        Args:\n            openrouter_client: The OpenRouter client to use\n        \"\"\"\n        self._client = openrouter_client",
+        "detail": "src.mbxai.tools.client",
+        "documentation": {}
+    },
     {
         "label": "T",
         "kind": 5,
@@ -936,15 +929,6 @@
         "detail": "src.mbxai.tools.example",
         "documentation": {}
     },
-    {
-        "label": "ToolFunction",
-        "kind": 6,
-        "importPath": "src.mbxai.tools.types",
-        "description": "src.mbxai.tools.types",
-        "peekOfCode": "class ToolFunction(TypedDict):\n    \"\"\"OpenAI function definition for a tool.\"\"\"\n    name: str\n    description: str\n    parameters: dict[str, Any]\nclass ToolCall(BaseModel):\n    \"\"\"A tool call from the model.\"\"\"\n    id: str\n    name: str\n    arguments: dict[str, Any]",
-        "detail": "src.mbxai.tools.types",
-        "documentation": {}
-    },
     {
         "label": "ToolCall",
         "kind": 6,
@@ -959,7 +943,7 @@
         "kind": 6,
         "importPath": "src.mbxai.tools.types",
         "description": "src.mbxai.tools.types",
-        "peekOfCode": "class Tool(BaseModel):\n    \"\"\"A tool that can be used by the model.\"\"\"\n    name: str\n    description: str\n    function: Callable[..., Any]\n    schema: dict[str, Any]\n    def to_openai_function(self) -> ToolFunction:\n        \"\"\"Convert the tool to an OpenAI function definition.\"\"\"\n        return {\n            \"name\": self.name,",
+        "peekOfCode": "class Tool(BaseModel):\n    \"\"\"A tool that can be used by the model.\"\"\"\n    name: str\n    description: str\n    function: Callable[..., Any]\n    schema: dict[str, Any]\n    def to_openai_function(self) -> dict[str, Any]:\n        \"\"\"Convert the tool to an OpenAI function definition.\"\"\"\n        return {\n            \"type\": \"function\",",
         "detail": "src.mbxai.tools.types",
         "documentation": {}
     },
@@ -1332,6 +1316,15 @@
         "detail": "tests.test_tools",
         "documentation": {}
     },
+    {
+        "label": "test_tool_to_openai_function",
+        "kind": 2,
+        "importPath": "tests.test_tools",
+        "description": "tests.test_tools",
+        "peekOfCode": "def test_tool_to_openai_function():\n    \"\"\"Test converting a tool to OpenAI function format.\"\"\"\n    # Create a test tool\n    def test_function(arg1: str) -> str:\n        return f\"Test: {arg1}\"\n    tool = Tool(\n        name=\"test_tool\",\n        description=\"A test tool\",\n        function=test_function,\n        schema={",
+        "detail": "tests.test_tools",
+        "documentation": {}
+    },
     {
         "label": "test_chat_without_tools",
         "kind": 2,

{mbxai-0.5.4 → mbxai-0.5.6}/PKG-INFO

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

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

{mbxai-0.5.4 → mbxai-0.5.6}/setup.py

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

{mbxai-0.5.4 → mbxai-0.5.6}/src/mbxai/__init__.py

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

{mbxai-0.5.4 → mbxai-0.5.6}/src/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-0.5.4 → mbxai-0.5.6}/src/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-0.5.4 → mbxai-0.5.6}/src/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-0.5.4 → mbxai-0.5.6}/src/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 → mbxai-0.5.6}/tests/test_tools.py

@@ -1,12 +1,11 @@
-"""
-Tests for the ToolClient.
-"""
+"""Tests for the tools module."""
 
 import pytest
 from unittest.mock import Mock, patch
 from pydantic import BaseModel
-from mbxai.tools import ToolClient, Tool
-from mbxai.openrouter import OpenRouterClient, OpenRouterModel
+
+from mbxai.openrouter import OpenRouterClient
+from mbxai.tools import ToolClient, Tool, ToolCall
 
 class TestOutput(BaseModel):
     """Test output model."""
@@ -43,11 +42,45 @@ def test_tool_registration():
     # Verify tool was registered
     assert "test_tool" in tool_client._tools
     tool = tool_client._tools["test_tool"]
+    assert isinstance(tool, Tool)
     assert tool.name == "test_tool"
     assert tool.description == "A test tool"
     assert tool.function == test_function
     assert tool.schema["type"] == "object"
 
+def test_tool_to_openai_function():
+    """Test converting a tool to OpenAI function format."""
+    # Create a test tool
+    def test_function(arg1: str) -> str:
+        return f"Test: {arg1}"
+    
+    tool = Tool(
+        name="test_tool",
+        description="A test tool",
+        function=test_function,
+        schema={
+            "type": "object",
+            "properties": {
+                "arg1": {
+                    "type": "string",
+                    "description": "Test argument"
+                }
+            },
+            "required": ["arg1"]
+        }
+    )
+    
+    # Convert to OpenAI function format
+    function_def = tool.to_openai_function()
+    
+    # Verify the format
+    assert function_def["type"] == "function"
+    assert "function" in function_def
+    assert function_def["function"]["name"] == "test_tool"
+    assert function_def["function"]["description"] == "A test tool"
+    assert function_def["function"]["parameters"]["type"] == "object"
+    assert "arg1" in function_def["function"]["parameters"]["properties"]
+
 def test_chat_without_tools():
     """Test chat without any tools."""
     # Setup

{mbxai-0.5.4 → mbxai-0.5.6}/uv.lock

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