mbxai 0.6.26__py3-none-any.whl → 0.7.0__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.6.26" 
+__version__ = "0.7.0" 

mbxai/mcp/server.py

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

mbxai/openrouter/client.py

@@ -205,7 +205,7 @@ class OpenRouterClient:
             total_size = sum(len(str(msg)) for msg in messages)
             logger.info(f"Total message size: {total_size} bytes")
             
-            response = self._client.chat.completions.create(
+            response = self._client.responses.create(
                 messages=messages,
                 model=model or self.model,
                 stream=stream,
@@ -214,14 +214,10 @@ class OpenRouterClient:
             
             # 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")
-                if hasattr(response.choices[0], 'message'):
-                    content = response.choices[0].message.content
-                    content_length = len(content) if content else 0
-                    logger.info(f"First choice has message with content length: {content_length}")
-                    if content_length > 1000000:  # Log warning for very large responses
-                        logger.warning(f"Response content is very large ({content_length} bytes)")
+            if hasattr(response, 'output'):
+                logger.info(f"Response output length: {len(response.output) if response.output else 0}")
+            if hasattr(response, 'tool_calls'):
+                logger.info(f"Response includes {len(response.tool_calls)} tool calls")
             
             return response
             
@@ -256,7 +252,7 @@ class OpenRouterClient:
             **kwargs: Additional parameters
 
         Returns:
-            Parsed completion response
+            Parsed completion response with output and output_parsed fields
 
         Raises:
             OpenRouterConnectionError: For connection issues
@@ -273,17 +269,26 @@ class OpenRouterClient:
             total_size = sum(len(str(msg)) for msg in messages)
             logger.info(f"Total message size: {total_size} bytes")
             
-            response = self._client.beta.chat.completions.parse(
-                messages=messages,
+            # Use responses.parse for structured output
+            response = self._client.responses.parse(
                 model=model or self.model,
-                response_format=response_format,
+                input=messages,
+                text_format=response_format,
                 **kwargs,
             )
             
+            if not response:
+                logger.error(f"Full response content: {response}")
+                raise OpenRouterAPIError("Invalid response from OpenRouter: empty response")
+            
             # 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")
+            if hasattr(response, 'output'):
+                logger.info(f"Response output length: {len(response.output) if response.output else 0}")
+            if hasattr(response, 'output_parsed'):
+                logger.info("Response includes parsed output")
+            if hasattr(response, 'tool_calls'):
+                logger.info(f"Response includes {len(response.tool_calls)} tool calls")
             
             return response
             

mbxai/tools/client.py

@@ -210,7 +210,6 @@ class ToolClient:
         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
@@ -224,87 +223,71 @@ class ToolClient:
             if stream:
                 return response
 
-            message = response.choices[0].message
-            # Add the assistant's message with tool calls
-            assistant_message = {
-                "role": "assistant",
-                "content": message.content or None,  # Ensure content is None if empty
-            }
-            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
+            # Parse the response output
+            output = response.output
+            
+            # Get all function calls from the output
+            tool_calls = []
+            if isinstance(output, list):
+                tool_calls = [
+                    tc for tc in output 
+                    if isinstance(tc, dict) and tc.get("type") == "function_call"
                 ]
-            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):
+            
+            # Process function calls if any
+            if tool_calls:
+                logger.info(f"Processing {len(tool_calls)} function calls")
+                
+                # Process each function call
+                for tool_call in tool_calls:
+                    logger.info(f"Processing tool call: {tool_call['name']}")
+
+                    # Get the tool
+                    tool = self._tools.get(tool_call["name"])
+                    if not tool:
+                        raise ValueError(f"Unknown tool: {tool_call['name']}")
+
+                    # Parse arguments
                     try:
-                        arguments = json.loads(arguments)
+                        arguments = json.loads(tool_call["arguments"])
                     except json.JSONDecodeError as e:
                         logger.error(f"Failed to parse tool arguments: {e}")
-                        raise ValueError(f"Invalid tool arguments format: {arguments}")
+                        raise ValueError(f"Invalid tool arguments format: {tool_call['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
+                    # 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)
+                        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 string if needed
+                    if not isinstance(result, str):
+                        result = json.dumps(result)
+
+                    # Append the function call and result to messages
+                    messages.append(tool_call)  # Append the model's function call
+                    messages.append({
+                        "type": "function_call_output",
+                        "call_id": tool_call["call_id"],
+                        "output": result
+                    })
+                    
+                    logger.info(f"Added function call and output for {tool_call['name']}")
+
+                # Continue the conversation after processing all calls
+                continue
+            else:
+                logger.info("Added assistant response")
+                return response
 
     async def parse(
         self,
@@ -330,7 +313,6 @@ class ToolClient:
         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
@@ -341,85 +323,68 @@ class ToolClient:
                 **kwargs,
             )
 
-            message = response.choices[0].message
-            # Add the assistant's message with tool calls
-            assistant_message = {
-                "role": "assistant",
-                "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
+            # Parse the response output
+            output = response.output
+            
+            # Get all function calls from the output
+            tool_calls = []
+            if isinstance(output, list):
+                tool_calls = [
+                    tc for tc in output 
+                    if isinstance(tc, dict) and tc.get("type") == "function_call"
                 ]
-            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):
+            
+            # Process function calls if any
+            if tool_calls:
+                logger.info(f"Processing {len(tool_calls)} function calls")
+                
+                # Process each function call
+                for tool_call in tool_calls:
+                    logger.info(f"Processing tool call: {tool_call['name']}")
+
+                    # Get the tool
+                    tool = self._tools.get(tool_call["name"])
+                    if not tool:
+                        raise ValueError(f"Unknown tool: {tool_call['name']}")
+
+                    # Parse arguments
                     try:
-                        arguments = json.loads(arguments)
+                        arguments = json.loads(tool_call["arguments"])
                     except json.JSONDecodeError as e:
                         logger.error(f"Failed to parse tool arguments: {e}")
-                        raise ValueError(f"Invalid tool arguments format: {arguments}")
+                        raise ValueError(f"Invalid tool arguments format: {tool_call['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
+                    # 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)
+                        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 string if needed
+                    if not isinstance(result, str):
+                        result = json.dumps(result)
+
+                    # Append the function call and result to messages
+                    messages.append(tool_call)  # Append the model's function call
+                    messages.append({
+                        "type": "function_call_output",
+                        "call_id": tool_call["call_id"],
+                        "output": result
+                    })
+                    
+                    logger.info(f"Added function call and output for {tool_call['name']}")
+
+                # Continue the conversation after processing all calls
+                continue
+            else:
+                logger.info("Added assistant response with parsed output")
+                return response

{mbxai-0.6.26.dist-info → mbxai-0.7.0.dist-info}/METADATA

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

{mbxai-0.6.26.dist-info → mbxai-0.7.0.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=Out2NMCo5hL8fjqtf7vlBcmN2hfHzmLai8gORDPKVvE,48
+mbxai/__init__.py,sha256=3Df0lwLheU0HxspabtS7logrnJNfK1O9b2ErV4pfYBg,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
 mbxai/mcp/client.py,sha256=m3FBMqewv6b8ZJ7V9TnHqHxJ3acHDQDHvbuYhweI9-g,5283
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=mav-1O445zNBGCSubzt91IrYZnPD_QLpHm02TQyyw9Y,3463
+mbxai/mcp/server.py,sha256=_qWxAxMNosw7PRiuhuqhN1DW7Z2p4PMT6LweVQ8gins,3462
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=nusxYObyLAMGQd6J9u2uLfkRXyE5kZmdIGdlU-76HPo,13529
+mbxai/openrouter/client.py,sha256=16ToKA0x-CdIXRrVzmv-31u9973Yssv-tUvG_InBlI0,13715
 mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/tools/__init__.py,sha256=ogxrHvgJ7OR62Lmd5x9Eh5d2C0jqWyQis7Zy3yKpZ78,218
-mbxai/tools/client.py,sha256=qOf8MiQ8_flPUNiMioOyjeEaV8rN1EBWb98T8qTC3D4,17582
+mbxai/tools/client.py,sha256=uubKrzz_T_EAwkCMh3jo8ylWYJ41_KdFhj3-Tyuvc3g,16006
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
 mbxai/tools/types.py,sha256=PEJ2AxBqywbJCp689QZhG87rDHWNuKGnmB5CCQsAMlw,5251
-mbxai-0.6.26.dist-info/METADATA,sha256=9r-_evlE1RdD3q0cUbuWmQeSqVVWAkm5n17f6Q2y5xA,4148
-mbxai-0.6.26.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.26.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.26.dist-info/RECORD,,
+mbxai-0.7.0.dist-info/METADATA,sha256=5-1BkoCgNgY04G-lrmfBqO1pGPprVWX2h9hGQGYNAPE,4147
+mbxai-0.7.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.7.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.7.0.dist-info/RECORD,,