nvidia-nat 1.3.0a20250829__py3-none-any.whl → 1.3.0a20250830__py3-none-any.whl

nat/tool/mcp/mcp_client_impl.py

@@ -0,0 +1,229 @@
+# 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.
+
+import logging
+from typing import Literal
+
+from pydantic import BaseModel
+from pydantic import Field
+from pydantic import HttpUrl
+from pydantic import model_validator
+
+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.experimental.decorators.experimental_warning_decorator import experimental
+from nat.tool.mcp.mcp_client_base import MCPBaseClient
+
+logger = logging.getLogger(__name__)
+
+# All functions in this file are experimental
+
+
+class ToolOverrideConfig(BaseModel):
+    """
+    Configuration for overriding tool properties when exposing from MCP server.
+    """
+    alias: str | None = Field(default=None, description="Override the tool name (function name in the workflow)")
+    description: str | None = Field(default=None, description="Override the tool description")
+
+
+class MCPServerConfig(BaseModel):
+    """
+    Server connection details for MCP client.
+    Supports stdio, sse, and streamable-http transports.
+    streamable-http is the recommended default for HTTP-based connections.
+    """
+    transport: Literal["stdio", "sse", "streamable-http"] = Field(
+        ..., description="Transport type to connect to the MCP server (stdio, sse, or streamable-http)")
+    url: HttpUrl | None = Field(default=None,
+                                description="URL of the MCP server (for sse or streamable-http transport)")
+    command: str | None = Field(default=None,
+                                description="Command to run for stdio transport (e.g. 'python' or 'docker')")
+    args: list[str] | None = Field(default=None, description="Arguments for the stdio command")
+    env: dict[str, str] | None = Field(default=None, description="Environment variables for the stdio process")
+
+    @model_validator(mode="after")
+    def validate_model(self):
+        """Validate that stdio and SSE/Streamable HTTP properties are mutually exclusive."""
+        if self.transport == "stdio":
+            if self.url is not None:
+                raise ValueError("url should not be set when using stdio transport")
+            if not self.command:
+                raise ValueError("command is required when using stdio transport")
+        elif self.transport in ("sse", "streamable-http"):
+            if self.command is not None or self.args is not None or self.env is not None:
+                raise ValueError("command, args, and env should not be set when using sse or streamable-http transport")
+            if not self.url:
+                raise ValueError("url is required when using sse or streamable-http transport")
+        return self
+
+
+class MCPClientConfig(FunctionBaseConfig, name="mcp_client"):
+    """
+    Configuration for connecting to an MCP server as a client and exposing selected tools.
+    """
+    server: MCPServerConfig = Field(..., description="Server connection details (transport, url/command, etc.)")
+    tool_filter: dict[str, ToolOverrideConfig] | list[str] | None = Field(
+        default=None,
+        description="""Filter or map tools to expose from the server (list or dict).
+        Can be:
+        - A list of tool names to expose: ['tool1', 'tool2']
+        - A dict mapping tool names to override configs:
+          {'tool1': {'alias': 'new_name', 'description': 'New desc'}}
+          {'tool2': {'description': 'Override description only'}}  # alias defaults to 'tool2'
+        """)
+
+
+class MCPSingleToolConfig(FunctionBaseConfig, name="mcp_single_tool"):
+    """
+    Configuration for wrapping a single tool from an MCP server as a NeMo Agent toolkit function.
+    """
+    client: MCPBaseClient = Field(..., description="MCP client to use for the tool")
+    tool_name: str = Field(..., description="Name of the tool to use")
+    tool_description: str | None = Field(default=None, description="Description of the tool")
+
+    model_config = {"arbitrary_types_allowed": True}
+
+
+def _get_server_name_safe(client: MCPBaseClient) -> str:
+
+    # Avoid leaking env secrets from stdio client in logs.
+    if client.transport == "stdio":
+        safe_server = f"stdio: {client.command}"
+    else:
+        safe_server = f"{client.transport}: {client.url}"
+
+    return safe_server
+
+
+@register_function(config_type=MCPSingleToolConfig)
+async def mcp_single_tool(config: MCPSingleToolConfig, builder: Builder):
+    """
+    Wrap a single tool from an MCP server as a NeMo Agent toolkit function.
+    """
+    tool = await config.client.get_tool(config.tool_name)
+    if config.tool_description:
+        tool.set_description(description=config.tool_description)
+    input_schema = tool.input_schema
+
+    logger.info("Configured to use tool: %s from MCP server at %s", tool.name, _get_server_name_safe(config.client))
+
+    def _convert_from_str(input_str: str) -> BaseModel:
+        return input_schema.model_validate_json(input_str)
+
+    @experimental(feature_name="mcp_client")
+    async def _response_fn(tool_input: BaseModel | None = None, **kwargs) -> str:
+        try:
+            if tool_input:
+                return await tool.acall(tool_input.model_dump())
+            _ = input_schema.model_validate(kwargs)
+            return await tool.acall(kwargs)
+        except Exception as e:
+            return str(e)
+
+    fn = FunctionInfo.create(single_fn=_response_fn,
+                             description=tool.description,
+                             input_schema=input_schema,
+                             converters=[_convert_from_str])
+    yield fn
+
+
+@register_function(MCPClientConfig)
+async def mcp_client_function_handler(config: MCPClientConfig, builder: Builder):
+    """
+    Connect to an MCP server, discover tools, and register them as functions in the workflow.
+
+    Note:
+    - Uses builder's exit stack to manage client lifecycle
+    - Applies tool filters if provided
+    """
+    from nat.tool.mcp.mcp_client_base import MCPSSEClient
+    from nat.tool.mcp.mcp_client_base import MCPStdioClient
+    from nat.tool.mcp.mcp_client_base import MCPStreamableHTTPClient
+
+    # Build the appropriate client
+    client_cls = {
+        "stdio": lambda: MCPStdioClient(config.server.command, config.server.args, config.server.env),
+        "sse": lambda: MCPSSEClient(str(config.server.url)),
+        "streamable-http": lambda: MCPStreamableHTTPClient(str(config.server.url)),
+    }.get(config.server.transport)
+
+    if not client_cls:
+        raise ValueError(f"Unsupported transport: {config.server.transport}")
+
+    client = client_cls()
+    logger.info("Configured to use MCP server at %s", _get_server_name_safe(client))
+
+    # client aenter connects to the server and stores the client in the exit stack
+    # so it's cleaned up when the workflow is done
+    async with client:
+        all_tools = await client.get_tools()
+        tool_configs = _filter_and_configure_tools(all_tools, config.tool_filter)
+
+        for tool_name, tool_cfg in tool_configs.items():
+            await builder.add_function(
+                tool_cfg["function_name"],
+                MCPSingleToolConfig(
+                    client=client,
+                    tool_name=tool_name,
+                    tool_description=tool_cfg["description"],
+                ))
+
+        @experimental(feature_name="mcp_client")
+        async def idle_fn(text: str) -> str:
+            # This function is a placeholder and will be removed when function groups are used
+            return f"MCP client connected: {text}"
+
+        yield FunctionInfo.create(single_fn=idle_fn, description="MCP client")
+
+
+def _filter_and_configure_tools(all_tools: dict, tool_filter) -> dict[str, dict]:
+    """
+    Apply tool filtering and optional aliasing/description overrides.
+
+    Returns:
+        Dict[str, dict] where each value has:
+            - function_name
+            - description
+    """
+    if tool_filter is None:
+        return {name: {"function_name": name, "description": tool.description} for name, tool in all_tools.items()}
+
+    if isinstance(tool_filter, list):
+        return {
+            name: {
+                "function_name": name, "description": all_tools[name].description
+            }
+            for name in tool_filter if name in all_tools
+        }
+
+    if isinstance(tool_filter, dict):
+        result = {}
+        for name, override in tool_filter.items():
+            tool = all_tools.get(name)
+            if not tool:
+                logger.warning("Tool '%s' specified in tool_filter not found in MCP server", name)
+                continue
+
+            if isinstance(override, ToolOverrideConfig):
+                result[name] = {
+                    "function_name": override.alias or name, "description": override.description or tool.description
+                }
+            else:
+                logger.warning("Unsupported override type for '%s': %s", name, type(override))
+                result[name] = {"function_name": name, "description": tool.description}
+        return result

nat/tool/mcp/mcp_tool.py

@@ -14,10 +14,12 @@
 # limitations under the License.
 
 import logging
+from typing import Literal
 
 from pydantic import BaseModel
 from pydantic import Field
 from pydantic import HttpUrl
+from pydantic import model_validator
 
 from nat.builder.builder import Builder
 from nat.builder.function_info import FunctionInfo
@@ -33,8 +35,16 @@ class MCPToolConfig(FunctionBaseConfig, name="mcp_tool_wrapper"):
     function.
     """
     # Add your custom configuration parameters here
-    url: HttpUrl = Field(description="The URL of the MCP server")
+    url: HttpUrl | None = Field(default=None,
+                                description="The URL of the MCP server (for streamable-http or sse modes)")
     mcp_tool_name: str = Field(description="The name of the tool served by the MCP Server that you want to use")
+    transport: Literal["sse", "stdio", "streamable-http"] = Field(
+        default="streamable-http",
+        description="The type of transport to use (default: streamable-http, backwards compatible with sse)")
+    command: str | None = Field(default=None,
+                                description="The command to run for stdio mode (e.g. 'docker' or 'python')")
+    args: list[str] | None = Field(default=None, description="Additional arguments for the stdio command")
+    env: dict[str, str] | None = Field(default=None, description="Environment variables to set for the stdio process")
     description: str | None = Field(default=None,
                                     description="""
         Description for the tool that will override the description provided by the MCP server. Should only be used if
@@ -46,51 +56,78 @@ class MCPToolConfig(FunctionBaseConfig, name="mcp_tool_wrapper"):
         If false, raise the exception.
         """)
 
+    @model_validator(mode="after")
+    def validate_model(self):
+        """Validate that stdio and SSE/Streamable HTTP properties are mutually exclusive."""
+        if self.transport == 'stdio':
+            if self.url is not None:
+                raise ValueError("url should not be set when using stdio client type")
+            if not self.command:
+                raise ValueError("command is required when using stdio client type")
+        elif self.transport in ['streamable-http', 'sse']:
+            if self.command is not None or self.args is not None or self.env is not None:
+                raise ValueError(
+                    "command, args, and env should not be set when using streamable-http or sse client type")
+            if not self.url:
+                raise ValueError("url is required when using streamable-http or sse client type")
+        return self
+
 
 @register_function(config_type=MCPToolConfig)
 async def mcp_tool(config: MCPToolConfig, builder: Builder):
     """
-    Generate a NAT Function that wraps a tool provided by the MCP server.
+    Generate a NeMo Agent Toolkit Function that wraps a tool provided by the MCP server.
     """
 
-    from nat.tool.mcp.mcp_client import MCPBuilder
-    from nat.tool.mcp.mcp_client import MCPToolClient
-
-    client = MCPBuilder(url=str(config.url))
-
-    tool: MCPToolClient = await client.get_tool(config.mcp_tool_name)
-    if config.description:
-        tool.set_description(description=config.description)
-
-    logger.info("Configured to use tool: %s from MCP server at %s", tool.name, str(config.url))
-
-    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)
-            filtered_kwargs = {k: v for k, v in kwargs.items() if v is not None}
-            return await tool.acall(filtered_kwargs)
-        except Exception as e:
-            if config.return_exception:
+    from nat.tool.mcp.mcp_client_base import MCPSSEClient
+    from nat.tool.mcp.mcp_client_base import MCPStdioClient
+    from nat.tool.mcp.mcp_client_base import MCPStreamableHTTPClient
+    from nat.tool.mcp.mcp_client_base import MCPToolClient
+
+    # Initialize the client
+    if config.transport == 'stdio':
+        client = MCPStdioClient(command=config.command, args=config.args, env=config.env)
+    elif config.transport == 'streamable-http':
+        client = MCPStreamableHTTPClient(url=str(config.url))
+    elif config.transport == 'sse':
+        client = MCPSSEClient(url=str(config.url))
+    else:
+        raise ValueError(f"Invalid transport type: {config.transport}")
+
+    async with client:
+        # If the tool is found create a MCPToolClient object and set the description if provided
+        tool: MCPToolClient = await client.get_tool(config.mcp_tool_name)
+        if config.description:
+            tool.set_description(description=config.description)
+
+        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:
-                    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])
+                    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])

nat/tool/register.py

@@ -31,6 +31,7 @@ from .github_tools import get_github_file
 from .github_tools import get_github_issue
 from .github_tools import get_github_pr
 from .github_tools import update_github_issue
+from .mcp import mcp_client_impl
 from .mcp import mcp_tool
 from .memory_tools import add_memory_tool
 from .memory_tools import delete_memory_tool

{nvidia_nat-1.3.0a20250829.dist-info → nvidia_nat-1.3.0a20250830.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nvidia-nat
-Version: 1.3.0a20250829
+Version: 1.3.0a20250830
 Summary: NVIDIA NeMo Agent toolkit
 Author: NVIDIA Corporation
 Maintainer: NVIDIA Corporation
@@ -221,7 +221,7 @@ Requires-Dist: fastapi~=0.115.5
 Requires-Dist: httpx~=0.27
 Requires-Dist: jinja2~=3.1
 Requires-Dist: jsonpath-ng~=1.7
-Requires-Dist: mcp~=1.10
+Requires-Dist: mcp~=1.13
 Requires-Dist: networkx~=3.4
 Requires-Dist: numpy~=1.26
 Requires-Dist: openinference-semantic-conventions~=0.1.14
@@ -229,7 +229,7 @@ Requires-Dist: openpyxl~=3.1
 Requires-Dist: pkce==1.0.3
 Requires-Dist: pkginfo~=1.12
 Requires-Dist: platformdirs~=4.3
-Requires-Dist: pydantic==2.10.*
+Requires-Dist: pydantic~=2.11
 Requires-Dist: pymilvus~=2.4
 Requires-Dist: PyYAML~=6.0
 Requires-Dist: ragas~=0.2.14

{nvidia_nat-1.3.0a20250829.dist-info → nvidia_nat-1.3.0a20250830.dist-info}/RECORD

@@ -4,10 +4,10 @@ nat/agent/base.py,sha256=TnspR3rLYyUbzKkPHQknQhk9nLyrKcoyKdSJN7vy9aU,9856
 nat/agent/dual_node.py,sha256=YRGRwwkui-2iV_TafTWRnVjWLYFcFIs1HC4kR6AEPyE,2553
 nat/agent/register.py,sha256=1utq5-6GxtEh2kIEj521q1R17GyxKlWOLBFwuSd0BNs,973
 nat/agent/react_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-nat/agent/react_agent/agent.py,sha256=IP6c8M_kHLbhIqQc8PKMnOZMuP-bmLWcuhEtPB_cXsw,20637
+nat/agent/react_agent/agent.py,sha256=ead5hwZ9AdklAyem85pbfj5gq6lcpaGMW2YpFBtH4JA,21277
 nat/agent/react_agent/output_parser.py,sha256=m7K6wRwtckBBpAHqOf3BZ9mqZLwrP13Kxz5fvNxbyZE,4219
 nat/agent/react_agent/prompt.py,sha256=N47JJrT6xwYQCv1jedHhlul2AE7EfKsSYfAbgJwWRew,1758
-nat/agent/react_agent/register.py,sha256=VZFBgR6nuliWvYOp1bqatiWZoUUa5pLUcunY2sAdWP0,8319
+nat/agent/react_agent/register.py,sha256=B3LMOxWa47rQi5XpFMo7hrSb3UsfXHEMp2otNTxZ4lA,8625
 nat/agent/reasoning_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/agent/reasoning_agent/reasoning_agent.py,sha256=2NDDHeesM2s2PnJfRsv2OTYjeajR1rYUVDvJZLzWGAQ,9434
 nat/agent/rewoo_agent/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -49,7 +49,7 @@ nat/builder/intermediate_step_manager.py,sha256=iOuMLWTaES0J0XzaLxhTUqFvuoCAChJu
 nat/builder/llm.py,sha256=DW-2q64A06VChsXNEL5PfBjH3DcsnTKVoCEWDuP7MF4,951
 nat/builder/retriever.py,sha256=ZyEqc7pFK31t_yr6Jaxa34c-tRas2edKqJZCNiVh9-0,970
 nat/builder/user_interaction_manager.py,sha256=-Z2qbQes7a2cuXgT7KEbWeuok0HcCnRdw9WB8Ghyl9k,3081
-nat/builder/workflow.py,sha256=toK6Zek2k0SqfXRLV7zCvDvYJ-V7DHdf0_U3YLrN_ag,6492
+nat/builder/workflow.py,sha256=t2rnXyNreW-0UN1ZT67X_Bp7yDNov6IwhBi66QNUVGU,6594
 nat/builder/workflow_builder.py,sha256=dXSP-b3160qEX2_NC2J_3iGfXfTlFqEaRhB8KYjzfws,46084
 nat/cli/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 nat/cli/entrypoint.py,sha256=lKx3aRjEEaP6mBaO7Hn28dtRN-vA-ooIJG93ZkchmOo,4975
@@ -61,7 +61,7 @@ nat/cli/cli_utils/config_override.py,sha256=hLhJDjkLTLkUSYXMjK1qT7USy7ds1ddEDxcE
 nat/cli/cli_utils/validation.py,sha256=KVZvAkWZx-QVVBuCFTcH2muLzMB7ONQA1GE2TzEVN78,1288
 nat/cli/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/cli/commands/evaluate.py,sha256=_gSK9km6DQNxFcOZnOpzYuXtM0MG3-ng6S-1UNccG80,4748
-nat/cli/commands/start.py,sha256=vm3boXXI3sB5lOZrhlRIg-wkLtelx-WQkFORyu0nv7Y,9730
+nat/cli/commands/start.py,sha256=kYXLWj-jNQZLyC1JjM4UEvqSK9vP7As6C9pzhNwHQsg,10431
 nat/cli/commands/uninstall.py,sha256=KJDe-BCUD5ws_lTpCNPj3Ac26TQO8kys0AZqjZsljfs,3180
 nat/cli/commands/validate.py,sha256=mseAUfwRP8RL2Jc_a7MA9_0j9CRQFojEFPTPSuLiFGI,1669
 nat/cli/commands/configure/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -75,7 +75,7 @@ nat/cli/commands/info/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9a
 nat/cli/commands/info/info.py,sha256=5_s2_MMYn6ZLQpADdZ3aVRg4uvyXvF-4xVJclXxN15U,1317
 nat/cli/commands/info/list_channels.py,sha256=K97TE6wtikgImY-wAbFNi0HHUGtkvIFd2woaG06VkT0,1277
 nat/cli/commands/info/list_components.py,sha256=QlAJVONBA77xW8Lx6Autw5NTAZNy_VrJGr1GL9MfnHM,4532
-nat/cli/commands/info/list_mcp.py,sha256=W94X0kWjqMX_yqJSEtZJOCDy6SoUx7PlXbak3crCSUc,12619
+nat/cli/commands/info/list_mcp.py,sha256=-gFrAfsfu--LdP1V-GpFn5jG70H1LMWs2N2l_hDm2p8,18152
 nat/cli/commands/object_store/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
 nat/cli/commands/object_store/object_store.py,sha256=_ivB-R30a-66fNy-fUzi58HQ0Ay0gYsGz7T1xXoRa3Y,8576
 nat/cli/commands/registry/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
@@ -128,7 +128,7 @@ nat/data_models/streaming.py,sha256=sSqJqLqb70qyw69_4R9QC2RMbRw7UjTLPdo3FYBUGxE,
 nat/data_models/swe_bench_model.py,sha256=uZs-hLFuT1B5CiPFwFg1PHinDW8PHne8TBzu7tHFv_k,1718
 nat/data_models/telemetry_exporter.py,sha256=P7kqxIQnFVuvo_UFpH9QSB8fACy_0U2Uzkw_IfWXagE,998
 nat/data_models/temperature_mixin.py,sha256=nUvA_tvjMfILGpBx52RLmJrApJzuswQqlNpS6netkxM,1485
-nat/data_models/thinking_mixin.py,sha256=KnGvk7b97pcHo7IfORGQoTaXfClqk13UEoFnlElSY7w,2666
+nat/data_models/thinking_mixin.py,sha256=bRvMiuaBKInypZ2OU3npR1RjJTrOzTSWE-xFLHQAFuc,3293
 nat/data_models/top_p_mixin.py,sha256=33cRWjgT0lctucSl8rzioMVeabw3977aGRRWupD9ZaY,1456
 nat/data_models/ttc_strategy.py,sha256=tAkKWcyEBmBOOYtHMtQTgeCbHxFTk5SEkmFunNVnfyE,1114
 nat/embedder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -235,11 +235,11 @@ nat/front_ends/fastapi/auth_flow_handlers/websocket_flow_handler.py,sha256=5HX6m
 nat/front_ends/fastapi/html_snippets/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
 nat/front_ends/fastapi/html_snippets/auth_code_grant_success.py,sha256=BNpWwzmA58UM0GK4kZXG4PHJy_5K9ihaVHu8SgCs5JA,1131
 nat/front_ends/mcp/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
-nat/front_ends/mcp/mcp_front_end_config.py,sha256=QS8DUVOPqg71RrU7gtw_gBApmmADUAZHNy69I425QNg,1826
-nat/front_ends/mcp/mcp_front_end_plugin.py,sha256=kHR7jhenSuibrsKoXVHAeLoAiDcZxalStYEFR-38gDo,3243
-nat/front_ends/mcp/mcp_front_end_plugin_worker.py,sha256=Ssgv6ORdRmdfANLSehOCuTr_zzUS9Ok6Rkn7uWNyoZk,5249
+nat/front_ends/mcp/mcp_front_end_config.py,sha256=ivj8xWzE-Z1675jS7KB4LgpI3A7Atq-zJ6FgFQxdQuU,2062
+nat/front_ends/mcp/mcp_front_end_plugin.py,sha256=CerJGbuPaHVcpnMFtjs8IKeQaa3blHzX90VKptUM_3g,3674
+nat/front_ends/mcp/mcp_front_end_plugin_worker.py,sha256=OvNXRMsp9k9MEwBJ6J27Sa-EfMs07qP1ikTJ8amVcmU,5303
 nat/front_ends/mcp/register.py,sha256=3aJtgG5VaiqujoeU1-Eq7Hl5pWslIlIwGFU2ASLTXgM,1173
-nat/front_ends/mcp/tool_converter.py,sha256=rCvFL8lrztkjC0nFtfzgfFrPK_IUKk-M_er8jBCM9Ic,9755
+nat/front_ends/mcp/tool_converter.py,sha256=vNPaTckcqjKakwdjkqET_T4-ChjlLkMfdw0_H-x6eVc,11309
 nat/front_ends/simple_base/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 nat/front_ends/simple_base/simple_front_end_plugin_base.py,sha256=3kevZVhvzj_Wvu8HYhRz-CRrO2OldW6wcmtcsIQCELk,1765
 nat/llm/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -263,7 +263,7 @@ nat/object_store/models.py,sha256=xsch4o3GzEFxVbFEYBfr92lEMZk5XHHr224WZGsQUNM,15
 nat/object_store/register.py,sha256=jNuZfyG2rSuxS-DNK_aFdgfjiHK3VC1_4A5lmpmRP_A,756
 nat/observability/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 nat/observability/exporter_manager.py,sha256=4AcF-EbuJ9lTfL06NL1Nz6rgmzkHWOPZJ9KSJlFiv2E,13852
-nat/observability/register.py,sha256=ONNZca9oUtF3twcLaXy5gp6kVBzJFTSSQcap1AhTYYY,4192
+nat/observability/register.py,sha256=Hpk5aYYXCKdvkTqE245QgtmhCKrGh75uZZoefcxa38Y,4225
 nat/observability/exporter/__init__.py,sha256=Xs1JQ16L9btwreh4pdGKwskffAw1YFO48jKrU4ib_7c,685
 nat/observability/exporter/base_exporter.py,sha256=tP7c5O-gQnHB_1TwIJJUib1xmtUhX4f4Mf_bmpejtkI,16612
 nat/observability/exporter/exporter.py,sha256=fqF0GYuhZRQEq0skq_FK2nlnsaUAzLpQi-OciaOkRno,2391
@@ -376,7 +376,7 @@ nat/tool/chat_completion.py,sha256=zB8sqEBEHW0QDcnv0NdqO43ybxe5Q-WKZr9s349UBvA,3
 nat/tool/datetime_tools.py,sha256=yZV5lE3FsQuIZE3B36gg38hxfavxgaG04eVFbL0UBTI,3239
 nat/tool/document_search.py,sha256=M6OjKdqUm_HdNn5-rgm5SDOeFGTNuwjYiuMQL43myGc,6741
 nat/tool/nvidia_rag.py,sha256=cEHSc3CZwpd71YcOQngya-Ca_B6ZOb87Dmsoza0VhFY,4163
-nat/tool/register.py,sha256=zlf6uGVrq_baCAqo8d_lWtcJOzlAbnznq4J8g9fg58k,1459
+nat/tool/register.py,sha256=IAvxfeUVYu9fa1bUgQ1iLtLh9MNauZH9iorbhXegnqc,1492
 nat/tool/retriever.py,sha256=FP5JL1vCQNrqaKz4F1up-osjxEPhxPFOyaScrgByc34,3877
 nat/tool/server_tools.py,sha256=rQLipwRv8lAyU-gohky2JoVDxWQTUTSttNWjhu7lcHU,3194
 nat/tool/code_execution/README.md,sha256=sl3YX4As95HX61XqTXOGnUcHBV1lla-OeuTnLI4qgng,4019
@@ -401,8 +401,9 @@ nat/tool/github_tools/get_github_pr.py,sha256=p4Xu-YA6L1dQ8O0e5LDzphrn5DknjttDhL
 nat/tool/github_tools/update_github_issue.py,sha256=fj_OAp5bSmSyj-wPAUvzfCGRBuwPyoK1kJ95Fn8XDg8,4103
 nat/tool/mcp/__init__.py,sha256=GUJrgGtpvyMUCjUBvR3faAdv-tZzbU9W-izgx9aMEQg,680
 nat/tool/mcp/exceptions.py,sha256=EGVOnYlui8xufm8dhJyPL1SUqBLnCGOTvRoeyNcmcWE,5980
-nat/tool/mcp/mcp_client.py,sha256=jdlJULJG1EGdj2CwT26x6hBatG6vz0cXsh14c_ttv20,8963
-nat/tool/mcp/mcp_tool.py,sha256=fZGFRupumjXKMXaO_6IhOZ8t1HqHxyv4yytjmoFKlZE,4061
+nat/tool/mcp/mcp_client_base.py,sha256=uZ9WCJYhPiYYCaZfC3oa2EwXYJUMDSnm2b5Z6_VSfZE,13412
+nat/tool/mcp/mcp_client_impl.py,sha256=Q2qJAUFWq__opXXUzO6XhhRf9gjwJcEkdHXSiQz4S4I,9668
+nat/tool/mcp/mcp_tool.py,sha256=OIvoLnl2d9PWqE9625jj0CiVEPBVS9LajxFD1VOJlVY,6382
 nat/tool/memory_tools/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/tool/memory_tools/add_memory_tool.py,sha256=DYaYkVlH2myRshJpzmULfzdF0wFoPCAkTBokFVmhfzU,3349
 nat/tool/memory_tools/delete_memory_tool.py,sha256=EWJVgzIzLDqktY5domXph-N2U9FmybdWl4J7KM7uK4g,2532
@@ -438,10 +439,10 @@ nat/utils/reactive/base/observer_base.py,sha256=6BiQfx26EMumotJ3KoVcdmFBYR_fnAss
 nat/utils/reactive/base/subject_base.py,sha256=UQOxlkZTIeeyYmG5qLtDpNf_63Y7p-doEeUA08_R8ME,2521
 nat/utils/settings/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nat/utils/settings/global_settings.py,sha256=9JaO6pxKT_Pjw6rxJRsRlFCXdVKCl_xUKU2QHZQWWNM,7294
-nvidia_nat-1.3.0a20250829.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
-nvidia_nat-1.3.0a20250829.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
-nvidia_nat-1.3.0a20250829.dist-info/METADATA,sha256=8OmfLMouhRsMDaTaLEq3z37MLT_Mp1GsRh2NFT_hptM,21858
-nvidia_nat-1.3.0a20250829.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nvidia_nat-1.3.0a20250829.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
-nvidia_nat-1.3.0a20250829.dist-info/top_level.txt,sha256=lgJWLkigiVZuZ_O1nxVnD_ziYBwgpE2OStdaCduMEGc,8
-nvidia_nat-1.3.0a20250829.dist-info/RECORD,,
+nvidia_nat-1.3.0a20250830.dist-info/licenses/LICENSE-3rd-party.txt,sha256=fOk5jMmCX9YoKWyYzTtfgl-SUy477audFC5hNY4oP7Q,284609
+nvidia_nat-1.3.0a20250830.dist-info/licenses/LICENSE.md,sha256=QwcOLU5TJoTeUhuIXzhdCEEDDvorGiC6-3YTOl4TecE,11356
+nvidia_nat-1.3.0a20250830.dist-info/METADATA,sha256=gLncdxCW0y8zo8IgT0J-PY-GOhfC1so3uX94K6Qqcns,21856
+nvidia_nat-1.3.0a20250830.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nvidia_nat-1.3.0a20250830.dist-info/entry_points.txt,sha256=FNh4pZVSe_61s29zdks66lmXBPtsnko8KSZ4ffv7WVE,653
+nvidia_nat-1.3.0a20250830.dist-info/top_level.txt,sha256=lgJWLkigiVZuZ_O1nxVnD_ziYBwgpE2OStdaCduMEGc,8
+nvidia_nat-1.3.0a20250830.dist-info/RECORD,,