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

mbxai/__init__.py

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

mbxai/mcp/client.py

@@ -94,29 +94,7 @@ class MCPClient(ToolClient):
             )
             return response.json()
         
-        # Create a sync wrapper for the async function
-        def sync_tool_function(**kwargs: Any) -> Any:
-            try:
-                # Try to get the current event loop
-                loop = asyncio.get_event_loop()
-            except RuntimeError:
-                # If no event loop exists, create a new one
-                loop = asyncio.new_event_loop()
-                asyncio.set_event_loop(loop)
-            
-            # Check if we're already in an event loop
-            if loop.is_running():
-                # Create a new event loop for this call
-                new_loop = asyncio.new_event_loop()
-                try:
-                    return new_loop.run_until_complete(tool_function(**kwargs))
-                finally:
-                    new_loop.close()
-            else:
-                # Use the existing event loop
-                return loop.run_until_complete(tool_function(**kwargs))
-        
-        return sync_tool_function
+        return tool_function
 
     async def register_mcp_server(self, name: str, base_url: str) -> None:
         """Register an MCP server and load its tools."""

mbxai/mcp/server.py

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

mbxai/tools/client.py

@@ -4,6 +4,7 @@ ToolClient implementation for MBX AI.
 
 from typing import Any, Callable, TypeVar, cast
 import logging
+import inspect
 from pydantic import BaseModel
 from ..openrouter import OpenRouterClient
 from .types import Tool, ToolCall
@@ -48,7 +49,7 @@ class ToolClient:
         self._tools[name] = tool
         logger.debug(f"Registered tool: {name}")
 
-    def chat(
+    async def chat(
         self,
         messages: list[dict[str, Any]],
         *,
@@ -120,18 +121,41 @@ class ToolClient:
 
                 # Call the tool
                 logger.debug(f"Calling tool {tool.name} with arguments: {arguments}")
-                result = tool.function(**arguments)
+                if inspect.iscoroutinefunction(tool.function):
+                    result = await tool.function(**arguments)
+                else:
+                    result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
                 # Add the tool response to the messages
-                messages.append({
+                tool_response = {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
                     "name": tool_call.function.name,
                     "content": str(result),
-                })
+                }
+                messages.append(tool_response)
+                logger.debug(f"Added tool response to messages: {tool_response}")
 
-    def parse(
+            # 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
+
+    async def parse(
         self,
         messages: list[dict[str, Any]],
         response_format: type[T],
@@ -206,13 +230,37 @@ class ToolClient:
 
                 # Call the tool
                 logger.debug(f"Calling tool {tool.name} with arguments: {arguments}")
-                result = tool.function(**arguments)
+                if inspect.iscoroutinefunction(tool.function):
+                    result = await tool.function(**arguments)
+                else:
+                    result = tool.function(**arguments)
                 logger.debug(f"Tool result: {result}")
 
                 # Add the tool response to the messages
-                messages.append({
+                tool_response = {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
                     "name": tool_call.function.name,
                     "content": str(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 

{mbxai-0.5.7.dist-info → mbxai-0.5.9.dist-info}/METADATA

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

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

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=jvqll5TM8QPQNLg3ReLmexr8D4C_VjvwJvoBki68cck,47
+mbxai/__init__.py,sha256=EGmcQW8yIqs35vLXZTkb_1ZtjO2cYytVbPOV3aHyX2c,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=q2YmtvUlmrkv0tA50DmeX9-wsDJy_-NVkkc69wSsGaY,6277
+mbxai/mcp/client.py,sha256=hEAVWIrIq758C1zm9aWGf-FiITB3LxtuxZEZ0CcjJ4s,5343
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=3brJK6NNjnLZgIajPF8CGbc_fwekkV5cxpieF9o4P5I,3462
+mbxai/mcp/server.py,sha256=yHzkHwL41vR4st4A0wx1bGuPFoGewDEa5KwVJ5nhSUI,3462
 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=f4i4lyLWeI81NPwnV8Rz1cO5bGh6kLHcxahNijUrTxw,7718
+mbxai/tools/client.py,sha256=tqOJARnBvmW5Hpjy4RAN45D1RPPT76neltbYHxT0Zt0,9508
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.7.dist-info/METADATA,sha256=nc8Rk_zETLzbOpPxSEw0nWEa_TROtALd7Z3qa7ZOT0E,4107
-mbxai-0.5.7.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.7.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.7.dist-info/RECORD,,
+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,,