mbxai 0.6.3__py3-none-any.whl → 0.6.5__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.6.3" 
+__version__ = "0.6.5" 

mbxai/mcp/server.py

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

mbxai/tools/client.py

@@ -252,7 +252,6 @@ class ToolClient:
         response_format: type[T],
         *,
         model: str | None = None,
-        stream: bool = False,
         **kwargs: Any,
     ) -> Any:
         """Chat with the model and parse the response into a Pydantic model.
@@ -261,84 +260,47 @@ class ToolClient:
             messages: The conversation messages
             response_format: The Pydantic model to parse the response into
             model: Optional model override
-            stream: Whether to stream the response
             **kwargs: Additional parameters for the chat completion
 
         Returns:
             The parsed response from the model
         """
-        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:
-            # Log messages before sending to OpenRouter
-            self._log_messages(messages)
+        # First use the chat function to handle any tool calls
+        response = await self.chat(
+            messages=messages,
+            model=model,
+            **kwargs,
+        )
+
+        if not response or not response.choices:
+            raise ValueError("No response received from OpenRouter")
             
-            # Get the model's response
-            response = await self._openrouter_client.chat_completion_parse(
+        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 we still have tool calls, something went wrong
+        if message.tool_calls:
+            raise ValueError("Unexpected tool calls in final response")
+
+        # Ensure we have content to parse
+        if not message.content:
+            raise ValueError("No content in final response to parse")
+
+        # Now that we have the final response, parse it into the desired format
+        try:
+            final_response = await self._openrouter_client.chat_completion_parse(
                 messages=messages,
                 response_format=response_format,
                 model=model,
-                stream=stream,
+                tools=None,  # No tools for the final parse
                 **kwargs,
             )
-
-            if stream:
-                return response
-
-            if not response or not response.choices:
-                raise ValueError("No response received from OpenRouter")
-                
-            choice = response.choices[0]
-            if not choice:
-                raise ValueError("Empty choice in response")
-                
-            message = choice.message
-            if not message:
-                raise ValueError("Choice missing message")
-
-            # Check for tool calls first
-            if message.tool_calls:
-                # Add the assistant's message with tool calls
-                assistant_message = {
-                    "role": "assistant",
-                    "content": None,
-                    "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]}")
-
-                # Process all tool calls
-                await self._process_tool_calls(message, messages)
-
-                # Continue the loop to get the next response
-                continue
-
-            # If we have a parsed response, return it
-            if hasattr(message, "parsed") and message.parsed:
-                return response
-
-            # If we have content but no tool calls, try to parse it
-            if message.content:
-                try:
-                    return response
-                except Exception as e:
-                    logger.error(f"Failed to parse response: {e}")
-                    raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
-
-            # If we have neither parsed content nor tool calls, something is wrong
-            raise ValueError("Response has neither parsed content nor tool calls") 
+            return final_response
+        except Exception as e:
+            logger.error(f"Failed to parse response: {e}")
+            raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}") 

{mbxai-0.6.3.dist-info → mbxai-0.6.5.dist-info}/METADATA

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

{mbxai-0.6.3.dist-info → mbxai-0.6.5.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=BMqoY5xamu9yHHw49edZO3PXPMjy_-oXovlRNf-sU78,47
+mbxai/__init__.py,sha256=C_O5XTKt8ws8GVayjNJK-2h4-zghRDr80HB4nYUvDvU,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=Ecapt1_yeR4ROmCSF8C0Jn7DHjLM506YLW2vv_MrbbI,3462
+mbxai/mcp/server.py,sha256=URtiGIwGoagb7_0isx6V6JsrI9RfAHwqYT_FnRSdJcM,3462
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
 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=prubkDWakvM_jhbI0dlEO2NRDxPN7kBdglQPoJecqMI,13563
+mbxai/tools/client.py,sha256=uY1dtQAVqzLy6y2-Ps3ca05ejHZRnleLxwusoqQoXN4,11941
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.6.3.dist-info/METADATA,sha256=OSzpwF2znzDZUtsyN0TN1_zZYe44i83MUNZ9B1Mg-I8,4107
-mbxai-0.6.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.3.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.3.dist-info/RECORD,,
+mbxai-0.6.5.dist-info/METADATA,sha256=8eAqM3Jkm5tjJHuDJxmvcN4M--EpTYzz2MlqQE1fCuw,4107
+mbxai-0.6.5.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.5.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.5.dist-info/RECORD,,