mbxai 0.6.18__py3-none-any.whl → 0.6.20__py3-none-any.whl

mbxai/__init__.py

@@ -2,4 +2,4 @@
 MBX AI package.
 """
 
-__version__ = "0.5.25" 
+__version__ = "0.6.20" 

mbxai/mcp/client.py

@@ -7,7 +7,7 @@ import asyncio
 import json
 from pydantic import BaseModel, Field
 
-from ..tools import ToolClient, Tool
+from ..tools import ToolClient, Tool, convert_to_strict_schema
 from ..openrouter import OpenRouterClient
 
 logger = logging.getLogger(__name__)
@@ -16,22 +16,15 @@ T = TypeVar("T", bound=BaseModel)
 
 
 class MCPTool(Tool):
-    """MCP tool definition."""
-    internal_url: str | None = Field(default=None, description="The internal URL to invoke the tool")
-    service: str = Field(description="The service that provides the tool")
-    strict: bool = Field(default=True, description="Whether the tool response is strictly validated")
-    input_schema: dict[str, Any] = Field(description="The input schema for the tool")
-    function: Callable[..., Any] | None = Field(default=None, description="The function that implements the tool")
+    """A tool from the MCP server."""
+    input_schema: dict[str, Any]
+    internal_url: str
+    strict: bool = True
 
     def to_openai_function(self) -> dict[str, Any]:
         """Convert the tool to an OpenAI function definition."""
-        # Log the original schema
-        logger.info(f"Original schema for {self.name}: {json.dumps(self.input_schema, indent=2)}")
-        
-        # Convert the schema to strict format
-        strict_schema = self._convert_to_openai_schema(self.input_schema)
-        
-        # Log the converted schema
+        # Use the base Tool's schema conversion
+        strict_schema = convert_to_strict_schema(self.input_schema, strict=self.strict)
         logger.info(f"Converted schema for {self.name}: {json.dumps(strict_schema, indent=2)}")
         
         return {
@@ -48,61 +41,64 @@ class MCPTool(Tool):
         if not mcp_schema:
             return {"type": "object", "properties": {}, "required": []}
 
-        logger.info(f"Starting schema conversion for {self.name}")
-        logger.info(f"Initial schema: {json.dumps(mcp_schema, indent=2)}")
+        # Create a new schema object to ensure we have all required fields
+        strict_schema = {
+            "type": "object",
+            "properties": {},
+            "required": []
+        }
 
-        # If schema has a $ref, resolve it
-        if "$ref" in mcp_schema:
-            ref = mcp_schema["$ref"].split("/")[-1]
-            mcp_schema = mcp_schema.get("$defs", {}).get(ref, {})
-            logger.info(f"Resolved $ref to: {json.dumps(mcp_schema, indent=2)}")
+        # Add additionalProperties: false for strict tools
+        if self.strict:
+            strict_schema["additionalProperties"] = False
 
-        # If schema has an input wrapper, unwrap it
+        # Handle input wrapper
         if "properties" in mcp_schema and "input" in mcp_schema["properties"]:
             input_schema = mcp_schema["properties"]["input"]
+            
+            # 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, {})
-            mcp_schema = input_schema
-            logger.info(f"Unwrapped input schema: {json.dumps(mcp_schema, indent=2)}")
-
-        # Create a new schema object to ensure we have all required fields
-        strict_schema = {
-            "type": "object",
-            "properties": {},
-            "required": []
-        }
+            
+            # Create the input property schema
+            input_prop_schema = {
+                "type": "object",
+                "properties": {},
+                "required": []
+            }
+            
+            # Add additionalProperties: false for input schema
+            if self.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
+            
+            # Copy over required fields for input schema
+            if "required" in input_schema:
+                input_prop_schema["required"] = input_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 mcp_schema:
+                strict_schema["required"] = mcp_schema["required"]
 
-        # Copy over properties, ensuring each has type and description
-        if "properties" in mcp_schema:
-            for prop_name, prop in mcp_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 mcp_schema:
-            strict_schema["required"] = mcp_schema["required"]
-            logger.info(f"Added required fields: {strict_schema['required']}")
-
-        # Ensure all required fields are actually in properties
-        strict_schema["required"] = [
-            req for req in strict_schema["required"]
-            if req in strict_schema["properties"]
-        ]
-        logger.info(f"Final required fields: {strict_schema['required']}")
-
-        logger.info(f"Final strict schema: {json.dumps(strict_schema, indent=2)}")
         return strict_schema
 
 
@@ -175,7 +171,7 @@ class MCPClient(ToolClient):
         
         # Register each tool
         for idx, tool_data in enumerate(tools_data):
-            logger.info(f"Processing tool {idx}: {json.dumps(tool_data, indent=2)}")
+            logger.debug(f"Processing tool {idx}: {json.dumps(tool_data, indent=2)}")
             
             # Ensure tool_data is a dictionary
             if not isinstance(tool_data, dict):

mbxai/mcp/server.py

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

mbxai/tools/__init__.py

@@ -3,10 +3,11 @@ Tools module for MBX AI.
 """
 
 from .client import ToolClient
