mbxai 0.5.24__py3-none-any.whl → 0.6.0__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.24" 
+__version__ = "0.6.0" 

mbxai/mcp/server.py

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

mbxai/openrouter/client.py

@@ -9,6 +9,7 @@ from .models import OpenRouterModel, OpenRouterModelRegistry
 from .config import OpenRouterConfig
 import logging
 import time
+import asyncio
 from functools import wraps
 
 logger = logging.getLogger(__name__)

mbxai/tools/client.py

@@ -16,40 +16,90 @@ logger = logging.getLogger(__name__)
 T = TypeVar("T", bound=BaseModel)
 
 class ToolClient:
-    """Client for handling tool calls with OpenRouter."""
+    """Base class for tool clients."""
 
-    def __init__(self, openrouter_client: OpenRouterClient) -> None:
-        """Initialize the ToolClient.
-
-        Args:
-            openrouter_client: The OpenRouter client to use
-        """
-        self._client = openrouter_client
+    def __init__(self, openrouter_client: OpenRouterClient):
+        """Initialize the tool client."""
+        self._openrouter_client = openrouter_client
         self._tools: dict[str, Tool] = {}
 
-    def register_tool(
-        self,
-        name: str,
-        description: str,
-        function: Callable[..., Any],
-        schema: dict[str, Any],
-    ) -> None:
-        """Register a new tool.
+    def register_tool(self, tool: Tool) -> None:
+        """Register a tool."""
+        self._tools[tool.name] = tool
 
-        Args:
-            name: The name of the tool
-            description: A description of what the tool does
-            function: The function to call when the tool is used
-            schema: The JSON schema for the tool's parameters
-        """
-        tool = Tool(
-            name=name,
-            description=description,
-            function=function,
-            schema=schema,
+    async def invoke_tool(self, tool_name: str, **kwargs: Any) -> Any:
+        """Invoke a tool by name."""
+        tool = self._tools.get(tool_name)
+        if not tool:
+            raise ValueError(f"Tool {tool_name} not found")
+        
+        if not tool.function:
+            raise ValueError(f"Tool {tool_name} has no function implementation")
+            
+        return await tool.function(**kwargs)
+
+    async def chat(self, messages: list[dict[str, str]], model: str) -> Any:
+        """Process a chat request with tools."""
+        # Convert tools to OpenAI function format
+        functions = [tool.to_openai_function() for tool in self._tools.values()]
+        
+        # Make the chat request
+        response = await self._openrouter_client.chat(
+            messages=messages,
+            model=model,
+            functions=functions,
         )
-        self._tools[name] = tool
-        logger.info(f"Registered tool: {name}")
+        
+        # Validate response
+        if not response:
+            raise ValueError("No response received from OpenRouter")
+            
+        if not response.choices:
+            raise ValueError("Response missing choices")
+            
+        choice = response.choices[0]
+        if not choice:
+            raise ValueError("Empty choice in response")
+            
+        message = choice.message
+        if not message:
+            raise ValueError("Choice missing message")
+            
+        # If message has function call, execute it
+        if message.function_call:
+            tool_name = message.function_call.name
+            tool_args = json.loads(message.function_call.arguments)
+            
+            # Invoke the tool
+            tool_response = await self.invoke_tool(tool_name, **tool_args)
+            
+            # Add tool response to messages
+            messages.append({
+                "role": "assistant",
+                "content": None,
+                "function_call": {
+                    "name": tool_name,
+                    "arguments": message.function_call.arguments,
+                },
+            })
+            messages.append({
+                "role": "function",
+                "name": tool_name,
+                "content": json.dumps(tool_response),
+            })
+            
+            # Get final response
+            final_response = await self._openrouter_client.chat(
+                messages=messages,
+                model=model,
+            )
+            
+            if not final_response or not final_response.choices:
+                raise ValueError("No response received after tool execution")
+                
+            return final_response
+            
+        return response
 
     def _truncate_content(self, content: str | None, max_length: int = 100) -> str:
         """Truncate content for logging."""
@@ -196,116 +246,6 @@ class ToolClient:
         # Log the messages we're about to send
         self._log_messages(messages, validate_responses=False)
 
-    async def chat(
-        self,
-        messages: list[dict[str, Any]],
-        *,
-        model: str | None = None,
-        stream: bool = False,
-        **kwargs: Any,
-    ) -> Any:
-        """Chat with the model, handling tool calls."""
-        tools = [tool.to_openai_function() for tool in self._tools.values()]
-        
-        if tools:
-            logger.info(f"Available tools: {[tool['function']['name'] for tool in tools]}")
-            kwargs["tools"] = tools
-            kwargs["tool_choice"] = "auto"
-        
-        while True:
-            # Get the model's response
-            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"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
-            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)}")
-                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):
-                    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)
-
-            # Continue the loop to get the next response
-            continue
-
     async def parse(
         self,
         messages: list[dict[str, Any]],
@@ -339,7 +279,7 @@ class ToolClient:
             self._log_messages(messages)
             
             # Get the model's response
-            response = self._client.chat_completion_parse(
+            response = self._openrouter_client.chat_completion_parse(
                 messages=messages,
                 response_format=response_format,
                 model=model,

{mbxai-0.5.24.dist-info → mbxai-0.6.0.dist-info}/METADATA

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

{mbxai-0.5.24.dist-info → mbxai-0.6.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=uOU108fCrriuZbpIuLG4acnQ0ZDvDwD6AnuvvE9mA4A,48
+mbxai/__init__.py,sha256=Jcym8UkXy8bN6bXrlc6D6eL9sjPD8EC0xMMW7BJ3Zt0,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
 mbxai/mcp/client.py,sha256=B8ZpH-uecmTCgoDw65LwwVxsFWVoX-08t5ff0hOEPXk,6011
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=-oTWHpKJBF2p6Y9s8FhSFY4mytwNzCCx4S2lwR5Xr_E,3463
+mbxai/mcp/server.py,sha256=WUBsnIuSc9kKpZRm_JVnML0PYQOjRqon3RIv1qlJuHw,3462
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=YOjcYkD8VLMVzBd6z_rB7kLGEzNwIVSUEOyMZlcIhkw,13647
+mbxai/openrouter/client.py,sha256=RO5tbF42vkcjxjvC-QFB8DGA0gQLljH3KPBn3HgZV8I,13662
 mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/tools/__init__.py,sha256=QUFaXhDm-UKcuAtT1rbKzhBkvyRBVokcQIOf9cxIuwc,160
-mbxai/tools/client.py,sha256=t7rdITqgCbDXQPFOZhGj6VDDPAwqdilJMKPfCOcJaFo,17279
+mbxai/tools/client.py,sha256=ozIuWTQV4jePnKJrBHc8ZxMPUWfTbCqc1pOoImWoHrk,14577
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.24.dist-info/METADATA,sha256=yA2MFVTn6yxrLmoC_XgS8frW9MalTT2XEv2Re5S7Org,4108
-mbxai-0.5.24.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.24.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.24.dist-info/RECORD,,
+mbxai-0.6.0.dist-info/METADATA,sha256=maISXH6b_8zmxBmzj-olxxDaM7vc9TbRmVlXdqVhbys,4107
+mbxai-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.0.dist-info/RECORD,,