mbxai 0.6.16__tar.gz → 0.6.18__tar.gz

{mbxai-0.6.16 → mbxai-0.6.18}/PKG-INFO

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

{mbxai-0.6.16 → mbxai-0.6.18}/pyproject.toml

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

{mbxai-0.6.16 → mbxai-0.6.18}/setup.py

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

{mbxai-0.6.16 → mbxai-0.6.18}/src/mbxai/mcp/client.py

@@ -4,6 +4,7 @@ from typing import Any, TypeVar, Callable
 import httpx
 import logging
 import asyncio
+import json
 from pydantic import BaseModel, Field
 
 from ..tools import ToolClient, Tool
@@ -24,24 +25,37 @@ class MCPTool(Tool):
 
     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
+        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": self._convert_to_openai_schema(self.input_schema)
+                "parameters": strict_schema
             }
         }
 
     def _convert_to_openai_schema(self, mcp_schema: dict[str, Any]) -> dict[str, Any]:
         """Convert MCP schema to OpenAI schema format."""
         if not mcp_schema:
-            return {"type": "object", "properties": {}}
+            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)}")
 
         # 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)}")
 
         # If schema has an input wrapper, unwrap it
         if "properties" in mcp_schema and "input" in mcp_schema["properties"]:
@@ -49,9 +63,47 @@ class MCPTool(Tool):
             if "$ref" in input_schema:
                 ref = input_schema["$ref"].split("/")[-1]
                 input_schema = mcp_schema.get("$defs", {}).get(ref, {})
-            return input_schema
+            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": []
+        }
+
+        # 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']}")
 
-        return mcp_schema
+        logger.info(f"Final strict schema: {json.dumps(strict_schema, indent=2)}")
+        return strict_schema
 
 
 class MCPClient(ToolClient):
@@ -123,7 +175,7 @@ class MCPClient(ToolClient):
         
         # Register each tool
         for idx, tool_data in enumerate(tools_data):
-            logger.debug(f"Processing tool {idx}: {tool_data}")
+            logger.info(f"Processing tool {idx}: {json.dumps(tool_data, indent=2)}")
             
             # Ensure tool_data is a dictionary
             if not isinstance(tool_data, dict):
@@ -145,4 +197,4 @@ class MCPClient(ToolClient):
                 logger.info(f"Successfully registered tool: {tool.name}")
             except Exception as e:
                 logger.error(f"Failed to register tool: {str(e)}")
-                logger.error(f"Tool data that caused the error: {tool_data}") 
+                logger.error(f"Tool data that caused the error: {json.dumps(tool_data, indent=2)}") 

{mbxai-0.6.16 → mbxai-0.6.18}/uv.lock

@@ -292,11 +292,11 @@ wheels = [
 
 [[package]]
 name = "httpx-sse"
-version = "0.6.16"
+version = "0.6.18"
 source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.16.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
+sdist = { url = "https://files.pythonhosted.org/packages/4c/60/8f4281fa9bbf3c8034fd54c0e7412e66edbab6bc74c4996bd616f8d0406e/httpx-sse-0.6.18.tar.gz", hash = "sha256:1e81a3a3070ce322add1d3529ed42eb5f70817f45ed6ec915ab753f961139721", size = 12624 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.16-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
+    { url = "https://files.pythonhosted.org/packages/e1/9b/a181f281f65d776426002f330c31849b86b31fc9d848db62e16f03ff739f/httpx_sse-0.6.18-py3-none-any.whl", hash = "sha256:f329af6eae57eaa2bdfd962b42524764af68075ea87370a2de920af5341e318f", size = 7819 },
 ]
 
 [[package]]
@@ -446,7 +446,7 @@ wheels = [
 
 [[package]]
 name = "mbxai"
-version = "0.6.16"
+version = "0.6.18"
 source = { editable = "." }
 dependencies = [
     { name = "fastapi" },
@@ -980,14 +980,14 @@ wheels = [
 
 [[package]]
 name = "typing-inspection"
-version = "0.6.16"
+version = "0.6.18"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "typing-extensions" },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.16.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
+sdist = { url = "https://files.pythonhosted.org/packages/82/5c/e6082df02e215b846b4b8c0b887a64d7d08ffaba30605502639d44c06b82/typing_inspection-0.6.18.tar.gz", hash = "sha256:9765c87de36671694a67904bf2c96e395be9c6439bb6c87b5142569dcdd65122", size = 76222 }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.16-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
+    { url = "https://files.pythonhosted.org/packages/31/08/aa4fdfb71f7de5176385bd9e90852eaf6b5d622735020ad600f2bab54385/typing_inspection-0.6.18-py3-none-any.whl", hash = "sha256:50e72559fcd2a6367a19f7a7e610e6afcb9fac940c650290eed893d61386832f", size = 14125 },
 ]
 
 [[package]]