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

{aiq → nat}/data_models/dataset_handler.py

@@ -13,6 +13,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+import importlib
 import json
 import typing
 from collections.abc import Callable
@@ -24,8 +25,8 @@ from pydantic import Discriminator
 from pydantic import FilePath
 from pydantic import Tag
 
-from aiq.data_models.common import BaseModelRegistryTag
-from aiq.data_models.common import TypedBaseModel
+from nat.data_models.common import BaseModelRegistryTag
+from nat.data_models.common import TypedBaseModel
 
 
 class EvalS3Config(BaseModel):
@@ -68,7 +69,7 @@ class EvalDatasetBaseConfig(TypedBaseModel, BaseModelRegistryTag):
     s3: EvalS3Config | None = None
 
     remote_file_path: str | None = None  # only for s3
-    file_path: Path | str = Path(".tmp/aiq/examples/default/default.json")
+    file_path: Path | str = Path(".tmp/nat/examples/default/default.json")
 
 
 class EvalDatasetJsonConfig(EvalDatasetBaseConfig, name="json"):
@@ -78,7 +79,7 @@ class EvalDatasetJsonConfig(EvalDatasetBaseConfig, name="json"):
         return pd.read_json, {}
 
 
-def read_jsonl(file_path: FilePath, **kwargs):
+def read_jsonl(file_path: FilePath):
     with open(file_path, 'r', encoding='utf-8') as f:
         data = [json.loads(line) for line in f]
     return pd.DataFrame(data)
@@ -112,12 +113,57 @@ class EvalDatasetXlsConfig(EvalDatasetBaseConfig, name="xls"):
         return pd.read_excel, {"engine": "openpyxl"}
 
 
+class EvalDatasetCustomConfig(EvalDatasetBaseConfig, name="custom"):
+    """
+    Configuration for custom dataset type that allows users to specify
+    a custom Python function to transform their dataset into EvalInput format.
+    """
+
+    function: str  # Direct import path to function, format: "module.path.function_name"
+    kwargs: dict[str, typing.Any] = {}  # Additional arguments to pass to the custom function
+
+    def parser(self) -> tuple[Callable, dict]:
+        """
+        Load and return the custom function for dataset transformation.
+
+        Returns:
+            Tuple of (custom_function, kwargs) where custom_function transforms
+            a dataset file into an EvalInput object.
+        """
+        custom_function = self._load_custom_function()
+        return custom_function, self.kwargs
+
+    def _load_custom_function(self) -> Callable:
+        """
+        Import and return the custom function using standard Python import path.
+        """
+        if not self.function:
+            raise ValueError("Function path cannot be empty")
+
+        # Split the function path to get module and function name
+        module_path, function_name = self.function.rsplit(".", 1)
+
+        # Import the module
+        module = importlib.import_module(module_path)
+
+        # Get the function from the module
+        if not hasattr(module, function_name):
+            raise AttributeError(f"Function '{function_name}' not found in module '{module_path}'")
+
+        custom_function = getattr(module, function_name)
+
+        if not callable(custom_function):
+            raise ValueError(f"'{self.function}' is not callable")
+
+        return custom_function
+
+
 # Union model with discriminator
-EvalDatasetConfig = typing.Annotated[typing.Annotated[EvalDatasetJsonConfig, Tag(EvalDatasetJsonConfig.static_type())]
-                                     | typing.Annotated[EvalDatasetCsvConfig, Tag(EvalDatasetCsvConfig.static_type())]
-                                     | typing.Annotated[EvalDatasetXlsConfig, Tag(EvalDatasetXlsConfig.static_type())]
-                                     | typing.Annotated[EvalDatasetParquetConfig,
-                                                        Tag(EvalDatasetParquetConfig.static_type())]
-                                     | typing.Annotated[EvalDatasetJsonlConfig,
-                                                        Tag(EvalDatasetJsonlConfig.static_type())],
-                                     Discriminator(TypedBaseModel.discriminator)]
+EvalDatasetConfig = typing.Annotated[
+    typing.Annotated[EvalDatasetJsonConfig, Tag(EvalDatasetJsonConfig.static_type())]
+    | typing.Annotated[EvalDatasetCsvConfig, Tag(EvalDatasetCsvConfig.static_type())]
+    | typing.Annotated[EvalDatasetXlsConfig, Tag(EvalDatasetXlsConfig.static_type())]
+    | typing.Annotated[EvalDatasetParquetConfig, Tag(EvalDatasetParquetConfig.static_type())]
+    | typing.Annotated[EvalDatasetJsonlConfig, Tag(EvalDatasetJsonlConfig.static_type())]
+    | typing.Annotated[EvalDatasetCustomConfig, Tag(EvalDatasetCustomConfig.static_type())],
+    Discriminator(TypedBaseModel.discriminator)]

