mbxai 0.6.0__py3-none-any.whl → 0.6.2__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.6.0" 
+__version__ = "0.6.2" 

mbxai/mcp/server.py

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

mbxai/tools/client.py

@@ -279,7 +279,7 @@ class ToolClient:
             self._log_messages(messages)
             
             # Get the model's response
-            response = self._openrouter_client.chat_completion_parse(
+            response = await self._openrouter_client.chat_completion_parse(
                 messages=messages,
                 response_format=response_format,
                 model=model,
@@ -290,12 +290,24 @@ class ToolClient:
             if stream:
                 return response
 
-            message = response.choices[0].message
+            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")
+
             # Add the assistant's message with tool calls
             assistant_message = {
                 "role": "assistant",
-                "content": message.content or None,  # Ensure content is None if empty
+                "parsed": message.parsed if hasattr(message, "parsed") else None,
+                "content": message.content if not hasattr(message, "parsed") else None,
             }
+            
             if message.tool_calls:
                 assistant_message["tool_calls"] = [
                     {
@@ -308,58 +320,26 @@ class ToolClient:
                     }
                     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] if message.tool_calls else None}")
+                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]}")
 
-            # If there are no tool calls, we're done
-            if not 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
 
-            # Process all tool calls
-            tool_responses = []
-            for tool_call in message.tool_calls:
-                tool = self._tools.get(tool_call.function.name)
-                if not tool:
-                    raise ValueError(f"Unknown tool: {tool_call.function.name}")
-
-                # Parse arguments if they're a string
-                arguments = tool_call.function.arguments
-                if isinstance(arguments, str):
-                    try:
-                        arguments = json.loads(arguments)
-                    except json.JSONDecodeError as e:
-                        logger.error(f"Failed to parse tool arguments: {e}")
-                        raise ValueError(f"Invalid tool arguments format: {arguments}")
-
-                # Call the tool
-                logger.info(f"Calling tool: {tool.name} with args: {self._truncate_dict(arguments)}")
-                if inspect.iscoroutinefunction(tool.function):
-                    result = await tool.function(**arguments)
-                else:
-                    result = tool.function(**arguments)
-
-                # 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,
-                    "content": result,
-                }
-                tool_responses.append(tool_response)
-                logger.info(f"Created tool response for call ID {tool_call.id}")
-
-            # Add all tool responses to the messages
-            messages.extend(tool_responses)
-            logger.info(f"Message count: {len(messages)}, Added {len(tool_responses)} tool responses to messages")
-
-            # Validate the message sequence
-            self._validate_message_sequence(messages, validate_responses=True)
-
-            # Log the messages we're about to send
-            self._log_messages(messages, validate_responses=False)
-
-            # Continue the loop to get the next response
-            continue 
+            # 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") 

{mbxai-0.6.0.dist-info → mbxai-0.6.2.dist-info}/METADATA

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

{mbxai-0.6.0.dist-info → mbxai-0.6.2.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=Jcym8UkXy8bN6bXrlc6D6eL9sjPD8EC0xMMW7BJ3Zt0,47
+mbxai/__init__.py,sha256=QF6GPUFkc9xDYnPdavBWOhJWzjoVpKaAE-4SQfPg2DA,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=WUBsnIuSc9kKpZRm_JVnML0PYQOjRqon3RIv1qlJuHw,3462
+mbxai/mcp/server.py,sha256=XJoguvJxkJwJXSl0VUAF1HvWmlAet_VnuD5J-UCstOs,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=ozIuWTQV4jePnKJrBHc8ZxMPUWfTbCqc1pOoImWoHrk,14577
+mbxai/tools/client.py,sha256=wKq3APquu8jS3N6cpVnIr1im5nzFNUrfyzvWv48uuH4,13628
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.6.0.dist-info/METADATA,sha256=maISXH6b_8zmxBmzj-olxxDaM7vc9TbRmVlXdqVhbys,4107
-mbxai-0.6.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.0.dist-info/RECORD,,
+mbxai-0.6.2.dist-info/METADATA,sha256=Ohw_7hB2nj55bc3UnMNVV-ihuAp0PtN5hH5eYCJ7D80,4107
+mbxai-0.6.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.2.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.2.dist-info/RECORD,,