Merge branch 'main' into aqua/ADS_MS_changes

Author: kumar-shivam-ranjan

ads/model/datascience_model.py

@@ -2528,7 +2528,9 @@ def get_custom_metadata_artifact(
         artifact_file_path = os.path.join(target_dir, f"{metadata_key_name}")
 
         if not override and is_path_exists(artifact_file_path):
-            raise FileExistsError(f"File already exists: {artifact_file_path}")
+            raise FileExistsError(
+                f"File already exists: {artifact_file_path}. Please use boolean override parameter to override the file content."
+            )
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)
@@ -2567,7 +2569,9 @@ def get_defined_metadata_artifact(
         artifact_file_path = os.path.join(target_dir, f"{metadata_key_name}")
 
         if not override and is_path_exists(artifact_file_path):
-            raise FileExistsError(f"File already exists: {artifact_file_path}")
+            raise FileExistsError(
+                f"File already exists: {artifact_file_path}. Please use boolean override parameter to override the file content."
+            )
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)

ads/model/service/oci_datascience_model.py

@@ -624,7 +624,7 @@ def get_metadata_content(
         self,
         artifact_path_or_content: Union[str, bytes],
         path_type: MetadataArtifactPathType,
-    ):
+    ) -> bytes:
         """
         returns the content of the metadata artifact
 
@@ -639,29 +639,24 @@ def get_metadata_content(
 
         Returns
         -------
-        metadata artifact content
+        bytes
+            metadata artifact content in bytes
         """
 
         if path_type == MetadataArtifactPathType.CONTENT:
             return artifact_path_or_content
 
-        elif path_type == MetadataArtifactPathType.LOCAL:
-            if not utils.is_path_exists(artifact_path_or_content):
-                raise FileNotFoundError(
-                    f"File not found:  {artifact_path_or_content} . "
-                )
-
-            with open(artifact_path_or_content, "rb") as f:
-                contents = f.read()
-                logger.info(f"The metadata artifact content - {contents}")
-
-            return contents
-
-        elif path_type == MetadataArtifactPathType.OSS:
+        elif (
+            path_type == MetadataArtifactPathType.LOCAL
+            or path_type == MetadataArtifactPathType.OSS
+        ):
             if not utils.is_path_exists(artifact_path_or_content):
                 raise FileNotFoundError(f"File not found: {artifact_path_or_content}")
+            signer = (
+                default_signer() if path_type == MetadataArtifactPathType.OSS else {}
+            )
             contents = read_file(
-                file_path=artifact_path_or_content, auth=default_signer()
+                file_path=artifact_path_or_content, auth=signer
             ).encode()
             logger.debug(f"The metadata artifact content - {contents}")