{aiq → nat}/data_models/discovery_metadata.py

@@ -15,25 +15,23 @@
 
 import importlib.metadata
 import inspect
-import json
 import logging
 import typing
 from enum import Enum
 from functools import lru_cache
-from pathlib import Path
 from types import ModuleType
 from typing import TYPE_CHECKING
 
 from pydantic import BaseModel
 from pydantic import field_validator
 
-from aiq.builder.framework_enum import LLMFrameworkEnum
-from aiq.data_models.component import AIQComponentEnum
-from aiq.utils.metadata_utils import generate_config_type_docs
+from nat.builder.framework_enum import LLMFrameworkEnum
+from nat.data_models.component import ComponentEnum
+from nat.utils.metadata_utils import generate_config_type_docs
 
 if TYPE_CHECKING:
-    from aiq.cli.type_registry import ToolWrapperBuildCallableT
-    from aiq.data_models.common import TypedBaseModelT
+    from nat.cli.type_registry import ToolWrapperBuildCallableT
+    from nat.data_models.common import TypedBaseModelT
 
 logger = logging.getLogger(__name__)
 
@@ -56,18 +54,18 @@ class DiscoveryMetadata(BaseModel):
     """A data model representing metadata about each registered component to faciliate its discovery.
 
     Args:
-        package (str): The name of the package containing the AIQ Toolkit component.
-        version (str): The version number of the package containing the AIQ Toolkit component.
-        component_type (AIQComponentEnum): The type of AIQ Toolkit component this metadata represents.
-        component_name (str): The registered name of the AIQ Toolkit component.
-        description (str): Description of the AIQ Toolkit component pulled from its config objects docstrings.
+        package (str): The name of the package containing the NAT component.
+        version (str): The version number of the package containing the NAT component.
+        component_type (ComponentEnum): The type of NAT component this metadata represents.
+        component_name (str): The registered name of the NAT component.
+        description (str): Description of the NAT component pulled from its config objects docstrings.
         developer_notes (str): Other notes to a developers to aid in the use of the component.
         status (DiscoveryStatusEnum): Provides the status of the metadata discovery process.
     """
 
     package: str = ""
     version: str = ""
-    component_type: AIQComponentEnum = AIQComponentEnum.UNDEFINED
+    component_type: ComponentEnum = ComponentEnum.UNDEFINED
     component_name: str = ""
     description: str = ""
     developer_notes: str = ""
@@ -95,27 +93,12 @@ class DiscoveryMetadata(BaseModel):
         mapping = importlib.metadata.packages_distributions()
         try:
             distro_names = mapping.get(root_package_name, [None])
-            distro_name = DiscoveryMetadata.get_preferred_item(distro_names, "aiqtoolkit")
+            distro_name = DiscoveryMetadata.get_preferred_item(distro_names, "nvidia-nat")
         except KeyError:
             return root_package_name
 
         return distro_name if distro_name else root_package_name
 
-    @staticmethod
-    @lru_cache
-    def get_distribution_name_from_private_data(root_package: str) -> str | None:
-        # Locate distibution mapping stored in the packages private data
-        module = __import__(root_package)
-        for path in module.__path__:
-            package_dir = Path(path).resolve()
-            distinfo_path = package_dir / "meta" / "module_to_distro.json"
-
-            if distinfo_path.exists():
-                with distinfo_path.open("r") as f:
-                    data = json.load(f)
-                    return data.get(root_package, None)
-        return None
-
     @staticmethod
     @lru_cache
     def get_distribution_name_from_module(module: ModuleType | None) -> str:
@@ -125,22 +108,22 @@ class DiscoveryMetadata(BaseModel):
             module (ModuleType): A registered component's module.
 
         Returns:
