mbxai 1.3.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "1.3.0" 
+__version__ = "1.5.0" 

mbxai/examples/mcp/mcp_client_example.py

@@ -51,6 +51,10 @@ def main():
                 if not hasattr(response, 'choices'):
                     logger.error(f"Invalid response format - no choices attribute: {response}")
                     return
+                
+                if response.choices is None:
+                    logger.error("Response choices is None")
+                    return
                     
                 if not response.choices:
                     logger.error("No choices in response")

mbxai/mcp/server.py

@@ -31,7 +31,7 @@ class MCPServer:
         self.app = FastAPI(
             title=self.name,
             description=self.description,
-            version="1.3.0",
+            version="1.5.0",
         )
         
         # Initialize MCP server
@@ -74,13 +74,10 @@ class MCPServer:
         tools = await self.mcp_server.list_tools()
         tool_metadata = tools[-1]
         
-        # Convert FastMCP schema to our schema format
+        # Use the raw inputSchema from FastMCP - it will be processed later by convert_to_strict_schema
+        # when the tool is converted to OpenAI function format
         inputSchema = tool_metadata.inputSchema
-        if isinstance(inputSchema, dict):
-            if "$ref" in inputSchema:
-                ref = inputSchema["$ref"].split("/")[-1]
-                inputSchema = tool_metadata.inputSchema.get("$defs", {}).get(ref, {})
-                    
+        
         # Create and store Tool instance
         self._tools[tool_metadata.name] = Tool(
             name=tool_metadata.name,

mbxai/openrouter/client.py

@@ -234,6 +234,15 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
+            # Validate response structure
+            if not hasattr(response, 'choices'):
+                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
+                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
+
+            if response.choices is None:
+                logger.error("Response choices is None")
+                raise OpenRouterAPIError("Invalid response format: choices is None")
+
             logger.debug(f"Response type: {type(response)}")
             logger.debug(f"Response attributes: {dir(response)}")
             logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")
@@ -320,47 +329,6 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
-            # Try to get the raw response content if available
-            if hasattr(response, '_response'):
-                try:
-                    raw_content = response._response.text
-                    logger.debug(f"Raw response content: {raw_content[:1000]}...")
-                except Exception as e:
-                    logger.debug(f"Could not get raw response content: {e}")
-
-            # Validate response structure
-            if not hasattr(response, 'choices'):
-                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
-                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
-
-            if not response.choices:
-                logger.error("Response has empty choices list")
-                raise OpenRouterAPIError("Invalid response format: empty choices list")
-
-            if not hasattr(response.choices[0], 'message'):
-                logger.error(f"First choice missing 'message' attribute. Available attributes: {dir(response.choices[0])}")
-                raise OpenRouterAPIError("Invalid response format: missing 'message' attribute in first choice")
-
-            # Check if the message has a parsed attribute or content
-            if not hasattr(response.choices[0].message, 'parsed') and not hasattr(response.choices[0].message, 'content'):
-                logger.error(f"Message missing both 'parsed' and 'content' attributes. Available attributes: {dir(response.choices[0].message)}")
-                raise OpenRouterAPIError("Invalid response format: message must have either 'parsed' or 'content' attribute")
-
-            # If there's no parsed attribute but there is content, try to parse it
-            if not hasattr(response.choices[0].message, 'parsed') and hasattr(response.choices[0].message, 'content'):
-                try:
-                    content = response.choices[0].message.content
-                    if isinstance(content, str):
-                        parsed = json.loads(content)
-                        response.choices[0].message.parsed = parsed
-                    else:
-                        response.choices[0].message.parsed = content
-                except Exception as e:
-                    stack_trace = traceback.format_exc()
-                    logger.error(f"Failed to parse message content: {str(e)}")
-                    logger.error(f"Stack trace:\n{stack_trace}")
-                    raise OpenRouterAPIError(f"Failed to parse message content: {str(e)}\nStack trace:\n{stack_trace}")
-
             logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")
 
             return response
@@ -431,6 +399,15 @@ class OpenRouterClient:
                 logger.error("Received None response from OpenRouter API")
                 raise OpenRouterAPIError("Received None response from OpenRouter API")
 
+            # Validate response structure
+            if not hasattr(response, 'choices'):
+                logger.error(f"Response missing 'choices' attribute. Available attributes: {dir(response)}")
+                raise OpenRouterAPIError("Invalid response format: missing 'choices' attribute")
+
+            if response.choices is None:
+                logger.error("Response choices is None")
+                raise OpenRouterAPIError("Invalid response format: choices is None")
+
             logger.debug(f"Response type: {type(response)}")
             logger.debug(f"Response attributes: {dir(response)}")
             logger.debug(f"Received response from OpenRouter: {len(response.choices)} choices")

mbxai/tools/types.py

@@ -9,16 +9,117 @@ import json
 
 logger = logging.getLogger(__name__)
 
+def _resolve_ref(schema: dict[str, Any], ref: str, root_schema: dict[str, Any]) -> dict[str, Any]:
+    """Resolve a $ref to its actual schema definition.
+    
+    Args:
+        schema: The current schema object
+        ref: The reference string (e.g., "#/$defs/MyType")
+        root_schema: The root schema containing $defs
+        
+    Returns:
+        The resolved schema definition
+    """
+    if ref.startswith("#/"):
+        # Remove the "#/" prefix and split the path
+        path_parts = ref[2:].split("/")
+        current = root_schema
+        
+        # Navigate through the path
+        for part in path_parts:
+            if isinstance(current, dict) and part in current:
+                current = current[part]
+            else:
+                logger.warning(f"Could not resolve $ref: {ref}")
+                return {"type": "object", "additionalProperties": False}
+        
+        return current if isinstance(current, dict) else {"type": "object", "additionalProperties": False}
+    else:
+        logger.warning(f"Unsupported $ref format: {ref}")
+        return {"type": "object", "additionalProperties": False}
+
+def _convert_property_to_strict(prop: dict[str, Any], root_schema: dict[str, Any]) -> dict[str, Any]:
+    """Convert a single property to strict format, recursively handling nested objects and arrays.
+    
+    Args:
+        prop: The property definition to convert
+        root_schema: The root schema containing $defs
+        
+    Returns:
+        A strict format property definition
+    """
+    # Handle $ref resolution
+    if "$ref" in prop:
+        resolved = _resolve_ref(prop, prop["$ref"], root_schema)
+        return _convert_property_to_strict(resolved, root_schema)
+    
+    # Get the property type, defaulting to string
+    prop_type = prop.get("type", "string")
+    
+    # Start with basic property structure
+    new_prop = {
+        "type": prop_type,
+        "description": prop.get("description", f"A {prop_type} parameter")
+    }
+    
+    # Handle specific types
+    if prop_type == "object":
+        # Objects need additionalProperties: false and properties
+        new_prop["additionalProperties"] = False
+        new_prop["properties"] = {}
+        new_prop["required"] = []
+        
+        # Process nested properties
+        if "properties" in prop:
+            for nested_name, nested_prop in prop["properties"].items():
+                new_prop["properties"][nested_name] = _convert_property_to_strict(nested_prop, root_schema)
+        
+        # Copy required fields
+        if "required" in prop:
+            new_prop["required"] = prop["required"]
+            
+    elif prop_type == "array":
+        # Arrays must have items definition
+        if "items" in prop:
+            new_prop["items"] = _convert_property_to_strict(prop["items"], root_schema)
+        else:
+            # Default items schema if missing
+            new_prop["items"] = {
+                "type": "string",
+                "description": "Array item"
+            }
+            
+    elif prop_type in ["string", "number", "integer", "boolean"]:
+        # For primitive types, copy additional constraints
+        if "enum" in prop:
+            new_prop["enum"] = prop["enum"]
+        if "minimum" in prop:
+            new_prop["minimum"] = prop["minimum"]
+        if "maximum" in prop:
+            new_prop["maximum"] = prop["maximum"]
+        if "pattern" in prop:
+            new_prop["pattern"] = prop["pattern"]
+        if "format" in prop:
+            new_prop["format"] = prop["format"]
+    
+    return new_prop
+
 def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True, keep_input_wrapper: bool = False) -> dict[str, Any]:
     """Convert a schema to strict format required by OpenAI.
     
+    This function handles:
+    - Resolving all $ref and $defs to inline definitions
+    - Adding required 'items' property for arrays
+    - Ensuring all objects have 'additionalProperties: false'
+    - Recursively processing nested schemas
+    
     Args:
         schema: The input schema to validate and convert
         strict: Whether to enforce strict validation with additionalProperties: false
         keep_input_wrapper: Whether to keep the input wrapper (for MCP tools)
         
     Returns:
-        A schema in strict format
+        A schema in strict format with all references resolved
     """
     if not schema:
         return {"type": "object", "properties": {}, "required": [], "additionalProperties": False}
