Aqua/add modeldeployenvvar (#904)

Author: harsh97

ads/aqua/common/utils.py

@@ -251,9 +251,9 @@ def list_os_files_with_extension(oss_path: str, extension: str) -> [str]:
     files: List[ObjectSummary] = oss_client.list_objects().objects
 
     return [
-        file.name
+        file.name[len(oss_client.filepath) :]
         for file in files
-        if file.name.endswith(extension) and "/" not in file.name
+        if file.name.endswith(extension)
     ]
 
 

ads/aqua/model/model.py

@@ -364,8 +364,8 @@ def _build_ft_metrics(
             training_final,
         ]
 
+    @staticmethod
     def to_aqua_model(
-        self,
         model: Union[
             DataScienceModel,
             oci.data_science.models.model.Model,
@@ -375,7 +375,7 @@ def to_aqua_model(
         region: str,
     ) -> AquaModel:
         """Converts a model to an Aqua model."""
-        return AquaModel(**self._process_model(model, region))
+        return AquaModel(**AquaModelApp._process_model(model, region))
 
     @staticmethod
     def _process_model(

ads/aqua/modeldeployment/deployment.py

@@ -25,6 +25,7 @@
     load_config,
 )
 from ads.aqua.constants import (
+    AQUA_MODEL_ARTIFACT_FILE,
     AQUA_MODEL_TYPE_CUSTOM,
     AQUA_MODEL_TYPE_SERVICE,
     MODEL_BY_REFERENCE_OSS_PATH_KEY,
@@ -39,6 +40,7 @@
     AquaDeploymentDetail,
     ContainerSpec,
 )
+from ads.aqua.ui import ModelFormat
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.utils import get_log_links
 from ads.config import (
@@ -210,6 +212,21 @@ def create(
 
         env_var.update({"BASE_MODEL": f"{model_path_prefix}"})
 
+        model_format = aqua_model.freeform_tags.get(
+            Tags.MODEL_FORMAT, ModelFormat.SAFETENSORS.value
+        ).upper()
+        if model_format == ModelFormat.GGUF.value:
+            try:
+                model_file = aqua_model.custom_metadata_list.get(
+                    AQUA_MODEL_ARTIFACT_FILE
+                ).value
+            except ValueError as err:
+                raise AquaValueError(
+                    f"{AQUA_MODEL_ARTIFACT_FILE} key is not available in the custom metadata field "
+                    f"for model {aqua_model.id}."
+                ) from err
+            env_var.update({"BASE_MODEL_FILE": f"{model_file}"})
+
         if is_fine_tuned_model:
             _, fine_tune_output_path = get_model_by_reference_paths(
                 aqua_model.model_file_description
@@ -302,13 +319,15 @@ def create(
 
         deployment_params = get_combined_params(config_params, user_params)
 
-        if deployment_params:
-            params = f"{params} {deployment_params}"
+        params = f"{params} {deployment_params}".strip()
+        if params:
+            env_var.update({"PARAMS": params})
 
-        env_var.update({"PARAMS": params})
         for env in container_spec.get(ContainerSpec.ENV_VARS, []):
             if isinstance(env, dict):
-                env_var.update(env)
+                for key, _items in env.items():
+                    if key not in env_var:
+                        env_var.update(env)
 
         logging.info(f"Env vars used for deploying {aqua_model.id} :{env_var}")