nvidia-nat-mcp 1.3.0a20250926__py3-none-any.whl → 1.3.0a20251111__py3-none-any.whl

nat/plugins/mcp/tool.py

@@ -26,6 +26,7 @@ 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
+from nat.utils.decorators import deprecated
 
 logger = logging.getLogger(__name__)
 
@@ -93,13 +94,7 @@ def mcp_tool_function(tool: MCPToolClient) -> FunctionInfo:
             _ = 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)
+            logger.warning("Error calling tool %s", tool.name, exc_info=True)
             return str(e)
 
     return FunctionInfo.create(single_fn=_response_fn,
@@ -109,6 +104,10 @@ def mcp_tool_function(tool: MCPToolClient) -> FunctionInfo:
 
 
 @register_function(config_type=MCPToolConfig)
+@deprecated(
+    reason=
+    "This function is being replaced with the new mcp_client function group that supports additional MCP features",
+    feature_name="mcp_tool_wrapper")
 async def mcp_tool(config: MCPToolConfig, builder: Builder):
     """
     Generate a NeMo Agent Toolkit Function that wraps a tool provided by the MCP server.

nat/plugins/mcp/utils.py

@@ -21,6 +21,22 @@ from pydantic import Field
 from pydantic import create_model
 
 
+def truncate_session_id(session_id: str, max_length: int = 10) -> str:
+    """
+    Truncate a session ID for logging purposes.
+
+    Args:
+        session_id: The session ID to truncate
+        max_length: Maximum length before truncation (default: 10)
+
+    Returns:
+        Truncated session ID with "..." if longer than max_length, otherwise full ID
+    """
+    if len(session_id) > max_length:
+        return session_id[:max_length] + "..."
+    return session_id
+
+
 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
@@ -31,7 +47,7 @@ def model_from_mcp_schema(name: str, mcp_input_schema: dict) -> type[BaseModel]:
         "integer": int,
         "boolean": bool,
         "array": list,
-        "null": None,
+        "null": type(None),
         "object": dict,
     }
 
@@ -42,51 +58,168 @@ def model_from_mcp_schema(name: str, mcp_input_schema: dict) -> type[BaseModel]:
     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")
+    def _resolve_schema_type(schema: dict[str, Any], name: str) -> Any:
+        """
+        Recursively resolve a JSON schema to a Python type.
+        Handles nested anyOf/oneOf, arrays, objects, enums, and primitive types.
+        """
+        # Check for anyOf/oneOf first
+        any_of = schema.get("anyOf")
+        one_of = schema.get("oneOf")
+
+        if any_of or one_of:
+            union_schemas = any_of if any_of else one_of
+            resolved_type: Any = None
 
+            if union_schemas:
+                for sub_schema in union_schemas:
+                    mapped = _resolve_schema_type(sub_schema, name)
+                    if resolved_type is None:
+                        resolved_type = mapped
+                    elif mapped is not type(None):
+                        # Don't add None here, handle separately
+                        resolved_type = resolved_type | mapped
+                    else:
+                        # If we encounter null, combine with None at the end
+                        resolved_type = resolved_type | None if resolved_type else type(None)
+
+            return resolved_type if resolved_type is not None else Any
+
+        # Handle enum values
+        enum_vals = schema.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)
+            # Check if enum contains null
+            has_null = any(val is None or val == "null" for val in enum_vals)
+            # Filter out None/null values from enum
+            non_null_vals = [v for v in enum_vals if v is not None and v != "null"]
+
+            if non_null_vals:
+                enum_name = f"{name.capitalize()}Enum"
+                enum_type: Any = Enum(enum_name, {item: item for item in non_null_vals})
+                # If enum had null, make it a union with None
+                return enum_type | None if has_null else enum_type
+            elif has_null:
+                # Enum only contains null
+                return type(None)
             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)
+                # Empty enum (shouldn't happen but handle gracefully)
+                return Any
+
+        schema_type = schema.get("type")
+
+        # Handle type as list (e.g., ["string", "integer", "null"])
+        if isinstance(schema_type, list):
+            list_type: Any = None
+            for t in schema_type:
+                if t == "array":
+                    # Incorporate the mapped type of items
+                    item_schema = schema.get("items", {})
+                    if item_schema:
+                        item_type = _resolve_schema_type(item_schema, name)
+                        mapped = list[item_type]
+                    else:
+                        mapped = _type_map.get(t, Any)
+                elif t == "object":
+                    # Incorporate the mapped type from properties
+                    if "properties" in schema:
+                        mapped = model_from_mcp_schema(name=name, mcp_input_schema=schema)
+                    else:
+                        mapped = _type_map.get(t, Any)
+                else:
+                    mapped = _type_map.get(t, Any)
+
+                list_type = mapped if list_type is None else list_type | mapped
+            return list_type if list_type is not None else Any
+
+        # Handle null type
+        if schema_type == "null":
+            return type(None)
+
+        # Handle object type
+        if schema_type == "object" and "properties" in schema:
+            return model_from_mcp_schema(name=name, mcp_input_schema=schema)
+
+        # Handle array type
+        if schema_type == "array" and "items" in schema:
+            item_schema = schema.get("items", {})
+            # Recursively resolve item type (handles nested anyOf/oneOf)
+            item_type = _resolve_schema_type(item_schema, name)
+            return list[item_type]
+
+        # Handle primitive types
+        if schema_type is not None:
+            return _type_map.get(schema_type, Any)
+
+        return Any
+
+    def _has_null_in_type(field_properties: dict[str, Any]) -> bool:
+        """Check if a schema contains null as a valid type."""
+        # Check anyOf/oneOf for null
+        any_of = field_properties.get("anyOf")
+        one_of = field_properties.get("oneOf")
+        if any_of or one_of:
+            union_schemas = any_of if any_of else one_of
+            if union_schemas:
+                for schema in union_schemas:
+                    if schema.get("type") == "null":
+                        return True
+
+        # Check type list for null
+        json_type = field_properties.get("type")
+        if isinstance(json_type, list) and "null" in json_type:
+            return True
+
+        # Check enum for null (Python None or string "null")
+        enum_vals = field_properties.get("enum")
+        if enum_vals:
+            for val in enum_vals:
+                if val is None or val == "null":
+                    return True
+
+        # Check const for null (Python None or string "null")
+        if "const" in field_properties:
+            const_val = field_properties.get("const")
+            if const_val is None or const_val == "null":
+                return True
+
+        return False
+
+    def _generate_field(field_name: str, field_properties: dict[str, Any]) -> tuple:
+        """
+        Generate a Pydantic field from JSON schema properties.
+        Uses _resolve_schema_type for type resolution and handles field-specific logic.
+        """
+        # Resolve the field type using the unified resolver
+        field_type = _resolve_schema_type(field_properties, field_name)
+
+        # Check if the type includes null
+        has_null = _has_null_in_type(field_properties)
 
         # Determine the default value based on whether the field is required
+        default_value = field_properties.get("default")
+
         if field_name in required_fields:
-            # Field is required - use explicit default if provided, otherwise make it required
-            default_value = field_properties.get("default", ...)
+            # Field is required - use explicit default if provided, otherwise use ... to enforce presence
+            if default_value is None and "default" not in field_properties:
+                # Required field without explicit default: always use ... even if nullable
+                default_value = ...
+            # Make the field type nullable if it allows null
+            if has_null:
+                field_type = field_type | None
         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:
+            if default_value is None:
+                default_value = None
+            # Make the type optional if no default was provided and not already nullable
+            if "default" not in field_properties and not has_null:
                 field_type = field_type | None
 
+        # Handle nullable property (less common, but still supported)
         nullable = field_properties.get("nullable", False)
-        description = field_properties.get("description", "")
+        if nullable and not has_null:
+            field_type = field_type | None
 
-        field_type = field_type | None if nullable else field_type
+        description = field_properties.get("description", "")
 
         return field_type, Field(default=default_value, description=description)
 

{nvidia_nat_mcp-1.3.0a20250926.dist-info → nvidia_nat_mcp-1.3.0a20251111.dist-info}/METADATA

@@ -1,7 +1,12 @@
 Metadata-Version: 2.4
 Name: nvidia-nat-mcp
-Version: 1.3.0a20250926
+Version: 1.3.0a20251111
 Summary: Subpackage for MCP client integration in NeMo Agent toolkit
+Author: NVIDIA Corporation
+Maintainer: NVIDIA Corporation
+License: Apache-2.0
+Project-URL: documentation, https://docs.nvidia.com/nemo/agent-toolkit/latest/
+Project-URL: source, https://github.com/NVIDIA/NeMo-Agent-Toolkit
 Keywords: ai,rag,agents,mcp
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Python :: 3.11
@@ -9,8 +14,12 @@ 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.0a20250926
+License-File: LICENSE-3rd-party.txt
+License-File: LICENSE.md
+Requires-Dist: nvidia-nat==v1.3.0a20251111
+Requires-Dist: aiorwlock~=1.5
 Requires-Dist: mcp~=1.14
+Dynamic: license-file
 
 <!--
 SPDX-FileCopyrightText: Copyright (c) 2025, NVIDIA CORPORATION & AFFILIATES. All rights reserved.
@@ -33,9 +42,9 @@ limitations under the License.
 
 
 # NVIDIA NeMo Agent Toolkit MCP Subpackage
-Subpackage for MCP client integration in NeMo Agent toolkit.
+Subpackage for MCP integration in NeMo Agent toolkit.
 
-This package provides MCP (Model Context Protocol) client functionality, allowing NeMo Agent toolkit workflows to connect to external MCP servers and use their tools as functions.
+This package provides MCP (Model Context Protocol) functionality, allowing NeMo Agent toolkit workflows to connect to external MCP servers and use their tools as functions.
 
 ## Features
 

nvidia_nat_mcp-1.3.0a20251111.dist-info/RECORD

@@ -0,0 +1,23 @@
+nat/meta/pypi.md,sha256=EYyJTCCEOWzuuz-uNaYJ_WBk55Jiig87wcUr9E4g0yw,1484
+nat/plugins/mcp/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
+nat/plugins/mcp/client_base.py,sha256=JIyO2ZJsVkQ1g5BOU2zKXGHg_0yxv16g7_YJAqdCXTA,26504
+nat/plugins/mcp/client_config.py,sha256=l9tVUHe8WdFPJ9rXDg8dZkQi1dvHGYwoqQ8Glqg2LGs,6783
+nat/plugins/mcp/client_impl.py,sha256=j7cKAUBKtZAY3mt5Mm8VqgqMhRZk7kzvUd1nwMU_h0o,27072
+nat/plugins/mcp/exception_handler.py,sha256=4JVdZDJL4LyumZEcMIEBK2LYC6djuSMzqUhQDZZ6dUo,7648
+nat/plugins/mcp/exceptions.py,sha256=EGVOnYlui8xufm8dhJyPL1SUqBLnCGOTvRoeyNcmcWE,5980
+nat/plugins/mcp/register.py,sha256=HOT2Wl2isGuyFc7BUTi58-BbjI5-EtZMZo7stsv5pN4,831
+nat/plugins/mcp/tool.py,sha256=xNfBIF__ugJKFEjkYEM417wWM1PpuTaCMGtSFmxHSuA,6089
+nat/plugins/mcp/utils.py,sha256=dUIig7jeKz0ctb4o38jFGbe2uvM3DMR3PSJjfN_Lr5M,9111
+nat/plugins/mcp/auth/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
+nat/plugins/mcp/auth/auth_flow_handler.py,sha256=v21IK3IKZ2TLEP6wO9r-sJQiilWPq7Ry40M96SAxQFA,9125
+nat/plugins/mcp/auth/auth_provider.py,sha256=BgH66DlZgzhLDLO4cBERpHvNAmli5fMo_SCy11W9aBU,21251
+nat/plugins/mcp/auth/auth_provider_config.py,sha256=b1AaXzOuAkygKXAWSxMKWg8wfW8k33tmUUq6Dk5Mmwk,4038
+nat/plugins/mcp/auth/register.py,sha256=L2x69NjJPS4s6CCE5myzWVrWn3e_ttHyojmGXvBipMg,1228
+nat/plugins/mcp/auth/token_storage.py,sha256=aS13ZvEJXcYzkZ0GSbrSor4i5bpjD5BkXHQw1iywC9k,9240
+nvidia_nat_mcp-1.3.0a20251111.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat_mcp-1.3.0a20251111.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat_mcp-1.3.0a20251111.dist-info/METADATA,sha256=_xxkOAPgqKhQZd0MiZe1NCGmgmPaqBT-pWxFA7esvSY,2319
+nvidia_nat_mcp-1.3.0a20251111.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat_mcp-1.3.0a20251111.dist-info/entry_points.txt,sha256=rYvUp4i-klBr3bVNh7zYOPXret704vTjvCk1qd7FooI,97
+nvidia_nat_mcp-1.3.0a20251111.dist-info/top_level.txt,sha256=8-CJ2cP6-f0ZReXe5Hzqp-5pvzzHz-5Ds5H2bGqh1-U,4
+nvidia_nat_mcp-1.3.0a20251111.dist-info/RECORD,,