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

{aiq → nat}/data_models/api_server.py

@@ -30,8 +30,10 @@ from pydantic import field_serializer
 from pydantic import field_validator
 from pydantic_core.core_schema import ValidationInfo
 
-from aiq.data_models.interactive import HumanPrompt
-from aiq.utils.type_converter import GlobalTypeConverter
+from nat.data_models.interactive import HumanPrompt
+from nat.utils.type_converter import GlobalTypeConverter
+
+FINISH_REASONS = frozenset({'stop', 'length', 'tool_calls', 'content_filter', 'function_call'})
 
 
 class Request(BaseModel):
@@ -109,9 +111,9 @@ class Message(BaseModel):
     role: str
 
 
-class AIQChatRequest(BaseModel):
+class ChatRequest(BaseModel):
     """
-    AIQChatRequest is a data model that represents a request to the AIQ Toolkit chat API.
+    ChatRequest is a data model that represents a request to the NAT chat API.
     Fully compatible with OpenAI Chat Completions API specification.
     """
 
@@ -160,13 +162,13 @@ class AIQChatRequest(BaseModel):
                     model: str | None = None,
                     temperature: float | None = None,
                     max_tokens: int | None = None,
-                    top_p: float | None = None) -> "AIQChatRequest":
+                    top_p: float | None = None) -> "ChatRequest":
 
-        return AIQChatRequest(messages=[Message(content=data, role="user")],
-                              model=model,
-                              temperature=temperature,
-                              max_tokens=max_tokens,
-                              top_p=top_p)
+        return ChatRequest(messages=[Message(content=data, role="user")],
+                           model=model,
+                           temperature=temperature,
+                           max_tokens=max_tokens,
+                           top_p=top_p)
 
     @staticmethod
     def from_content(content: list[UserContent],
@@ -174,45 +176,45 @@ class AIQChatRequest(BaseModel):
                      model: str | None = None,
                      temperature: float | None = None,
                      max_tokens: int | None = None,
-                     top_p: float | None = None) -> "AIQChatRequest":
+                     top_p: float | None = None) -> "ChatRequest":
 
-        return AIQChatRequest(messages=[Message(content=content, role="user")],
-                              model=model,
-                              temperature=temperature,
-                              max_tokens=max_tokens,
-                              top_p=top_p)
+        return ChatRequest(messages=[Message(content=content, role="user")],
+                           model=model,
+                           temperature=temperature,
+                           max_tokens=max_tokens,
+                           top_p=top_p)
 
 
-class AIQChoiceMessage(BaseModel):
+class ChoiceMessage(BaseModel):
     content: str | None = None
     role: str | None = None
 
 
-class AIQChoiceDelta(BaseModel):
+class ChoiceDelta(BaseModel):
     """Delta object for streaming responses (OpenAI-compatible)"""
     content: str | None = None
     role: str | None = None
 
 
-class AIQChoice(BaseModel):
+class Choice(BaseModel):
     model_config = ConfigDict(extra="allow")
 
-    message: AIQChoiceMessage | None = None
-    delta: AIQChoiceDelta | None = None
+    message: ChoiceMessage | None = None
+    delta: ChoiceDelta | None = None
     finish_reason: typing.Literal['stop', 'length', 'tool_calls', 'content_filter', 'function_call'] | None = None
     index: int
-    # logprobs: AIQChoiceLogprobs | None = None
+    # logprobs: ChoiceLogprobs | None = None
 
 
-class AIQUsage(BaseModel):
+class Usage(BaseModel):
     prompt_tokens: int
     completion_tokens: int
     total_tokens: int
 
 
-class AIQResponseSerializable(abc.ABC):
+class ResponseSerializable(abc.ABC):
     """
-    AIQChatResponseSerializable is an abstract class that defines the interface for serializing output for the AIQ
+    ResponseSerializable is an abstract class that defines the interface for serializing output for the NAT
     Toolkit chat streaming API.
     """
 
@@ -221,21 +223,21 @@ class AIQResponseSerializable(abc.ABC):
         pass
 
 