@@ -31,14 +132,16 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True, keep_i
         "additionalProperties": False  # Always enforce additionalProperties: false for OpenRouter
     }
 
+    # Store the root schema for $ref resolution
+    root_schema = schema
+
     # Handle input wrapper
     if "properties" in schema and "input" in schema["properties"]:
         inputSchema = schema["properties"]["input"]
         
         # If input has a $ref, resolve it
         if "$ref" in inputSchema:
-            ref = inputSchema["$ref"].split("/")[-1]
-            inputSchema = schema.get("$defs", {}).get(ref, {})
+            inputSchema = _resolve_ref(inputSchema, inputSchema["$ref"], root_schema)
         
         if keep_input_wrapper:
             # Create the input property schema
@@ -49,20 +152,10 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True, keep_i
                 "additionalProperties": False  # Always enforce additionalProperties: false for OpenRouter
             }
             
-            # Copy over input properties
+            # Process input properties
             if "properties" in inputSchema:
                 for prop_name, prop in inputSchema["properties"].items():
-                    # Create a new property object with only allowed fields
-                    new_prop = {
-                        "type": prop.get("type", "string"),
-                        "description": prop.get("description", f"The {prop_name} parameter")
-                    }
-                    
-                    # If the property is an object, ensure it has additionalProperties: false
-                    if new_prop["type"] == "object":
-                        new_prop["additionalProperties"] = False
-                    
-                    input_prop_schema["properties"][prop_name] = new_prop
+                    input_prop_schema["properties"][prop_name] = _convert_property_to_strict(prop, root_schema)
             
             # Copy over required fields for input schema
             if "required" in inputSchema:
@@ -78,17 +171,7 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True, keep_i
             # If not keeping input wrapper, use input schema directly
             if "properties" in inputSchema:
                 for prop_name, prop in inputSchema["properties"].items():
-                    # Create a new property object with only allowed fields
-                    new_prop = {
-                        "type": prop.get("type", "string"),
-                        "description": prop.get("description", f"The {prop_name} parameter")
-                    }
-                    
-                    # If the property is an object, ensure it has additionalProperties: false
-                    if new_prop["type"] == "object":
-                        new_prop["additionalProperties"] = False
-                    
-                    strict_schema["properties"][prop_name] = new_prop
+                    strict_schema["properties"][prop_name] = _convert_property_to_strict(prop, root_schema)
             
             # Copy over required fields
             if "required" in inputSchema:
@@ -97,17 +180,7 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True, keep_i
         # If no input wrapper, use the schema as is
         if "properties" in schema:
             for prop_name, prop in schema["properties"].items():
-                # Create a new property object with only allowed fields
-                new_prop = {
-                    "type": prop.get("type", "string"),
-                    "description": prop.get("description", f"The {prop_name} parameter")
-                }
-                
-                # If the property is an object, ensure it has additionalProperties: false
-                if new_prop["type"] == "object":
-                    new_prop["additionalProperties"] = False
-                
-                strict_schema["properties"][prop_name] = new_prop
+                strict_schema["properties"][prop_name] = _convert_property_to_strict(prop, root_schema)
         
         # Copy over required fields
         if "required" in schema:

{mbxai-1.3.0.dist-info → mbxai-1.5.0.dist-info}/METADATA

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

