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

nat/profiler/profile_runner.py

@@ -49,7 +49,7 @@ class InferenceOptimizationHolder(BaseModel):
 
 class ProfilerRunner:
     """
-    A utility to run a series of prompts through an AIQ Toolkit workflow for profiling:
+    A utility to run a series of prompts through a NAT workflow for profiling:
 
     - can load prompts from a file
     - or generate them via an LLM

nat/registry_handlers/local/local_handler.py

@@ -42,10 +42,10 @@ class LocalRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def publish(self, artifact: Artifact) -> AsyncGenerator[PublishResponse]:
-        """Publishes an AIQ Toolkit artifact to a local registry.
+        """Publishes a NAT artifact to a local registry.
 
         Args:
-            artifact (AIQArtifact): An artifact that contain AIQ Toolkit plugin wheel and it's corrosponding discovery
+            artifact (Artifact): An artifact that contain NAT plugin wheel and it's corrosponding discovery
             metadata.
 
         Yields:
@@ -62,10 +62,10 @@ class LocalRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def pull(self, packages: PullRequestPackages) -> AsyncGenerator[PullResponse]:
-        """Download and install AIQ Toolkit artifacts from a local registry.
+        """Download and install NAT artifacts from a local registry.
 
         Args:
-            packages (PullRequestPackages): Parameters used to pull the AIQ Toolkit artifact.
+            packages (PullRequestPackages): Parameters used to pull the NAT artifact.
 
         Yields:
             Iterator[AsyncGenerator[PullResponse]]: A response message that includes a the pulled packages and a
@@ -83,7 +83,7 @@ class LocalRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def search(self, query: SearchQuery) -> AsyncGenerator[SearchResponse]:
-        """Searches the local aiq registry for relevant AIQ Toolkit components.
+        """Searches the local nat registry for relevant NAT components.
 
         Args:
             query (SearchQuery): Parameters of the search to be performed.

nat/registry_handlers/local/register_local.py

@@ -22,7 +22,7 @@ logger = logging.getLogger(__name__)
 
 
 class LocalRegistryHandlerConfig(RegistryHandlerBaseConfig, name="local"):
-    """Interact with the local AIQ Toolkit environment to search and uninstall AIQ Toolkit components."""
+    """Interact with the local NAT environment to search and uninstall NAT components."""
 
     pass
 

nat/registry_handlers/package_utils.py

@@ -89,13 +89,13 @@ def resolve_extras_to_packages(package_name: str, extras: list[str]) -> set[str]
     """Resolve package extras to their actual package dependencies.
 
     Args:
-        package_name (str): The base package name (e.g., 'aiqtoolkit')
+        package_name (str): The base package name (e.g., 'nvidia-nat')
         extras (list[str]): List of extra names (e.g., ['langchain', 'telemetry'])
 
     Returns:
         set[str]: Set of additional package names that the extras resolve to
-        (e.g., {'aiqtoolkit-langchain', 'aiqtoolkit-opentelemetry', 'aiqtoolkit-phoenix',
-        'aiqtoolkit-weave', 'aiqtoolkit-ragaai'})
+        (e.g., {'nvidia-nat-langchain', 'nvidia-nat-opentelemetry', 'nvidia-nat-phoenix',
+        'nvidia-nat-weave', 'nvidia-nat-ragaai'})
     """
     resolved_packages = set()
 
@@ -149,8 +149,8 @@ def extract_dependencies_with_extras_resolved(pyproject_path: str) -> set[str]:
         set[str]: Set of all dependency names including those resolved from extras
 
     Example:
-        For a dependency like "aiqtoolkit[langchain,telemetry]~=1.2", this will return:
-        {'aiqtoolkit', 'aiqtoolkit-langchain', 'aiqtoolkit-opentelemetry', 'aiqtoolkit-phoenix', ...}
+        For a dependency like "nat[langchain,telemetry]~=1.2", this will return:
+        {'nvidia-nat', 'nvidia-nat-langchain', 'nvidia-nat-opentelemetry', 'nvidia-nat-phoenix', ...}
 
     Raises:
         FileNotFoundError: If the pyproject.toml file doesn't exist
@@ -287,7 +287,7 @@ def get_transitive_dependencies(distribution_names: list[str]) -> dict[str, set[
     This function recursively resolves all dependencies for the given distribution names,
     returning a mapping of each package to its complete set of transitive dependencies.
     This is useful when publishing plugins to remote registries that contain with nested dependencies,
-    ensuring that all dependencies are included in the AIQArtifact's metadata.
+    ensuring that all dependencies are included in the Artifact's metadata.
 
     Args:
         distribution_names (list[str]): List of Python distribution names (package names) to analyze.
@@ -408,7 +408,7 @@ def get_all_transitive_dependencies(distribution_names: list[str]) -> set[str]:
 
     Returns a flattened set of all unique dependencies across all the provided distribution names.
     This is useful when publishing plugins to remote registries that contain with nested dependencies,
-    ensuring that all dependencies are included in the AIQArtifact's metadata.
+    ensuring that all dependencies are included in the Artifact's metadata.
 
     Args:
         distribution_names: List of Python distribution names (package names) to analyze
@@ -449,7 +449,7 @@ def build_wheel(package_root: str) -> WheelData:
 
     toml_project: dict = data.get("project", {})
     toml_project_name = toml_project.get("name", None)
-    toml_packages = set(i for i in data.get("project", {}).get("entry-points", {}).get("aiq.plugins", {}))
+    toml_packages = set(i for i in data.get("project", {}).get("entry-points", {}).get("nat.plugins", {}))
 
     # Extract dependencies using the robust requirement parser with extras resolution
     try:
@@ -488,13 +488,13 @@ def build_wheel(package_root: str) -> WheelData:
 
     os.chdir(working_dir)
 
-    whl_version = Wheel(whl_path).version
+    whl_version = Wheel(whl_path).version or "unknown"
 
     return WheelData(package_root=package_root,
                      package_name=toml_project_name,
                      toml_project=toml_project,
                      toml_dependencies=toml_dependencies,
-                     toml_aiq_packages=toml_packages,
+                     toml_nat_packages=toml_packages,
                      union_dependencies=union_dependencies,
                      whl_path=whl_path,
                      whl_base64=whl_base64,
@@ -502,13 +502,13 @@ def build_wheel(package_root: str) -> WheelData:
 
 
 def build_package_metadata(wheel_data: WheelData | None) -> dict[ComponentEnum, list[dict | DiscoveryMetadata]]:
-    """Loads discovery metadata for all registered AIQ Toolkit components included in this Python package.
+    """Loads discovery metadata for all registered NAT components included in this Python package.
 
     Args:
         wheel_data (WheelData): Data model containing a built python wheel and its corresponding metadata.
 
     Returns:
-        dict[AIQComponentEnum, list[typing.Union[dict, DiscoveryMetadata]]]: List containing each components discovery
+        dict[ComponentEnum, list[typing.Union[dict, DiscoveryMetadata]]]: List containing each components discovery
         metadata.
     """
 
@@ -520,11 +520,11 @@ def build_package_metadata(wheel_data: WheelData | None) -> dict[ComponentEnum,
 
     registry = GlobalTypeRegistry.get()
 
-    aiq_plugins = discover_entrypoints(PluginTypes.ALL)
+    nat_plugins = discover_entrypoints(PluginTypes.ALL)
 
     if (wheel_data is not None):
         registry.register_package(package_name=wheel_data.package_name, package_version=wheel_data.whl_version)
-        for entry_point in aiq_plugins:
+        for entry_point in nat_plugins:
             package_name = entry_point.dist.name
             if (package_name == wheel_data.package_name):
                 continue
@@ -532,7 +532,7 @@ def build_package_metadata(wheel_data: WheelData | None) -> dict[ComponentEnum,
                 registry.register_package(package_name=package_name)
 
     else:
-        for entry_point in aiq_plugins:
+        for entry_point in nat_plugins:
             registry.register_package(package_name=entry_point.dist.name)
 
     discovery_metadata = {}
@@ -549,13 +549,13 @@ def build_package_metadata(wheel_data: WheelData | None) -> dict[ComponentEnum,
 
 
 def build_artifact(package_root: str) -> Artifact:
-    """Builds a complete AIQ Toolkit Artifact that can be published for discovery and reuse.
+    """Builds a complete NeMo Agent toolkit Artifact that can be published for discovery and reuse.
 
     Args:
         package_root (str): Path to root of python package
 
     Returns:
-        AIQArtifact: An publishabla AIQArtifact containing package wheel and discovery metadata.
+        Artifact: A publishable Artifact containing package wheel and discovery metadata.
     """
 
     from nat.registry_handlers.schemas.publish import BuiltArtifact

nat/registry_handlers/pypi/pypi_handler.py

@@ -60,10 +60,10 @@ class PypiRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def publish(self, artifact: Artifact) -> AsyncGenerator[PublishResponse]:
-        """Publishes an AIQ Toolkit artifact to a PyPI remote registry.
+        """Publishes a NAT artifact to a PyPI remote registry.
 
         Args:
-            artifact (AIQArtifact): An artifact that contain AIQ Toolkit plugin wheel and it's corrosponding discovery
+            artifact (Artifact): An artifact that contain NAT plugin wheel and it's corrosponding discovery
             metadata.
 
         Yields:
@@ -101,10 +101,10 @@ class PypiRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def pull(self, packages: PullRequestPackages) -> AsyncGenerator[PullResponse]:
-        """Download and install AIQ Toolkit artifacts from a remote PyPI remote registry.
+        """Download and install NAT artifacts from a remote PyPI remote registry.
 
         Args:
-            packages (PullRequestPackages): Parameters used to pull the AIQ Toolkit artifact.
+            packages (PullRequestPackages): Parameters used to pull the NAT artifact.
 
         Yields:
             Iterator[AsyncGenerator[PullResponse, None]]: A response message that includes a the pulled packages and a
@@ -160,7 +160,7 @@ class PypiRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def search(self, query: SearchQuery) -> AsyncGenerator[SearchResponse]:
-        """Searches a remote PyPI registry for relevant AIQ Toolkit components.
+        """Searches a remote PyPI registry for relevant NAT components.
 
         Args:
             query (SearchQuery): Parameters of the search to be performed.

nat/registry_handlers/pypi/register_pypi.py

@@ -25,9 +25,9 @@ class PypiRegistryHandlerConfig(RegistryHandlerBaseConfig, name="pypi"):
     endpoint: str = Field(description="A string representing the remote endpoint.")
     token: str | None = Field(default=None,
                               description="The authentication token to use when interacting with the registry.")
-    publish_route: str = Field(description="The route to the AIQ Toolkit publish service.")
-    pull_route: str = Field(description="The route to the AIQ Toolkit pull service.")
-    search_route: str = Field(default="simple", description="The route to the AIQ Toolkit search service.")
+    publish_route: str = Field(description="The route to the NAT publish service.")
+    pull_route: str = Field(description="The route to the NAT pull service.")
+    search_route: str = Field(default="simple", description="The route to the NAT search service.")
 
 
 @register_registry_handler(config_type=PypiRegistryHandlerConfig)

nat/registry_handlers/registry_handler_base.py

@@ -33,11 +33,11 @@ from nat.registry_handlers.schemas.search import VisualizeFields
 
 
 class AbstractRegistryHandler(ABC):
-    """Base class outlining the interfaces for remote AIQ Toolkit registry interactions."""
+    """Base class outlining the interfaces for remote NAT registry interactions."""
 
     def __init__(self):
         self._discovery_metadata: dict[ComponentEnum, list[dict | DiscoveryMetadata]] = {}
-        self._aiq_artifact: Artifact | None = None
+        self._nat_artifact: Artifact | None = None
         self._whl_bytes: bytes
         self._whl_path: str
         self._whl_base64: str
@@ -45,10 +45,10 @@ class AbstractRegistryHandler(ABC):
     @abstractmethod
     @asynccontextmanager
     async def publish(self, artifact: Artifact) -> AsyncGenerator[PublishResponse]:
-        """Publishes an AIQ Toolkit artifact to a remote registry.
+        """Publishes a NAT artifact to a remote registry.
 
         Args:
-            artifact (AIQArtifact): An artifact that contain AIQ Toolkit plugin wheel and it's corrosponding discovery
+            artifact (Artifact): An artifact that contain NAT plugin wheel and it's corrosponding discovery
             metadata.
 
         Yields:
@@ -61,10 +61,10 @@ class AbstractRegistryHandler(ABC):
     @abstractmethod
     @asynccontextmanager
     async def pull(self, packages: PullRequestPackages) -> AsyncGenerator[PullResponse]:
-        """Download and install AIQ Toolkit artifacts from a remote registry.
+        """Download and install NAT artifacts from a remote registry.
 
         Args:
-            packages (PullRequestPackages): Parameters used to pull the AIQ Toolkit artifact.
+            packages (PullRequestPackages): Parameters used to pull the NAT artifact.
 
         Yields:
             Iterator[AsyncGenerator[PullResponse]]: A response message that includes a the pulled packages and a
@@ -76,7 +76,7 @@ class AbstractRegistryHandler(ABC):
     @abstractmethod
     @asynccontextmanager
     async def search(self, query: SearchQuery) -> AsyncGenerator[SearchResponse]:
-        """Searches the local aiq registry for relevant AIQ Toolkit components.
+        """Searches the local nat registry for relevant NAT components.
 
         Args:
             query (SearchQuery): Parameters of the search to be performed.
@@ -118,7 +118,7 @@ class AbstractRegistryHandler(ABC):
         from rich.table import Table
         from rich.text import Text
 
-        table = Table(title="AIQ Toolkit Search Results", padding=(0, 1), show_lines=True)
+        table = Table(title="NAT Search Results", padding=(0, 1), show_lines=True)
         for column in VisualizeFields:
             table.add_column(column.value)
 

nat/registry_handlers/rest/register_rest.py

@@ -27,10 +27,10 @@ class RestRegistryHandlerConfig(RegistryHandlerBaseConfig, name="rest"):
     endpoint: str = Field(description="A string representing the remote endpoint.")
     token: str | None = Field(default=None,
                               description="The authentication token to use when interacting with the registry.")
-    publish_route: str = Field(default="", description="The route to the AIQ Toolkit publish service.")
-    pull_route: str = Field(default="", description="The route to the AIQ Toolkit pull service.")
-    search_route: str = Field(default="", description="The route to the AIQ Toolkit search service")
-    remove_route: str = Field(default="", description="The route to the AIQ Toolkit remove service")
+    publish_route: str = Field(default="", description="The route to the NAT publish service.")
+    pull_route: str = Field(default="", description="The route to the NAT pull service.")
+    search_route: str = Field(default="", description="The route to the NAT search service")
+    remove_route: str = Field(default="", description="The route to the NAT remove service")
 
 
 @register_registry_handler(config_type=RestRegistryHandlerConfig)

nat/registry_handlers/rest/rest_handler.py

@@ -62,10 +62,10 @@ class RestRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def publish(self, artifact: Artifact) -> AsyncGenerator[PublishResponse]:
-        """Publishes an AIQ Toolkit artifact to a remote REST registry.
+        """Publishes a NAT artifact to a remote REST registry.
 
         Args:
-            artifact (AIQArtifact): An artifact that contain AIQ Toolkit plugin wheel and it's corrosponding discovery
+            artifact (Artifact): An artifact that contain NAT plugin wheel and it's corrosponding discovery
             metadata.
 
         Yields:
@@ -98,17 +98,17 @@ class RestRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def pull(self, packages: PullRequestPackages) -> AsyncGenerator[PullResponse]:
-        """Download and install AIQ Toolkit artifacts from a remote REST registry.
+        """Download and install NAT artifacts from a remote REST registry.
 
         Args:
-            packages (PullRequestPackages): Parameters used to pull the AIQ Toolkit artifact.
+            packages (PullRequestPackages): Parameters used to pull the NAT artifact.
 
         Yields:
             Iterator[AsyncGenerator[PullResponse]]: A response message that includes a the pulled packages and a
                 completion status message.
         """
 
-        tmp_dir = ".tmp-aiq-pull"
+        tmp_dir = "./.tmp/nat-pull"
 
         try:
             async with httpx.AsyncClient(headers=self._headers, timeout=self._timeout) as client:
@@ -165,7 +165,7 @@ class RestRegistryHandler(AbstractRegistryHandler):
 
     @asynccontextmanager
     async def search(self, query: SearchQuery) -> AsyncGenerator[SearchResponse]:
-        """Searches a remote REST registry for relevant AIQ Toolkit components.
+        """Searches a remote REST registry for relevant NAT components.
 
         Args:
             query (SearchQuery): Parameters of the search to be performed.

nat/registry_handlers/schemas/package.py

@@ -28,8 +28,8 @@ class WheelData(BaseModel):
         package_name (str): The name of the python package.
         toml_project (dict): A dictionary containing data about the python project.
         toml_dependencies (set): The list of dependencies provided in the pyproject.toml file.
-        toml_aiq_packages (set): The AIQ Toolkit plugins listed in the pyproject.toml.
-        union_dependencies (set): The union of toml_dependencies and toml_aiq_packages.
+        toml_nat_packages (set): The NAT plugins listed in the pyproject.toml.
+        union_dependencies (set): The union of toml_dependencies and toml_nat_packages.
         whl_path (str): The path to the package wheel file.
         whl_base64 (str): Base64 encoded string of the wheel file.
         whl_version (str): The version representing the wheel file.
@@ -39,7 +39,7 @@ class WheelData(BaseModel):
     package_name: str
     toml_project: dict
     toml_dependencies: set
-    toml_aiq_packages: set
+    toml_nat_packages: set
     union_dependencies: set
     whl_path: str
     whl_base64: str

nat/registry_handlers/schemas/publish.py

@@ -25,10 +25,10 @@ logger = logging.getLogger(__name__)
 
 
 class BuiltArtifact(BaseModel):
-    """An NAT artifact including base64 encoded string of wheel package and corrosponding discovery metadata.
+    """A NAT artifact including base64 encoded string of wheel package and corrosponding discovery metadata.
 
     Args:
-        whl (str): A base64 encoded string of an NAT package wheel (.whl).
+        whl (str): A base64 encoded string of a NAT package wheel (.whl).
 
         metadata (dict[ComponentEnum, list[DiscoveryMetadata]]): Provides rich discover metadata for developers to
         quickly find useful components.
@@ -39,10 +39,10 @@ class BuiltArtifact(BaseModel):
 
 
 class Artifact(BaseModel):
-    """An AIQ Toolkit artifact including base64 encoded string of wheel package and corrosponding discovery metadata.
+    """A NAT artifact including base64 encoded string of wheel package and corrosponding discovery metadata.
 
     Args:
-        artifact (BuiltArtifact): An NAT artifact including base64 encoded string of wheel package and
+        artifact (BuiltArtifact): A NAT artifact including base64 encoded string of wheel package and
         corrosponding discovery metadata.
 
         whl_path (str): A local path to the built wheel package.

nat/registry_handlers/schemas/pull.py

@@ -27,7 +27,7 @@ class PulledPackage(BaseModel):
     """Represents a data model of a pulled package containing the package wheel and its name.
 
     Args:
-        whl (str): Base64 encoded string of the AIQ Toolkit python package wheel (.whl).
+        whl (str): Base64 encoded string of the NAT python package wheel (.whl).
         whl_name (str): A string representing the wheel filename.
     """
 
@@ -37,7 +37,7 @@ class PulledPackage(BaseModel):
 
 class PullResponse(BaseModel):
     """
-    Represents a data model of the expected respones from a AIQ Toolkit pull request, including detailed status
+    Represents a data model of the expected respones from a NAT pull request, including detailed status
     information.
 
     Args:
@@ -72,11 +72,11 @@ class PullRequestPackage(BaseModel):
 
 
 class PullRequestPackages(BaseModel):
-    """Represents a list of all packages th download and install in the local AIQ Toolkit environment.
+    """Represents a list of all packages th download and install in the local NAT environment.
 
     Args:
         packages (list[typing.Union[PackageNameVersion, PullPackageWhl]]): A list of packages that can be
-            downloaded and installed in the local AIQ Toolkit environment.
+            downloaded and installed in the local NAT environment.
     """
 
     packages: list[PackageNameVersion | PullPackageWhl]

nat/registry_handlers/schemas/search.py

@@ -42,12 +42,12 @@ class VisualizeFields(str, Enum):
 
 
 class SearchQuery(BaseModel):
-    """Represents the search criteria that will be used to discover useful AIQ Toolkit components.
+    """Represents the search criteria that will be used to discover useful NAT components.
 
     Args:
-        query (str): A query string used to find useful AIQ Toolkit components.
+        query (str): A query string used to find useful NAT components.
         fields (list[SearchFields]): The list of fields used when applying the query string.
-        component_types (list[AIQComponentEnum]): AIQ Toolkit components types to filter search results.
+        component_types (list[ComponentEnum]): NAT components types to filter search results.
         top_k (int): Specifies the number of search results to provide.
     """
 
@@ -61,10 +61,10 @@ class SearchResponseItem(BaseModel):
     """Represents an individual item in the search response, including elements of it's discovery metadata.
 
     Args:
-        package (str): The name of the AIQ Toolkit package that includes the component.
-        version (str): The version of the AIQ Toolkit package that includes the component.
-        component_type (AIQComponentEnum): Type of AIQ Toolkit component this item represents.
-        description (str): A description of this AIQ Toolkit component.
+        package (str): The name of the NAT package that includes the component.
+        version (str): The version of the NAT package that includes the component.
+        component_type (ComponentEnum): Type of NAT component this item represents.
+        description (str): A description of this NAT component.
         developer_notes (str): Additional details that would help a developer use this component.
     """
 

nat/runtime/loader.py

@@ -58,7 +58,7 @@ class PluginTypes(IntFlag):
     # Convenience flag for groups of plugin types
     CONFIG_OBJECT = COMPONENT | FRONT_END | EVALUATOR | AUTHENTICATION
     """
-    Any plugin that can be specified in the AIQ Toolkit configuration file.
+    Any plugin that can be specified in the NAT configuration file.
     """
     ALL = COMPONENT | FRONT_END | EVALUATOR | REGISTRY_HANDLER | AUTHENTICATION
     """
@@ -68,8 +68,8 @@ class PluginTypes(IntFlag):
 
 def load_config(config_file: StrPath) -> Config:
     """
-    This is the primary entry point for loading an AIQ Toolkit configuration file. It ensures that all plugins are
-    loaded and then validates the configuration file against the AIQConfig schema.
+    This is the primary entry point for loading a NAT configuration file. It ensures that all plugins are
+    loaded and then validates the configuration file against the Config schema.
 
     Parameters
     ----------
@@ -78,8 +78,8 @@ def load_config(config_file: StrPath) -> Config:
 
     Returns
     -------
-    AIQConfig
-        The validated AIQConfig object
+    Config
+        The validated Config object
     """
 
     # Ensure all of the plugins are loaded
@@ -87,17 +87,17 @@ def load_config(config_file: StrPath) -> Config:
 
     config_yaml = yaml_load(config_file)
 
-    # Validate configuration adheres to AIQ Toolkit schemas
-    validated_aiq_config = validate_schema(config_yaml, Config)
+    # Validate configuration adheres to NAT schemas
+    validated_nat_config = validate_schema(config_yaml, Config)
 
-    return validated_aiq_config
+    return validated_nat_config
 
 
 @asynccontextmanager
 async def load_workflow(config_file: StrPath, max_concurrency: int = -1):
     """
-    Load the AIQ Toolkit configuration file and create an AIQRunner object. This is the primary entry point for running
-    AIQ Toolkit workflows.
+    Load the NAT configuration file and create an Runner object. This is the primary entry point for running
+    NAT workflows.
 
     Parameters
     ----------
@@ -128,16 +128,17 @@ def discover_entrypoints(plugin_type: PluginTypes):
     plugin_groups = []
 
     # Add the specified plugin type to the list of groups to load
+    # The aiq entrypoints are intentionally left in the list to maintain backwards compatibility.
     if (plugin_type & PluginTypes.COMPONENT):
-        plugin_groups.extend(["nat.plugins", "nat.components"])
+        plugin_groups.extend(["aiq.plugins", "aiq.components", "nat.plugins", "nat.components"])
     if (plugin_type & PluginTypes.FRONT_END):
-        plugin_groups.append("nat.front_ends")
+        plugin_groups.extend(["aiq.front_ends", "nat.front_ends"])
     if (plugin_type & PluginTypes.REGISTRY_HANDLER):
-        plugin_groups.append("nat.registry_handlers")
+        plugin_groups.extend(["aiq.registry_handlers", "nat.registry_handlers"])
     if (plugin_type & PluginTypes.EVALUATOR):
-        plugin_groups.append("nat.evaluators")
+        plugin_groups.extend(["aiq.evaluators", "nat.evaluators"])
     if (plugin_type & PluginTypes.AUTHENTICATION):
-        plugin_groups.append("nat.authentication_providers")
+        plugin_groups.extend(["aiq.authentication_providers", "nat.authentication_providers"])
 
     # Get the entry points for the specified groups
     nat_plugins = reduce(lambda x, y: list(x) + list(y), [entry_points.select(group=y) for y in plugin_groups])
@@ -148,12 +149,12 @@ def discover_entrypoints(plugin_type: PluginTypes):
 @lru_cache
 def get_all_entrypoints_distro_mapping() -> dict[str, str]:
     """
-    Get the mapping of all AIQ entry points to their distribution names.
+    Get the mapping of all NAT entry points to their distribution names.
     """
 
     mapping = {}
-    aiq_entrypoints = discover_entrypoints(PluginTypes.ALL)
-    for ep in aiq_entrypoints:
+    nat_entrypoints = discover_entrypoints(PluginTypes.ALL)
+    for ep in nat_entrypoints:
         ep_module_parts = ep.module.split(".")
         current_parts = []
         for part in ep_module_parts:
@@ -171,14 +172,14 @@ def discover_and_register_plugins(plugin_type: PluginTypes):
     """
 
     # Get the entry points for the specified groups
-    aiq_plugins = discover_entrypoints(plugin_type)
+    nat_plugins = discover_entrypoints(plugin_type)
 
     count = 0
 
     # Pause registration hooks for performance. This is useful when loading a large number of plugins.
     with GlobalTypeRegistry.get().pause_registration_changed_hooks():
 
-        for entry_point in aiq_plugins:
+        for entry_point in nat_plugins:
             try:
                 logger.debug("Loading module '%s' from entry point '%s'...", entry_point.module, entry_point.name)
 

nat/runtime/runner.py

@@ -50,7 +50,7 @@ class Runner:
                  context_state: ContextState,
                  exporter_manager: ExporterManager):
         """
-        The AIQRunner class is used to run a workflow. It handles converting input and output data types and running the
+        The Runner class is used to run a workflow. It handles converting input and output data types and running the
         workflow with the specified concurrency.
 
         Parameters
@@ -59,7 +59,7 @@ class Runner:
             The input message to the workflow
         entry_fn : Function
             The entry function to the workflow
-        context_state : AIQContextState
+        context_state : ContextState
             The context state to use
         exporter_manager : ExporterManager
             The exporter manager to use

nat/runtime/session.py

@@ -44,7 +44,7 @@ class SessionManager:
 
     def __init__(self, workflow: Workflow, max_concurrency: int = 8):
         """
-        The AIQSessionManager class is used to run and manage a user workflow session. It runs and manages the context,
+        The SessionManager class is used to run and manage a user workflow session. It runs and manages the context,
         and configuration of a workflow with the specified concurrency.
 
         Parameters

nat/settings/global_settings.py

@@ -152,7 +152,7 @@ class Settings(HashableBaseModel):
     @staticmethod
     def from_file():
 
-        configuration_directory = os.getenv("AIQ_CONFIG_DIR", user_config_dir(appname="aiq"))
+        configuration_directory = os.getenv("NAT_CONFIG_DIR", user_config_dir(appname="nat"))
 
         if not os.path.exists(configuration_directory):
             os.makedirs(configuration_directory, exist_ok=True)
@@ -181,7 +181,7 @@ class Settings(HashableBaseModel):
         if (remove):
             if os.path.exists(self.configuration_directory):
                 os.rmdir(self.configuration_directory)
-        self._configuration_directory = os.getenv("AIQ_CONFIG_DIR", user_config_dir(appname="aiq"))
+        self._configuration_directory = os.getenv("NAT_CONFIG_DIR", user_config_dir(appname="nat"))
 
     def _save_settings(self) -> None:
 

nat/tool/chat_completion.py

@@ -13,7 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 """
-Simple Completion Function for AIQ Toolkit
+Simple Completion Function for NAT
 
 This module provides a simple completion function that can handle
 natural language queries and perform basic text completion tasks.

nat/tool/code_execution/README.md

@@ -35,7 +35,7 @@ The Code Execution Sandbox provides:
 Navigate to the local sandbox directory and start the server:
 
 ```bash
-cd src/aiq/tool/code_execution/local_sandbox
+cd src/nat/tool/code_execution/local_sandbox
 ./start_local_sandbox.sh
 ```
 
@@ -62,7 +62,7 @@ export OUTPUT_DATA_PATH=/path/to/output
 Run the comprehensive test suite to verify everything is working:
 
 ```bash
-cd src/aiq/tool/code_execution
+cd src/nat/tool/code_execution
 pytest test_code_execution_sandbox.py
 ```