-class AIQResponseBaseModelOutput(BaseModel, AIQResponseSerializable):
+class ResponseBaseModelOutput(BaseModel, ResponseSerializable):
 
     def get_stream_data(self) -> str:
         return f"data: {self.model_dump_json()}\n\n"
 
 
-class AIQResponseBaseModelIntermediate(BaseModel, AIQResponseSerializable):
+class ResponseBaseModelIntermediate(BaseModel, ResponseSerializable):
 
     def get_stream_data(self) -> str:
         return f"intermediate_data: {self.model_dump_json()}\n\n"
 
 
-class AIQChatResponse(AIQResponseBaseModelOutput):
+class ChatResponse(ResponseBaseModelOutput):
     """
-    AIQChatResponse is a data model that represents a response from the AIQ Toolkit chat API.
+    ChatResponse is a data model that represents a response from the NAT chat API.
     Fully compatible with OpenAI Chat Completions API specification.
     """
 
@@ -245,8 +247,8 @@ class AIQChatResponse(AIQResponseBaseModelOutput):
     object: str = "chat.completion"
     model: str = ""
     created: datetime.datetime
-    choices: list[AIQChoice]
-    usage: AIQUsage | None = None
+    choices: list[Choice]
+    usage: Usage | None = None
     system_fingerprint: str | None = None
     service_tier: typing.Literal["scale", "default"] | None = None
 
@@ -262,7 +264,7 @@ class AIQChatResponse(AIQResponseBaseModelOutput):
                     object_: str | None = None,
                     model: str | None = None,
                     created: datetime.datetime | None = None,
-                    usage: AIQUsage | None = None) -> "AIQChatResponse":
+                    usage: Usage | None = None) -> "ChatResponse":
 
         if id_ is None:
             id_ = str(uuid.uuid4())
@@ -273,18 +275,17 @@ class AIQChatResponse(AIQResponseBaseModelOutput):
         if created is None:
             created = datetime.datetime.now(datetime.timezone.utc)
 
-        return AIQChatResponse(
-            id=id_,
-            object=object_,
-            model=model,
-            created=created,
-            choices=[AIQChoice(index=0, message=AIQChoiceMessage(content=data), finish_reason="stop")],
-            usage=usage)
+        return ChatResponse(id=id_,
+                            object=object_,
+                            model=model,
+                            created=created,
+                            choices=[Choice(index=0, message=ChoiceMessage(content=data), finish_reason="stop")],
+                            usage=usage)
 
 
-class AIQChatResponseChunk(AIQResponseBaseModelOutput):
+class ChatResponseChunk(ResponseBaseModelOutput):
     """
-    AIQChatResponseChunk is a data model that represents a response chunk from the AIQ Toolkit chat streaming API.
+    ChatResponseChunk is a data model that represents a response chunk from the NAT chat streaming API.
     Fully compatible with OpenAI Chat Completions API specification.
     """
 
@@ -292,13 +293,13 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
     model_config = ConfigDict(extra="allow")
 
     id: str
-    choices: list[AIQChoice]
+    choices: list[Choice]
     created: datetime.datetime
     model: str = ""
     object: str = "chat.completion.chunk"
     system_fingerprint: str | None = None
     service_tier: typing.Literal["scale", "default"] | None = None
-    usage: AIQUsage | None = None
+    usage: Usage | None = None
 
     @field_serializer('created')
     def serialize_created(self, created: datetime.datetime) -> int:
@@ -311,7 +312,7 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
                     id_: str | None = None,
                     created: datetime.datetime | None = None,
                     model: str | None = None,
-                    object_: str | None = None) -> "AIQChatResponseChunk":
+                    object_: str | None = None) -> "ChatResponseChunk":
 
         if id_ is None:
             id_ = str(uuid.uuid4())
@@ -322,12 +323,11 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
         if object_ is None:
             object_ = "chat.completion.chunk"
 
-        return AIQChatResponseChunk(
-            id=id_,
-            choices=[AIQChoice(index=0, message=AIQChoiceMessage(content=data), finish_reason="stop")],
-            created=created,
-            model=model,
-            object=object_)
+        return ChatResponseChunk(id=id_,
+                                 choices=[Choice(index=0, message=ChoiceMessage(content=data), finish_reason="stop")],
+                                 created=created,
+                                 model=model,
+                                 object=object_)
 
     @staticmethod
     def create_streaming_chunk(content: str,
@@ -337,8 +337,8 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
                                model: str | None = None,
                                role: str | None = None,
                                finish_reason: str | None = None,
-                               usage: AIQUsage | None = None,
-                               system_fingerprint: str | None = None) -> "AIQChatResponseChunk":
+                               usage: Usage | None = None,
+                               system_fingerprint: str | None = None) -> "ChatResponseChunk":
         """Create an OpenAI-compatible streaming chunk"""
         if id_ is None:
             id_ = str(uuid.uuid4())
@@ -347,12 +347,13 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
         if model is None:
             model = ""
 
-        delta = AIQChoiceDelta(content=content,
-                               role=role) if content is not None or role is not None else AIQChoiceDelta()
+        delta = ChoiceDelta(content=content, role=role) if content is not None or role is not None else ChoiceDelta()
+
+        final_finish_reason = finish_reason if finish_reason in FINISH_REASONS else None
 
-        return AIQChatResponseChunk(
+        return ChatResponseChunk(
             id=id_,
-            choices=[AIQChoice(index=0, message=None, delta=delta, finish_reason=finish_reason)],
+            choices=[Choice(index=0, message=None, delta=delta, finish_reason=final_finish_reason)],
             created=created,
             model=model,
             object="chat.completion.chunk",
@@ -360,9 +361,9 @@ class AIQChatResponseChunk(AIQResponseBaseModelOutput):
             system_fingerprint=system_fingerprint)
 
 
-class AIQResponseIntermediateStep(AIQResponseBaseModelIntermediate):
+class ResponseIntermediateStep(ResponseBaseModelIntermediate):
     """
-    AIQResponseSerializedStep is a data model that represents a serialized step in the AIQ Toolkit chat streaming API.
+    ResponseSerializedStep is a data model that represents a serialized step in the NAT chat streaming API.
     """
 
     # Allow extra fields in the model_config to support derived models
@@ -375,7 +376,7 @@ class AIQResponseIntermediateStep(AIQResponseBaseModelIntermediate):
     payload: str
 
 
-class AIQResponsePayloadOutput(BaseModel, AIQResponseSerializable):
+class ResponsePayloadOutput(BaseModel, ResponseSerializable):
 
     payload: typing.Any
 
@@ -387,7 +388,7 @@ class AIQResponsePayloadOutput(BaseModel, AIQResponseSerializable):
         return f"data: {self.payload}\n\n"
 
 
-class AIQGenerateResponse(BaseModel):
+class GenerateResponse(BaseModel):
     # Allow extra fields in the model_config to support derived models
     model_config = ConfigDict(extra="allow")
 
@@ -523,6 +524,7 @@ class WebSocketSystemIntermediateStepMessage(BaseModel):
     parent_id: str = "default"
     intermediate_parent_id: str | None = "default"
     update_message_id: str | None = "default"
+    conversation_id: str | None = None
     content: SystemIntermediateStepContent
     status: WebSocketMessageStatus
     timestamp: str = str(datetime.datetime.now(datetime.timezone.utc))
@@ -546,18 +548,19 @@ class WebSocketSystemResponseTokenMessage(BaseModel):
     id: str | None = "default"
     thread_id: str | None = "default"
     parent_id: str = "default"
-    content: SystemResponseContent | Error | AIQGenerateResponse
+    conversation_id: str | None = None
+    content: SystemResponseContent | Error | GenerateResponse
     status: WebSocketMessageStatus
     timestamp: str = str(datetime.datetime.now(datetime.timezone.utc))
 
     @field_validator("content")
     @classmethod
-    def validate_content_by_type(cls, value: SystemResponseContent | Error | AIQGenerateResponse, info: ValidationInfo):
+    def validate_content_by_type(cls, value: SystemResponseContent | Error | GenerateResponse, info: ValidationInfo):
         if info.data.get("type") == WebSocketMessageType.ERROR_MESSAGE and not isinstance(value, Error):
             raise ValueError(f"Field: content must be 'Error' when type is {WebSocketMessageType.ERROR_MESSAGE}")
 
         if info.data.get("type") == WebSocketMessageType.RESPONSE_MESSAGE and not isinstance(
-                value, (SystemResponseContent, AIQGenerateResponse)):
+                value, (SystemResponseContent, GenerateResponse)):
             raise ValueError(
                 f"Field: content must be 'SystemResponseContent' when type is {WebSocketMessageType.RESPONSE_MESSAGE}")
         return value
