update enum name

Author: VipulMascarenhas

ads/aqua/common/enums.py

@@ -40,6 +40,21 @@ class Tags(str, metaclass=ExtendedEnumMeta):
     AQUA_EVALUATION_MODEL_ID = "evaluation_model_id"
 
 
+class InferenceContainerType(str, metaclass=ExtendedEnumMeta):
+    CONTAINER_TYPE_VLLM = "vllm"
+    CONTAINER_TYPE_TGI = "tgi"
+
+
+class InferenceContainerTypeFamily(str, metaclass=ExtendedEnumMeta):
+    AQUA_VLLM_CONTAINER_FAMILY = "odsc-vllm-serving"
+    AQUA_TGI_CONTAINER_FAMILY = "odsc-tgi-serving"
+
+
+class InferenceContainerParamType(str, metaclass=ExtendedEnumMeta):
+    PARAM_TYPE_VLLM = "VLLM_PARAMS"
+    PARAM_TYPE_TGI = "TGI_PARAMS"
+
+
 class HuggingFaceTags(str, metaclass=ExtendedEnumMeta):
     TEXT_GENERATION_INFERENCE = "text-generation-inference"
 

ads/aqua/model/model.py

@@ -13,7 +13,7 @@
 
 from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID
 from ads.aqua.app import AquaApp
-from ads.aqua.common.enums import Tags, HuggingFaceTags
+from ads.aqua.common.enums import Tags, HuggingFaceTags, InferenceContainerTypeFamily
 from ads.aqua.common.errors import AquaRuntimeError
 from ads.aqua.common.utils import (
     create_word_icon,
@@ -38,7 +38,6 @@
 )
 from ads.aqua.model.constants import *
 from ads.aqua.model.entities import *
-from ads.aqua.modeldeployment.enums import InferenceContainerTypeKey
 from ads.common.auth import default_signer
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
 from ads.common.utils import get_console_link
@@ -628,11 +627,11 @@ def _create_model_catalog_entry(
 
             if not inference_container:
                 inference_container = (
-                    InferenceContainerTypeKey.AQUA_TGI_CONTAINER_KEY
+                    InferenceContainerTypeFamily.AQUA_TGI_CONTAINER_FAMILY
                     if model_info
                     and model_info.tags
                     and HuggingFaceTags.TEXT_GENERATION_INFERENCE in model_info.tags
-                    else InferenceContainerTypeKey.AQUA_VLLM_CONTAINER_KEY
+                    else InferenceContainerTypeFamily.AQUA_VLLM_CONTAINER_FAMILY
                 )
                 logger.info(
                     f"Model: {model_name} does not have associated inference container defaults. "

ads/aqua/modeldeployment/deployment.py

@@ -10,7 +10,12 @@
 from oci.data_science.models import ModelDeployment
 
 from ads.aqua.app import AquaApp, logger
-from ads.aqua.common.enums import Tags
+from ads.aqua.common.enums import (
+    Tags,
+    InferenceContainerParamType,
+    InferenceContainerType,
+    InferenceContainerTypeFamily,
+)
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
     get_container_config,
@@ -42,11 +47,6 @@
     VLLMInferenceRestrictedParams,
     TGIInferenceRestrictedParams,
 )
-from ads.aqua.modeldeployment.enums import (
-    InferenceContainerParamType,
-    InferenceContainerType,
-    InferenceContainerTypeKey,
-)
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.utils import get_log_links
 from ads.config import (
@@ -241,7 +241,7 @@ def create(
             if not container_family:
                 raise AquaValueError(
                     f"{message}. For unverified Aqua models, container_family parameter should be "
-                    f"set and value can be one of {', '.join(InferenceContainerTypeKey.values())}."
+                    f"set and value can be one of {', '.join(InferenceContainerTypeFamily.values())}."
                 )
             container_type_key = container_family
         try:
@@ -572,7 +572,7 @@ def get_deployment_default_params(
 
         if container_type_key:
             container_type_key = container_type_key.lower()
-            if container_type_key in InferenceContainerTypeKey.values():
+            if container_type_key in InferenceContainerTypeFamily.values():
                 deployment_config = self.get_deployment_config(model_id)
                 config_parameters = (
                     deployment_config.get("configuration", UNKNOWN_DICT)
@@ -639,7 +639,7 @@ def validate_deployment_params(
                 if not container_family:
                     raise AquaValueError(
                         f"{message}. For unverified Aqua models, container_family parameter should be "
-                        f"set and value can be one of {', '.join(InferenceContainerTypeKey.values())}."
+                        f"set and value can be one of {', '.join(InferenceContainerTypeFamily.values())}."
                     )
                 container_type_key = container_family
 

ads/aqua/modeldeployment/enums.py

@@ -3,20 +3,3 @@
 
 # Copyright (c) 2024 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
-
-from ads.common.extended_enum import ExtendedEnumMeta
-
-
-class InferenceContainerType(str, metaclass=ExtendedEnumMeta):
-    CONTAINER_TYPE_VLLM = "vllm"
-    CONTAINER_TYPE_TGI = "tgi"
-
-
-class InferenceContainerTypeKey(str, metaclass=ExtendedEnumMeta):
-    AQUA_VLLM_CONTAINER_KEY = "odsc-vllm-serving"
-    AQUA_TGI_CONTAINER_KEY = "odsc-tgi-serving"
-
-
-class InferenceContainerParamType(str, metaclass=ExtendedEnumMeta):
-    PARAM_TYPE_VLLM = "VLLM_PARAMS"
-    PARAM_TYPE_TGI = "TGI_PARAMS"