Resolving conflicts

Author: kumar-shivam-ranjan

ads/aqua/app.py

@@ -314,18 +314,23 @@ def get_config(
             )
             base_model = self.ds_client.get_model(base_model_ocid).data
             artifact_path = get_artifact_path(base_model.custom_metadata_list)
-            config_path = f"{os.path.dirname(artifact_path)}/{config_folder}/"
+            if config_folder == "artifact":
+                artifact_path = get_artifact_path(oci_model.custom_metadata_list)
         else:
             logger.info(f"Loading {config_file_name} for model {oci_model.id}...")
             artifact_path = get_artifact_path(oci_model.custom_metadata_list)
-            config_path = f"{artifact_path.rstrip('/')}/{config_folder}/"
         if not artifact_path:
             logger.debug(
                 f"Failed to get artifact path from custom metadata for the model: {model_id}"
             )
             return config
 
-        config_file_path = f"{config_path.rstrip('/')}/{config_file_name}"
+        config_path = f"{os.path.dirname(artifact_path)}/{config_folder}/"
+        if not is_path_exists(config_path):
+            config_path = f"{artifact_path.rstrip('/')}/{config_folder}/"
+            if not is_path_exists(config_path):
+                config_path = f"{artifact_path.rstrip('/')}/"
+        config_file_path = f"{config_path}{config_file_name}"
         if is_path_exists(config_file_path):
             try:
                 config = load_config(

ads/aqua/model/model.py

@@ -582,7 +582,7 @@ def get_hf_tokenizer_config(self, model_id):
         str:
             Chat template string.
         """
-        config = self.get_config(model_id, AQUA_MODEL_TOKENIZER_CONFIG, "/")
+        config = self.get_config(model_id, AQUA_MODEL_TOKENIZER_CONFIG, "artifact")
         if not config:
             logger.debug(f"Tokenizer config for model: {model_id} is not available.")
         return config

docs/source/release_notes.rst

@@ -2,6 +2,13 @@
 Release Notes
 =============
 
+2.12.11
+-------
+Release date: Feb 5th, 2024
+
+* Fixed bug while loading model configuration in AI Quick Actions.
+
+
 2.12.10
 -------
 Release date: Feb 5th, 2024

pyproject.toml

@@ -21,7 +21,7 @@ build-backend = "flit_core.buildapi"
 
 # Required
 name = "oracle_ads" # the install (PyPI) name; name for local build in [tool.flit.module] section below
-version = "2.12.10"
+version = "2.12.11"
 
 # Optional
 description = "Oracle Accelerated Data Science SDK"