@@ -576,88 +579,91 @@ class WebSocketSystemInteractionMessage(BaseModel):
     id: str | None = "default"
     thread_id: str | None = "default"
     parent_id: str = "default"
+    conversation_id: str | None = None
     content: HumanPrompt
     status: WebSocketMessageStatus
     timestamp: str = str(datetime.datetime.now(datetime.timezone.utc))
 
 
-# ======== AIQGenerateResponse Converters ========
+# ======== GenerateResponse Converters ========
 
 
-def _generate_response_to_str(response: AIQGenerateResponse) -> str:
+def _generate_response_to_str(response: GenerateResponse) -> str:
     return response.output
 
 
 GlobalTypeConverter.register_converter(_generate_response_to_str)
 
 
-def _generate_response_to_chat_response(response: AIQGenerateResponse) -> AIQChatResponse:
+def _generate_response_to_chat_response(response: GenerateResponse) -> ChatResponse:
     data = response.output
 
     # Simulate usage
     prompt_tokens = 0
-    usage = AIQUsage(prompt_tokens=prompt_tokens,
-                     completion_tokens=len(data.split()),
-                     total_tokens=prompt_tokens + len(data.split()))
+    usage = Usage(prompt_tokens=prompt_tokens,
+                  completion_tokens=len(data.split()),
+                  total_tokens=prompt_tokens + len(data.split()))
 
     # Build and return the response
-    return AIQChatResponse.from_string(data, usage=usage)
+    return ChatResponse.from_string(data, usage=usage)
 
 
 GlobalTypeConverter.register_converter(_generate_response_to_chat_response)
 
 
-# ======== AIQChatRequest Converters ========
-def _aiq_chat_request_to_string(data: AIQChatRequest) -> str:
+# ======== ChatRequest Converters ========
+def _nat_chat_request_to_string(data: ChatRequest) -> str:
     if isinstance(data.messages[-1].content, str):
         return data.messages[-1].content
     return str(data.messages[-1].content)
 
 
-GlobalTypeConverter.register_converter(_aiq_chat_request_to_string)
+GlobalTypeConverter.register_converter(_nat_chat_request_to_string)
 
 
-def _string_to_aiq_chat_request(data: str) -> AIQChatRequest:
-    return AIQChatRequest.from_string(data, model="")
+def _string_to_nat_chat_request(data: str) -> ChatRequest:
+    return ChatRequest.from_string(data, model="")
 
 
-GlobalTypeConverter.register_converter(_string_to_aiq_chat_request)
+GlobalTypeConverter.register_converter(_string_to_nat_chat_request)
 
 
-# ======== AIQChatResponse Converters ========
-def _aiq_chat_response_to_string(data: AIQChatResponse) -> str:
-    return data.choices[0].message.content or ""
+# ======== ChatResponse Converters ========
+def _nat_chat_response_to_string(data: ChatResponse) -> str:
+    if data.choices and data.choices[0].message:
+        return data.choices[0].message.content or ""
+    return ""
 
 
-GlobalTypeConverter.register_converter(_aiq_chat_response_to_string)
+GlobalTypeConverter.register_converter(_nat_chat_response_to_string)
 
 
-def _string_to_aiq_chat_response(data: str) -> AIQChatResponse:
-    '''Converts a string to an AIQChatResponse object'''
+def _string_to_nat_chat_response(data: str) -> ChatResponse:
+    '''Converts a string to an ChatResponse object'''
 
     # Simulate usage
     prompt_tokens = 0
