unique_toolkit 1.16.3__py3-none-any.whl → 1.16.4__py3-none-any.whl

unique_toolkit/agentic/tools/mcp/tool_wrapper.py

@@ -3,7 +3,6 @@ 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
@@ -45,44 +44,13 @@ class MCPToolWrapper(Tool[MCPToolConfig]):
         logger.info(
             "MCP tool %s schema %s", self._mcp_tool.name, self._mcp_tool.input_schema
         )
-        parameters_model = self._create_parameters_model()
-        logger.info(
-            "MCP tool %s contructed params %s",
-            self._mcp_tool.name,
-            parameters_model.model_json_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/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/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()

{unique_toolkit-1.16.3.dist-info → unique_toolkit-1.16.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: unique_toolkit
-Version: 1.16.3
+Version: 1.16.4
 Summary: 
 License: Proprietary
 Author: Cedric Klinkert
@@ -118,6 +118,9 @@ 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
 

{unique_toolkit-1.16.3.dist-info → unique_toolkit-1.16.4.dist-info}/RECORD

@@ -84,7 +84,7 @@ unique_toolkit/agentic/tools/factory.py,sha256=A1Aliwx037UAk9ADiDsg0zjCWWnvzV_Px
 unique_toolkit/agentic/tools/mcp/__init__.py,sha256=RLF_p-LDRC7GhiB3fdCi4u3bh6V9PY_w26fg61BLyco,122
 unique_toolkit/agentic/tools/mcp/manager.py,sha256=DPYwwDe6RSZyuPaxn-je49fP_qOOs0ZV46EM6GZcV4c,2748
 unique_toolkit/agentic/tools/mcp/models.py,sha256=OyCCb7Vwv1ftzC_OCpFkf3TX9Aeb74ZZagG-qK5peIU,722
-unique_toolkit/agentic/tools/mcp/tool_wrapper.py,sha256=Pjgzg_Ew20-82UCh6AqTQmPSKvalMDKJtV10mRQIHiA,10304
+unique_toolkit/agentic/tools/mcp/tool_wrapper.py,sha256=37nkalHNUfti9rKdCH_rLEObbYdH7kDfkbLulf_sXmQ,9027
 unique_toolkit/agentic/tools/openai_builtin/__init__.py,sha256=NdVjkTa3LbW-JHhzPRjinTmgOCtEv090Zr9jGZXmgqs,345
 unique_toolkit/agentic/tools/openai_builtin/base.py,sha256=2Lw47XworwwkIQBQW5S1T6HS2mWqx13lx50moAMekRk,808
 unique_toolkit/agentic/tools/openai_builtin/code_interpreter/__init__.py,sha256=w2vONpnC6hKRPoJGwzDuRtNBsQd_o-gMUqArgIl_5KY,305
@@ -92,7 +92,7 @@ unique_toolkit/agentic/tools/openai_builtin/code_interpreter/config.py,sha256=r-
 unique_toolkit/agentic/tools/openai_builtin/code_interpreter/service.py,sha256=RKVExS1l3rJDVcu3mxKYA7SNV_Hphx2przhhiC-5PSo,7467
 unique_toolkit/agentic/tools/openai_builtin/manager.py,sha256=kU4wGit9AnDbkijB7LJEHcGXG8UeTBhiZh4a7lxTGA8,2246
 unique_toolkit/agentic/tools/schemas.py,sha256=0ZR8xCdGj1sEdPE0lfTIG2uSR5zqWoprUa3Seqez4C8,4837
-unique_toolkit/agentic/tools/test/test_mcp_manager.py,sha256=PVRvkK3M21rzONpy5VE_i3vEbAGIz1haW_VPVwiPDI0,15724
+unique_toolkit/agentic/tools/test/test_mcp_manager.py,sha256=9q9TpzrQlxzQOwcyEGc6J7L4K55cclgvJme5jFQmc4M,19044
 unique_toolkit/agentic/tools/test/test_tool_progress_reporter.py,sha256=dod5QPqgGUInVAGXAbsAKNTEypIi6pUEWhDbJr9YfUU,6307
 unique_toolkit/agentic/tools/tool.py,sha256=m56VLxiHuKU2_J5foZp00xhm5lTxWEW7zRLGbIE9ssU,6744
 unique_toolkit/agentic/tools/tool_manager.py,sha256=DtxJobe_7QKFe6CjnMhCP-mnKO6MjnZeDXsO3jBoC9w,16283
@@ -150,7 +150,7 @@ unique_toolkit/language_model/functions.py,sha256=LGX3rR-XjkB-R520jp4w_Azgqf7BsI
 unique_toolkit/language_model/infos.py,sha256=pGd4I7fAuy8D8iqEgKC7-grQZe4AIMebonkBBv1k37Q,59363
 unique_toolkit/language_model/prompt.py,sha256=JSawaLjQg3VR-E2fK8engFyJnNdk21zaO8pPIodzN4Q,3991
 unique_toolkit/language_model/reference.py,sha256=nkX2VFz-IrUz8yqyc3G5jUMNwrNpxITBrMEKkbqqYoI,8583
-unique_toolkit/language_model/schemas.py,sha256=k99I9GAR6e2rdVfbfl49ojbT7sk5xCMNYmME22RGJkk,23423
+unique_toolkit/language_model/schemas.py,sha256=oHcJgmNSGpGW6ygjWvEB9iYaHgx250-Mtm-olSSJ-Ek,23760
 unique_toolkit/language_model/service.py,sha256=JkYGtCug8POQskTv_aoYkzTMOaPCWRM94y73o3bUttQ,12019
 unique_toolkit/language_model/utils.py,sha256=bPQ4l6_YO71w-zaIPanUUmtbXC1_hCvLK0tAFc3VCRc,1902
 unique_toolkit/protocols/support.py,sha256=ZEnbQL5w2-T_1AeM8OHycZJ3qbdfVI1nXe0nL9esQEw,5544
@@ -165,7 +165,7 @@ unique_toolkit/short_term_memory/service.py,sha256=5PeVBu1ZCAfyDb2HLVvlmqSbyzBBu
 unique_toolkit/smart_rules/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 unique_toolkit/smart_rules/compile.py,sha256=Ozhh70qCn2yOzRWr9d8WmJeTo7AQurwd3tStgBMPFLA,1246
 unique_toolkit/test_utilities/events.py,sha256=_mwV2bs5iLjxS1ynDCjaIq-gjjKhXYCK-iy3dRfvO3g,6410
-unique_toolkit-1.16.3.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
-unique_toolkit-1.16.3.dist-info/METADATA,sha256=-cjUgbbqgO5hXcS_7rJZII5FJLfYjVBMW8BbTFmYGzo,37687
-unique_toolkit-1.16.3.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
-unique_toolkit-1.16.3.dist-info/RECORD,,
+unique_toolkit-1.16.4.dist-info/LICENSE,sha256=GlN8wHNdh53xwOPg44URnwag6TEolCjoq3YD_KrWgss,193
+unique_toolkit-1.16.4.dist-info/METADATA,sha256=56XB6tgGoHWkl0ycXsqQ3owRbEmk5uvg3eu7ogZLF88,37755
+unique_toolkit-1.16.4.dist-info/WHEEL,sha256=sP946D7jFCHeNz5Iq4fL4Lu-PrWrFsgfLXbbkciIZwg,88
+unique_toolkit-1.16.4.dist-info/RECORD,,