mbxai 0.5.15__py3-none-any.whl → 0.5.17__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.15" 
+__version__ = "0.5.17" 

mbxai/mcp/server.py

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

mbxai/tools/client.py

@@ -72,10 +72,42 @@ class ToolClient:
                 truncated[k] = str(v)[:max_length] + "..." if len(str(v)) > max_length else v
         return str(truncated)
 
+    def _validate_message_sequence(self, messages: list[dict[str, Any]]) -> None:
+        """Validate the message sequence for tool calls and responses."""
+        tool_call_ids = set()
+        tool_response_ids = set()
+        
+        for i, msg in enumerate(messages):
+            role = msg.get("role")
+            if role == "assistant" and "tool_calls" in msg:
+                # Track tool calls
+                for tc in msg["tool_calls"]:
+                    tool_call_ids.add(tc["id"])
+                    logger.info(f"Found tool call {tc['id']} for {tc['function']['name']} in message {i}")
+            elif role == "tool":
+                # Track tool responses
+                tool_response_ids.add(msg["tool_call_id"])
+                logger.info(f"Found tool response for call ID {msg['tool_call_id']} in message {i}")
+        
+        # Check for missing responses
+        missing_responses = tool_call_ids - tool_response_ids
+        if missing_responses:
+            logger.error(f"Missing tool responses for call IDs: {missing_responses}")
+            logger.error("Message sequence:")
+            for i, msg in enumerate(messages):
+                role = msg.get("role", "unknown")
+                if role == "assistant" and "tool_calls" in msg:
+                    logger.error(f"  Message {i} - Assistant with tool calls: {[tc['id'] for tc in msg['tool_calls']]}")
+                elif role == "tool":
+                    logger.error(f"  Message {i} - Tool response for call ID: {msg['tool_call_id']}")
+                else:
+                    logger.error(f"  Message {i} - {role}: {self._truncate_content(msg.get('content'))}")
+            raise ValueError(f"Invalid message sequence: missing responses for tool calls {missing_responses}")
+
     def _log_messages(self, messages: list[dict[str, Any]]) -> None:
         """Log the messages being sent to OpenRouter."""
         logger.info("Sending messages to OpenRouter:")
-        for msg in messages:
+        for i, msg in enumerate(messages):
             role = msg.get("role", "unknown")
             content = self._truncate_content(msg.get("content"))
             tool_calls = msg.get("tool_calls", [])
@@ -86,33 +118,14 @@ class ToolClient:
                     f"{tc['function']['name']}(id={tc['id']})"
                     for tc in tool_calls
                 ]
-                logger.info(f"  {role}: content='{content}', tool_calls={tool_call_info}")
+                logger.info(f"  Message {i} - {role}: content='{content}', tool_calls={tool_call_info}")
             elif tool_call_id:
-                logger.info(f"  {role}: content='{content}', tool_call_id={tool_call_id}")
+                logger.info(f"  Message {i} - {role}: content='{content}', tool_call_id={tool_call_id}")
             else:
-                logger.info(f"  {role}: content='{content}'")
-
-        # Validate tool call responses
-        tool_call_ids = set()
-        tool_response_ids = set()
+                logger.info(f"  Message {i} - {role}: content='{content}'")
         
-        for msg in messages:
-            if msg.get("role") == "assistant" and "tool_calls" in msg:
-                for tc in msg["tool_calls"]:
-                    tool_call_ids.add(tc["id"])
-            elif msg.get("role") == "tool":
-                tool_response_ids.add(msg["tool_call_id"])
-        
-        missing_responses = tool_call_ids - tool_response_ids
-        if missing_responses:
-            logger.error(f"Missing tool responses for call IDs: {missing_responses}")
-            logger.error("Message sequence:")
-            for msg in messages:
-                role = msg.get("role", "unknown")
-                if role == "assistant" and "tool_calls" in msg:
-                    logger.error(f"  Assistant message with tool calls: {[tc['id'] for tc in msg['tool_calls']]}")
-                elif role == "tool":
-                    logger.error(f"  Tool response for call ID: {msg['tool_call_id']}")
+        # Validate message sequence
+        self._validate_message_sequence(messages)
 
     async def chat(
         self,
@@ -174,7 +187,7 @@ class ToolClient:
                     for tool_call in message.tool_calls
                 ]
             messages.append(assistant_message)