-            str: The distribution name of the AIQ Toolkit component.
+            str: The distribution name of the NAT component.
         """
-        from aiq.runtime.loader import get_all_aiq_entrypoints_distro_mapping
+        from nat.runtime.loader import get_all_entrypoints_distro_mapping
 
         if module is None:
-            return "aiqtoolkit"
+            return "nvidia-nat"
 
         # Get the mapping of module names to distro names
-        mapping = get_all_aiq_entrypoints_distro_mapping()
+        mapping = get_all_entrypoints_distro_mapping()
         module_package = module.__package__
 
         if module_package is None:
-            return "aiqtoolkit"
+            return "nvidia-nat"
 
         # Traverse the module package parts in reverse order to find the distro name
-        # This is because the module package is the root package for the AIQ Toolkit component
+        # This is because the module package is the root package for the NAT component
         # and the distro name is the name of the package that contains the component
         module_package_parts = module_package.split(".")
         for part_idx in range(len(module_package_parts), 0, -1):
@@ -149,7 +132,7 @@ class DiscoveryMetadata(BaseModel):
             if candidate_distro_name is not None:
                 return candidate_distro_name
 
-        return "aiqtoolkit"
+        return "nvidia-nat"
 
     @staticmethod
     @lru_cache
@@ -160,32 +143,20 @@ class DiscoveryMetadata(BaseModel):
             config_type (type[TypedBaseModelT]): A registered component's configuration object.
 
         Returns:
-            str: The distribution name of the AIQ Toolkit component.
+            str: The distribution name of the NAT component.
         """
         module = inspect.getmodule(config_type)
         return DiscoveryMetadata.get_distribution_name_from_module(module)
 
-    @staticmethod
-    @lru_cache
-    def get_distribution_name(root_package: str) -> str:
-        """
-        The aiq library packages use a distro name 'aiqtoolkit[]' and
-        root package name 'aiq'. They provide mapping in a metadata file
-        for optimized installation.
-        """
-
-        distro_name = DiscoveryMetadata.get_distribution_name_from_private_data(root_package)
-        return distro_name if distro_name else root_package
-
     @staticmethod
     def from_config_type(config_type: type["TypedBaseModelT"],
-                         component_type: AIQComponentEnum = AIQComponentEnum.UNDEFINED) -> "DiscoveryMetadata":
-        """Generates discovery metadata from an AIQ Toolkit config object.
+                         component_type: ComponentEnum = ComponentEnum.UNDEFINED) -> "DiscoveryMetadata":
+        """Generates discovery metadata from a NAT config object.
 
         Args:
             config_type (type[TypedBaseModelT]): A registered component's configuration object.
-            component_type (AIQComponentEnum, optional): The type of the registered component. Defaults to
-            AIQComponentEnum.UNDEFINED.
+            component_type (ComponentEnum, optional): The type of the registered component. Defaults to
+            ComponentEnum.UNDEFINED.
 
         Returns:
             DiscoveryMetadata: A an object containing component metadata to facilitate discovery and reuse.
@@ -220,7 +191,7 @@ class DiscoveryMetadata(BaseModel):
     @staticmethod
     def from_fn_wrapper(fn: "ToolWrapperBuildCallableT",
                         wrapper_type: LLMFrameworkEnum | str,
-                        component_type: AIQComponentEnum = AIQComponentEnum.TOOL_WRAPPER) -> "DiscoveryMetadata":
+                        component_type: ComponentEnum = ComponentEnum.TOOL_WRAPPER) -> "DiscoveryMetadata":
         """Generates discovery metadata from function with specified wrapper type.
 
         Args:
@@ -228,8 +199,8 @@ class DiscoveryMetadata(BaseModel):
             wrapper_type (LLMFrameworkEnum): The wrapper to apply to the callable to faciliate inter-framwork
             interoperability.
 
-            component_type (AIQComponentEnum, optional): The type of the registered component. Defaults to
-            AIQComponentEnum.TOOL_WRAPPER.
+            component_type (ComponentEnum, optional): The type of the registered component. Defaults to
+            ComponentEnum.TOOL_WRAPPER.
 
         Returns:
             DiscoveryMetadata: A an object containing component metadata to facilitate discovery and reuse.
@@ -263,7 +234,7 @@ class DiscoveryMetadata(BaseModel):
         """Generates discovery metadata from an installed package name.
 
         Args:
-            package_name (str): The name of the AIQ Toolkit plugin package containing registered components.
+            package_name (str): The name of the NAT plugin package containing registered components.
             package_version (str, optional): The version of the package, Defaults to None.
 
         Returns:
@@ -286,16 +257,15 @@ class DiscoveryMetadata(BaseModel):
 
         return DiscoveryMetadata(package=package_name,
                                  version=package_version,
-                                 component_type=AIQComponentEnum.PACKAGE,
+                                 component_type=ComponentEnum.PACKAGE,
                                  component_name=package_name,
                                  description=description)
 
     @staticmethod
