mbxai 0.5.9__py3-none-any.whl → 0.5.11__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.9" 
+__version__ = "0.5.11" 

mbxai/mcp/server.py

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

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,7 +89,25 @@ 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:
@@ -111,7 +130,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 +145,54 @@ class ToolClient:
                     result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
+                # Convert result to JSON string if it's not already
+                if not isinstance(result, str):
+                    result = json.dumps(result)
+
                 # Add the tool response to the messages
                 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 the tool results
-            response = self._client.chat_completion(
-                messages=messages,
-                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
+                # Get a new response from the model with this tool result
+                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.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,7 +236,25 @@ 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:
@@ -220,7 +277,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 +292,52 @@ class ToolClient:
                     result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
+                # Convert result to JSON string if it's not already
+                if not isinstance(result, str):
+                    result = json.dumps(result)
+
                 # Add the tool response to the messages
                 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 the 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
-            messages.append({"role": "assistant", "content": message.content})
-
-            # If there are no more tool calls, we're done
-            if not message.tool_calls:
-                return 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
+                # 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.9.dist-info → mbxai-0.5.11.dist-info}/METADATA

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

{mbxai-0.5.9.dist-info → mbxai-0.5.11.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=EGmcQW8yIqs35vLXZTkb_1ZtjO2cYytVbPOV3aHyX2c,47
+mbxai/__init__.py,sha256=Nrk-9hVjGptSGLRYdkZYhni7CQG40G6nbzn7DQCmeTE,48
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
 mbxai/mcp/client.py,sha256=hEAVWIrIq758C1zm9aWGf-FiITB3LxtuxZEZ0CcjJ4s,5343
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=yHzkHwL41vR4st4A0wx1bGuPFoGewDEa5KwVJ5nhSUI,3462
+mbxai/mcp/server.py,sha256=kYErSSCh__6Fe5hanBCrgYbtT-5rcjTrP356d2EjuVQ,3463
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
 mbxai/openrouter/client.py,sha256=XLRMRNRJH96Jl6_af0KkzRDdLJnixh8I3RvEEcFuXyg,10840
 mbxai/openrouter/config.py,sha256=MTX_YHsFrM7JYqovJSkEF6JzVyIdajeI5Dja2CALH58,2874
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/tools/__init__.py,sha256=QUFaXhDm-UKcuAtT1rbKzhBkvyRBVokcQIOf9cxIuwc,160
-mbxai/tools/client.py,sha256=tqOJARnBvmW5Hpjy4RAN45D1RPPT76neltbYHxT0Zt0,9508
+mbxai/tools/client.py,sha256=0JyWijPzXuyeYBzUuTWndxh9GGmJ0hrEsmLFmXbtD-Q,12978
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.9.dist-info/METADATA,sha256=-9DzHsxUcnL7x9afsWKUnF8OOmqZLi-aE7lmnXUx7_A,4107
-mbxai-0.5.9.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.9.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.9.dist-info/RECORD,,
+mbxai-0.5.11.dist-info/METADATA,sha256=e5ZqNMVQfzDegWT_mQyCnd0WqrLsJ8L43Qi2eBuVSos,4108
+mbxai-0.5.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.5.11.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.5.11.dist-info/RECORD,,