Addressing review comments

Author: kumar-shivam-ranjan

ads/aqua/app.py

@@ -13,7 +13,7 @@
 
 from ads import set_auth
 from ads.aqua import logger
-from ads.aqua.common.enums import Tags
+from ads.aqua.common.enums import ConfigFolder, Tags
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.common.utils import (
     _is_valid_mvs,
@@ -272,7 +272,7 @@ def get_config(
         self,
         model_id: str,
         config_file_name: str,
-        config_folder: Optional[str] = "config",
+        config_folder: Optional[str] = ConfigFolder.CONFIG,
     ) -> Dict:
         """Gets the config for the given Aqua model.
 
@@ -282,15 +282,16 @@ def get_config(
             The OCID of the Aqua model.
         config_file_name: str
             name of the config file
-        config_folder: Optional[str]
+        config_folder: (str, optional):
             subfolder path where config_file_name needs to be searched
-            default value: config
+             Defaults to `ConfigFolder.CONFIG`.
 
         Returns
         -------
         Dict:
             A dict of allowed configs.
         """
+        config_folder = config_folder or ConfigFolder.CONFIG
         oci_model = self.ds_client.get_model(model_id).data
         oci_aqua = (
             (
@@ -314,7 +315,7 @@ def get_config(
             )
             base_model = self.ds_client.get_model(base_model_ocid).data
             artifact_path = get_artifact_path(base_model.custom_metadata_list)
-            if config_folder == "artifact":
+            if config_folder == ConfigFolder.ARTIFACT:
                 artifact_path = get_artifact_path(oci_model.custom_metadata_list)
         else:
             logger.info(f"Loading {config_file_name} for model {oci_model.id}...")

ads/aqua/common/enums.py

@@ -92,3 +92,8 @@ class TextEmbeddingInferenceContainerParams(str, metaclass=ExtendedEnumMeta):
 
     MODEL_ID = "model-id"
     PORT = "port"
+
+
+class ConfigFolder(str, metaclass=ExtendedEnumMeta):
+    CONFIG = "config"
+    ARTIFACT = "artifact"

ads/aqua/extension/model_handler.py

@@ -322,6 +322,8 @@ def get(self, model_id):
         url_parse = urlparse(self.request.path)
         paths = url_parse.path.strip("/")
         path_list = paths.split("/")
+        # Path should be /aqua/models/ocid1.iad.ahdxxx/tokenizer
+        # path_list=['aqua','models','<model-ocid>','tokenizer']
         if (
             len(path_list) == 4
             and is_valid_ocid(path_list[2])

ads/aqua/model/model.py

@@ -15,6 +15,7 @@
 from ads.aqua import ODSC_MODEL_COMPARTMENT_OCID, logger
 from ads.aqua.app import AquaApp
 from ads.aqua.common.enums import (
+    ConfigFolder,
     CustomInferenceContainerTypeFamily,
     FineTuningContainerTypeFamily,
     InferenceContainerTypeFamily,
@@ -582,7 +583,9 @@ def get_hf_tokenizer_config(self, model_id):
         str:
             Chat template string.
         """
-        config = self.get_config(model_id, AQUA_MODEL_TOKENIZER_CONFIG, "artifact")
+        config = self.get_config(
+            model_id, AQUA_MODEL_TOKENIZER_CONFIG, ConfigFolder.ARTIFACT
+        )
         if not config:
             logger.debug(f"Tokenizer config for model: {model_id} is not available.")
         return config