Updating if_model_custom_metadata_artifact_exist in evaluation

Author: kumar-shivam-ranjan

ads/aqua/evaluation/evaluation.py

@@ -433,9 +433,7 @@ def create(
                 metrics=create_aqua_evaluation_details.metrics,
                 inference_configuration=eval_inference_configuration or {},
             )
-        ).create(
-            **kwargs
-        )  ## TODO: decide what parameters will be needed
+        ).create(**kwargs)  ## TODO: decide what parameters will be needed
         logger.debug(
             f"Successfully created evaluation job {evaluation_job.id} for {create_aqua_evaluation_details.evaluation_source_id}."
         )
@@ -1076,11 +1074,14 @@ def download_report(self, eval_id) -> AquaEvalReport:
         with tempfile.TemporaryDirectory() as temp_dir:
             logger.info(f"Downloading evaluation artifact for {eval_id}.")
             dsc_model = DataScienceModel.from_id(eval_id)
-            if dsc_model.if_model_custom_metadata_artifact_exist(
-                eval_id, EVALUATION_REPORT
-            ):
+            if_custom_metadata_exists = (
+                dsc_model.if_model_custom_metadata_artifact_exist(EVALUATION_REPORT)
+            )
+            if if_custom_metadata_exists:
+                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.")
                 dsc_model.download_artifact(
                     temp_dir,
                     auth=self._auth,

ads/model/datascience_model.py

@@ -2236,14 +2236,12 @@ def find_model_idx():
             self.model_file_description["models"].pop(modelSearchIdx)
 
     def if_model_custom_metadata_artifact_exist(
-        self, model_id: str, metadata_key_name: str, **kwargs
+        self, metadata_key_name: str, **kwargs
     ) -> bool:
         """Checks if the custom metadata artifact exists for the model.
 
         Parameters
         ----------
-        model_id : str
-            The model OCID.
         metadata_key_name: str
             Custom metadata key name
         **kwargs :
@@ -2259,13 +2257,12 @@ def if_model_custom_metadata_artifact_exist(
             response = self.dsc_model.head_custom_metadata_artifact(
                 metadata_key_name=metadata_key_name, **kwargs
             )
-            return response.status == 200
-        except oci.exceptions.ServiceError as ex:
-            if ex.status == 404 or ex.status == 400:
-                logger.info(
-                    f"Artifact not found in model {model_id} for cutom metadata {metadata_key_name}. {ex}"
-                )
-                return False
+            return int(response.status) == 200
+        except Exception as ex:
+            logger.info(
+                f"Error fetching custom metadata: {metadata_key_name} for model {self.id}. {ex}"
+            )
+            return False
 
     def create_custom_metadata_artifact(
         self,

ads/model/service/oci_datascience_model.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2022, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2022, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import logging
@@ -110,7 +110,7 @@ def wrapper(self, *args, **kwargs):
 def convert_model_metadata_response(
     headers: Union[Dict, CaseInsensitiveDict], status: int
 ) -> ModelMetadataArtifactDetails:
-    return ModelMetadataArtifactDetails(headers=headers, status=str(status))
+    return ModelMetadataArtifactDetails(headers=dict(headers), status=str(status))
 
 
 class OCIDataScienceModel(