nvidia-nat 1.2.0a20250813__py3-none-any.whl → 1.2.0rc6__py3-none-any.whl

nat/agent/react_agent/register.py

@@ -34,7 +34,7 @@ logger = logging.getLogger(__name__)
 
 class ReActAgentWorkflowConfig(FunctionBaseConfig, name="react_agent"):
     """
-    Defines an AIQ Toolkit function that uses a ReAct Agent performs reasoning inbetween tool calls, and utilizes the
+    Defines a NAT function that uses a ReAct Agent performs reasoning inbetween tool calls, and utilizes the
     tool names and descriptions to select the optimal tool.
     """
 

nat/agent/reasoning_agent/reasoning_agent.py

@@ -33,7 +33,7 @@ logger = logging.getLogger(__name__)
 
 class ReasoningFunctionConfig(FunctionBaseConfig, name="reasoning_agent"):
     """
-    Defines an AIQ Toolkit function that performs reasoning on the input data.
+    Defines a NAT function that performs reasoning on the input data.
     Output is passed to the next function in the workflow.
 
     Designed to be used with an InterceptingFunction.
@@ -140,7 +140,7 @@ async def build_reasoning_function(config: ReasoningFunctionConfig, builder: Bui
             Perform reasoning on the input text.
 
             Args:
-                input_message (AIQChatRequest): The input text to reason on.
+                input_message (ChatRequest): The input text to reason on.
             """
 
             input_text = "".join([str(message.model_dump()) + "\n" for message in input_message.messages])
