Updating fetch evaluation report flow

Author: kumar-shivam-ranjan

ads/aqua/evaluation/evaluation.py

@@ -81,7 +81,13 @@
 from ads.aqua.model.constants import ModelCustomMetadataFields
 from ads.common.auth import default_signer
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.common.utils import UNKNOWN, get_console_link, get_files, get_log_links
+from ads.common.utils import (
+    UNKNOWN,
+    get_console_link,
+    get_files,
+    get_log_links,
+    read_file,
+)
 from ads.config import (
     AQUA_JOB_SUBNET_ID,
     COMPARTMENT_OCID,
@@ -1268,14 +1274,38 @@ def download_report(self, eval_id) -> AquaEvalReport:
                 logger.info(f"Fetching {EVALUATION_REPORT} from custom metadata.")
                 dsc_model.get_custom_metadata_artifact(EVALUATION_REPORT, temp_dir)
             else:
-                logger.info(f"Fetching {EVALUATION_REPORT} from OSS bucket.")
+                logger.info(f"Fetching {EVALUATION_REPORT} from Model artifact.")
                 dsc_model.download_artifact(
                     temp_dir,
                     auth=self._auth,
                 )
-            content = self._read_from_artifact(
-                temp_dir, get_files(temp_dir), EVALUATION_REPORT
-            )
+            files_in_artifact = get_files(temp_dir)
+            if not len(files_in_artifact):
+                try:
+                    evaluation_output_path = dsc_model.custom_metadata_list.get(
+                        EvaluationCustomMetadata.EVALUATION_OUTPUT_PATH
+                    ).value
+                    report_path = (
+                        evaluation_output_path.rstrip("/")
+                        + "/"
+                        + eval_id
+                        + "/"
+                        + EVALUATION_REPORT
+                    )
+                    logger.info(
+                        f"Fetching {EVALUATION_REPORT} from {report_path} for evaluation {eval_id}"
+                    )
+                    content = read_file(
+                        file_path=report_path, auth=default_signer()
+                    ).encode()
+                except ValueError as err:
+                    raise AquaValueError(
+                        f"{EvaluationCustomMetadata.EVALUATION_OUTPUT_PATH} is missing from custom metadata for the model {eval_id}"
+                    ) from err
+            else:
+                content = self._read_from_artifact(
+                    temp_dir, files_in_artifact, EVALUATION_REPORT
+                )
         report = AquaEvalReport(
             evaluation_id=eval_id, content=base64.b64encode(content).decode()
         )

ads/aqua/modeldeployment/deployment.py

@@ -60,7 +60,7 @@
 )
 from ads.aqua.modeldeployment.utils import MultiModelDeploymentConfigLoader
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.common.utils import UNKNOWN, UNKNOWN_LIST, get_log_links
+from ads.common.utils import UNKNOWN, get_log_links
 from ads.config import (
     AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
     AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,
@@ -520,7 +520,7 @@ def _create(
         params = f"{params} {deployment_params}".strip()
         if params:
             env_var.update({"PARAMS": params})
-        env_vars = container_spec.env_vars if container_spec else UNKNOWN_LIST
+        env_vars = container_spec.env_vars if container_spec else []
         for env in env_vars:
             if isinstance(env, dict):
                 env = {k: v for k, v in env.items() if v}
@@ -651,7 +651,7 @@ def _create_multi(
 
         env_var.update({AQUA_MULTI_MODEL_CONFIG: json.dumps({"models": model_config})})
 
-        env_vars = container_spec.env_vars if container_spec else UNKNOWN_LIST
+        env_vars = container_spec.env_vars if container_spec else []
         for env in env_vars:
             if isinstance(env, dict):
                 env = {k: v for k, v in env.items() if v}

ads/aqua/modeldeployment/utils.py

@@ -200,8 +200,14 @@ def _fetch_deployment_config_from_metadata_and_oss(
             model_id, AquaModelMetadataKeys.DEPLOYMENT_CONFIGURATION
         )
         if config:
+            logger.info(
+                f"Fetched metadata key '{AquaModelMetadataKeys.DEPLOYMENT_CONFIGURATION}' from defined metadata for model '{model_id}'"
+            )
             return config
         else:
+            logger.info(
+                f"Fetching '{AquaModelMetadataKeys.DEPLOYMENT_CONFIGURATION}' from object storage bucket for {model_id}'"
+            )
             return self.deployment_app.get_config(
                 model_id, AQUA_MODEL_DEPLOYMENT_CONFIG
             )

ads/common/utils.py

@@ -64,7 +64,6 @@
 MAX_DISPLAY_VALUES = 10
 
 UNKNOWN = ""
-UNKNOWN_LIST = []
 
 # par link of the index json file.
 PAR_LINK = "https://objectstorage.us-ashburn-1.oraclecloud.com/p/WyjtfVIG0uda-P3-2FmAfwaLlXYQZbvPZmfX1qg0-sbkwEQO6jpwabGr2hMDBmBp/n/ociodscdev/b/service-conda-packs/o/service_pack/index.json"