nvidia-nat-mcp 1.3.0a20250917__py3-none-any.whl → 1.3.0a20250923__py3-none-any.whl

nat/plugins/mcp/tool.py

@@ -25,6 +25,7 @@ from nat.builder.builder import Builder
 from nat.builder.function_info import FunctionInfo
 from nat.cli.register_workflow import register_function
 from nat.data_models.function import FunctionBaseConfig
+from nat.plugins.mcp.client_base import MCPToolClient
 
 logger = logging.getLogger(__name__)
 
@@ -50,11 +51,6 @@ class MCPToolConfig(FunctionBaseConfig, name="mcp_tool_wrapper"):
         Description for the tool that will override the description provided by the MCP server. Should only be used if
         the description provided by the server is poor or nonexistent
         """)
-    return_exception: bool = Field(default=True,
-                                   description="""
-        If true, the tool will return the exception message if the tool call fails.
-        If false, raise the exception.
-        """)
 
     @model_validator(mode="after")
     def validate_model(self):
@@ -73,6 +69,45 @@ class MCPToolConfig(FunctionBaseConfig, name="mcp_tool_wrapper"):
         return self
 
 
+def mcp_tool_function(tool: MCPToolClient) -> FunctionInfo:
+    """
+    Create a NeMo Agent toolkit function from an MCP tool.
+
+    Args:
+        tool: The MCP tool to wrap
+
+    Returns:
+        The NeMo Agent toolkit function
+    """
+
+    def _convert_from_str(input_str: str) -> tool.input_schema:
+        return tool.input_schema.model_validate_json(input_str)
+
+    async def _response_fn(tool_input: BaseModel | None = None, **kwargs) -> str:
+        # Run the tool, catching any errors and sending to agent for correction
+        try:
+            if tool_input:
+                args = tool_input.model_dump()
+                return await tool.acall(args)
+
+            _ = tool.input_schema.model_validate(kwargs)
+            return await tool.acall(kwargs)
+        except Exception as e:
+            if tool_input:
+                logger.warning("Error calling tool %s with serialized input: %s",
+                               tool.name,
+                               tool_input.model_dump(),
+                               exc_info=True)
+            else:
+                logger.warning("Error calling tool %s with input: %s", tool.name, kwargs, exc_info=True)
+            return str(e)
+
+    return FunctionInfo.create(single_fn=_response_fn,
+                               description=tool.description,
+                               input_schema=tool.input_schema,
+                               converters=[_convert_from_str])
+
+
 @register_function(config_type=MCPToolConfig)
 async def mcp_tool(config: MCPToolConfig, builder: Builder):
     """
@@ -82,7 +117,6 @@ async def mcp_tool(config: MCPToolConfig, builder: Builder):
     from nat.plugins.mcp.client_base import MCPSSEClient
     from nat.plugins.mcp.client_base import MCPStdioClient
     from nat.plugins.mcp.client_base import MCPStreamableHTTPClient
-    from nat.plugins.mcp.client_base import MCPToolClient
 
     # Initialize the client
     if config.transport == 'stdio':
@@ -102,32 +136,4 @@ async def mcp_tool(config: MCPToolConfig, builder: Builder):
 
         logger.info("Configured to use tool: %s from MCP server at %s", tool.name, client.server_name)
 
-        def _convert_from_str(input_str: str) -> tool.input_schema:
-            return tool.input_schema.model_validate_json(input_str)
-
-        async def _response_fn(tool_input: BaseModel | None = None, **kwargs) -> str:
-            # Run the tool, catching any errors and sending to agent for correction
-            try:
-                if tool_input:
-                    args = tool_input.model_dump()
-                    return await tool.acall(args)
-
-                _ = tool.input_schema.model_validate(kwargs)
-                return await tool.acall(kwargs)
-            except Exception as e:
-                if config.return_exception:
-                    if tool_input:
-                        logger.warning("Error calling tool %s with serialized input: %s",
-                                       tool.name,
-                                       tool_input.model_dump(),
-                                       exc_info=True)
-                    else:
-                        logger.warning("Error calling tool %s with input: %s", tool.name, kwargs, exc_info=True)
-                    return str(e)
-                # If the tool call fails, raise the exception.
-                raise
-
-        yield FunctionInfo.create(single_fn=_response_fn,
-                                  description=tool.description,
-                                  input_schema=tool.input_schema,
-                                  converters=[_convert_from_str])
+        yield mcp_tool_function(tool)