{mbxai-1.3.0.dist-info → mbxai-1.5.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-mbxai/__init__.py,sha256=4cotIuKStlHqnJBxOJuEwoHh2V9cg49no_NLkaElFts,47
+mbxai/__init__.py,sha256=mTVWACpiOVn0-b8RkDKds5fidOixUuIoeSMF4yk9_ug,47
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/examples/openrouter_example.py,sha256=-grXHKMmFLoh-yUIEMc31n8Gg1S7uSazBWCIOWxgbyQ,1317
 mbxai/examples/parse_example.py,sha256=eCKMJoOl6qwo8sDP6Trc6ncgjPlgTqi5tPE2kB5_P0k,3821
@@ -7,22 +7,22 @@ mbxai/examples/request.json,sha256=fjVMses305wVUXgcmjESCvPgP81Js8Kk6zHjZ8EDyEg,5
 mbxai/examples/response.json,sha256=4SGJJyQjWWeN__Mrxm6ZtHIo1NUtLEheldd5KaA2mHw,856
 mbxai/examples/send_request.py,sha256=O5gCHUHy7RvkEFo9IQATgnSOfOdu8OqKHfjAlLDwWPg,6023
 mbxai/examples/tool_client_example.py,sha256=9DNaejXLA85dPbExMiv5y76qlFhzOJF9E5EnMOsy_Dc,3993
-mbxai/examples/mcp/mcp_client_example.py,sha256=R4H-OU5FvGL41cCkTdLa3bocsmVJYQYOcOHRf61nbZc,2822
+mbxai/examples/mcp/mcp_client_example.py,sha256=d5-TRHNDdp3nT_NGt0tKpT3VUAJVvqAHSyqkzk9Dd2s,2972
 mbxai/examples/mcp/mcp_server_example.py,sha256=nFfg22Jnc6HMW_ezLO3So1xwDdx2_rItj5CR-y_Nevs,3966
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
 mbxai/mcp/client.py,sha256=QRzId6o4_WRWVv3rtm8cfZZGaoY_UlaOO-oqNjY-tmw,5219
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=k_MH77DHutAfnWUSt2UFxoycqH6xn33bZOhdM5PTuW0,3454
+mbxai/mcp/server.py,sha256=-dzINI4cqzGuGyenXK1Jm9Tq5KS1l59x36Pe0KYgWVc,3332
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
-mbxai/openrouter/client.py,sha256=wWdYIzbrG-0c_MkK2GYy92OOmaaCKVv7qGUwU5tqtTo,19893
+mbxai/openrouter/client.py,sha256=3LD6WDJ8wjo_nefH5d1NJCsrWPvBc_KBf2NsItUoSt8,18302
 mbxai/openrouter/config.py,sha256=Ia93s-auim9Sq71eunVDbn9ET5xX2zusXpV4JBdHAzs,3251
 mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,2604
 mbxai/openrouter/schema.py,sha256=H_77ZrA9zmbX155bWpCJj1jehUyJPS0QybEW1IVAoe0,540
 mbxai/tools/__init__.py,sha256=ogxrHvgJ7OR62Lmd5x9Eh5d2C0jqWyQis7Zy3yKpZ78,218
 mbxai/tools/client.py,sha256=j6yB2hYxvWbaQ5SqN1Fs_YFdPtwettdcMoXcdeV-520,14930
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
-mbxai/tools/types.py,sha256=7gNIJBjzr9i4DT50OGLMjn3-6yBXqlK-kIz_RWcqywo,5875
-mbxai-1.3.0.dist-info/METADATA,sha256=j9nZGvIPsVhcBL281HSyZNIOEorCboE0qtSfsZqVbSc,4147
-mbxai-1.3.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-1.3.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-1.3.0.dist-info/RECORD,,
+mbxai/tools/types.py,sha256=AIYaX7onY6eRcCEUjrymtiSYFYXi4hpVXLYbj-i9qqo,8277
+mbxai-1.5.0.dist-info/METADATA,sha256=d55xUlW3m4tMaz6Fs2dKIWc4TnGcqfuI0jdWe9GkBOY,4147
+mbxai-1.5.0.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-1.5.0.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-1.5.0.dist-info/RECORD,,