mbxai 0.6.3__tar.gz → 0.6.5__tar.gz

{mbxai-0.6.3 → mbxai-0.6.5}/PKG-INFO

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

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

{mbxai-0.6.3 → mbxai-0.6.5}/setup.py

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

{mbxai-0.6.3 → mbxai-0.6.5}/src/mbxai/__init__.py

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

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

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