nat/plugins/mcp/utils.py

@@ -0,0 +1,95 @@
+# SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
+# SPDX-License-Identifier: Apache-2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+# http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+
+from enum import Enum
+from typing import Any
+
+from pydantic import BaseModel
+from pydantic import Field
+from pydantic import create_model
+
+
+def model_from_mcp_schema(name: str, mcp_input_schema: dict) -> type[BaseModel]:
+    """
+    Create a pydantic model from the input schema of the MCP tool
+    """
+    _type_map = {
+        "string": str,
+        "number": float,
+        "integer": int,
+        "boolean": bool,
+        "array": list,
+        "null": None,
+        "object": dict,
+    }
+
+    properties = mcp_input_schema.get("properties", {})
+    required_fields = set(mcp_input_schema.get("required", []))
+    schema_dict = {}
+
+    def _generate_valid_classname(class_name: str):
+        return class_name.replace('_', ' ').replace('-', ' ').title().replace(' ', '')
+
+    def _generate_field(field_name: str, field_properties: dict[str, Any]) -> tuple:
+        json_type = field_properties.get("type", "string")
+        enum_vals = field_properties.get("enum")
+
+        if enum_vals:
+            enum_name = f"{field_name.capitalize()}Enum"
+            field_type = Enum(enum_name, {item: item for item in enum_vals})
+
+        elif json_type == "object" and "properties" in field_properties:
+            field_type = model_from_mcp_schema(name=field_name, mcp_input_schema=field_properties)
+        elif json_type == "array" and "items" in field_properties:
+            item_properties = field_properties.get("items", {})
+            if item_properties.get("type") == "object":
+                item_type = model_from_mcp_schema(name=field_name, mcp_input_schema=item_properties)
+            else:
+                item_type = _type_map.get(item_properties.get("type", "string"), Any)
+            field_type = list[item_type]
+        elif isinstance(json_type, list):
+            field_type = None
+            for t in json_type:
+                mapped = _type_map.get(t, Any)
+                field_type = mapped if field_type is None else field_type | mapped
+
+            return field_type, Field(
+                default=field_properties.get("default", None if "null" in json_type else ...),
+                description=field_properties.get("description", "")
+            )
+        else:
+            field_type = _type_map.get(json_type, Any)
+
+        # Determine the default value based on whether the field is required
+        if field_name in required_fields:
+            # Field is required - use explicit default if provided, otherwise make it required
+            default_value = field_properties.get("default", ...)
+        else:
+            # Field is optional - use explicit default if provided, otherwise None
+            default_value = field_properties.get("default", None)
+            # Make the type optional if no default was provided
+            if "default" not in field_properties:
+                field_type = field_type | None
+
+        nullable = field_properties.get("nullable", False)
+        description = field_properties.get("description", "")
+
+        field_type = field_type | None if nullable else field_type
+
+        return field_type, Field(default=default_value, description=description)
+
+    for field_name, field_props in properties.items():
+        schema_dict[field_name] = _generate_field(field_name=field_name, field_properties=field_props)
+    return create_model(f"{_generate_valid_classname(name)}InputSchema", **schema_dict)