-            logger.info(f"Assistant message: content='{self._truncate_content(message.content)}', tool_calls={[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
+            logger.info(f"Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
 
             # If there are no tool calls, we're done
             if not message.tool_calls:
@@ -213,7 +226,10 @@ class ToolClient:
                     "content": result,
                 }
                 messages.append(tool_response)
-                logger.info(f"Tool response for call ID {tool_call.id}: {self._truncate_content(result)}")
+                logger.info(f"Added tool response for call ID {tool_call.id}")
+
+            # Validate message sequence before getting next response
+            self._validate_message_sequence(messages)
 
             # Get a new response from the model with all tool results
             response = self._client.chat_completion(
@@ -245,7 +261,7 @@ class ToolClient:
                     for tool_call in message.tool_calls
                 ]
             messages.append(assistant_message)
-            logger.info(f"Assistant message: content='{self._truncate_content(message.content)}', tool_calls={[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
+            logger.info(f"Added assistant message with tool calls: {[tc.function.name for tc in message.tool_calls] if message.tool_calls else None}")
 
             # If there are no more tool calls, we're done
             if not message.tool_calls:
@@ -321,7 +337,6 @@ class ToolClient:
                 return response
 
             # Handle all tool calls before getting the next model response
-            tool_responses = []
             for tool_call in message.tool_calls:
                 tool = self._tools.get(tool_call.function.name)
                 if not tool:
@@ -347,17 +362,14 @@ class ToolClient:
                 if not isinstance(result, str):
                     result = json.dumps(result)
 
-                # Create the tool response
+                # Create and add the tool response immediately
                 tool_response = {
                     "role": "tool",
                     "tool_call_id": tool_call.id,
                     "content": result,
                 }
-                tool_responses.append(tool_response)
-                logger.info(f"Tool response: {self._truncate_content(result)}")
-
-            # Add all tool responses to the messages
-            messages.extend(tool_responses)
+                messages.append(tool_response)
+                logger.info(f"Tool response for call ID {tool_call.id}: {self._truncate_content(result)}")
 
             # Get a new response from the model with all tool results
             response = self._client.chat_completion_parse(

{mbxai-0.5.15.dist-info → mbxai-0.5.17.dist-info}/METADATA

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

{mbxai-0.5.15.dist-info → mbxai-0.5.17.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=bRHyO3paNdo9cp-TPVr7zZ4cW-RvHzQm5rwAp-WDYb0,48
+mbxai/__init__.py,sha256=ZLQIr0rOpwAUUWES-qp9QdbVKYWSAdUb9L08NrI7SB4,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=CMcgw3FKAZKmiKYfy09-Gs9vTGA9kWGR-O5nGw4F_Xo,3463
+mbxai/mcp/server.py,sha256=apl2xuRSpFpqsgYNE42WCD-YfNVFguyUSYaYzngGj1Q,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=jkP7HLlr-0SVklNnQRU9A6XX8-_ObixplNjheWlfZwY,15486
+mbxai/tools/client.py,sha256=SunEXOpJva6faGGxzKtMhgscHPq7PS4YFwV_Ll6VX-Q,16298
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.5.15.dist-info/METADATA,sha256=SE49yR-ukNm-dhRxwXrp1xyQYktQ7mZMWZ1O_hvDESU,4108
-mbxai-0.5.15.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.5.15.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.5.15.dist-info/RECORD,,
+mbxai-0.5.17.dist-info/METADATA,sha256=s2QPZsInPdzDQBc18Jg5qisz-srRA9qo4cZ82ew2TLc,4108
+mbxai-0.5.17.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.5.17.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.5.17.dist-info/RECORD,,