mbxai 0.5.10__tar.gz → 0.5.12__tar.gz

{mbxai-0.5.10 → mbxai-0.5.12}/.vscode/PythonImportHelper-v2-Completion.json

@@ -439,6 +439,15 @@
         "detail": "inspect",
         "documentation": {}
     },
+    {
+        "label": "json",
+        "kind": 6,
+        "isExtraImport": true,
+        "importPath": "json",
+        "description": "json",
+        "detail": "json",
+        "documentation": {}
+    },
     {
         "label": "hello_world",
         "importPath": "mbxai.core",
@@ -520,15 +529,6 @@
         "detail": "fastapi.testclient",
         "documentation": {}
     },
-    {
-        "label": "json",
-        "kind": 6,
-        "isExtraImport": true,
-        "importPath": "json",
-        "description": "json",
-        "detail": "json",
-        "documentation": {}
-    },
     {
         "label": "MCPClient",
         "importPath": "mbxai.mcp",

{mbxai-0.5.10 → mbxai-0.5.12}/PKG-INFO

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

{mbxai-0.5.10 → mbxai-0.5.12}/pyproject.toml

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

{mbxai-0.5.10 → mbxai-0.5.12}/setup.py

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

{mbxai-0.5.10 → mbxai-0.5.12}/src/mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.10" 
+__version__ = "0.5.12" 

{mbxai-0.5.10 → mbxai-0.5.12}/src/mbxai/mcp/server.py

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

{mbxai-0.5.10 → mbxai-0.5.12}/src/mbxai/tools/client.py

@@ -5,6 +5,7 @@ ToolClient implementation for MBX AI.
 from typing import Any, Callable, TypeVar, cast
 import logging
 import inspect
+import json
 from pydantic import BaseModel
 from ..openrouter import OpenRouterClient
 from .types import Tool, ToolCall
@@ -88,13 +89,32 @@ class ToolClient:
                 return response
 
             message = response.choices[0].message
-            messages.append({"role": "assistant", "content": message.content})
+            # 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.debug(f"Added assistant message: {assistant_message}")
 
             # If there are no tool calls, we're done
             if not message.tool_calls:
                 return response
 
-            # Handle each tool call
+            # Handle all tool calls before getting the next model response
+            tool_responses = []
             for tool_call in message.tool_calls:
                 logger.debug(f"Processing tool call: {tool_call}")
                 logger.debug(f"Tool call ID: {tool_call.id}")
@@ -111,7 +131,6 @@ class ToolClient:
                 logger.debug(f"Raw arguments: {arguments}")
 
                 if isinstance(arguments, str):
-                    import json
                     try:
                         arguments = json.loads(arguments)
                         logger.debug(f"Parsed arguments: {arguments}")
@@ -127,33 +146,58 @@ class ToolClient:
                     result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
-                # Add the tool response to the messages
+                # 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,
-                    "name": tool_call.function.name,
-                    "content": str(result),
+                    "content": result,
                 }
-                messages.append(tool_response)
-                logger.debug(f"Added tool response to messages: {tool_response}")
+                tool_responses.append(tool_response)
+                logger.debug(f"Created tool response: {tool_response}")
 
-                # Get a new response from the model with this tool result
-                response = self._client.chat_completion(
-                    messages=messages,
-                    model=model,
-                    stream=stream,
-                    **kwargs,
-                )
+            # Add all tool responses to the messages
+            messages.extend(tool_responses)
+            logger.debug(f"Added all tool responses to messages: {tool_responses}")
 
-                if stream:
-                    return response
+            # Get a new response from the model with all tool results
+            response = self._client.chat_completion(
+                messages=messages,
+                model=model,
+                stream=stream,
+                **kwargs,
+            )
 
-                message = response.choices[0].message
-                messages.append({"role": "assistant", "content": message.content})
+            if stream:
+                return response
 
-                # If there are no more tool calls, we're done
-                if not message.tool_calls:
-                    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.debug(f"Added assistant message: {assistant_message}")
+
+            # If there are no more tool calls, we're done
+            if not message.tool_calls:
+                return response
 
     async def parse(
         self,
@@ -197,13 +241,32 @@ class ToolClient:
                 return response
 
             message = response.choices[0].message
-            messages.append({"role": "assistant", "content": message.content})
+            # 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.debug(f"Added assistant message: {assistant_message}")
 
             # If there are no tool calls, we're done
             if not message.tool_calls:
                 return response
 
-            # Handle each tool call
+            # Handle all tool calls before getting the next model response
+            tool_responses = []
             for tool_call in message.tool_calls:
                 logger.debug(f"Processing tool call: {tool_call}")
                 logger.debug(f"Tool call ID: {tool_call.id}")
@@ -220,7 +283,6 @@ class ToolClient:
                 logger.debug(f"Raw arguments: {arguments}")
 
                 if isinstance(arguments, str):
-                    import json
                     try:
                         arguments = json.loads(arguments)
                         logger.debug(f"Parsed arguments: {arguments}")
@@ -236,31 +298,56 @@ class ToolClient:
                     result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
-                # Add the tool response to the messages
+                # 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,
-                    "name": tool_call.function.name,
-                    "content": str(result),
+                    "content": result,
                 }
-                messages.append(tool_response)
-                logger.debug(f"Added tool response to messages: {tool_response}")
-
-                # Get a new response from the model with this tool result
-                response = self._client.chat_completion_parse(
-                    messages=messages,
-                    response_format=response_format,
-                    model=model,
-                    stream=stream,
-                    **kwargs,
-                )
-
-                if stream:
-                    return response
-
-                message = response.choices[0].message
-                messages.append({"role": "assistant", "content": message.content})
-
-                # If there are no more tool calls, we're done
-                if not message.tool_calls:
-                    return response 
+                tool_responses.append(tool_response)
+                logger.debug(f"Created tool response: {tool_response}")
+
+            # Add all tool responses to the messages
+            messages.extend(tool_responses)
+            logger.debug(f"Added all tool responses to messages: {tool_responses}")
+
+            # Get a new response from the model with all tool results
+            response = self._client.chat_completion_parse(
+                messages=messages,
+                response_format=response_format,
+                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.debug(f"Added assistant message: {assistant_message}")
+
+            # If there are no more tool calls, we're done
+            if not message.tool_calls:
+                return response 

{mbxai-0.5.10 → mbxai-0.5.12}/uv.lock

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