{nvidia_nat_mcp-1.3.0a20250917.dist-info → nvidia_nat_mcp-1.3.0a20250923.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-mcp
-Version: 1.3.0a20250917
+Version: 1.3.0a20250923
 Summary: Subpackage for MCP client integration in NeMo Agent toolkit
 Keywords: ai,rag,agents,mcp
 Classifier: Programming Language :: Python
@@ -9,8 +9,8 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3.13
 Requires-Python: <3.14,>=3.11
 Description-Content-Type: text/markdown
-Requires-Dist: nvidia-nat==v1.3.0a20250917
-Requires-Dist: mcp~=1.13
+Requires-Dist: nvidia-nat==v1.3.0a20250923
+Requires-Dist: mcp~=1.14
 
 <!--
 SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.

nvidia_nat_mcp-1.3.0a20250923.dist-info/RECORD

@@ -0,0 +1,18 @@
+nat/meta/pypi.md,sha256=GyV4DI1d9ThgEhnYTQ0vh40Q9hPC8jN-goLnRiFDmZ8,1498
+nat/plugins/mcp/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
+nat/plugins/mcp/client_base.py,sha256=eWIHhZIaX8KGJMS7BTQ2szU2Nm4h57zCZ7uR5CmbYiY,15585
+nat/plugins/mcp/client_impl.py,sha256=A1rSxVz1K29ZlqY-7BRrMNRAkCVZyUg7MS6vU0stYZc,8067
+nat/plugins/mcp/exception_handler.py,sha256=JdPdZG1NgWpdRnIz7JTGHiJASS5wot9nJiD3SRWV4Kw,7649
+nat/plugins/mcp/exceptions.py,sha256=EGVOnYlui8xufm8dhJyPL1SUqBLnCGOTvRoeyNcmcWE,5980
+nat/plugins/mcp/register.py,sha256=HOT2Wl2isGuyFc7BUTi58-BbjI5-EtZMZo7stsv5pN4,831
+nat/plugins/mcp/tool.py,sha256=v3MFsiaLJy8Ourcfqa6ohtAE2Nn-vqpC6Q6gsCdJ28Q,6165
+nat/plugins/mcp/utils.py,sha256=3fuzYpC14wrfMOTOGvY2KHWcxZvBWqrxdDZD17lhmC8,4055
+nat/plugins/mcp/auth/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
+nat/plugins/mcp/auth/auth_provider.py,sha256=GOmM9vCfVd0QiyD_hBj7zCfkiimHa1WDfTTWWfMsr_k,17466
+nat/plugins/mcp/auth/auth_provider_config.py,sha256=bE6IKV0yveo98KXr0xynrH5BMwPhRv8xbaMBwYu42YQ,3587
+nat/plugins/mcp/auth/register.py,sha256=yzphsn1I4a5G39_IacbuX0ZQqGM8fevvTUM_B94UXKE,1211
+nvidia_nat_mcp-1.3.0a20250923.dist-info/METADATA,sha256=GYws10CYVt4uL9OpBw7EiACV6DdEjLLDuoZexWgZJf8,1997
+nvidia_nat_mcp-1.3.0a20250923.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_mcp-1.3.0a20250923.dist-info/entry_points.txt,sha256=rYvUp4i-klBr3bVNh7zYOPXret704vTjvCk1qd7FooI,97
+nvidia_nat_mcp-1.3.0a20250923.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_mcp-1.3.0a20250923.dist-info/RECORD,,

{nvidia_nat_mcp-1.3.0a20250917.dist-info → nvidia_nat_mcp-1.3.0a20250923.dist-info}/entry_points.txt

@@ -1,2 +1,3 @@
 [nat.components]
 nat_mcp = nat.plugins.mcp.register
+nat_mcp_auth = nat.plugins.mcp.auth.register

nvidia_nat_mcp-1.3.0a20250917.dist-info/RECORD

@@ -1,13 +0,0 @@
-nat/meta/pypi.md,sha256=GyV4DI1d9ThgEhnYTQ0vh40Q9hPC8jN-goLnRiFDmZ8,1498
-nat/plugins/mcp/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
-nat/plugins/mcp/client_base.py,sha256=4vFOBFoSpLpkq7r2iXDMbi6tDj02JBidZo5RiBR167w,13424
-nat/plugins/mcp/client_impl.py,sha256=6rG3LcCX4TFsiST5O0_C8eOpY9LdnoSMarfAWeR76XA,9724
-nat/plugins/mcp/exception_handler.py,sha256=JdPdZG1NgWpdRnIz7JTGHiJASS5wot9nJiD3SRWV4Kw,7649
-nat/plugins/mcp/exceptions.py,sha256=EGVOnYlui8xufm8dhJyPL1SUqBLnCGOTvRoeyNcmcWE,5980
-nat/plugins/mcp/register.py,sha256=HOT2Wl2isGuyFc7BUTi58-BbjI5-EtZMZo7stsv5pN4,831
-nat/plugins/mcp/tool.py,sha256=MSRnnr1a6OjfqVkt2SYPkfLi9lU0JqovIZuTOL1cgHQ,6378
-nvidia_nat_mcp-1.3.0a20250917.dist-info/METADATA,sha256=_u78nMJ-J8BKxiwJI4KZdf25baNEzu2x4guWmyQ6icI,1997
-nvidia_nat_mcp-1.3.0a20250917.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat_mcp-1.3.0a20250917.dist-info/entry_points.txt,sha256=x7dQTqek3GEdU-y9GslnygxMu0BSbEeUiOOMa2gvaaQ,52
-nvidia_nat_mcp-1.3.0a20250917.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
-nvidia_nat_mcp-1.3.0a20250917.dist-info/RECORD,,