-from .types import Tool, ToolCall
+from .types import Tool, ToolCall, convert_to_strict_schema
 
 __all__ = [
     "ToolClient",
     "Tool",
     "ToolCall",
+    "convert_to_strict_schema",
 ] 

mbxai/tools/types.py

@@ -4,66 +4,63 @@ Type definitions for the tools package.
 
 from typing import Any, Callable
 from pydantic import BaseModel, Field
+import logging
+import json
 
-class ToolCall(BaseModel):
-    """A tool call from the model."""
-    id: str
-    name: str
-    arguments: dict[str, Any]
+logger = logging.getLogger(__name__)
 
-class Tool(BaseModel):
-    """A tool that can be used by the model."""
-    name: str
-    description: str
-    function: Callable[..., Any]
-    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 = self._ensure_strict_schema(self.schema)
+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
         
-        return {
-            "type": "function",
-            "function": {
-                "name": self.name,
-                "description": self.description,
-                "parameters": strict_schema
-            }
-        }
+    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}")
 
-    def _ensure_strict_schema(self, schema: dict[str, Any]) -> dict[str, Any]:
-        """Ensure the schema is in strict format required by OpenAI.
-        
-        Args:
-            schema: The input schema to validate and convert
-            
-        Returns:
-            A schema in strict format
-        """
-        # If schema has a $ref, resolve it
-        if "$ref" in schema:
-            ref = schema["$ref"].split("/")[-1]
-            schema = schema.get("$defs", {}).get(ref, {})
+    if not schema:
+        return {"type": "object", "properties": {}, "required": []}
 
-        # If schema has an input wrapper, unwrap it
-        if "properties" in schema and "input" in schema["properties"]:
-            input_schema = schema["properties"]["input"]
-            if "$ref" in input_schema:
-                ref = input_schema["$ref"].split("/")[-1]
-                input_schema = schema.get("$defs", {}).get(ref, {})
-            schema = input_schema
+    # Create a new schema object to ensure we have all required fields
+    strict_schema = {
+        "type": "object",
+        "properties": {},
+        "required": []
+    }
 
-        # Create a new schema object to ensure we have all required fields
-        strict_schema = {
+    # 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": []
         }
-
-        # Copy over properties, ensuring each has type and description
-        if "properties" in schema:
-            for prop_name, prop in schema["properties"].items():
+        
+        # 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"),
@@ -75,21 +72,49 @@ class Tool(BaseModel):
                     if key not in new_prop:
                         new_prop[key] = value
                 
-                strict_schema["properties"][prop_name] = new_prop
-
-        # Copy over required fields
+                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
 
