nvidia-nat 1.2.0rc5__py3-none-any.whl → 1.2.0rc7__py3-none-any.whl

{aiq → nat}/builder/intermediate_step_manager.py

@@ -17,16 +17,16 @@ import dataclasses
 import logging
 import typing
 
-from aiq.data_models.intermediate_step import IntermediateStep
-from aiq.data_models.intermediate_step import IntermediateStepPayload
-from aiq.data_models.intermediate_step import IntermediateStepState
-from aiq.utils.reactive.observable import OnComplete
-from aiq.utils.reactive.observable import OnError
-from aiq.utils.reactive.observable import OnNext
-from aiq.utils.reactive.subscription import Subscription
+from nat.data_models.intermediate_step import IntermediateStep
+from nat.data_models.intermediate_step import IntermediateStepPayload
+from nat.data_models.intermediate_step import IntermediateStepState
+from nat.utils.reactive.observable import OnComplete
+from nat.utils.reactive.observable import OnError
+from nat.utils.reactive.observable import OnNext
+from nat.utils.reactive.subscription import Subscription
 
 if typing.TYPE_CHECKING:
-    from aiq.builder.context import AIQContextState
+    from nat.builder.context import ContextState
 
 logger = logging.getLogger(__name__)
 
@@ -43,17 +43,17 @@ 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: "AIQContextState"):  # noqa: F821
+    def __init__(self, context_state: "ContextState"):  # noqa: F821
         self._context_state = context_state
 
         self._outstanding_start_steps: dict[str, OpenStep] = {}
 
     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)

{aiq → nat}/builder/llm.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from aiq.data_models.llm import LLMBaseConfig
+from nat.data_models.llm import LLMBaseConfig
 
 
 class LLMProviderInfo:

{aiq → nat}/builder/retriever.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from aiq.data_models.retriever import RetrieverBaseConfig
+from nat.data_models.retriever import RetrieverBaseConfig
 
 
 class RetrieverProviderInfo:

{aiq → nat}/builder/user_interaction_manager.py

@@ -17,25 +17,25 @@ import logging
 import time
 import uuid
 
-from aiq.data_models.interactive import HumanPrompt
-from aiq.data_models.interactive import HumanResponse
-from aiq.data_models.interactive import InteractionPrompt
-from aiq.data_models.interactive import InteractionResponse
-from aiq.data_models.interactive import InteractionStatus
+from nat.data_models.interactive import HumanPrompt
+from nat.data_models.interactive import HumanResponse
+from nat.data_models.interactive import InteractionPrompt
+from nat.data_models.interactive import InteractionResponse
+from nat.data_models.interactive import InteractionStatus
 
 logger = logging.getLogger(__name__)
 
 
