mbxai 0.6.21__tar.gz → 0.6.23__tar.gz

{mbxai-0.6.21 → mbxai-0.6.23}/PKG-INFO

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

{mbxai-0.6.21 → mbxai-0.6.23}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "mbxai"
-version = "0.6.21"
+version = "0.6.23"
 authors = [
     { name = "MBX AI" }
 ]

{mbxai-0.6.21 → mbxai-0.6.23}/setup.py

@@ -2,7 +2,7 @@ from setuptools import setup, find_packages
 
 setup(
     name="mbxai",
-    version="0.6.21",
+    version="0.6.23",
     author="MBX AI",
     description="MBX AI SDK",
     long_description=open("README.md").read(),

{mbxai-0.6.21 → mbxai-0.6.23}/src/mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.6.21" 
+__version__ = "0.6.23" 

{mbxai-0.6.21 → mbxai-0.6.23}/src/mbxai/mcp/client.py

@@ -24,8 +24,8 @@ class MCPTool(Tool):
 
     def to_openai_function(self) -> dict[str, Any]:
         """Convert the tool to an OpenAI function definition."""
-        # Use the base Tool's schema conversion
-        strict_schema = convert_to_strict_schema(self.input_schema, strict=self.strict)
+        # Use the unified schema conversion with keep_input_wrapper=True for MCP tools
+        strict_schema = convert_to_strict_schema(self.input_schema, strict=self.strict, keep_input_wrapper=True)
         logger.info(f"Converted schema for {self.name}: {json.dumps(strict_schema, indent=2)}")
         
         return {
@@ -56,11 +56,13 @@ class MCPTool(Tool):
         # Handle input wrapper
         if "properties" in mcp_schema and "input" in mcp_schema["properties"]:
             input_schema = mcp_schema["properties"]["input"]
+            logger.info(f"Found input wrapper. Input schema: {json.dumps(input_schema, indent=2)}")
             
             # If input has a $ref, resolve it
             if "$ref" in input_schema:
                 ref = input_schema["$ref"].split("/")[-1]
                 input_schema = mcp_schema.get("$defs", {}).get(ref, {})
+                logger.info(f"Resolved $ref to: {json.dumps(input_schema, indent=2)}")
             
             # Create the input property schema
             input_prop_schema = {
@@ -88,10 +90,12 @@ class MCPTool(Tool):
                             new_prop[key] = value
                     
                     input_prop_schema["properties"][prop_name] = new_prop
+                    logger.info(f"Added property {prop_name}: {json.dumps(new_prop, indent=2)}")
             
             # Copy over required fields for input schema
             if "required" in input_schema:
                 input_prop_schema["required"] = input_schema["required"]
+                logger.info(f"Added required fields for input schema: {input_prop_schema['required']}")
             
             # Add the input property to the main schema
             strict_schema["properties"]["input"] = input_prop_schema
@@ -99,7 +103,9 @@ class MCPTool(Tool):
             # Copy over required fields for main schema
             if "required" in mcp_schema:
                 strict_schema["required"] = mcp_schema["required"]
+                logger.info(f"Added required fields for main schema: {strict_schema['required']}")
 
+        logger.info(f"Final strict schema: {json.dumps(strict_schema, indent=2)}")
         return strict_schema
 
 

{mbxai-0.6.21 → mbxai-0.6.23}/src/mbxai/mcp/server.py

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

mbxai-0.6.23/src/mbxai/tools/types.py

@@ -0,0 +1,166 @@
+"""
+Type definitions for the tools package.
+"""
+
+from typing import Any, Callable
+from pydantic import BaseModel, Field
+import logging
+import json
+
+logger = logging.getLogger(__name__)
+
+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.
+    
+    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
+    """
+    logger.info(f"Converting schema to strict format. Input schema: {json.dumps(schema, indent=2)}")
+    logger.info(f"Strict mode: {strict}, Keep input wrapper: {keep_input_wrapper}")
+
+    if not schema:
+        return {"type": "object", "properties": {}, "required": []}
+
+    # Create a new schema object to ensure we have all required fields
+    strict_schema = {
+        "type": "object",
+        "properties": {},
+        "required": []
+    }
+
+    # Add additionalProperties: false for strict validation
+    if strict:
+        strict_schema["additionalProperties"] = False
+
+    # Handle input wrapper
+    if "properties" in schema and "input" in schema["properties"]:
+        input_schema = schema["properties"]["input"]
+        logger.info(f"Found input wrapper. Input schema: {json.dumps(input_schema, indent=2)}")
+        
+        # If input has a $ref, resolve it
+        if "$ref" in input_schema:
+            ref = input_schema["$ref"].split("/")[-1]
+            input_schema = schema.get("$defs", {}).get(ref, {})
+            logger.info(f"Resolved $ref to: {json.dumps(input_schema, indent=2)}")
+        
+        if keep_input_wrapper:
+            # Create the input property schema
+            input_prop_schema = {
+                "type": "object",
+                "properties": {},
+                "required": []
+            }
+            
+            # Add additionalProperties: false for input schema
+            if strict:
+                input_prop_schema["additionalProperties"] = False
+            
+            # Copy over input properties
+            if "properties" in input_schema:
+                for prop_name, prop in input_schema["properties"].items():
+                    # Create a new property object with required fields
+                    new_prop = {
+                        "type": prop.get("type", "string"),
+                        "description": prop.get("description", f"The {prop_name} parameter")
+                    }
+                    
+                    # Copy over any additional fields that might be useful
+                    for key, value in prop.items():
+                        if key not in new_prop:
+                            new_prop[key] = value
+                    
+                    input_prop_schema["properties"][prop_name] = new_prop
+                    logger.info(f"Added property {prop_name}: {json.dumps(new_prop, indent=2)}")
+            
+            # Copy over required fields for input schema
+            if "required" in input_schema:
+                input_prop_schema["required"] = input_schema["required"]
+                logger.info(f"Added required fields for input schema: {input_prop_schema['required']}")
+            
+            # Add the input property to the main schema
+            strict_schema["properties"]["input"] = input_prop_schema
+            
+            # Copy over required fields for main schema
+            if "required" in schema:
+                strict_schema["required"] = schema["required"]
+                logger.info(f"Added required fields for main schema: {strict_schema['required']}")
+        else:
+            # If not keeping input wrapper, use input schema directly
+            if "properties" in input_schema:
+                for prop_name, prop in input_schema["properties"].items():
+                    # Create a new property object with required fields
+                    new_prop = {
+                        "type": prop.get("type", "string"),
+                        "description": prop.get("description", f"The {prop_name} parameter")
+                    }
+                    
+                    # Copy over any additional fields that might be useful
+                    for key, value in prop.items():
+                        if key not in new_prop:
+                            new_prop[key] = value
+                    
+                    strict_schema["properties"][prop_name] = new_prop
+                    logger.info(f"Added property {prop_name}: {json.dumps(new_prop, indent=2)}")
+            
+            # Copy over required fields
+            if "required" in input_schema:
+                strict_schema["required"] = input_schema["required"]
+                logger.info(f"Added required fields: {strict_schema['required']}")
+    else:
+        # 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 required fields
+                new_prop = {
+                    "type": prop.get("type", "string"),
+                    "description": prop.get("description", f"The {prop_name} parameter")
+                }
+                
+                # Copy over any additional fields that might be useful
+                for key, value in prop.items():
+                    if key not in new_prop:
+                        new_prop[key] = value
+                
+                strict_schema["properties"][prop_name] = new_prop
+                logger.info(f"Added property {prop_name}: {json.dumps(new_prop, indent=2)}")
+        
+        # Copy over required fields
+        if "required" in schema:
+            strict_schema["required"] = schema["required"]
+            logger.info(f"Added required fields: {strict_schema['required']}")
+
+    logger.info(f"Final strict schema: {json.dumps(strict_schema, indent=2)}")
+    return strict_schema
+
+class ToolCall(BaseModel):
+    """A tool call from the model."""
+    id: str
+    name: str
+    arguments: dict[str, Any]
+
+class Tool(BaseModel):
+    """A tool that can be used by the model."""
+    name: str
+    description: str
+    function: Callable[..., Any] | None = None  # Make function optional
+    schema: dict[str, Any]
+
+    def to_openai_function(self) -> dict[str, Any]:
+        """Convert the tool to an OpenAI function definition."""
+        # Ensure schema is in strict format
+        strict_schema = convert_to_strict_schema(self.schema)
+        logger.info(f"Converted schema for {self.name}: {json.dumps(strict_schema, indent=2)}")
+        
+        return {
+            "type": "function",
+            "function": {
+                "name": self.name,
+                "description": self.description,
+                "parameters": strict_schema
+            }
+        } 

{mbxai-0.6.21 → mbxai-0.6.23}/uv.lock

@@ -446,7 +446,7 @@ wheels = [
 
 [[package]]
 name = "mbxai"
-version = "0.6.21"
+version = "0.6.23"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },

mbxai-0.6.21/src/mbxai/tools/types.py

@@ -1,120 +0,0 @@
-"""
-Type definitions for the tools package.
-"""
-
-from typing import Any, Callable
-from pydantic import BaseModel, Field
-import logging
-import json
-
-logger = logging.getLogger(__name__)
-
-def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dict[str, Any]:
-    """Convert a schema to strict format required by OpenAI.
-    
-    Args:
-        schema: The input schema to validate and convert
-        strict: Whether to enforce strict validation with additionalProperties: false
-        
-    Returns:
-        A schema in strict format
-    """
-    logger.info(f"Converting schema to strict format. Input schema: {json.dumps(schema, indent=2)}")
-    logger.info(f"Strict mode: {strict}")
-
-    if not schema:
-        return {"type": "object", "properties": {}, "required": []}
-
-    # Create a new schema object to ensure we have all required fields
-    strict_schema = {
-        "type": "object",
-        "properties": {},
-        "required": []
-    }
-
-    # Add additionalProperties: false for strict validation
-    if strict:
-        strict_schema["additionalProperties"] = False
-
-    # Handle input wrapper
-    if "properties" in schema and "input" in schema["properties"]:
-        input_schema = schema["properties"]["input"]
-        logger.info(f"Found input wrapper. Input schema: {json.dumps(input_schema, indent=2)}")
-        
-        # If input has a $ref, resolve it
-        if "$ref" in input_schema:
-            ref = input_schema["$ref"].split("/")[-1]
-            input_schema = schema.get("$defs", {}).get(ref, {})
-            logger.info(f"Resolved $ref to: {json.dumps(input_schema, indent=2)}")
-        
-        # Create the input property schema
-        input_prop_schema = {
-            "type": "object",
-            "properties": {},
-            "required": []
-        }
-        
-        # Add additionalProperties: false for input schema
-        if strict:
-            input_prop_schema["additionalProperties"] = False
-        
-        # Copy over input properties
-        if "properties" in input_schema:
-            for prop_name, prop in input_schema["properties"].items():
-                # Create a new property object with required fields
-                new_prop = {
-                    "type": prop.get("type", "string"),
-                    "description": prop.get("description", f"The {prop_name} parameter")
-                }
-                
-                # Copy over any additional fields that might be useful
-                for key, value in prop.items():
-                    if key not in new_prop:
-                        new_prop[key] = value
-                
-                input_prop_schema["properties"][prop_name] = new_prop
-                logger.info(f"Added property {prop_name}: {json.dumps(new_prop, indent=2)}")
-        
-        # Copy over required fields for input schema
-        if "required" in input_schema:
-            input_prop_schema["required"] = input_schema["required"]
-            logger.info(f"Added required fields for input schema: {input_prop_schema['required']}")
-        
-        # Add the input property to the main schema
-        strict_schema["properties"]["input"] = input_prop_schema
-        
-        # Copy over required fields for main schema
-        if "required" in schema:
-            strict_schema["required"] = schema["required"]
-            logger.info(f"Added required fields for main schema: {strict_schema['required']}")
-
-    logger.info(f"Final strict schema: {json.dumps(strict_schema, indent=2)}")
-    return strict_schema
-
-class ToolCall(BaseModel):
-    """A tool call from the model."""
-    id: str
-    name: str
-    arguments: dict[str, Any]
-
-class Tool(BaseModel):
-    """A tool that can be used by the model."""
-    name: str
-    description: str
-    function: Callable[..., Any] | None = None  # Make function optional
-    schema: dict[str, Any]
-
-    def to_openai_function(self) -> dict[str, Any]:
-        """Convert the tool to an OpenAI function definition."""
-        # Ensure schema is in strict format
-        strict_schema = convert_to_strict_schema(self.schema)
-        logger.info(f"Converted schema for {self.name}: {json.dumps(strict_schema, indent=2)}")
-        
-        return {
-            "type": "function",
-            "function": {
-                "name": self.name,
-                "description": self.description,
-                "parameters": strict_schema
-            }
-        }