-        # Ensure all required fields are actually in properties
-        strict_schema["required"] = [
-            req for req in strict_schema["required"]
-            if req in strict_schema["properties"]
-        ]
+class ToolCall(BaseModel):
+    """A tool call from the model."""
+    id: str
+    name: str
+    arguments: dict[str, Any]
 
-        # Add any additional fields from the original schema
-        for key, value in schema.items():
-            if key not in strict_schema:
-                strict_schema[key] = value
+class Tool(BaseModel):
+    """A tool that can be used by the model."""
+    name: str
+    description: str
+    function: Callable[..., Any]
+    schema: dict[str, Any]
 
-        return strict_schema 
+    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.18.dist-info → mbxai-0.6.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbxai
-Version: 0.6.18
+Version: 0.6.20
 Summary: MBX AI SDK
 Project-URL: Homepage, https://www.mibexx.de
 Project-URL: Documentation, https://www.mibexx.de
@@ -22,6 +22,7 @@ Requires-Dist: pydantic>=2.9.1
 Requires-Dist: python-multipart>=0.0.20
 Requires-Dist: sse-starlette>=2.3.4
 Requires-Dist: starlette>=0.46.2
+Requires-Dist: typing-inspection<=0.4.0
 Requires-Dist: uvicorn>=0.34.2
 Provides-Extra: dev
 Requires-Dist: black>=24.3.0; extra == 'dev'

{mbxai-0.6.18.dist-info → mbxai-0.6.20.dist-info}/RECORD

@@ -1,18 +1,18 @@
-mbxai/__init__.py,sha256=TPQPmobkBuhgo14NoMCbpjcR4Lgi3T-hc27EY0cDggk,48
+mbxai/__init__.py,sha256=k5Jl-pIwvz4w-b1_h3wR6y9AzjIl18Pwd10AZN-l-rk,48
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=_FKq0oayE4eMklHdeMapBzJhzdJ0yAvGYz81-RB5GQY,8408
+mbxai/mcp/client.py,sha256=UhrtsR13px-3MyfHvida5Eh_ou9-ofVexHkhMUEmYH8,7748
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=T0-Y7FeHRFqSTp2ERU96fOQlQJKjMFxg8oqC4dzBmBA,3463
+mbxai/mcp/server.py,sha256=65DvS6RyZ59tRThiFo_bCm3C_SbagGtzkTKEAh2JLLM,3463
 mbxai/openrouter/__init__.py,sha256=Ito9Qp_B6q-RLGAQcYyTJVWwR2YAZvNqE-HIYXxhtD8,298
 mbxai/openrouter/client.py,sha256=nusxYObyLAMGQd6J9u2uLfkRXyE5kZmdIGdlU-76HPo,13529
 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/__init__.py,sha256=ogxrHvgJ7OR62Lmd5x9Eh5d2C0jqWyQis7Zy3yKpZ78,218
 mbxai/tools/client.py,sha256=qOf8MiQ8_flPUNiMioOyjeEaV8rN1EBWb98T8qTC3D4,17582
 mbxai/tools/example.py,sha256=1HgKK39zzUuwFbnp3f0ThyWVfA_8P28PZcTwaUw5K78,2232
-mbxai/tools/types.py,sha256=pFSV59rebWASnIQb27wVg1kFYbCGZmPlOjrLNfNuvrc,3245
-mbxai-0.6.18.dist-info/METADATA,sha256=LsCxFm_0dH1JcYPmOMBZZhYXOk0TiO3HPh69RyhjLXk,4108
-mbxai-0.6.18.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.18.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.18.dist-info/RECORD,,
+mbxai/tools/types.py,sha256=lAmy35IX04QV18Am8Ebd-0o6i34QU0vv82FaBYznu_E,4375
+mbxai-0.6.20.dist-info/METADATA,sha256=BQJaUY0ZGe924fILDvEIPefVaPPyu66BFSWZ9Rc-JS8,4148
+mbxai-0.6.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.20.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.20.dist-info/RECORD,,