-class AIQUserInteractionManager:
+class UserInteractionManager:
     """
-    AIQUserInteractionManager is responsible for requesting user input
+    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 AIQUserInteractionManager:
         """
         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.
         """
@@ -72,3 +72,7 @@ class AIQUserInteractionManager:
         sys_human_interaction = InteractionResponse(id=uuid_req, status=status, timestamp=timestamp, content=resp)
 
         return sys_human_interaction
+
+
+# Compatibility aliases with previous releases
+AIQUserInteractionManager = UserInteractionManager

{aiq → nat}/builder/workflow.py

@@ -17,22 +17,22 @@ from contextlib import asynccontextmanager
 from contextvars import ContextVar
 from typing import Any
 
-from aiq.builder.context import AIQContextState
-from aiq.builder.embedder import EmbedderProviderInfo
-from aiq.builder.function import Function
-from aiq.builder.function_base import FunctionBase
-from aiq.builder.function_base import InputT
-from aiq.builder.function_base import SingleOutputT
-from aiq.builder.function_base import StreamingOutputT
-from aiq.builder.llm import LLMProviderInfo
-from aiq.builder.retriever import RetrieverProviderInfo
-from aiq.data_models.config import AIQConfig
-from aiq.experimental.test_time_compute.models.strategy_base import StrategyBase
-from aiq.memory.interfaces import MemoryEditor
-from aiq.object_store.interfaces import ObjectStore
-from aiq.observability.exporter.base_exporter import BaseExporter
-from aiq.observability.exporter_manager import ExporterManager
-from aiq.runtime.runner import AIQRunner
+from nat.builder.context import ContextState
+from nat.builder.embedder import EmbedderProviderInfo
+from nat.builder.function import Function
+from nat.builder.function_base import FunctionBase
+from nat.builder.function_base import InputT
+from nat.builder.function_base import SingleOutputT
+from nat.builder.function_base import StreamingOutputT
+from nat.builder.llm import LLMProviderInfo
+from nat.builder.retriever import RetrieverProviderInfo
+from nat.data_models.config import Config
+from nat.experimental.test_time_compute.models.strategy_base import StrategyBase
+from nat.memory.interfaces import MemoryEditor
+from nat.object_store.interfaces import ObjectStore
+from nat.observability.exporter.base_exporter import BaseExporter
+from nat.observability.exporter_manager import ExporterManager
+from nat.runtime.runner import Runner
 
 callback_handler_var: ContextVar[Any | None] = ContextVar("callback_handler_var", default=None)
 
@@ -41,7 +41,7 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
 
     def __init__(self,
                  *,
-                 config: AIQConfig,
+                 config: Config,
                  entry_fn: Function[InputT, StreamingOutputT, SingleOutputT],
                  functions: dict[str, Function] | None = None,
                  llms: dict[str, LLMProviderInfo] | None = None,
@@ -51,7 +51,7 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
                  telemetry_exporters: dict[str, BaseExporter] | None = None,
                  retrievers: dict[str | None, RetrieverProviderInfo] | None = None,
                  ttc_strategies: dict[str, StrategyBase] | None = None,
-                 context_state: AIQContextState):
+                 context_state: ContextState):
 
         super().__init__(input_schema=entry_fn.input_schema,
                          streaming_output_schema=entry_fn.streaming_output_schema,
@@ -90,10 +90,10 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
         a new top-level workflow span here.
         """
 
-        async with AIQRunner(input_message=message,
-                             entry_fn=self._entry_fn,
-                             context_state=self._context_state,
-                             exporter_manager=self._exporter_manager.get()) as runner:
+        async with Runner(input_message=message,
+                          entry_fn=self._entry_fn,
+                          context_state=self._context_state,
+                          exporter_manager=self._exporter_manager.get()) as runner:
 
             # The caller can `yield runner` so they can do `runner.result()` or `runner.result_stream()`
             yield runner
@@ -102,7 +102,7 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
 
         async with self.run(message) as runner:
 
-            from aiq.eval.runtime_event_subscriber import pull_intermediate
+            from nat.eval.runtime_event_subscriber import pull_intermediate
 
             # Start the intermediate stream
             pull_done, intermediate_steps = pull_intermediate()
@@ -116,7 +116,7 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
 
     @staticmethod
     def from_entry_fn(*,
-                      config: AIQConfig,
+                      config: Config,
                       entry_fn: Function[InputT, StreamingOutputT, SingleOutputT],
                       functions: dict[str, Function] | None = None,
                       llms: dict[str, LLMProviderInfo] | None = None,
@@ -126,7 +126,7 @@ class Workflow(FunctionBase[InputT, StreamingOutputT, SingleOutputT]):
                       telemetry_exporters: dict[str, BaseExporter] | None = None,
                       retrievers: dict[str | None, RetrieverProviderInfo] | None = None,
                       ttc_strategies: dict[str, StrategyBase] | None = None,
-                      context_state: AIQContextState) -> 'Workflow[InputT, StreamingOutputT, SingleOutputT]':
+                      context_state: ContextState) -> 'Workflow[InputT, StreamingOutputT, SingleOutputT]':
 
         input_type: type = entry_fn.input_type
         streaming_output_type = entry_fn.streaming_output_type

{aiq → nat}/builder/workflow_builder.py

@@ -21,54 +21,54 @@ from contextlib import AbstractAsyncContextManager
 from contextlib import AsyncExitStack
 from contextlib import asynccontextmanager
 
