mbxai 0.6.22__py3-none-any.whl → 0.6.23__py3-none-any.whl

mbxai/__init__.py

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

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/mcp/server.py

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

mbxai/tools/types.py

@@ -9,18 +9,19 @@ import json
 
 logger = logging.getLogger(__name__)
 
-def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dict[str, Any]:
+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}")
+    logger.info(f"Strict mode: {strict}, Keep input wrapper: {keep_input_wrapper}")
 
     if not schema:
         return {"type": "object", "properties": {}, "required": []}
@@ -47,41 +48,91 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dic
             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 only allowed fields
+        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")
                 }
                 
-                input_prop_schema["properties"][prop_name] = new_prop
+                # 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 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
+        # Copy over required fields
         if "required" in schema:
             strict_schema["required"] = schema["required"]
-            logger.info(f"Added required fields for main schema: {strict_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

{mbxai-0.6.22.dist-info → mbxai-0.6.23.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: mbxai
-Version: 0.6.22
+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.22.dist-info → mbxai-0.6.23.dist-info}/RECORD

@@ -1,9 +1,9 @@
-mbxai/__init__.py,sha256=yg4sZUYaTu5lJqkUoW6bkIZhWpjbkcSLbNTkfDhD_5I,48
+mbxai/__init__.py,sha256=sXELKJtZXTLn227-FJ-5b3CCiKmyNk74UWVjduIoeeE,48
 mbxai/core.py,sha256=WMvmU9TTa7M_m-qWsUew4xH8Ul6xseCZ2iBCXJTW-Bs,196
 mbxai/mcp/__init__.py,sha256=_ek9iYdYqW5saKetj4qDci11jxesQDiHPJRpHMKkxgU,175
-mbxai/mcp/client.py,sha256=EtgrKiTsHHeAzmnsYCOJMiu-i-k06kJZqR_L2bz91pw,7843
+mbxai/mcp/client.py,sha256=2aX5zMe0vSxZSdvfxoHDA5p_aQSqV1bhX_-QopG2uX8,8477
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=oFDL4CHXJxIpH1btcWTlxm4mLztfrY6X8cKI30HZxj0,3463
+mbxai/mcp/server.py,sha256=2rQtXDie1hx9ofm5py779pjvdZXslY4bYcCXHfzFQ6E,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
@@ -11,8 +11,8 @@ mbxai/openrouter/models.py,sha256=b3IjjtZAjeGOf2rLsdnCD1HacjTnS8jmv_ZXorc-KJQ,26
 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=iyoSnRwr_Anf7qBybAQ_-dqFnDmABmrtPpgef3R7PV0,4193
-mbxai-0.6.22.dist-info/METADATA,sha256=sK-8ps0-u6T-8CaR8Rfgw1ZZ3wg7SI3On1ZwMQ7PQ2I,4148
-mbxai-0.6.22.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.22.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.22.dist-info/RECORD,,
+mbxai/tools/types.py,sha256=NA-9JvbKbNpg7LzUwuDlssBVfQoRI_5t8-UR4zGPqXM,6966
+mbxai-0.6.23.dist-info/METADATA,sha256=MdcRJaBfxIslGOWZvrUXe1HgrLxRUwb0jK9xQtAJBzo,4148
+mbxai-0.6.23.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+mbxai-0.6.23.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
+mbxai-0.6.23.dist-info/RECORD,,