-    usage = AIQUsage(prompt_tokens=prompt_tokens,
-                     completion_tokens=len(data.split()),
-                     total_tokens=prompt_tokens + len(data.split()))
+    usage = Usage(prompt_tokens=prompt_tokens,
+                  completion_tokens=len(data.split()),
+                  total_tokens=prompt_tokens + len(data.split()))
 
     # Build and return the response
-    return AIQChatResponse.from_string(data, usage=usage)
+    return ChatResponse.from_string(data, usage=usage)
 
 
-GlobalTypeConverter.register_converter(_string_to_aiq_chat_response)
+GlobalTypeConverter.register_converter(_string_to_nat_chat_response)
 
 
-def _chat_response_to_chat_response_chunk(data: AIQChatResponse) -> AIQChatResponseChunk:
+def _chat_response_to_chat_response_chunk(data: ChatResponse) -> ChatResponseChunk:
     # Preserve original message structure for backward compatibility
-    return AIQChatResponseChunk(id=data.id, choices=data.choices, created=data.created, model=data.model)
+    return ChatResponseChunk(id=data.id, choices=data.choices, created=data.created, model=data.model)
 
 
 GlobalTypeConverter.register_converter(_chat_response_to_chat_response_chunk)
 
 
-# ======== AIQChatResponseChunk Converters ========
-def _aiq_chat_response_chunk_to_string(data: AIQChatResponseChunk) -> str:
+# ======== ChatResponseChunk Converters ========
+def _chat_response_chunk_to_string(data: ChatResponseChunk) -> str:
     if data.choices and len(data.choices) > 0:
         choice = data.choices[0]
         if choice.delta and choice.delta.content:
@@ -667,22 +673,22 @@ def _aiq_chat_response_chunk_to_string(data: AIQChatResponseChunk) -> str:
     return ""
 
 
-GlobalTypeConverter.register_converter(_aiq_chat_response_chunk_to_string)
+GlobalTypeConverter.register_converter(_chat_response_chunk_to_string)
 
 
-def _string_to_aiq_chat_response_chunk(data: str) -> AIQChatResponseChunk:
-    '''Converts a string to an AIQChatResponseChunk object'''
+def _string_to_nat_chat_response_chunk(data: str) -> ChatResponseChunk:
+    '''Converts a string to an ChatResponseChunk object'''
 
     # Build and return the response
-    return AIQChatResponseChunk.from_string(data)
+    return ChatResponseChunk.from_string(data)
 
 
-GlobalTypeConverter.register_converter(_string_to_aiq_chat_response_chunk)
+GlobalTypeConverter.register_converter(_string_to_nat_chat_response_chunk)
 
 
 # ======== AINodeMessageChunk Converters ========
-def _ai_message_chunk_to_aiq_chat_response_chunk(data) -> AIQChatResponseChunk:
-    '''Converts LangChain AINodeMessageChunk to AIQChatResponseChunk'''
+def _ai_message_chunk_to_nat_chat_response_chunk(data) -> ChatResponseChunk:
+    '''Converts LangChain AINodeMessageChunk to ChatResponseChunk'''
     content = ""
     if hasattr(data, 'content') and data.content is not None:
         content = str(data.content)
@@ -691,4 +697,20 @@ def _ai_message_chunk_to_aiq_chat_response_chunk(data) -> AIQChatResponseChunk:
     elif hasattr(data, 'message') and data.message is not None:
         content = str(data.message)
 
-    return AIQChatResponseChunk.create_streaming_chunk(content=content, role="assistant", finish_reason=None)
+    return ChatResponseChunk.create_streaming_chunk(content=content, role="assistant", finish_reason=None)
+
+
+# Compatibility aliases with previous releases
+AIQChatRequest = ChatRequest
+AIQChoiceMessage = ChoiceMessage
+AIQChoiceDelta = ChoiceDelta
+AIQChoice = Choice
+AIQUsage = Usage
+AIQResponseSerializable = ResponseSerializable
+AIQResponseBaseModelOutput = ResponseBaseModelOutput
+AIQResponseBaseModelIntermediate = ResponseBaseModelIntermediate
+AIQChatResponse = ChatResponse
+AIQChatResponseChunk = ChatResponseChunk
+AIQResponseIntermediateStep = ResponseIntermediateStep
+AIQResponsePayloadOutput = ResponsePayloadOutput
+AIQGenerateResponse = GenerateResponse

{aiq → nat}/data_models/authentication.py

@@ -24,8 +24,8 @@ from pydantic import ConfigDict
 from pydantic import Field
 from pydantic import SecretStr
 
-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 AuthProviderBaseConfig(TypedBaseModel, BaseModelRegistryTag):

{aiq → nat}/data_models/component.py

@@ -19,7 +19,7 @@ from enum import StrEnum
 logger = logging.getLogger(__name__)
 
 
-class AIQComponentEnum(StrEnum):
+class ComponentEnum(StrEnum):
     # Keep sorted!!!
     AUTHENTICATION_PROVIDER = "auth_provider"
     EMBEDDER_CLIENT = "embedder_client"
@@ -52,3 +52,7 @@ class ComponentGroup(StrEnum):
     MEMORY = "memory"
     OBJECT_STORES = "object_stores"
     RETRIEVERS = "retrievers"
+
+
+# Compatibility aliases with previous releases
+AIQComponentEnum = ComponentEnum

{aiq → nat}/data_models/component_ref.py

@@ -20,9 +20,9 @@ from abc import abstractmethod
 from pydantic_core import CoreSchema
 from pydantic_core import core_schema
 
-from aiq.data_models.common import HashableBaseModel
-from aiq.data_models.component import ComponentGroup
-from aiq.utils.type_utils import override
+from nat.data_models.common import HashableBaseModel
+from nat.data_models.component import ComponentGroup
+from nat.utils.type_utils import override
 
 
 def generate_instance_id(input_object: typing.Any) -> str:
@@ -43,7 +43,7 @@ class ComponentRefNode(HashableBaseModel):
 
     Args:
         ref_name (ComponentRef): The name of the component runtime instance.
-        component_group (ComponentGroup): The component group in an AIQ Toolkit configuration object.
+        component_group (ComponentGroup): The component group in a NAT configuration object.
     """
 
     ref_name: "ComponentRef"
@@ -70,7 +70,7 @@ class ComponentRef(str, ABC):
         """Provides the component group this ComponentRef object represents.
 
         Returns:
-            ComponentGroup: A component group of the AIQ Toolkit configuration object
+            ComponentGroup: A component group of the NAT configuration object
         """
 
         pass
@@ -82,7 +82,7 @@ class ComponentRef(str, ABC):
 
 class EmbedderRef(ComponentRef):
     """
-    A reference to an embedder in an AIQ Toolkit configuration object.
+    A reference to an embedder in a NAT configuration object.
     """
 
     @property
@@ -93,7 +93,7 @@ class EmbedderRef(ComponentRef):
 
 class FunctionRef(ComponentRef):
     """
-    A reference to a function in an AIQ Toolkit configuration object.
+    A reference to a function in a NAT configuration object.
     """
 
     @property
@@ -104,7 +104,7 @@ class FunctionRef(ComponentRef):
 
 class LLMRef(ComponentRef):
     """
-    A reference to an LLM in an AIQ Toolkit configuration object.
+    A reference to an LLM in a NAT configuration object.
     """
 
     @property
@@ -115,7 +115,7 @@ class LLMRef(ComponentRef):
 
 class MemoryRef(ComponentRef):
     """
-    A reference to a memory in an AIQ Toolkit configuration object.
+    A reference to a memory in a NAT configuration object.
     """
 
     @property
@@ -126,7 +126,7 @@ class MemoryRef(ComponentRef):
 
 class ObjectStoreRef(ComponentRef):
     """
-    A reference to an object store in an AIQ toolkit configuration object.
+    A reference to an object store in a NAT configuration object.
     """
 
     @property
@@ -137,7 +137,7 @@ class ObjectStoreRef(ComponentRef):
 
 class RetrieverRef(ComponentRef):
     """
-    A reference to a retriever in an AIQ Toolkit configuration object.
+    A reference to a retriever in a NAT configuration object.
     """
 
     @property
@@ -148,7 +148,7 @@ class RetrieverRef(ComponentRef):
 
 class AuthenticationRef(ComponentRef):
     """
-    A reference to an API Authentication Provider in an AIQ Toolkit configuration object.
+    A reference to an API Authentication Provider in a NAT configuration object.
     """
 
     @property

{aiq → nat}/data_models/config.py

@@ -25,14 +25,14 @@ from pydantic import ValidationInfo
 from pydantic import ValidatorFunctionWrapHandler
 from pydantic import field_validator
 
-from aiq.data_models.evaluate import EvalConfig
-from aiq.data_models.front_end import FrontEndBaseConfig
-from aiq.data_models.function import EmptyFunctionConfig
-from aiq.data_models.function import FunctionBaseConfig
-from aiq.data_models.logging import LoggingBaseConfig
-from aiq.data_models.telemetry_exporter import TelemetryExporterBaseConfig
-from aiq.data_models.ttc_strategy import TTCStrategyBaseConfig
-from aiq.front_ends.fastapi.fastapi_front_end_config import FastApiFrontEndConfig
+from nat.data_models.evaluate import EvalConfig
+from nat.data_models.front_end import FrontEndBaseConfig
+from nat.data_models.function import EmptyFunctionConfig
+from nat.data_models.function import FunctionBaseConfig
+from nat.data_models.logging import LoggingBaseConfig
+from nat.data_models.telemetry_exporter import TelemetryExporterBaseConfig
+from nat.data_models.ttc_strategy import TTCStrategyBaseConfig
+from nat.front_ends.fastapi.fastapi_front_end_config import FastApiFrontEndConfig
 
 from .authentication import AuthProviderBaseConfig
 from .common import HashableBaseModel
@@ -47,7 +47,7 @@ logger = logging.getLogger(__name__)
 
 
 def _process_validation_error(err: ValidationError, handler: ValidatorFunctionWrapHandler, info: ValidationInfo):
-    from aiq.cli.type_registry import GlobalTypeRegistry  # pylint: disable=cyclic-import
+    from nat.cli.type_registry import GlobalTypeRegistry  # pylint: disable=cyclic-import
 
     new_errors = []
     logged_once = False
@@ -151,7 +151,7 @@ class TelemetryConfig(BaseModel):
     @classmethod
     def rebuild_annotations(cls):
 
-        from aiq.cli.type_registry import GlobalTypeRegistry
+        from nat.cli.type_registry import GlobalTypeRegistry
 
         type_registry = GlobalTypeRegistry.get()
 
@@ -209,7 +209,7 @@ class GeneralConfig(BaseModel):
     @classmethod
     def rebuild_annotations(cls):
 
-        from aiq.cli.type_registry import GlobalTypeRegistry
+        from nat.cli.type_registry import GlobalTypeRegistry
 
         type_registry = GlobalTypeRegistry.get()
 
@@ -232,7 +232,7 @@ class GeneralConfig(BaseModel):
         return False
 
 
-class AIQConfig(HashableBaseModel):
+class Config(HashableBaseModel):
 
     model_config = ConfigDict(extra="forbid")
 
@@ -307,7 +307,7 @@ class AIQConfig(HashableBaseModel):
     @classmethod
     def rebuild_annotations(cls):
 
-        from aiq.cli.type_registry import GlobalTypeRegistry
+        from nat.cli.type_registry import GlobalTypeRegistry
 
         type_registry = GlobalTypeRegistry.get()
 
@@ -404,3 +404,7 @@ class AIQConfig(HashableBaseModel):
             return cls.model_rebuild(force=True)
 
         return False
+
+
+# Compatibility aliases with previous releases
+AIQConfig = Config