-from aiq.authentication.interfaces import AuthProviderBase
-from aiq.builder.builder import Builder
-from aiq.builder.builder import UserManagerHolder
-from aiq.builder.component_utils import ComponentInstanceData
-from aiq.builder.component_utils import build_dependency_sequence
-from aiq.builder.context import AIQContext
-from aiq.builder.context import AIQContextState
-from aiq.builder.embedder import EmbedderProviderInfo
-from aiq.builder.framework_enum import LLMFrameworkEnum
-from aiq.builder.function import Function
-from aiq.builder.function import LambdaFunction
-from aiq.builder.function_info import FunctionInfo
-from aiq.builder.llm import LLMProviderInfo
-from aiq.builder.retriever import RetrieverProviderInfo
-from aiq.builder.workflow import Workflow
-from aiq.cli.type_registry import GlobalTypeRegistry
-from aiq.cli.type_registry import TypeRegistry
-from aiq.data_models.authentication import AuthProviderBaseConfig
-from aiq.data_models.component import ComponentGroup
-from aiq.data_models.component_ref import AuthenticationRef
-from aiq.data_models.component_ref import EmbedderRef
-from aiq.data_models.component_ref import FunctionRef
-from aiq.data_models.component_ref import LLMRef
-from aiq.data_models.component_ref import MemoryRef
-from aiq.data_models.component_ref import ObjectStoreRef
-from aiq.data_models.component_ref import RetrieverRef
-from aiq.data_models.component_ref import TTCStrategyRef
-from aiq.data_models.config import AIQConfig
-from aiq.data_models.config import GeneralConfig
-from aiq.data_models.embedder import EmbedderBaseConfig
-from aiq.data_models.function import FunctionBaseConfig
-from aiq.data_models.function_dependencies import FunctionDependencies
-from aiq.data_models.llm import LLMBaseConfig
-from aiq.data_models.memory import MemoryBaseConfig
-from aiq.data_models.object_store import ObjectStoreBaseConfig
-from aiq.data_models.retriever import RetrieverBaseConfig
-from aiq.data_models.telemetry_exporter import TelemetryExporterBaseConfig
-from aiq.data_models.ttc_strategy import TTCStrategyBaseConfig
-from aiq.experimental.decorators.experimental_warning_decorator import aiq_experimental
-from aiq.experimental.test_time_compute.models.stage_enums import PipelineTypeEnum
-from aiq.experimental.test_time_compute.models.stage_enums import StageTypeEnum
-from aiq.experimental.test_time_compute.models.strategy_base import StrategyBase
-from aiq.memory.interfaces import MemoryEditor
-from aiq.object_store.interfaces import ObjectStore
-from aiq.observability.exporter.base_exporter import BaseExporter
-from aiq.profiler.decorators.framework_wrapper import chain_wrapped_build_fn
-from aiq.profiler.utils import detect_llm_frameworks_in_build_fn
-from aiq.utils.type_utils import override
+from nat.authentication.interfaces import AuthProviderBase
+from nat.builder.builder import Builder
+from nat.builder.builder import UserManagerHolder
+from nat.builder.component_utils import ComponentInstanceData
+from nat.builder.component_utils import build_dependency_sequence
+from nat.builder.context import Context
+from nat.builder.context import ContextState
+from nat.builder.embedder import EmbedderProviderInfo
+from nat.builder.framework_enum import LLMFrameworkEnum
+from nat.builder.function import Function
+from nat.builder.function import LambdaFunction
+from nat.builder.function_info import FunctionInfo
+from nat.builder.llm import LLMProviderInfo
+from nat.builder.retriever import RetrieverProviderInfo
+from nat.builder.workflow import Workflow
+from nat.cli.type_registry import GlobalTypeRegistry
+from nat.cli.type_registry import TypeRegistry
+from nat.data_models.authentication import AuthProviderBaseConfig
+from nat.data_models.component import ComponentGroup
+from nat.data_models.component_ref import AuthenticationRef
+from nat.data_models.component_ref import EmbedderRef
+from nat.data_models.component_ref import FunctionRef
+from nat.data_models.component_ref import LLMRef
+from nat.data_models.component_ref import MemoryRef
+from nat.data_models.component_ref import ObjectStoreRef
+from nat.data_models.component_ref import RetrieverRef
+from nat.data_models.component_ref import TTCStrategyRef
+from nat.data_models.config import Config
+from nat.data_models.config import GeneralConfig
+from nat.data_models.embedder import EmbedderBaseConfig
+from nat.data_models.function import FunctionBaseConfig
+from nat.data_models.function_dependencies import FunctionDependencies
+from nat.data_models.llm import LLMBaseConfig
+from nat.data_models.memory import MemoryBaseConfig
+from nat.data_models.object_store import ObjectStoreBaseConfig
+from nat.data_models.retriever import RetrieverBaseConfig
+from nat.data_models.telemetry_exporter import TelemetryExporterBaseConfig
+from nat.data_models.ttc_strategy import TTCStrategyBaseConfig
+from nat.experimental.decorators.experimental_warning_decorator import experimental
+from nat.experimental.test_time_compute.models.stage_enums import PipelineTypeEnum
+from nat.experimental.test_time_compute.models.stage_enums import StageTypeEnum
+from nat.experimental.test_time_compute.models.strategy_base import StrategyBase
+from nat.memory.interfaces import MemoryEditor
+from nat.object_store.interfaces import ObjectStore
+from nat.observability.exporter.base_exporter import BaseExporter
+from nat.profiler.decorators.framework_wrapper import chain_wrapped_build_fn
+from nat.profiler.utils import detect_llm_frameworks_in_build_fn
+from nat.utils.type_utils import override
 
 logger = logging.getLogger(__name__)
 
