mbxai 0.6.12__py3-none-any.whl → 0.6.13__py3-none-any.whl

mbxai/openrouter/client.py

@@ -267,43 +267,41 @@ class OpenRouterClient:
             ValueError: If response parsing fails
         """
         try:
-            # Add system message to enforce JSON output if not present
-            if not any(msg.get("role") == "system" for msg in messages):
-                messages.insert(0, {
-                    "role": "system",
-                    "content": "You are a helpful assistant that responds in valid JSON format."
-                })
+            # Log the request details
+            logger.info(f"Sending chat completion request to OpenRouter with model: {model or self.model}")
+            logger.info(f"Message count: {len(messages)}")
             
-            # Add format instructions to user message
-            last_user_msg = next((msg for msg in reversed(messages) if msg.get("role") == "user"), None)
-            if last_user_msg:
-                format_desc = f"Respond with valid JSON matching this Pydantic model: {response_format.__name__}"
-                last_user_msg["content"] = f"{format_desc}\n\n{last_user_msg['content']}"
+            # Calculate total message size for logging
+            total_size = sum(len(str(msg)) for msg in messages)
+            logger.info(f"Total message size: {total_size} bytes")
             
-            response = self.chat_completion(
-                messages,
-                model=model,
+            response = self._client.beta.chat.completions.parse(
+                messages=messages,
+                model=model or self.model,
+                response_format=response_format,
                 stream=stream,
-                response_format={"type": "json_object"},  # Force JSON response
-                **kwargs
+                **kwargs,
             )
             
-            if stream:
-                return response
-
-            # Parse the response content into the specified format
-            content = response.choices[0].message.content
-            adapter = TypeAdapter(response_format)
-            try:
-                parsed = adapter.validate_json(content)
-                response.choices[0].message.parsed = parsed
-                return response
-            except Exception as e:
-                raise ValueError(f"Failed to parse response as {response_format.__name__}: {str(e)}")
-        except ValueError as e:
-            raise e
+            # Log response details
+            logger.info("Received response from OpenRouter")
+            if hasattr(response, 'choices') and response.choices:
+                logger.info(f"Response has {len(response.choices)} choices")
+            
+            return response
+            
         except Exception as e:
-            self._handle_api_error("chat completion parse", e)
+            logger.error(f"Error in chat completion: {str(e)}")
+            if hasattr(e, 'response') and e.response is not None:
+                logger.error(f"Response status: {e.response.status_code}")
+                logger.error(f"Response headers: {e.response.headers}")
+                try:
+                    content = e.response.text
+                    logger.error(f"Response content length: {len(content)} bytes")
+                    logger.error(f"Response content preview: {content[:1000]}...")
+                except:
+                    logger.error("Could not read response content")
+            self._handle_api_error("chat completion", e)
 
     @with_retry()
     def embeddings(

mbxai/tools/client.py

@@ -328,35 +328,105 @@ class ToolClient:
             The parsed response from the model
         """
         # First, use chat to handle any tool calls
-        chat_response = await self.chat(
-            messages=messages,
-            model=model,
-            stream=stream,
-            **kwargs,
-        )
-
-        if stream:
-            return chat_response
+        tools = [tool.to_openai_function() for tool in self._tools.values()]
+        
+        if tools:
+            logger.info(f"Available tools: {[tool['function']['name'] for tool in tools]}")
+            kwargs["tools"] = tools
+            kwargs["tool_choice"] = "auto"
+        
+        while True:
+            # Get the model's response
+            response = self._client.chat_completion_parse(
+                messages=messages,
+                response_format=response_format,
+                model=model,
+                stream=stream,
+                **kwargs,
+            )
 
-        # Get the final message after all tool calls are handled
-        final_message = chat_response.choices[0].message
+            if stream:
+                return response
 
-        # Create a new message list with just the final response
-        parse_messages = [
-            *messages,  # Include original context
-            {
+            message = response.choices[0].message
+            # Add the assistant's message with tool calls
+            assistant_message = {
                 "role": "assistant",
-                "content": final_message.content,
+                "content": message.content or None,
+                "parsed": message.parsed or None,
             }
-        ]
+            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.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}")
 
-        # Make a final parse request with the structured output format
-        parse_kwargs = kwargs.copy()
-        parse_kwargs["response_format"] = response_format
-        
-        return self._client.chat_completion_parse(
-            messages=parse_messages,
-            model=model,
-            stream=stream,
-            **parse_kwargs,
-        ) 
+            # If there are no tool calls, we're done
+            if not message.tool_calls:
+                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)}")
+                try:
+                    if inspect.iscoroutinefunction(tool.function):
+                        result = await asyncio.wait_for(tool.function(**arguments), timeout=300.0)  # 5 minutes timeout
+                    else:
+                        result = tool.function(**arguments)
+                    logger.info(f"Tool {tool.name} completed successfully")
+                except asyncio.TimeoutError:
+                    logger.error(f"Tool {tool.name} timed out after 5 minutes")
+                    result = {"error": "Tool execution timed out after 5 minutes"}
+                except Exception as e:
+                    logger.error(f"Error calling tool {tool.name}: {str(e)}")
+                    result = {"error": f"Tool execution failed: {str(e)}"}
+
+                # 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

{mbxai-0.6.12.dist-info → mbxai-0.6.13.dist-info}/METADATA

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

{mbxai-0.6.12.dist-info → mbxai-0.6.13.dist-info}/RECORD

@@ -5,14 +5,14 @@ mbxai/mcp/client.py,sha256=B8ZpH-uecmTCgoDw65LwwVxsFWVoX-08t5ff0hOEPXk,6011
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
 mbxai/mcp/server.py,sha256=T0-Y7FeHRFqSTp2ERU96fOQlQJKjMFxg8oqC4dzBmBA,3463
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=RO5tbF42vkcjxjvC-QFB8DGA0gQLljH3KPBn3HgZV8I,13662
+mbxai/openrouter/client.py,sha256=zcvs0LGFQy1WuPaW1aGi7MM5Ho-5yXrjhrgsfyZrO0A,13641
 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=sK2sl8VKB7sgMHtJpnC_2gfy7HCA4RMzRb32sfXvWbI,14260
+mbxai/tools/client.py,sha256=MnBUjwb20oSSBrdj6pe6X_z6lKLXhSNyFTxP67mbBas,17801
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.6.12.dist-info/METADATA,sha256=3Iwx5kOqV1v-wEQ6FskMYvz-j8AuiXRFHmpvGkUT8HA,4108
-mbxai-0.6.12.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.12.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.12.dist-info/RECORD,,
+mbxai-0.6.13.dist-info/METADATA,sha256=2f-u1N_77PMxGlWn39Gkyu9Y5tZ7yLH_vWtl_lwR9WI,4108
+mbxai-0.6.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.13.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.13.dist-info/RECORD,,