unique_toolkit 1.16.2__tar.gz → 1.16.4__tar.gz

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/CHANGELOG.md

@@ -4,6 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.16.4] - 2025-10-18
+- Fix bug with MCP tool parameters schema
+
+## [1.16.3] - 2025-10-18
+- Add logging of MCP tool schema and constructed parameters
+
 ## [1.16.2] - 2025-10-16
 - Reduce operation dependency on path instead of full url
 

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.16.2
+Version: 1.16.4
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -117,6 +117,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), 
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
+
+## [1.16.4] - 2025-10-18
+- Fix bug with MCP tool parameters schema
+
+## [1.16.3] - 2025-10-18
+- Add logging of MCP tool schema and constructed parameters
+
 ## [1.16.2] - 2025-10-16
 - Reduce operation dependency on path instead of full url
 

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "unique_toolkit"
-version = "1.16.2"
+version = "1.16.4"
 description = ""
 authors = [
     "Cedric Klinkert <cedric.klinkert@unique.ch>",

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -1,8 +1,8 @@
 import json
+import logging
 from typing import Any, Dict
 
 import unique_sdk
-from pydantic import BaseModel, Field, create_model
 
 from unique_toolkit.agentic.evaluation.schemas import EvaluationMetricName
 from unique_toolkit.agentic.tools.mcp.models import MCPToolConfig
@@ -19,6 +19,8 @@ from unique_toolkit.language_model.schemas import (
     LanguageModelToolDescription,
 )
 
+logger = logging.getLogger(__name__)
+
 
 class MCPToolWrapper(Tool[MCPToolConfig]):
     """Wrapper class for MCP tools that implements the Tool interface"""
@@ -39,39 +41,16 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
     def tool_description(self) -> LanguageModelToolDescription:
         """Convert MCP tool schema to LanguageModelToolDescription"""
         # Create a Pydantic model from the MCP tool's input schema
-        parameters_model = self._create_parameters_model()
+        logger.info(
+            "MCP tool %s schema %s", self._mcp_tool.name, self._mcp_tool.input_schema
+        )
 
         return LanguageModelToolDescription(
             name=self.name,
             description=self._mcp_tool.description or "",
-            parameters=parameters_model,
+            parameters=self._mcp_tool.input_schema,
         )
 
-    def _create_parameters_model(self) -> type[BaseModel]:
-        """Create a Pydantic model from MCP tool's input schema"""
-        properties = self._mcp_tool.input_schema.get("properties", {})
-        required_fields = self._mcp_tool.input_schema.get("required", [])
-
-        # Convert JSON schema properties to Pydantic fields
-        fields = {}
-        for prop_name, prop_schema in properties.items():
-            field_type = self._json_schema_to_python_type(prop_schema)
-            field_description = prop_schema.get("description", "")
-
-            if prop_name in required_fields:
-                fields[prop_name] = (
-                    field_type,
-                    Field(description=field_description),
-                )
-            else:
-                fields[prop_name] = (
-                    field_type,
-                    Field(default=None, description=field_description),
-                )
-
-        # Create dynamic model
-        return create_model(f"{self.name}Parameters", **fields)
-
     def _json_schema_to_python_type(self, schema: Dict[str, Any]) -> type:
         """Convert JSON schema type to Python type"""
         json_type = schema.get("type", "string")

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/unique_toolkit/agentic/tools/test/test_mcp_manager.py

@@ -13,6 +13,8 @@ from unique_toolkit.agentic.tools.config import (
 )
 from unique_toolkit.agentic.tools.factory import ToolFactory
 from unique_toolkit.agentic.tools.mcp.manager import MCPManager
+from unique_toolkit.agentic.tools.mcp.models import MCPToolConfig
+from unique_toolkit.agentic.tools.mcp.tool_wrapper import MCPToolWrapper
 from unique_toolkit.agentic.tools.schemas import BaseToolConfig
 from unique_toolkit.agentic.tools.tool import Tool
 from unique_toolkit.agentic.tools.tool_manager import ToolManager, ToolManagerConfig
@@ -114,11 +116,22 @@ class TestMCPManager:
             name="mcp_test_tool",
             description="Test MCP tool",
             input_schema={
+                "$schema": "https://json-schema.org/draft/2020-12/schema",
                 "type": "object",
                 "properties": {
-                    "query": {"type": "string", "description": "Search query"}
+                    "folder": {
+                        "description": "Mail folder to read mails from",
+                        "default": "inbox",
+                        "type": "string",
+                    },
+                    "limit": {
+                        "description": "Number of emails to retrieve",
+                        "default": 10,
+                        "type": "number",
+                        "minimum": 1,
+                        "maximum": 50,
+                    },
                 },
-                "required": ["query"],
             },
             output_schema=None,
             annotations=None,
@@ -446,3 +459,76 @@ class TestMCPManager:
         assert "internal_search" not in tool_names
         assert "mcp_test_tool" in tool_names
         assert len(tools) == 1
+
+    def test_mcp_tool_wrapper_generates_correct_parameters(
+        self, mcp_tools, mcp_servers, tool_progress_reporter
+    ):
+        """Test that MCPToolWrapper correctly generates parameters field from MCP tool input schema"""
+        # Get the first MCP tool and server from fixtures
+        mcp_tool = mcp_tools[0]
+        mcp_server = mcp_servers[0]
+
+        # Create MCPToolConfig
+        config = MCPToolConfig(
+            server_id="test_server_id",
+            server_name="test_server",
+            mcp_source_id="test_server_id",
+        )
+
+        # Initialize the MCPToolWrapper
+        tool_wrapper = MCPToolWrapper(
+            mcp_server=mcp_server,
+            mcp_tool=mcp_tool,
+            config=config,
+            event=self.event,
+            tool_progress_reporter=tool_progress_reporter,
+        )
+
+        # Call tool_description to get the LanguageModelToolDescription
+        tool_description = tool_wrapper.tool_description()
+
+        # Verify the basic properties
+        assert tool_description.name == "mcp_test_tool"
+        assert tool_description.description == "Test MCP tool"
+
+        # Verify that parameters field is correctly set to the input_schema
+        expected_parameters = {
+            "$schema": "https://json-schema.org/draft/2020-12/schema",
+            "type": "object",
+            "properties": {
+                "folder": {
+                    "description": "Mail folder to read mails from",
+                    "default": "inbox",
+                    "type": "string",
+                },
+                "limit": {
+                    "description": "Number of emails to retrieve",
+                    "default": 10,
+                    "type": "number",
+                    "minimum": 1,
+                    "maximum": 50,
+                },
+            },
+        }
+
+        assert tool_description.parameters == expected_parameters
+
+        # Verify specific parameter properties
+        parameters = tool_description.parameters
+        assert isinstance(parameters, dict)
+        assert parameters["type"] == "object"
+        assert "properties" in parameters
+
+        # Check folder parameter
+        folder_prop = parameters["properties"]["folder"]
+        assert folder_prop["type"] == "string"
+        assert folder_prop["description"] == "Mail folder to read mails from"
+        assert folder_prop["default"] == "inbox"
+
+        # Check limit parameter
+        limit_prop = parameters["properties"]["limit"]
+        assert limit_prop["type"] == "number"
+        assert limit_prop["description"] == "Number of emails to retrieve"
+        assert limit_prop["default"] == 10
+        assert limit_prop["minimum"] == 1
+        assert limit_prop["maximum"] == 50

{unique_toolkit-1.16.2 → unique_toolkit-1.16.4}/unique_toolkit/language_model/schemas.py

@@ -663,9 +663,10 @@ class LanguageModelToolDescription(BaseModel):
         ...,
         description="Description of what the tool is doing the tool",
     )
-    parameters: type[BaseModel] = Field(
+    parameters: type[BaseModel] | dict[str, Any] = Field(
         ...,
         description="Pydantic model for the tool parameters",
+        union_mode="left_to_right",
     )
 
     # TODO: This should be default `True` but if this is the case the parameter_model needs to include additional properties
@@ -675,8 +676,10 @@ class LanguageModelToolDescription(BaseModel):
     )
 
     @field_serializer("parameters")
-    def serialize_parameters(self, parameters: type[BaseModel]):
-        return parameters.model_json_schema()
+    def serialize_parameters(
+        self, parameters: type[BaseModel] | dict[str, Any]
+    ) -> dict[str, Any]:
+        return _parameters_as_json_schema(parameters)
 
     @overload
     def to_openai(
@@ -694,7 +697,7 @@ class LanguageModelToolDescription(BaseModel):
                 function=FunctionDefinition(
                     name=self.name,
                     description=self.description,
-                    parameters=self.parameters.model_json_schema(),
+                    parameters=_parameters_as_json_schema(self.parameters),
                     strict=self.strict,
                 ),
                 type="function",
@@ -703,7 +706,16 @@ class LanguageModelToolDescription(BaseModel):
             return FunctionToolParam(
                 type="function",
                 name=self.name,
-                parameters=self.parameters.model_json_schema(),
+                parameters=_parameters_as_json_schema(self.parameters),
                 strict=self.strict,
                 description=self.description,
             )
+
+
+def _parameters_as_json_schema(
+    parameters: type[BaseModel] | dict[str, Any],
+) -> dict[str, Any]:
+    if isinstance(parameters, dict):
+        return parameters
+
+    return parameters.model_json_schema()