@@ -156,7 +156,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
         self._retrievers: dict[str, ConfiguredRetriever] = {}
         self._ttc_strategies: dict[str, ConfiguredTTCStrategy] = {}
 
-        self._context_state = AIQContextState.get()
+        self._context_state = ContextState.get()
 
         self._exit_stack: AsyncExitStack | None = None
 
@@ -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
@@ -226,36 +226,36 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
             raise ValueError("Must set a workflow before building")
 
         # Build the config from the added objects
-        config = AIQConfig(general=self.general_config,
-                           functions={
-                               k: v.config
-                               for k, v in self._functions.items()
-                           },
-                           workflow=self._workflow.config,
-                           llms={
-                               k: v.config
-                               for k, v in self._llms.items()
-                           },
-                           embedders={
-                               k: v.config
-                               for k, v in self._embedders.items()
-                           },
-                           memory={
-                               k: v.config
-                               for k, v in self._memory_clients.items()
-                           },
-                           object_stores={
-                               k: v.config
-                               for k, v in self._object_stores.items()
-                           },
-                           retrievers={
-                               k: v.config
-                               for k, v in self._retrievers.items()
-                           },
-                           ttc_strategies={
-                               k: v.config
-                               for k, v in self._ttc_strategies.items()
-                           })
+        config = Config(general=self.general_config,
+                        functions={
+                            k: v.config
+                            for k, v in self._functions.items()
+                        },
+                        workflow=self._workflow.config,
+                        llms={
+                            k: v.config
+                            for k, v in self._llms.items()
+                        },
+                        embedders={
+                            k: v.config
+                            for k, v in self._embedders.items()
+                        },
+                        memory={
+                            k: v.config
+                            for k, v in self._memory_clients.items()
+                        },
+                        object_stores={
+                            k: v.config
+                            for k, v in self._object_stores.items()
+                        },
+                        retrievers={
+                            k: v.config
+                            for k, v in self._retrievers.items()
+                        },
+                        ttc_strategies={
+                            k: v.config
+                            for k, v in self._ttc_strategies.items()
+                        })
 
         if (entry_function is None):
             entry_fn_obj = self.get_workflow()
@@ -470,7 +470,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
         # Return the tool configuration object
         return self._llms[llm_name].config
 
-    @aiq_experimental(feature_name="Authentication")
+    @experimental(feature_name="Authentication")
     @override
     async def add_auth_provider(self, name: str | AuthenticationRef,
                                 config: AuthProviderBaseConfig) -> AuthProviderBase:
@@ -699,7 +699,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
 
         return self._retrievers[retriever_name].config
 
-    @aiq_experimental(feature_name="TTC")
+    @experimental(feature_name="TTC")
     @override
     async def add_ttc_strategy(self, name: str | str, config: TTCStrategyBaseConfig):
         if (name in self._ttc_strategies):
@@ -768,7 +768,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
 
     @override
     def get_user_manager(self):
-        return UserManagerHolder(context=AIQContext(self._context_state))
+        return UserManagerHolder(context=Context(self._context_state))
 
     async def add_telemetry_exporter(self, name: str, config: TelemetryExporterBaseConfig) -> None:
         """Add an configured telemetry exporter to the builder.
@@ -860,12 +860,12 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
         """
         self._log_build_failure("<workflow>", "workflow", completed_components, remaining_components, original_error)
 
