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

mbxai/tools/client.py

@@ -327,99 +327,36 @@ class ToolClient:
         Returns:
             The parsed response from the model
         """
-        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:
-            # Log messages before sending to OpenRouter
-            self._log_messages(messages)
-            
-            # Get the model's response
-            response = self._client.chat_completion_parse(
-                messages=messages,
-                response_format=response_format,
-                model=model,
-                stream=stream,
-                **kwargs,
-            )
+        # First, use chat to handle any tool calls
+        chat_response = await self.chat(
+            messages=messages,
+            model=model,
+            stream=stream,
+            **kwargs,
+        )
 
-            if stream:
-                return response
+        if stream:
+            return chat_response
 
-            message = response.choices[0].message
-            # Add the assistant's message with tool calls
-            assistant_message = {
+        # Get the final message after all tool calls are handled
+        final_message = chat_response.choices[0].message
+
+        # Create a new message list with just the final response
+        parse_messages = [
+            *messages,  # Include original context
+            {
                 "role": "assistant",
-                "content": message.content or None,  # Ensure content is None if empty
+                "content": final_message.content,
             }
-            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}")
-
-            # 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)}")
-                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 
+        # 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,
+        ) 

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

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

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

@@ -9,10 +9,10 @@ mbxai/openrouter/client.py,sha256=RO5tbF42vkcjxjvC-QFB8DGA0gQLljH3KPBn3HgZV8I,13
 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=t7rdITqgCbDXQPFOZhGj6VDDPAwqdilJMKPfCOcJaFo,17279
+mbxai/tools/client.py,sha256=sK2sl8VKB7sgMHtJpnC_2gfy7HCA4RMzRb32sfXvWbI,14260
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=fo5t9UbsHGynhA88vD_ecgDqL8iLvt2E1h1ym43Rrgk,745
-mbxai-0.6.11.dist-info/METADATA,sha256=TtJhH4DpDQqvu0nRx1-M6U4XRkXt51PBWzxbJtDV-g0,4108
-mbxai-0.6.11.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.11.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.11.dist-info/RECORD,,
+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,,