-    def from_provider_framework_map(
-            config_type: type["TypedBaseModelT"],
-            wrapper_type: LLMFrameworkEnum | str | None,
-            provider_type: AIQComponentEnum,
-            component_type: AIQComponentEnum = AIQComponentEnum.UNDEFINED) -> "DiscoveryMetadata":
+    def from_provider_framework_map(config_type: type["TypedBaseModelT"],
+                                    wrapper_type: LLMFrameworkEnum | str | None,
+                                    provider_type: ComponentEnum,
+                                    component_type: ComponentEnum = ComponentEnum.UNDEFINED) -> "DiscoveryMetadata":
         """Generates discovery metadata from provider and framework mapping information.
 
         Args:
@@ -303,9 +273,9 @@ class DiscoveryMetadata(BaseModel):
             wrapper_type (LLMFrameworkEnum | str): The wrapper to apply to the callable to faciliate inter-framwork
             interoperability.
 
-            provider_type (AIQComponentEnum): The type of provider the registered component supports.
-            component_type (AIQComponentEnum, optional): The type of the registered component. Defaults to
-            AIQComponentEnum.UNDEFINED.
+            provider_type (ComponentEnum): The type of provider the registered component supports.
+            component_type (ComponentEnum, optional): The type of the registered component. Defaults to
+            ComponentEnum.UNDEFINED.
 
         Returns:
             DiscoveryMetadata: A an object containing component metadata to facilitate discovery and reuse.

{aiq → nat}/data_models/evaluate.py

@@ -21,12 +21,12 @@ from pydantic import BaseModel
 from pydantic import Discriminator
 from pydantic import model_validator
 
-from aiq.data_models.common import TypedBaseModel
-from aiq.data_models.dataset_handler import EvalDatasetConfig
-from aiq.data_models.dataset_handler import EvalS3Config
-from aiq.data_models.evaluator import EvaluatorBaseConfig
-from aiq.data_models.intermediate_step import IntermediateStepType
-from aiq.data_models.profiler import ProfilerConfig
+from nat.data_models.common import TypedBaseModel
+from nat.data_models.dataset_handler import EvalDatasetConfig
+from nat.data_models.dataset_handler import EvalS3Config
+from nat.data_models.evaluator import EvaluatorBaseConfig
+from nat.data_models.intermediate_step import IntermediateStepType
+from nat.data_models.profiler import ProfilerConfig
 
 
 class JobEvictionPolicy(str, Enum):
@@ -54,7 +54,7 @@ class JobManagementConfig(BaseModel):
 
 class EvalOutputConfig(BaseModel):
     # Output directory for the workflow and evaluation results
-    dir: Path = Path("/tmp/aiq/examples/default/")
+    dir: Path = Path("./.tmp/nat/examples/default/")
     # S3 prefix for the workflow and evaluation results
     remote_dir: str | None = None
     # Custom scripts to run after the workflow and evaluation results are saved
@@ -77,7 +77,7 @@ class EvalGeneralConfig(BaseModel):
     workflow_alias: str | None = None
 
     # Output directory for the workflow and evaluation results
-    output_dir: Path = Path("/tmp/aiq/examples/default/")
+    output_dir: Path = Path("./.tmp/nat/examples/default/")
 
     # If present overrides output_dir
     output: EvalOutputConfig | None = None
@@ -108,7 +108,7 @@ class EvalConfig(BaseModel):
     @classmethod
     def rebuild_annotations(cls):
 
-        from aiq.cli.type_registry import GlobalTypeRegistry  # pylint: disable=cyclic-import
+        from nat.cli.type_registry import GlobalTypeRegistry  # pylint: disable=cyclic-import
 
         type_registry = GlobalTypeRegistry.get()
 

{aiq → nat}/data_models/intermediate_step.py

@@ -24,9 +24,9 @@ from pydantic import ConfigDict
 from pydantic import Field
 from pydantic import model_validator
 
-from aiq.builder.framework_enum import LLMFrameworkEnum
-from aiq.data_models.invocation_node import InvocationNode
-from aiq.profiler.callbacks.token_usage_base_model import TokenUsageBaseModel
+from nat.builder.framework_enum import LLMFrameworkEnum
+from nat.data_models.invocation_node import InvocationNode
+from nat.profiler.callbacks.token_usage_base_model import TokenUsageBaseModel
 
 
 class IntermediateStepCategory(str, Enum):
@@ -66,7 +66,7 @@ class IntermediateStepState(str, Enum):
 
 class StreamEventData(BaseModel):
     """