-    async def populate_builder(self, config: AIQConfig, skip_workflow: bool = False):
+    async def populate_builder(self, config: Config, skip_workflow: bool = False):
         """
         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.
 
         """
@@ -937,7 +937,7 @@ class WorkflowBuilder(Builder, AbstractAsyncContextManager):
 
     @classmethod
     @asynccontextmanager
-    async def from_config(cls, config: AIQConfig):
+    async def from_config(cls, config: Config):
 
         async with cls(general_config=config.general) as builder:
             await builder.populate_builder(config)

{aiq → nat}/cli/cli_utils/config_override.py

@@ -22,8 +22,8 @@ from typing import Any
 import click
 import yaml
 
-from aiq.utils.data_models.schema_validator import validate_yaml
-from aiq.utils.io.yaml_tools import yaml_load
+from nat.utils.data_models.schema_validator import validate_yaml
+from nat.utils.io.yaml_tools import yaml_load
 
 logger = logging.getLogger(__name__)
 

{aiq → nat}/cli/cli_utils/validation.py

@@ -18,15 +18,15 @@ from pathlib import Path
 import click
 import yaml
 
-from aiq.data_models.config import AIQConfig
+from nat.data_models.config import Config
 
 
-def validate_config(config_file: Path) -> AIQConfig:
+def validate_config(config_file: Path) -> Config:
     """Validate configuration file and return parsed config"""
     try:
-        from aiq.runtime.loader import load_config
+        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

{aiq → nat}/cli/commands/configure/channel/add.py

@@ -20,9 +20,9 @@ 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 aiq.utils.settings.global_settings import add_channel_interative
+    from nat.utils.settings.global_settings import add_channel_interative
 
     add_channel_interative(channel_type=channel_type)

{aiq → nat}/cli/commands/configure/channel/channel.py

@@ -17,16 +17,14 @@ import logging
 
 import click
 
-from aiq.cli.commands.configure.channel.add import add
-from aiq.cli.commands.configure.channel.remove import remove
-from aiq.cli.commands.configure.channel.update import update
+from nat.cli.commands.configure.channel.add import add
+from nat.cli.commands.configure.channel.remove import remove
+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
 

{aiq → nat}/cli/commands/configure/channel/remove.py

@@ -22,9 +22,9 @@ 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 aiq.utils.settings.global_settings import remove_channel_interactive
+    from nat.utils.settings.global_settings import remove_channel_interactive
 
     remove_channel_interactive(channel_name=channel)

{aiq → nat}/cli/commands/configure/channel/update.py

@@ -22,9 +22,9 @@ 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 aiq.utils.settings.global_settings import update_channel_interactive
+    from nat.utils.settings.global_settings import update_channel_interactive
 
     update_channel_interactive(channel_name=channel)

{aiq → nat}/cli/commands/configure/configure.py

@@ -17,15 +17,15 @@ import logging
 
 import click
 
-from aiq.cli.commands.configure.channel.channel import channel
+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
 

{aiq → nat}/cli/commands/evaluate.py

@@ -19,8 +19,8 @@ from pathlib import Path
 
 import click
 
-from aiq.eval.evaluate import EvaluationRun
-from aiq.eval.evaluate import EvaluationRunConfig
+from nat.eval.evaluate import EvaluationRun
+from nat.eval.evaluate import EvaluationRunConfig
 
 logger = logging.getLogger(__name__)
 
@@ -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,

{aiq → nat}/cli/commands/info/info.py

@@ -17,19 +17,17 @@ import logging
 
 import click
 
-from aiq.cli.commands.info.list_channels import list_channels
-from aiq.cli.commands.info.list_components import list_components
-from aiq.cli.commands.info.list_mcp import list_mcp
+from nat.cli.commands.info.list_channels import list_channels
+from nat.cli.commands.info.list_components import list_components
+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
 

{aiq → nat}/cli/commands/info/list_channels.py

@@ -23,7 +23,7 @@ logger = logging.getLogger(__name__)
 @click.group(name=__name__, invoke_without_command=True, help="List the configured remote registry channels.")
 @click.option("-t", "--type", "channel_type", type=str, required=False, help=("Filter the results by channel type."))
 def list_channels(channel_type: str):
-    from aiq.settings.global_settings import GlobalSettings
+    from nat.settings.global_settings import GlobalSettings
 
     settings = GlobalSettings().get()
     try: