added artifact location for fine tuned model

Author: elizjo

ads/aqua/model/model.py

@@ -312,12 +312,13 @@ def create_multi(
             #         "Currently only service models are supported for multi model deployment."
             #     )
 
-            # check if model is a fine-tuned model and if so, pass FT_MODEL info to model's env variables
+            # check if model is a fine-tuned model and if so, pass FT_MODEL info to model's
+            # env variables & set model_path to be the base model
             is_fine_tuned_model = Tags.AQUA_FINE_TUNED_MODEL_TAG in source_model.freeform_tags
 
             if is_fine_tuned_model:
                 model.model_id, model.model_name = extract_base_model_from_ft(source_model)
-                set_fine_tune_env_var(source_model, model.env_var)
+                set_fine_tune_env_var(source_model, model=model)
 
             display_name_list.append(display_name)
 

ads/aqua/model/utils.py

@@ -3,8 +3,9 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 """AQUA model utils"""
 
-from typing import Dict, Tuple
+from typing import Dict, Optional, Tuple
 
+from ads.aqua.common.entities import AquaMultiModelRef
 from ads.aqua.common.errors import AquaValueError
 from ads.aqua.common.utils import get_model_by_reference_paths
 from ads.aqua.finetuning.constants import FineTuneCustomMetadata
@@ -30,7 +31,7 @@ def extract_base_model_from_ft(aqua_model: DataScienceModel) -> Tuple[str, str]:
     return config_source_id, model_name
 
 
-def set_fine_tune_env_var(aqua_model: DataScienceModel, env_var: Dict[str,str]) -> None:
+def set_fine_tune_env_var(aqua_model: DataScienceModel, env_var: Optional[Dict[str,str]], model: Optional[AquaMultiModelRef] = None) -> None:
     """Extracts the fine tuning source (fine_tune_output_path).
     Sets the environment variable (env_var) of the fine tuned model to include FT_model (fine tuning source)"""
 
@@ -44,5 +45,12 @@ def set_fine_tune_env_var(aqua_model: DataScienceModel, env_var: Dict[str,str])
     os_path = ObjectStorageDetails.from_path(fine_tune_output_path)
     fine_tune_output_path = os_path.filepath.rstrip("/")
 
-    env_var.update({"FT_MODEL": f"{fine_tune_output_path}"})
+    # we add the correct artifact location when using FT in Multi Model Deployment
+    if model:
+        model.artifact_location = base_model_path # validated later in _create_multi method in deployment.py
+        model.env_var.update({"FT_MODEL": f"{fine_tune_output_path}"})
+
+    else:
+        env_var.update({"FT_MODEL": f"{fine_tune_output_path}"})
+
 

ads/aqua/modeldeployment/deployment.py

@@ -366,7 +366,7 @@ def _create(
 
         if is_fine_tuned_model:
             config_source_id, model_name = extract_base_model_from_ft(aqua_model)
-            set_fine_tune_env_var(aqua_model, env_var)
+            set_fine_tune_env_var(aqua_model, env_var=env_var)
 
         container_type_key = self._get_container_type_key(
             model=aqua_model,

tests/unitary/with_extras/aqua/test_deployment.py

@@ -19,22 +19,21 @@
 )
 from parameterized import parameterized
 
+import ads.aqua.modeldeployment.deployment
+import ads.config
+from ads.aqua.app import AquaApp
 from ads.aqua.common.entities import (
     AquaMultiModelRef,
     ComputeShapeSummary,
     ModelConfigResult,
 )
-from ads.aqua.app import AquaApp
-from ads.aqua.common.entities import ModelConfigResult
-import ads.aqua.modeldeployment.deployment
-import ads.config
-from ads.aqua.common.entities import AquaMultiModelRef
 from ads.aqua.common.enums import Tags
 from ads.aqua.common.errors import AquaRuntimeError, AquaValueError
 from ads.aqua.config.container_config import (
-    AquaContainerConfigItem,
     AquaContainerConfig,
+    AquaContainerConfigItem,
 )
+from ads.aqua.model.enums import MultiModelSupportedTaskType
 from ads.aqua.modeldeployment import AquaDeploymentApp, MDInferenceResponse
 from ads.aqua.modeldeployment.entities import (
     AquaDeployment,
@@ -45,7 +44,6 @@
     ModelDeploymentConfigSummary,
     ModelParams,
 )
-from ads.aqua.model.enums import MultiModelSupportedTaskType
 from ads.aqua.modeldeployment.utils import MultiModelDeploymentConfigLoader
 from ads.model.datascience_model import DataScienceModel
 from ads.model.deployment.model_deployment import ModelDeployment