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

mbxai/__init__.py

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

mbxai/mcp/client.py

@@ -16,28 +16,23 @@ 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")
-    _converted_schema: dict[str, Any] | None = None
+    """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."""
-        # Use cached schema if available
-        if self._converted_schema is None:
-            # Convert the schema to strict format
-            self._converted_schema = convert_to_strict_schema(self.input_schema, self.strict)
-            logger.debug(f"Converted schema for {self.name}: {json.dumps(self._converted_schema, indent=2)}")
+        # 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 {
             "type": "function",
             "function": {
                 "name": self.name,
                 "description": self.description,
-                "parameters": self._converted_schema
+                "parameters": strict_schema
             }
         }
 

mbxai/mcp/server.py

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

mbxai/tools/types.py

@@ -4,6 +4,10 @@ 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.
@@ -15,6 +19,9 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dic
     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": []}
 
@@ -32,11 +39,13 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dic
     # 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 = {
@@ -64,10 +73,12 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dic
                         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
@@ -75,7 +86,9 @@ def convert_to_strict_schema(schema: dict[str, Any], strict: bool = True) -> dic
         # 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):
@@ -95,6 +108,7 @@ class Tool(BaseModel):
         """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",

{mbxai-0.6.19.dist-info → mbxai-0.6.20.dist-info}/METADATA

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

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

@@ -1,9 +1,9 @@
-mbxai/__init__.py,sha256=pqQAqM2XXc5pNrLfCSIAv2P-v29FjHrtlZhI1gq_DNY,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=PpMNZSkmdPKf7artTDLDap-C9GbPjuGmKmr1byF0l6A,8309
+mbxai/mcp/client.py,sha256=UhrtsR13px-3MyfHvida5Eh_ou9-ofVexHkhMUEmYH8,7748
 mbxai/mcp/example.py,sha256=oaol7AvvZnX86JWNz64KvPjab5gg1VjVN3G8eFSzuaE,2350
-mbxai/mcp/server.py,sha256=xFAVMLwi7130DCJ1EdwrkFR4rQTa0O6GzuCsBfQnmM0,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
@@ -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=B3ujnPng997FCjQ5j25Da88ASkTDDj5gQpJRzVmdw9Q,3524
-mbxai-0.6.19.dist-info/METADATA,sha256=k6P9GsIx9wYDS0DVOczSwgUvepDfXxx8BCSTOBnZDpQ,4148
-mbxai-0.6.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-mbxai-0.6.19.dist-info/licenses/LICENSE,sha256=hEyhc4FxwYo3NQ40yNgZ7STqwVk-1_XcTXOnAPbGJAw,1069
-mbxai-0.6.19.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,,