-    AIQStreamEventData is a data model that represents the data field in an streaming event.
+    StreamEventData is a data model that represents the data field in an streaming event.
     """
 
     # Allow extra fields in the model_config to support derived models
@@ -121,7 +121,7 @@ class TraceMetadata(BaseModel):
 
 class IntermediateStepPayload(BaseModel):
     """
-    AIQIntermediateStep is a data model that represents an intermediate step in the AIQ Toolkit. Intermediate steps are
+    IntermediateStep is a data model that represents an intermediate step in the NAT. Intermediate steps are
     captured while a request is running and can be used to show progress or to evaluate the path a workflow took to get
     a response.
     """
@@ -226,7 +226,7 @@ class IntermediateStepPayload(BaseModel):
 
 class IntermediateStep(BaseModel):
     """
-    AIQIntermediateStep is a data model that represents an intermediate step in the AIQ Toolkit. Intermediate steps are
+    IntermediateStep is a data model that represents an intermediate step in the NAT. Intermediate steps are
     captured while a request is running and can be used to show progress or to evaluate the path a workflow took to get
     a response.
     """
@@ -243,7 +243,7 @@ class IntermediateStep(BaseModel):
 
     function_ancestry: InvocationNode
     """
-    The function ancestry for the current step showing the current AIQ function that was being executed when the step
+    The function ancestry for the current step showing the current NAT function that was being executed when the step
     was created.
     """
 

{aiq → nat}/data_models/retriever.py

@@ -15,8 +15,8 @@
 
 import typing
 
-from aiq.data_models.common import BaseModelRegistryTag
-from aiq.data_models.common import TypedBaseModel
+from nat.data_models.common import BaseModelRegistryTag
+from nat.data_models.common import TypedBaseModel
 
 
 class RetrieverBaseConfig(TypedBaseModel, BaseModelRegistryTag):

{aiq → nat}/data_models/span.py

@@ -14,6 +14,7 @@
 # limitations under the License.
 
 import logging
+import os
 import time
 import uuid
 from enum import Enum
@@ -25,6 +26,8 @@ from pydantic import field_validator
 
 logger = logging.getLogger(__name__)
 
+_SPAN_PREFIX = os.getenv("NAT_SPAN_PREFIX", "nat").strip() or "nat"
+
 
 class SpanKind(Enum):
     LLM = "LLM"
@@ -87,7 +90,7 @@ def event_type_to_span_kind(event_type: str) -> SpanKind:
 
 
 class SpanAttributes(Enum):
-    AIQ_SPAN_KIND = "aiq.span.kind"
+    NAT_SPAN_KIND = f"{_SPAN_PREFIX}.span.kind"
     INPUT_VALUE = "input.value"
     INPUT_MIME_TYPE = "input.mime_type"
     LLM_TOKEN_COUNT_PROMPT = "llm.token_count.prompt"
@@ -95,12 +98,12 @@ class SpanAttributes(Enum):
     LLM_TOKEN_COUNT_TOTAL = "llm.token_count.total"
     OUTPUT_VALUE = "output.value"
     OUTPUT_MIME_TYPE = "output.mime_type"
-    AIQ_USAGE_NUM_LLM_CALLS = "aiq.usage.num_llm_calls"
-    AIQ_USAGE_SECONDS_BETWEEN_CALLS = "aiq.usage.seconds_between_calls"
-    AIQ_USAGE_TOKEN_COUNT_PROMPT = "aiq.usage.token_count.prompt"
-    AIQ_USAGE_TOKEN_COUNT_COMPLETION = "aiq.usage.token_count.completion"
-    AIQ_USAGE_TOKEN_COUNT_TOTAL = "aiq.usage.token_count.total"
-    AIQ_EVENT_TYPE = "aiq.event_type"
+    NAT_USAGE_NUM_LLM_CALLS = f"{_SPAN_PREFIX}.usage.num_llm_calls"
+    NAT_USAGE_SECONDS_BETWEEN_CALLS = f"{_SPAN_PREFIX}.usage.seconds_between_calls"
+    NAT_USAGE_TOKEN_COUNT_PROMPT = f"{_SPAN_PREFIX}.usage.token_count.prompt"
+    NAT_USAGE_TOKEN_COUNT_COMPLETION = f"{_SPAN_PREFIX}.usage.token_count.completion"
+    NAT_USAGE_TOKEN_COUNT_TOTAL = f"{_SPAN_PREFIX}.usage.token_count.total"
+    NAT_EVENT_TYPE = f"{_SPAN_PREFIX}.event_type"
 
 
 class MimeTypes(Enum):

{aiq → nat}/data_models/step_adaptor.py

@@ -20,7 +20,7 @@ from pydantic import BaseModel
 from pydantic import Field
 from pydantic import model_validator
 
-from aiq.data_models.intermediate_step import IntermediateStepType
+from nat.data_models.intermediate_step import IntermediateStepType
 
 logger = logging.getLogger(__name__)
 

{aiq → nat}/data_models/telemetry_exporter.py

@@ -15,8 +15,8 @@
 
 import typing
 
-from aiq.data_models.common import BaseModelRegistryTag
-from aiq.data_models.common import TypedBaseModel
+from nat.data_models.common import BaseModelRegistryTag
+from nat.data_models.common import TypedBaseModel
 
 
 class TelemetryExporterBaseConfig(TypedBaseModel, BaseModelRegistryTag):

{aiq → nat}/embedder/nim_embedder.py

@@ -20,11 +20,11 @@ from pydantic import AliasChoices
 from pydantic import ConfigDict
 from pydantic import Field
 
-from aiq.builder.builder import Builder
-from aiq.builder.embedder import EmbedderProviderInfo
-from aiq.cli.register_workflow import register_embedder_provider
-from aiq.data_models.embedder import EmbedderBaseConfig
-from aiq.data_models.retry_mixin import RetryMixin
+from nat.builder.builder import Builder
+from nat.builder.embedder import EmbedderProviderInfo
+from nat.cli.register_workflow import register_embedder_provider
+from nat.data_models.embedder import EmbedderBaseConfig
+from nat.data_models.retry_mixin import RetryMixin
 
 allowed_truncate_values = ["NONE", "START", "END"]
 

{aiq → nat}/embedder/openai_embedder.py

@@ -17,11 +17,11 @@ from pydantic import AliasChoices
 from pydantic import ConfigDict
 from pydantic import Field
 
-from aiq.builder.builder import Builder
-from aiq.builder.embedder import EmbedderProviderInfo
-from aiq.cli.register_workflow import register_embedder_provider
-from aiq.data_models.embedder import EmbedderBaseConfig
-from aiq.data_models.retry_mixin import RetryMixin
+from nat.builder.builder import Builder
+from nat.builder.embedder import EmbedderProviderInfo
+from nat.cli.register_workflow import register_embedder_provider
+from nat.data_models.embedder import EmbedderBaseConfig
+from nat.data_models.retry_mixin import RetryMixin
 
 
 class OpenAIEmbedderModelConfig(EmbedderBaseConfig, RetryMixin, name="openai"):

{aiq/retriever → nat/embedder}/register.py

@@ -18,5 +18,5 @@
 # isort:skip_file
 
 # Import any providers which need to be automatically registered here
-import aiq.retriever.milvus.register
-import aiq.retriever.nemo_retriever.register
+from . import nim_embedder
+from . import openai_embedder

{aiq → nat}/eval/config.py

@@ -17,10 +17,10 @@ from pathlib import Path
 
 from pydantic import BaseModel
 
-from aiq.eval.evaluator.evaluator_model import EvalInput
-from aiq.eval.evaluator.evaluator_model import EvalOutput
-from aiq.eval.usage_stats import UsageStats
-from aiq.profiler.data_models import ProfilerResults
+from nat.eval.evaluator.evaluator_model import EvalInput
+from nat.eval.evaluator.evaluator_model import EvalOutput
+from nat.eval.usage_stats import UsageStats
+from nat.profiler.data_models import ProfilerResults
 
 
 class EvaluationRunConfig(BaseModel):

{aiq → nat}/eval/dataset_handler/dataset_downloader.py

@@ -19,7 +19,7 @@ import boto3
 import requests
 from botocore.exceptions import NoCredentialsError
 
-from aiq.data_models.dataset_handler import EvalDatasetConfig
+from nat.data_models.dataset_handler import EvalDatasetConfig
 
 logger = logging.getLogger(__name__)
 

{aiq → nat}/eval/dataset_handler/dataset_filter.py

@@ -15,7 +15,7 @@
 
 import pandas as pd
 
-from aiq.data_models.dataset_handler import EvalFilterConfig
+from nat.data_models.dataset_handler import EvalFilterConfig
 
 
 class DatasetFilter: