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

{aiq → nat}/cli/commands/workflow/templates/workflow.py.j2

@@ -2,10 +2,10 @@ import logging
 
 from pydantic import Field
 
-from aiq.builder.builder import Builder
-from aiq.builder.function_info import FunctionInfo
-from aiq.cli.register_workflow import register_function
-from aiq.data_models.function import FunctionBaseConfig
+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
 
 logger = logging.getLogger(__name__)
 

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

@@ -17,9 +17,9 @@ import logging
 
 import click
 
-from aiq.cli.commands.workflow.workflow_commands import create_command
-from aiq.cli.commands.workflow.workflow_commands import delete_command
-from aiq.cli.commands.workflow.workflow_commands import reinstall_command
+from nat.cli.commands.workflow.workflow_commands import create_command
+from nat.cli.commands.workflow.workflow_commands import delete_command
+from nat.cli.commands.workflow.workflow_commands import reinstall_command
 
 logger = logging.getLogger(__name__)
 

{aiq → nat}/cli/commands/workflow/workflow_commands.py

@@ -27,12 +27,12 @@ from jinja2 import FileSystemLoader
 logger = logging.getLogger(__name__)
 
 
-class AIQPackageError(Exception):
+class PackageError(Exception):
     pass
 
 
 def get_repo_root():
-    return find_package_root("aiqtoolkit")
+    return find_package_root("nvidia-nat")
 
 
 def _get_module_name(workflow_name: str):
@@ -93,12 +93,12 @@ def find_package_root(package_name: str) -> Path | None:
         return None
 
     except PackageNotFoundError as e:
-        raise AIQPackageError(f"Package {package_name} is not installed") from e
+        raise PackageError(f"Package {package_name} is not installed") from e
 
 
 def get_workflow_path_from_name(workflow_name: str):
     """
-    Look up the location of an installed AIQ Toolkit workflow and retrieve the root directory of the installed workflow.
+    Look up the location of an installed NAT workflow and retrieve the root directory of the installed workflow.
 
     Args:
         workflow_name: The name of the workflow.
@@ -112,7 +112,7 @@ def get_workflow_path_from_name(workflow_name: str):
         package_root = find_package_root(module_name)
         return package_root
 
-    except AIQPackageError as e:
+    except PackageError as e:
         logger.info("Unable to get the directory path for %s: %s", workflow_name, e)
         return None
 
@@ -127,13 +127,13 @@ def get_workflow_path_from_name(workflow_name: str):
     "within. Defaults to the present working directory.")
 @click.option(
     "--description",
-    default="AIQ Toolkit function template. Please update the description.",
+    default="NAT function template. Please update the description.",
     help="""A description of the component being created. Will be used to populate the docstring and will describe the
-         component when inspecting installed components using 'aiq info component'""")
+         component when inspecting installed components using 'nat info component'""")
 # pylint: disable=missing-param-doc
 def create_command(workflow_name: str, install: bool, workflow_dir: str, description: str):
     """
-    Create a new AIQ Toolkit workflow using templates.
+    Create a new NAT workflow using templates.
 
     Args:
         workflow_name (str): The name of the new workflow.
@@ -145,7 +145,7 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
         # Get the repository root
         try:
             repo_root = get_repo_root()
-        except AIQPackageError:
+        except PackageError:
             repo_root = None
 
         # Get the absolute path for the output directory
@@ -234,7 +234,7 @@ def create_command(workflow_name: str, install: bool, workflow_dir: str, descrip
 @click.argument('workflow_name')
 def reinstall_command(workflow_name):
     """
-    Reinstall an AIQ Toolkit workflow to update dependencies and code changes.
+    Reinstall a NAT workflow to update dependencies and code changes.
 
     Args:
         workflow_name (str): The name of the workflow to reinstall.
@@ -270,7 +270,7 @@ def reinstall_command(workflow_name):
 @click.argument('workflow_name')
 def delete_command(workflow_name: str):
     """
-    Delete an AIQ Toolkit workflow and uninstall its package.
+    Delete a NAT workflow and uninstall its package.
 
     Args:
         workflow_name (str): The name of the workflow to delete.
@@ -311,3 +311,7 @@ def delete_command(workflow_name: str):
     except Exception as e:
         logger.exception("An error occurred while deleting the workflow: %s", e, exc_info=True)
         click.echo(f"An error occurred while deleting the workflow: {e}")
+
+
+# Compatibility aliases with previous releases
+AIQPackageError = PackageError

{aiq → nat}/cli/entrypoint.py

@@ -65,12 +65,12 @@ def get_version():
     from importlib.metadata import version
     try:
         # Use the distro name to get the version
-        return version("aiqtoolkit")
+        return version("nvidia-nat")
     except PackageNotFoundError:
         return "unknown"
 
 
-@click.group(name="aiq", chain=False, invoke_without_command=True, no_args_is_help=True)
+@click.group(name="nat", chain=False, invoke_without_command=True, no_args_is_help=True)
 @click.version_option(version=get_version())
 @click.option('--log-level',
               type=click.Choice(LOG_LEVELS.keys(), case_sensitive=False),
@@ -78,20 +78,20 @@ def get_version():
               help='Set the logging level')
 @click.pass_context
 def cli(ctx: click.Context, log_level: str):
-    """Main entrypoint for the AIQ Toolkit CLI"""
+    """Main entrypoint for the NAT CLI"""
 
     ctx_dict = ctx.ensure_object(dict)
 
     # Setup logging
     numeric_level = setup_logging(log_level)
 
-    aiq_logger = logging.getLogger("aiq")
-    aiq_logger.setLevel(numeric_level)
+    nat_logger = logging.getLogger("nat")
+    nat_logger.setLevel(numeric_level)
 
     logger = logging.getLogger(__package__)
 
     # Set the parent logger for all of the llm examples to use morpheus so we can take advantage of configure_logging
-    logger.parent = aiq_logger
+    logger.parent = nat_logger
     logger.setLevel(numeric_level)
 
     ctx_dict["start_time"] = time.time()

{aiq → nat}/cli/main.py

@@ -35,9 +35,22 @@ def run_cli():
     if (parent_dir not in sys.path):
         sys.path.append(parent_dir)
 
-    from aiq.cli.entrypoint import cli
+    from nat.cli.entrypoint import cli
 
-    cli(obj={}, auto_envvar_prefix='AIQ', show_default=True, prog_name="aiq")
+    cli(obj={}, auto_envvar_prefix='NAT', show_default=True, prog_name="nat")
+
+
+def run_cli_aiq_compat():
+    "Entrypoint for the `aiq` compatibility command"
+    import warnings
+
+    # Warn with a UserWarning since DeprecationWarnings are not shown by default
+    warnings.warn(
+        "The 'aiq' command is deprecated and will be removed in a future release. "
+        "Please use the 'nat' command instead.",
+        UserWarning,
+        stacklevel=2)
+    run_cli()
 
 
 if __name__ == '__main__':

{aiq → nat}/cli/register_workflow.py

@@ -15,56 +15,56 @@
 
 from contextlib import asynccontextmanager
 
-from aiq.builder.framework_enum import LLMFrameworkEnum
-from aiq.cli.type_registry import AuthProviderBuildCallableT
-from aiq.cli.type_registry import AuthProviderRegisteredCallableT
-from aiq.cli.type_registry import EmbedderClientBuildCallableT
-from aiq.cli.type_registry import EmbedderClientRegisteredCallableT
-from aiq.cli.type_registry import EmbedderProviderBuildCallableT
-from aiq.cli.type_registry import EmbedderProviderRegisteredCallableT
-from aiq.cli.type_registry import EvaluatorBuildCallableT
-from aiq.cli.type_registry import EvaluatorRegisteredCallableT
-from aiq.cli.type_registry import FrontEndBuildCallableT
-from aiq.cli.type_registry import FrontEndRegisteredCallableT
-from aiq.cli.type_registry import FunctionBuildCallableT
-from aiq.cli.type_registry import FunctionRegisteredCallableT
-from aiq.cli.type_registry import LLMClientBuildCallableT
-from aiq.cli.type_registry import LLMClientRegisteredCallableT
-from aiq.cli.type_registry import LLMProviderBuildCallableT
-from aiq.cli.type_registry import LoggingMethodBuildCallableT
-from aiq.cli.type_registry import LoggingMethodConfigT
-from aiq.cli.type_registry import LoggingMethodRegisteredCallableT
-from aiq.cli.type_registry import MemoryBuildCallableT
-from aiq.cli.type_registry import MemoryRegisteredCallableT
-from aiq.cli.type_registry import ObjectStoreBuildCallableT
-from aiq.cli.type_registry import ObjectStoreRegisteredCallableT
-from aiq.cli.type_registry import RegisteredLoggingMethod
-from aiq.cli.type_registry import RegisteredTelemetryExporter
-from aiq.cli.type_registry import RegisteredToolWrapper
-from aiq.cli.type_registry import RegistryHandlerBuildCallableT
-from aiq.cli.type_registry import RegistryHandlerRegisteredCallableT
-from aiq.cli.type_registry import RetrieverClientBuildCallableT
-from aiq.cli.type_registry import RetrieverClientRegisteredCallableT
-from aiq.cli.type_registry import RetrieverProviderBuildCallableT
-from aiq.cli.type_registry import RetrieverProviderRegisteredCallableT
-from aiq.cli.type_registry import TeleExporterRegisteredCallableT
-from aiq.cli.type_registry import TelemetryExporterBuildCallableT
-from aiq.cli.type_registry import TelemetryExporterConfigT
-from aiq.cli.type_registry import ToolWrapperBuildCallableT
-from aiq.cli.type_registry import TTCStrategyBuildCallableT
-from aiq.cli.type_registry import TTCStrategyRegisterCallableT
-from aiq.data_models.authentication import AuthProviderBaseConfigT
-from aiq.data_models.component import AIQComponentEnum
-from aiq.data_models.discovery_metadata import DiscoveryMetadata
-from aiq.data_models.embedder import EmbedderBaseConfigT
-from aiq.data_models.evaluator import EvaluatorBaseConfigT
-from aiq.data_models.front_end import FrontEndConfigT
-from aiq.data_models.function import FunctionConfigT
-from aiq.data_models.llm import LLMBaseConfigT
-from aiq.data_models.memory import MemoryBaseConfigT
-from aiq.data_models.object_store import ObjectStoreBaseConfigT
-from aiq.data_models.registry_handler import RegistryHandlerBaseConfigT
-from aiq.data_models.retriever import RetrieverBaseConfigT
+from nat.builder.framework_enum import LLMFrameworkEnum
+from nat.cli.type_registry import AuthProviderBuildCallableT
+from nat.cli.type_registry import AuthProviderRegisteredCallableT
+from nat.cli.type_registry import EmbedderClientBuildCallableT
+from nat.cli.type_registry import EmbedderClientRegisteredCallableT
+from nat.cli.type_registry import EmbedderProviderBuildCallableT
+from nat.cli.type_registry import EmbedderProviderRegisteredCallableT
+from nat.cli.type_registry import EvaluatorBuildCallableT
+from nat.cli.type_registry import EvaluatorRegisteredCallableT
+from nat.cli.type_registry import FrontEndBuildCallableT
+from nat.cli.type_registry import FrontEndRegisteredCallableT
+from nat.cli.type_registry import FunctionBuildCallableT
+from nat.cli.type_registry import FunctionRegisteredCallableT
+from nat.cli.type_registry import LLMClientBuildCallableT
+from nat.cli.type_registry import LLMClientRegisteredCallableT
+from nat.cli.type_registry import LLMProviderBuildCallableT
+from nat.cli.type_registry import LoggingMethodBuildCallableT
+from nat.cli.type_registry import LoggingMethodConfigT
+from nat.cli.type_registry import LoggingMethodRegisteredCallableT
+from nat.cli.type_registry import MemoryBuildCallableT
+from nat.cli.type_registry import MemoryRegisteredCallableT
+from nat.cli.type_registry import ObjectStoreBuildCallableT
+from nat.cli.type_registry import ObjectStoreRegisteredCallableT
+from nat.cli.type_registry import RegisteredLoggingMethod
+from nat.cli.type_registry import RegisteredTelemetryExporter
+from nat.cli.type_registry import RegisteredToolWrapper
+from nat.cli.type_registry import RegistryHandlerBuildCallableT
+from nat.cli.type_registry import RegistryHandlerRegisteredCallableT
+from nat.cli.type_registry import RetrieverClientBuildCallableT
+from nat.cli.type_registry import RetrieverClientRegisteredCallableT
+from nat.cli.type_registry import RetrieverProviderBuildCallableT
+from nat.cli.type_registry import RetrieverProviderRegisteredCallableT
+from nat.cli.type_registry import TeleExporterRegisteredCallableT
+from nat.cli.type_registry import TelemetryExporterBuildCallableT
+from nat.cli.type_registry import TelemetryExporterConfigT
+from nat.cli.type_registry import ToolWrapperBuildCallableT
+from nat.cli.type_registry import TTCStrategyBuildCallableT
+from nat.cli.type_registry import TTCStrategyRegisterCallableT
+from nat.data_models.authentication import AuthProviderBaseConfigT
+from nat.data_models.component import ComponentEnum
+from nat.data_models.discovery_metadata import DiscoveryMetadata
+from nat.data_models.embedder import EmbedderBaseConfigT
+from nat.data_models.evaluator import EvaluatorBaseConfigT
+from nat.data_models.front_end import FrontEndConfigT
+from nat.data_models.function import FunctionConfigT
+from nat.data_models.llm import LLMBaseConfigT
+from nat.data_models.memory import MemoryBaseConfigT
+from nat.data_models.object_store import ObjectStoreBaseConfigT
+from nat.data_models.registry_handler import RegistryHandlerBaseConfigT
+from nat.data_models.retriever import RetrieverBaseConfigT
 
 
 def register_telemetry_exporter(config_type: type[TelemetryExporterConfigT]):
@@ -80,7 +80,7 @@ def register_telemetry_exporter(config_type: type[TelemetryExporterConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.TRACING)
+                                                                component_type=ComponentEnum.TRACING)
 
         GlobalTypeRegistry.get().register_telemetry_exporter(
             RegisteredTelemetryExporter(full_type=config_type.full_type,
@@ -103,7 +103,7 @@ def register_logging_method(config_type: type[LoggingMethodConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.LOGGING)
+                                                                component_type=ComponentEnum.LOGGING)
 
         GlobalTypeRegistry.get().register_logging_method(
             RegisteredLoggingMethod(full_type=config_type.full_type,
@@ -129,7 +129,7 @@ def register_front_end(config_type: type[FrontEndConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.FRONT_END)
+                                                                component_type=ComponentEnum.FRONT_END)
 
         GlobalTypeRegistry.get().register_front_end(
             RegisteredFrontEndInfo(full_type=config_type.full_type,
@@ -161,7 +161,7 @@ def register_function(config_type: type[FunctionConfigT],
             framework_wrappers_list = list(framework_wrappers)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.FUNCTION)
+                                                                component_type=ComponentEnum.FUNCTION)
 
         GlobalTypeRegistry.get().register_function(
             RegisteredFunctionInfo(
@@ -187,7 +187,7 @@ def register_llm_provider(config_type: type[LLMBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.LLM_PROVIDER)
+                                                                component_type=ComponentEnum.LLM_PROVIDER)
 
         GlobalTypeRegistry.get().register_llm_provider(
             RegisteredLLMProviderInfo(full_type=config_type.full_type,
@@ -211,7 +211,7 @@ def register_auth_provider(config_type: type[AuthProviderBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.AUTHENTICATION_PROVIDER)
+                                                                component_type=ComponentEnum.AUTHENTICATION_PROVIDER)
 
         GlobalTypeRegistry.get().register_auth_provider(
             RegisteredAuthProviderInfo(full_type=config_type.full_type,
@@ -235,8 +235,8 @@ def register_llm_client(config_type: type[LLMBaseConfigT], wrapper_type: LLMFram
 
         discovery_metadata = DiscoveryMetadata.from_provider_framework_map(config_type=config_type,
                                                                            wrapper_type=wrapper_type,
-                                                                           provider_type=AIQComponentEnum.LLM_PROVIDER,
-                                                                           component_type=AIQComponentEnum.LLM_CLIENT)
+                                                                           provider_type=ComponentEnum.LLM_PROVIDER,
+                                                                           component_type=ComponentEnum.LLM_CLIENT)
         GlobalTypeRegistry.get().register_llm_client(
             RegisteredLLMClientInfo(full_type=config_type.full_type,
                                     config_type=config_type,
@@ -260,7 +260,7 @@ def register_embedder_provider(config_type: type[EmbedderBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.EMBEDDER_PROVIDER)
+                                                                component_type=ComponentEnum.EMBEDDER_PROVIDER)
 
         GlobalTypeRegistry.get().register_embedder_provider(
             RegisteredEmbedderProviderInfo(full_type=config_type.full_type,
@@ -286,8 +286,8 @@ def register_embedder_client(config_type: type[EmbedderBaseConfigT], wrapper_typ
         discovery_metadata = DiscoveryMetadata.from_provider_framework_map(
             config_type=config_type,
             wrapper_type=wrapper_type,
-            provider_type=AIQComponentEnum.EMBEDDER_PROVIDER,
-            component_type=AIQComponentEnum.EMBEDDER_CLIENT)
+            provider_type=ComponentEnum.EMBEDDER_PROVIDER,
+            component_type=ComponentEnum.EMBEDDER_CLIENT)
 
         GlobalTypeRegistry.get().register_embedder_client(
             RegisteredEmbedderClientInfo(full_type=config_type.full_type,
@@ -311,7 +311,7 @@ def register_evaluator(config_type: type[EvaluatorBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.EVALUATOR)
+                                                                component_type=ComponentEnum.EVALUATOR)
 
         GlobalTypeRegistry.get().register_evaluator(
             RegisteredEvaluatorInfo(full_type=config_type.full_type,
@@ -334,7 +334,7 @@ def register_memory(config_type: type[MemoryBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.MEMORY)
+                                                                component_type=ComponentEnum.MEMORY)
 
         GlobalTypeRegistry.get().register_memory(
             RegisteredMemoryInfo(full_type=config_type.full_type,
@@ -358,7 +358,7 @@ def register_object_store(config_type: type[ObjectStoreBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.OBJECT_STORE)
+                                                                component_type=ComponentEnum.OBJECT_STORE)
 
         GlobalTypeRegistry.get().register_object_store(
             RegisteredObjectStoreInfo(full_type=config_type.full_type,
@@ -382,7 +382,7 @@ def register_ttc_strategy(config_type: type[TTCStrategyRegisterCallableT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.TTC_STRATEGY)
+                                                                component_type=ComponentEnum.TTC_STRATEGY)
 
         GlobalTypeRegistry.get().register_ttc_strategy(
             RegisteredTTCStrategyInfo(full_type=config_type.full_type,
@@ -406,7 +406,7 @@ def register_retriever_provider(config_type: type[RetrieverBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.RETRIEVER_PROVIDER)
+                                                                component_type=ComponentEnum.RETRIEVER_PROVIDER)
 
         GlobalTypeRegistry.get().register_retriever_provider(
             RegisteredRetrieverProviderInfo(full_type=config_type.full_type,
@@ -432,8 +432,8 @@ def register_retriever_client(config_type: type[RetrieverBaseConfigT], wrapper_t
         discovery_metadata = DiscoveryMetadata.from_provider_framework_map(
             config_type=config_type,
             wrapper_type=wrapper_type,
-            provider_type=AIQComponentEnum.RETRIEVER_PROVIDER,
-            component_type=AIQComponentEnum.RETRIEVER_CLIENT,
+            provider_type=ComponentEnum.RETRIEVER_PROVIDER,
+            component_type=ComponentEnum.RETRIEVER_CLIENT,
         )
 
         GlobalTypeRegistry.get().register_retriever_client(
@@ -455,7 +455,7 @@ def register_tool_wrapper(wrapper_type: LLMFrameworkEnum | str):
 
         discovery_metadata = DiscoveryMetadata.from_fn_wrapper(fn=fn,
                                                                wrapper_type=wrapper_type,
-                                                               component_type=AIQComponentEnum.TOOL_WRAPPER)
+                                                               component_type=ComponentEnum.TOOL_WRAPPER)
         GlobalTypeRegistry.get().register_tool_wrapper(
             RegisteredToolWrapper(llm_framework=wrapper_type, build_fn=fn, discovery_metadata=discovery_metadata))
 
@@ -475,7 +475,7 @@ def register_registry_handler(config_type: type[RegistryHandlerBaseConfigT]):
         context_manager_fn = asynccontextmanager(fn)
 
         discovery_metadata = DiscoveryMetadata.from_config_type(config_type=config_type,
-                                                                component_type=AIQComponentEnum.REGISTRY_HANDLER)
+                                                                component_type=ComponentEnum.REGISTRY_HANDLER)
 
         GlobalTypeRegistry.get().register_registry_handler(
             RegisteredRegistryHandlerInfo(full_type=config_type.full_type,