@@ -183,7 +183,7 @@ async def build_reasoning_function(config: ReasoningFunctionConfig, builder: Bui
             Perform reasoning on the input text.
 
             Args:
-                input_message (AIQChatRequest): The input text to reason on.
+                input_message (ChatRequest): The input text to reason on.
             """
 
             input_text = "".join([str(message.model_dump()) + "\n" for message in input_message.messages])

nat/agent/rewoo_agent/prompt.py

@@ -13,9 +13,6 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-# flake8: noqa
-from langchain_core.prompts.chat import ChatPromptTemplate
-
 PLANNER_SYSTEM_PROMPT = """
 For the following task, make plans that can solve the problem step by step. For each plan, indicate \
 which external tool together with tool input to retrieve evidence. You can store the evidence into a \
@@ -29,19 +26,25 @@ The tools should be one of the following: [{tool_names}]
 
 You are not required to use all the tools listed. Choose only the ones that best fit the needs of each plan step.
 
-Your output must be a JSON array where each element represents one planning step. Each step must be an object with exactly two keys:
+Your output must be a JSON array where each element represents one planning step. Each step must be an object with
+
+exactly two keys:
 
 1. "plan": A string that describes in detail the action or reasoning for that step.
 
-2. "evidence": An object representing the external tool call associated with that plan step. This object must have the following keys:
+2. "evidence": An object representing the external tool call associated with that plan step. This object must have the
+following keys:
 
-   -"placeholder": A string that identifies the evidence placeholder (e.g., "#E1", "#E2", etc.). The numbering should be sequential based on the order of steps.
+   -"placeholder": A string that identifies the evidence placeholder (e.g., "#E1", "#E2", etc.). The numbering should
+                   be sequential based on the order of steps.
 
    -"tool": A string specifying the name of the external tool used.
 
-   -"tool_input": The input to the tool. This can be a string, array, or object, depending on the requirements of the tool.
+   -"tool_input": The input to the tool. This can be a string, array, or object, depending on the requirements of the
+                  tool.
 
-Do not include any additional keys or characters in your output, and do not wrap your response with markdown formatting. Your output must be strictly valid JSON.
+Do not include any additional keys or characters in your output, and do not wrap your response with markdown formatting.
+Your output must be strictly valid JSON.
 
 Important instructions:
 
@@ -87,8 +90,6 @@ PLANNER_USER_PROMPT = """
 task: {task}
 """
 
-rewoo_planner_prompt = ChatPromptTemplate([("system", PLANNER_SYSTEM_PROMPT), ("user", PLANNER_USER_PROMPT)])
-
 SOLVER_SYSTEM_PROMPT = """
 Solve the following task or problem. To solve the problem, we have made step-by-step Plan and \
 retrieved corresponding Evidence to each Plan. Use them with caution since long evidence might \
@@ -104,5 +105,3 @@ task: {task}
 
 Response:
 """
-
-rewoo_solver_prompt = ChatPromptTemplate([("system", SOLVER_SYSTEM_PROMPT), ("user", SOLVER_USER_PROMPT)])

nat/agent/rewoo_agent/register.py

@@ -15,6 +15,7 @@
 
 import logging
 
+from pydantic import AliasChoices
 from pydantic import Field
 
 from nat.builder.builder import Builder
@@ -33,7 +34,7 @@ logger = logging.getLogger(__name__)
 
 class ReWOOAgentWorkflowConfig(FunctionBaseConfig, name="rewoo_agent"):
     """
-    Defines an AIQ Toolkit function that uses a ReWOO Agent performs reasoning inbetween tool calls, and utilizes the
+    Defines a NAT function that uses a ReWOO Agent performs reasoning inbetween tool calls, and utilizes the
     tool names and descriptions to select the optimal tool.
     """
 
@@ -54,51 +55,48 @@ class ReWOOAgentWorkflowConfig(FunctionBaseConfig, name="rewoo_agent"):
     use_openai_api: bool = Field(default=False,
                                  description=("Use OpenAI API for the input/output types to the function. "
                                               "If False, strings will be used."))
-    additional_instructions: str | None = Field(
-        default=None, description="Additional instructions to provide to the agent in addition to the base prompt.")
+    additional_planner_instructions: str | None = Field(
+        default=None,
+        validation_alias=AliasChoices("additional_planner_instructions", "additional_instructions"),
+        description="Additional instructions to provide to the agent in addition to the base planner prompt.")
+    additional_solver_instructions: str | None = Field(
+        default=None,
+        description="Additional instructions to provide to the agent in addition to the base solver prompt.")
 
 
 @register_function(config_type=ReWOOAgentWorkflowConfig, framework_wrappers=[LLMFrameworkEnum.LANGCHAIN])
-async def ReWOO_agent_workflow(config: ReWOOAgentWorkflowConfig, builder: Builder):
+async def rewoo_agent_workflow(config: ReWOOAgentWorkflowConfig, builder: Builder):
     from langchain.schema import BaseMessage
     from langchain_core.messages import trim_messages
     from langchain_core.messages.human import HumanMessage
     from langchain_core.prompts import ChatPromptTemplate
     from langgraph.graph.graph import CompiledGraph
 
+    from nat.agent.rewoo_agent.prompt import PLANNER_SYSTEM_PROMPT
     from nat.agent.rewoo_agent.prompt import PLANNER_USER_PROMPT
+    from nat.agent.rewoo_agent.prompt import SOLVER_SYSTEM_PROMPT
     from nat.agent.rewoo_agent.prompt import SOLVER_USER_PROMPT
 
     from .agent import ReWOOAgentGraph
     from .agent import ReWOOGraphState
-    from .prompt import rewoo_planner_prompt
-    from .prompt import rewoo_solver_prompt
-
-    # the ReWOO Agent prompt comes from prompt.py, and can be customized there or via config option planner_prompt and
-    # solver_prompt.
-    if config.planner_prompt:
-        planner_prompt = config.planner_prompt
-        if config.additional_instructions:
-            planner_prompt += f"{config.additional_instructions}"
-        valid = ReWOOAgentGraph.validate_planner_prompt(config.planner_prompt)
-        if not valid:
-            logger.exception("Invalid planner_prompt")
-            raise ValueError("Invalid planner_prompt")
-        planner_prompt = ChatPromptTemplate([("system", config.planner_prompt), ("user", PLANNER_USER_PROMPT)])
-    else:
-        planner_prompt = rewoo_planner_prompt
-
-    if config.solver_prompt:
-        solver_prompt = config.solver_prompt
-        if config.additional_instructions:
-            solver_prompt += f"{config.additional_instructions}"
-        valid = ReWOOAgentGraph.validate_solver_prompt(config.solver_prompt)
-        if not valid:
-            logger.exception("Invalid solver_prompt")
-            raise ValueError("Invalid solver_prompt")
-        solver_prompt = ChatPromptTemplate([("system", config.solver_prompt), ("user", SOLVER_USER_PROMPT)])
-    else:
-        solver_prompt = rewoo_solver_prompt
+
+    # the ReWOO Agent prompts are defined in prompt.py, and can be customized there or by modifying the config option
+    # planner_prompt and solver_prompt.
+    planner_system_prompt = PLANNER_SYSTEM_PROMPT if config.planner_prompt is None else config.planner_prompt
+    if config.additional_planner_instructions:
+        planner_system_prompt += f"{config.additional_planner_instructions}"
+    if not ReWOOAgentGraph.validate_planner_prompt(planner_system_prompt):
+        logger.exception("Invalid planner prompt")
+        raise ValueError("Invalid planner prompt")
+    planner_prompt = ChatPromptTemplate([("system", planner_system_prompt), ("user", PLANNER_USER_PROMPT)])
+
+    solver_system_prompt = SOLVER_SYSTEM_PROMPT if config.solver_prompt is None else config.solver_prompt
+    if config.additional_solver_instructions:
+        solver_system_prompt += f"{config.additional_solver_instructions}"
+    if not ReWOOAgentGraph.validate_solver_prompt(solver_system_prompt):
+        logger.exception("Invalid solver prompt")
+        raise ValueError("Invalid solver prompt")
+    solver_prompt = ChatPromptTemplate([("system", solver_system_prompt), ("user", SOLVER_USER_PROMPT)])
 
     # we can choose an LLM for the ReWOO agent in the config file
     llm = await builder.get_llm(config.llm_name, wrapper_type=LLMFrameworkEnum.LANGCHAIN)

nat/authentication/http_basic_auth/http_basic_auth_provider.py

@@ -47,7 +47,7 @@ class HTTPBasicAuthProvider(AuthProviderBase):
 
         if user_id is None and hasattr(context, "metadata") and hasattr(
                 context.metadata, "cookies") and context.metadata.cookies is not None:
-            session_id = context.metadata.cookies.get("aiqtoolkit-session", None)
+            session_id = context.metadata.cookies.get("nat-session", None)
             if not session_id:
                 raise RuntimeError("Authentication failed. No session ID found. Cannot identify user.")
 

nat/authentication/interfaces.py

@@ -75,7 +75,7 @@ class FlowHandlerBase(ABC):
 
     Each front end will define a FlowHandler that will implement the authenticate method.
 
-    The `authenticate` method will be stored as the callback in the AIQContextState.user_auth_callback
+    The `authenticate` method will be stored as the callback in the ContextState.user_auth_callback
     """
 
     @abstractmethod

nat/authentication/oauth2/oauth2_auth_code_flow_provider.py

@@ -65,7 +65,7 @@ class OAuth2AuthCodeFlowProvider(AuthProviderBase[OAuth2AuthCodeFlowProviderConf
     async def authenticate(self, user_id: str | None = None) -> AuthResult:
         if user_id is None and hasattr(Context.get(), "metadata") and hasattr(
                 Context.get().metadata, "cookies") and Context.get().metadata.cookies is not None:
-            session_id = Context.get().metadata.cookies.get("aiqtoolkit-session", None)
+            session_id = Context.get().metadata.cookies.get("nat-session", None)
             if not session_id:
                 raise RuntimeError("Authentication failed. No session ID found. Cannot identify user.")
 
@@ -82,7 +82,7 @@ class OAuth2AuthCodeFlowProvider(AuthProviderBase[OAuth2AuthCodeFlowProviderConf
 
         auth_callback = self._context.user_auth_callback
         if not auth_callback:
-            raise RuntimeError("Authentication callback not set on AIQContext.")
+            raise RuntimeError("Authentication callback not set on Context.")
 
         try:
             authenticated_context = await auth_callback(self.config, AuthFlowType.OAUTH2_AUTHORIZATION_CODE)

nat/builder/component_utils.py

@@ -56,7 +56,7 @@ class ComponentInstanceData(BaseModel):
     """A data model to hold component runtime instance metadata to support generating build sequences.
 
     Args:
-        component_group (ComponentGroup): The component group in an AIQ Toolkit configuration object.
+        component_group (ComponentGroup): The component group in a NAT configuration object.
         name (ComponentRef): The name of the component runtime instance.
         config (TypedBaseModel): The runtime instance's configuration object.
         instance_id (str): Unique identifier for each runtime instance.
@@ -166,7 +166,7 @@ def update_dependency_graph(config: "Config", instance_config: TypedBaseModel,
     """Updates the hierarchical component instance dependency graph from a configuration runtime instance.
 
     Args:
-        config (AIQConfig): An AIQ Toolkit configuration object with runtime instance details.
+        config (Config): A NAT configuration object with runtime instance details.
         instance_config (TypedBaseModel): A component's runtime instance configuration object.
         dependency_graph (nx.DiGraph): A graph tracking runtime instance component dependencies.
 
@@ -196,7 +196,7 @@ def config_to_dependency_objects(config: "Config") -> tuple[dict[str, ComponentI
     """Generates a map of component runtime instance IDs to use when generating a build sequence.
 
     Args:
-        config (AIQConfig): The AIQ Toolkit workflow configuration object.
+        config (Config): The NAT workflow configuration object.
 
     Returns:
         tuple[dict[str, ComponentInstanceData], nx.DiGraph]: A tuple containing a map of component runtime instance
@@ -244,10 +244,10 @@ def config_to_dependency_objects(config: "Config") -> tuple[dict[str, ComponentI
 
 
 def build_dependency_sequence(config: "Config") -> list[ComponentInstanceData]:
-    """Generates the depencency sequence from an AIQ Toolkit configuration object
+    """Generates the depencency sequence from a NAT configuration object
 
     Args:
-        config (AIQConfig): An AIQ Toolkit configuration object.
+        config (Config): A NAT configuration object.
 
     Returns:
         list[ComponentInstanceData]: A list representing the instatiation sequence to ensure all valid

nat/builder/context.py

@@ -136,7 +136,7 @@ class Context:
     @property
     def user_interaction_manager(self) -> UserInteractionManager:
         """
-        Return an instance of AIQUserInteractionManager that uses
+        Return an instance of UserInteractionManager that uses
         the current context's user_input_callback.
         """
         return UserInteractionManager(self._context_state)
@@ -253,13 +253,13 @@ class Context:
     @staticmethod
     def get() -> "Context":
         """
-        Static method to retrieve the current AIQContext instance.
+        Static method to retrieve the current Context instance.
 
-        This method creates and returns an instance of the AIQContext class
-        by obtaining the current state from the AIQContextState.
+        This method creates and returns an instance of the Context class
+        by obtaining the current state from the ContextState.
 
         Returns:
-            AIQContext: The created AIQContext instance.
+            Context: The created Context instance.
         """
         return Context(ContextState.get())
 

nat/builder/front_end.py

@@ -27,11 +27,11 @@ class FrontEndBase(typing.Generic[FrontEndConfigT], ABC):
 
     def __init__(self, full_config: "Config"):
         """
-        Initializes the FrontEndBase object with the specified AIQ Toolkit configuration.
+        Initializes the FrontEndBase object with the specified NAT configuration.
 
         Parameters
         ----------
-        full_config : AIQConfig
+        full_config : Config
             The configuration object to use for the front end.
         """
 
@@ -43,7 +43,7 @@ class FrontEndBase(typing.Generic[FrontEndConfigT], ABC):
     @property
     def front_end_config(self) -> FrontEndConfigT:
         """
-        Returns the front end configuration object extracted from the AIQ Toolkit configuration.
+        Returns the front end configuration object extracted from the NAT configuration.
 
         Returns
         -------
@@ -55,12 +55,12 @@ class FrontEndBase(typing.Generic[FrontEndConfigT], ABC):
     @property
     def full_config(self) -> "Config":
         """
-        Returns the full AIQ Toolkit configuration object.
+        Returns the full NAT configuration object.
 
         Returns
         -------
-        AIQConfig
-            The full AIQ Toolkit configuration object.
+        Config
+            The full NAT configuration object.
         """
 
         return self._full_config

nat/builder/function_base.py

@@ -12,10 +12,10 @@
 # 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.
-"""Base class for AIQ Toolkit functions providing type handling and schema management.
+"""Base class for NAT functions providing type handling and schema management.
 
 This module contains the FunctionBase abstract base class which provides core functionality
-for AIQ Toolkit functions including type handling via generics, schema management for inputs and outputs,
+for NAT functions including type handling via generics, schema management for inputs and outputs,
 and type conversion capabilities.
 """
 
@@ -40,7 +40,7 @@ logger = logging.getLogger(__name__)
 
 class FunctionBase(typing.Generic[InputT, StreamingOutputT, SingleOutputT], ABC):
     """
-    Abstract base class providing core functionality for AIQ Toolkit functions.
+    Abstract base class providing core functionality for NAT functions.
 
     This class provides type handling via generics, schema management for inputs and outputs,
     and type conversion capabilities.
@@ -56,7 +56,7 @@ class FunctionBase(typing.Generic[InputT, StreamingOutputT, SingleOutputT], ABC)
 
     Notes
     -----
-    FunctionBase is the foundation of the AIQ Toolkit function system, providing:
+    FunctionBase is the foundation of the NAT function system, providing:
     - Type handling via generics
     - Schema management for inputs and outputs
     - Type conversion capabilities

nat/builder/function_info.py

@@ -574,7 +574,7 @@ class FunctionInfo:
         Returns
         -------
         FunctionInfo
-            The created FunctionInfo object which can be used to create a Generic AIQ Toolkit function.
+            The created FunctionInfo object which can be used to create a Generic NAT function.
 
         """
 

nat/builder/intermediate_step_manager.py

@@ -43,7 +43,7 @@ class OpenStep:
 
 class IntermediateStepManager:
     """
-    Manages updates to the AIQ Toolkit Event Stream for intermediate steps
+    Manages updates to the NAT Event Stream for intermediate steps
     """
 
     def __init__(self, context_state: "ContextState"):  # noqa: F821
@@ -53,7 +53,7 @@ class IntermediateStepManager:
 
     def push_intermediate_step(self, payload: IntermediateStepPayload) -> None:
         """
-        Pushes an intermediate step to the AIQ Toolkit Event Stream
+        Pushes an intermediate step to the NAT Event Stream
         """
 
         if not isinstance(payload, IntermediateStepPayload):
@@ -129,7 +129,7 @@ class IntermediateStepManager:
             # Verify that the stack is now equal to the previous stack
             if (curr_stack != prev_stack):
                 logger.warning("Current span ID stack is not equal to the previous stack. "
-                               "This is likely an error. Report this to the AIQ team.")
+                               "This is likely an error. Report this to the NeMo Agent toolkit team.")
 
             logger.debug("Popped end step %s, name %s, type %s, parent %s, stack id %s",
                          payload.UUID,
@@ -168,7 +168,7 @@ class IntermediateStepManager:
                   on_error: OnError = None,
                   on_complete: OnComplete = None) -> Subscription:
         """
-        Subscribes to the AIQ Toolkit Event Stream for intermediate steps
+        Subscribes to the NAT Event Stream for intermediate steps
         """
 
         return self._context_state.event_stream.get().subscribe(on_next, on_error, on_complete)

nat/builder/user_interaction_manager.py

@@ -30,12 +30,12 @@ class UserInteractionManager:
     """
     UserInteractionManager is responsible for requesting user input
     at runtime. It delegates the actual prompting to a callback function
-    stored in AIQContextState.user_input_callback.
+    stored in ContextState.user_input_callback.
 
     Type is not imported in __init__ to prevent partial import.
     """
 
-    def __init__(self, context_state: "AIQContextState") -> None:  # noqa: F821
+    def __init__(self, context_state: "ContextState") -> None:  # noqa: F821
         self._context_state = context_state
 
     @staticmethod
@@ -54,7 +54,7 @@ class UserInteractionManager:
         """
         Ask the user a question and wait for input. This calls out to
         the callback from user_input_callback, which is typically
-        set by AIQSessionManager.
+        set by SessionManager.
 
         Returns the user's typed-in answer as a string.
         """

nat/builder/workflow_builder.py

@@ -183,7 +183,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
             # Store them in a dict so we can un-register them if needed
             self._logging_handlers[key] = handler
 
-            # Now attach to AIQ Toolkit's root logger
+            # Now attach to NAT's root logger
             logging.getLogger().addHandler(handler)
 
         # Add the telemetry exporters
@@ -865,7 +865,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
         Populate the builder with components and optionally set up the workflow.
 
         Args:
-            config (AIQConfig): The configuration object containing component definitions.
+            config (Config): The configuration object containing component definitions.
             skip_workflow (bool): If True, skips the workflow instantiation step. Defaults to False.
 
         """

nat/cli/cli_utils/validation.py

@@ -26,7 +26,7 @@ def validate_config(config_file: Path) -> Config:
     try:
         from nat.runtime.loader import load_config
 
-        # Load using the AIQ Toolkit loader functions. This performs validation
+        # Load using the NAT loader functions. This performs validation
         config = load_config(config_file)
 
         return config

nat/cli/commands/configure/channel/add.py

@@ -20,7 +20,7 @@ import click
 logger = logging.getLogger(__name__)
 
 
-@click.group(name=__name__, invoke_without_command=True, help="Utility to add an AIQ Toolkit remote registry channel.")
+@click.group(name=__name__, invoke_without_command=True, help="Utility to add a NAT remote registry channel.")
 @click.argument("channel_type", type=str)
 def add(channel_type: str) -> None:
     from nat.utils.settings.global_settings import add_channel_interative

nat/cli/commands/configure/channel/channel.py

@@ -24,9 +24,7 @@ from nat.cli.commands.configure.channel.update import update
 logger = logging.getLogger(__name__)
 
 
-@click.group(name=__name__,
-             invoke_without_command=False,
-             help="Utility to configure AIQ Toolkit remote registry channels.")
+@click.group(name=__name__, invoke_without_command=False, help="Utility to configure NAT remote registry channels.")
 def channel(**kwargs):
     pass
 

nat/cli/commands/configure/channel/remove.py

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 @click.group(name=__name__,
              invoke_without_command=True,
-             help="Utility to remove a configured AIQ Toolkit remote registry channel.")
+             help="Utility to remove a configured NAT remote registry channel.")
 @click.argument("channel", type=str)
 def remove(channel: str):
     from nat.utils.settings.global_settings import remove_channel_interactive

nat/cli/commands/configure/channel/update.py

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 @click.group(name="update",
              invoke_without_command=True,
-             help="Utility to update an AIQ Toolkit remote registry channel's settings.")
+             help="Utility to update a NAT remote registry channel's settings.")
 @click.argument("channel", type=str)
 def update(channel):
     from nat.utils.settings.global_settings import update_channel_interactive

nat/cli/commands/configure/configure.py

@@ -22,10 +22,10 @@ from nat.cli.commands.configure.channel.channel import channel
 logger = logging.getLogger(__name__)
 
 
-@click.group(name=__name__, invoke_without_command=False, help="Configure AIQ Toolkit developer preferences.")
+@click.group(name=__name__, invoke_without_command=False, help="Configure NAT developer preferences.")
 def configure_command(**kwargs):
     """
-    Publish AIQ Toolkit artifacts with the specified configuration
+    Publish NAT artifacts with the specified configuration
     """
     pass
 

nat/cli/commands/evaluate.py

@@ -96,7 +96,7 @@ async def run_and_evaluate(config: EvaluationRunConfig):
 
 
 @eval_command.result_callback(replace=True)
-def process_aiq_eval(
+def process_nat_eval(
     processors,  # pylint: disable=unused-argument
     *,
     config_file: Path,

nat/cli/commands/info/info.py

@@ -24,12 +24,10 @@ from nat.cli.commands.info.list_mcp import list_mcp
 logger = logging.getLogger(__name__)
 
 
-@click.group(name=__name__,
-             invoke_without_command=False,
-             help="Provide information about the local AIQ Toolkit environment.")
+@click.group(name=__name__, invoke_without_command=False, help="Provide information about the local NAT environment.")
 def info_command(**kwargs):
     """
-    Provide information about the local AIQ Toolkit environment.
+    Provide information about the local NAT environment.
     """
     pass
 

nat/cli/commands/info/list_components.py

@@ -60,7 +60,7 @@ async def search_artifacts(  # pylint: disable=R0917
             registry_handler.save_search_results(search_response=search_response, save_path=save_path)
 
 
-@click.group(name=__name__, invoke_without_command=True, help="List the locally registered AIQ Toolkit components.")
+@click.group(name=__name__, invoke_without_command=True, help="List the locally registered NAT components.")
 @click.option(
     "-t",
     "--types",
@@ -68,7 +68,7 @@ async def search_artifacts(  # pylint: disable=R0917
     multiple=True,
     type=click.Choice([e.value for e in ComponentEnum], case_sensitive=False),
     required=False,
-    help=("Filter the search by AIQ Toolkit component type."),
+    help=("Filter the search by NAT component type."),
 )
 @click.option(
     "-o",

nat/cli/commands/info/list_mcp.py

@@ -248,11 +248,11 @@ def list_mcp(ctx: click.Context, direct: bool, url: str, tool: str | None, detai
         json_output (bool): Whether to output tool metadata in JSON format instead of text
 
     Examples:
-        aiq info mcp                           # List tool names only
-        aiq info mcp --detail                  # Show all tools with full details
-        aiq info mcp --tool my_tool            # Show details for specific tool
-        aiq info mcp --json-output             # Get JSON format output
-        aiq info mcp --direct --url http://...  # Use direct protocol with custom URL
+        nat info mcp                           # List tool names only
+        nat info mcp --detail                  # Show all tools with full details
+        nat info mcp --tool my_tool            # Show details for specific tool
+        nat info mcp --json-output             # Get JSON format output
+        nat info mcp --direct --url http://...  # Use direct protocol with custom URL
     """
     if ctx.invoked_subcommand is not None:
         return
@@ -288,10 +288,10 @@ def ping(url: str, timeout: int, json_output: bool) -> None:
         json_output (bool): Whether to output the result in JSON format
 
     Examples:
-        aiq info mcp ping                                    # Ping default server
-        aiq info mcp ping --url http://custom-server:9901/sse # Ping custom server
-        aiq info mcp ping --timeout 10                      # Use 10 second timeout
-        aiq info mcp ping --json-output                     # Get JSON format output
+        nat info mcp ping                                    # Ping default server
+        nat info mcp ping --url http://custom-server:9901/sse # Ping custom server
+        nat info mcp ping --timeout 10                      # Use 10 second timeout
+        nat info mcp ping --json-output                     # Get JSON format output
     """
     result = asyncio.run(ping_mcp_server(url, timeout))
 

nat/cli/commands/registry/publish.py

@@ -47,7 +47,7 @@ async def publish_artifact(registry_handler_config: RegistryHandlerBaseConfig, p
 
 @click.group(name=__name__,
              invoke_without_command=True,
-             help=("Publish local AIQ Toolkit artifacts to a remote "
+             help=("Publish local NAT artifacts to a remote "
                    "registry from package repository."))
 @click.option(
     "--config_file",
@@ -61,12 +61,12 @@ async def publish_artifact(registry_handler_config: RegistryHandlerBaseConfig, p
     "--channel",
     type=str,
     required=True,
-    help=("The remote registry channel to use when publishing the AIQ Toolkit artifact."),
+    help=("The remote registry channel to use when publishing the NAT artifact."),
 )
 @click.argument("package_root", type=str)
 def publish(channel: str, config_file: str, package_root: str) -> None:
     """
-    Publish AIQ Toolkit artifacts with the specified configuration
+    Publish NAT artifacts with the specified configuration
     """
     from nat.settings.global_settings import GlobalSettings