Updating has_artifact field in ADS

kumar-shivam-ranjan · kumar-shivam-ranjan · commit f917ee798ac6 · 2025-03-10T16:41:27.000+05:30
diff --git a/ads/aqua/app.py b/ads/aqua/app.py
@@ -21,10 +21,10 @@
     is_valid_ocid,
     load_config,
 )
-from ads.aqua.constants import UNKNOWN
+
 from ads.common import oci_client as oc
 from ads.common.auth import default_signer
-from ads.common.utils import extract_region, is_path_exists
+from ads.common.utils import extract_region, is_path_exists , UNKNOWN
 from ads.config import (
     AQUA_TELEMETRY_BUCKET,
     AQUA_TELEMETRY_BUCKET_NS,
diff --git a/ads/aqua/common/utils.py b/ads/aqua/common/utils.py
@@ -58,17 +58,19 @@
     SUPPORTED_FILE_FORMATS,
     TEI_CONTAINER_DEFAULT_HOST,
     TGI_INFERENCE_RESTRICTED_PARAMS,
-    UNKNOWN,
     UNKNOWN_JSON_STR,
     VLLM_INFERENCE_RESTRICTED_PARAMS,
 )
+
+from ads.common.utils import UNKNOWN
+
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.auth import AuthState, default_signer
 from ads.common.decorator.threaded import threaded
 from ads.common.extended_enum import ExtendedEnum
 from ads.common.object_storage_details import ObjectStorageDetails
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
-from ads.common.utils import copy_file, get_console_link, upload_to_os
+from ads.common.utils import copy_file, get_console_link, upload_to_os, read_file
 from ads.config import (
     AQUA_MODEL_DEPLOYMENT_FOLDER,
     AQUA_SERVICE_MODELS_BUCKET,
@@ -228,15 +230,6 @@ def get_artifact_path(custom_metadata_list: List) -> str:
     return UNKNOWN
 
 
-def read_file(file_path: str, **kwargs) -> str:
-    try:
-        with fsspec.open(file_path, "r", **kwargs.get("auth", {})) as f:
-            return f.read()
-    except Exception as e:
-        logger.debug(f"Failed to read file {file_path}. {e}")
-        return UNKNOWN
-
-
 @threaded()
 def load_config(file_path: str, config_file_name: str, **kwargs) -> dict:
     artifact_path = f"{file_path.rstrip('/')}/{config_file_name}"
diff --git a/ads/aqua/constants.py b/ads/aqua/constants.py
@@ -3,7 +3,7 @@
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 """This module defines constants used in ads.aqua module."""
 
-UNKNOWN = ""
+
 UNKNOWN_VALUE = ""
 READY_TO_IMPORT_STATUS = "TRUE"
 UNKNOWN_DICT = {}
diff --git a/ads/aqua/evaluation/evaluation.py b/ads/aqua/evaluation/evaluation.py
@@ -52,8 +52,7 @@
     EVALUATION_REPORT_MD,
     JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
     LIFECYCLE_DETAILS_MISSING_JOBRUN,
-    NB_SESSION_IDENTIFIER,
-    UNKNOWN,
+    NB_SESSION_IDENTIFIER
 )
 from ads.aqua.evaluation.constants import (
     EVAL_TERMINATION_STATE,
@@ -78,7 +77,7 @@
 from ads.aqua.ui import AquaContainerConfig
 from ads.common.auth import default_signer
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.common.utils import get_console_link, get_files, get_log_links
+from ads.common.utils import get_console_link, get_files, get_log_links , UNKNOWN
 from ads.config import (
     AQUA_JOB_SUBNET_ID,
     COMPARTMENT_OCID,
diff --git a/ads/aqua/finetuning/finetuning.py b/ads/aqua/finetuning/finetuning.py
@@ -30,7 +30,6 @@
     DEFAULT_FT_REPLICA,
     DEFAULT_FT_VALIDATION_SET_SIZE,
     JOB_INFRASTRUCTURE_TYPE_DEFAULT_NETWORKING,
-    UNKNOWN,
     UNKNOWN_DICT,
 )
 from ads.aqua.data import AquaResourceIdentifier
@@ -45,7 +44,7 @@
 )
 from ads.common.auth import default_signer
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.common.utils import get_console_link
+from ads.common.utils import get_console_link , UNKNOWN
 from ads.config import (
     AQUA_FINETUNING_CONTAINER_OVERRIDE_FLAG_METADATA_NAME,
     AQUA_JOB_SUBNET_ID,
diff --git a/ads/aqua/model/model.py b/ads/aqua/model/model.py
@@ -56,7 +56,6 @@
     READY_TO_IMPORT_STATUS,
     TRAINING_METRICS_FINAL,
     TRINING_METRICS,
-    UNKNOWN,
     VALIDATION_METRICS,
     VALIDATION_METRICS_FINAL,
 )
@@ -79,7 +78,7 @@
 from ads.aqua.ui import AquaContainerConfig, AquaContainerConfigItem
 from ads.common.auth import default_signer
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
-from ads.common.utils import get_console_link
+from ads.common.utils import get_console_link , UNKNOWN
 from ads.config import (
     AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
     AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,
diff --git a/ads/aqua/modeldeployment/deployment.py b/ads/aqua/modeldeployment/deployment.py
@@ -30,7 +30,6 @@
     AQUA_MODEL_TYPE_CUSTOM,
     AQUA_MODEL_TYPE_SERVICE,
     MODEL_BY_REFERENCE_OSS_PATH_KEY,
-    UNKNOWN,
     UNKNOWN_DICT,
 )
 from ads.aqua.data import AquaResourceIdentifier
@@ -42,7 +41,7 @@
 )
 from ads.aqua.ui import ModelFormat
 from ads.common.object_storage_details import ObjectStorageDetails
-from ads.common.utils import get_log_links
+from ads.common.utils import get_log_links , UNKNOWN
 from ads.config import (
     AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
     AQUA_DEPLOYMENT_CONTAINER_METADATA_NAME,
diff --git a/ads/aqua/modeldeployment/entities.py b/ads/aqua/modeldeployment/entities.py
@@ -11,10 +11,10 @@
 )
 
 from ads.aqua.common.enums import Tags
-from ads.aqua.constants import UNKNOWN, UNKNOWN_DICT
+from ads.aqua.constants import  UNKNOWN_DICT
 from ads.aqua.data import AquaResourceIdentifier
 from ads.common.serializer import DataClassSerializable
-from ads.common.utils import get_console_link
+from ads.common.utils import get_console_link , UNKNOWN
 
 
 @dataclass
diff --git a/ads/common/utils.py b/ads/common/utils.py
@@ -64,6 +64,8 @@
 # Maximum distinct values by cardinality will be used for plotting
 MAX_DISPLAY_VALUES = 10
 
+UNKNOWN = ""
+
 # 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"
 
@@ -236,6 +238,13 @@ def random_valid_ocid(prefix="ocid1.dataflowapplication.oc1.iad"):
     fake = "".join([random.choice(string.ascii_lowercase) for i in range(60)])
     return f"{left}.{fake}"
 
+def read_file(file_path: str, **kwargs) -> str:
+    try:
+        with fsspec.open(file_path, "r", **kwargs.get("auth", {})) as f:
+            return f.read()
+    except Exception as e:
+        logger.debug(f"Failed to read file {file_path}. {e}")
+        return UNKNOWN
 
 def get_dataframe_styles(max_width=75):
     """Styles used for dataframe, example usage:
diff --git a/ads/model/datascience_model.py b/ads/model/datascience_model.py
@@ -2233,7 +2233,7 @@ def create_custom_metadata_artifact(
         self,
         metadata_key_name: str,
         artifact_path_or_content: str,
-        path_type: str = utils.MetadataArtifactPathType.LOCAL,
+        path_type: utils.MetadataArtifactPathType = utils.MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Creates model custom metadata artifact for specified model.
 
@@ -2245,7 +2245,7 @@ def create_custom_metadata_artifact(
         artifact_path_or_content: str
             The model custom metadata artifact path to be upload. It can also be the actual content of the custom metadata
 
-        path_type: str
+        path_type: utils.MetadataArtifactPathType
             Can be either of utils.MetadataArtifactPathType.LOCAL , utils.MetadataArtifactPathType.OSS , utils.MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
             Can be either local , oss or the actual content itself
@@ -2277,7 +2277,7 @@ def create_defined_metadata_artifact(
         self,
         metadata_key_name: str,
         artifact_path_or_content: str,
-        path_type: str = utils.MetadataArtifactPathType.LOCAL,
+        path_type: utils.MetadataArtifactPathType = utils.MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Creates model defined metadata artifact for specified model.
 
@@ -2289,7 +2289,7 @@ def create_defined_metadata_artifact(
         artifact_path_or_content: str
             The model defined metadata artifact path to be upload. It can also be the actual content of the defined metadata
 
-        path_type: str
+        path_type: utils.MetadataArtifactPathType
             Can be either of utils.MetadataArtifactPathType.LOCAL , utils.MetadataArtifactPathType.OSS , utils.MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
             Can be either local , oss or the actual content itself
@@ -2320,7 +2320,7 @@ def update_custom_metadata_artifact(
         self,
         metadata_key_name: str,
         artifact_path_or_content: str,
-        path_type: str = utils.MetadataArtifactPathType.LOCAL,
+        path_type: utils.MetadataArtifactPathType = utils.MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Update model custom metadata artifact for specified model.
 
@@ -2332,7 +2332,7 @@ def update_custom_metadata_artifact(
         artifact_path_or_content: str
             The model custom metadata artifact path. It can also be the actual content of the custom metadata
 
-        path_type: str
+        path_type: utils.MetadataArtifactPathType
             Can be either of utils.MetadataArtifactPathType.LOCAL , utils.MetadataArtifactPathType.OSS , utils.MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
             Can be either local , oss or the actual content itself
@@ -2364,7 +2364,7 @@ def update_defined_metadata_artifact(
         self,
         metadata_key_name: str,
         artifact_path_or_content: str,
-        path_type: str = utils.MetadataArtifactPathType.LOCAL,
+        path_type: utils.MetadataArtifactPathType = utils.MetadataArtifactPathType.LOCAL,
     ) -> ModelMetadataArtifactDetails:
         """Update model defined metadata artifact for specified model.
 
@@ -2376,7 +2376,7 @@ def update_defined_metadata_artifact(
         artifact_path_or_content: str
             The model defined metadata artifact path. It can also be the actual content of the defined metadata
 
-        path_type: str
+        path_type: utils.MetadataArtifactPathType
             Can be either of utils.MetadataArtifactPathType.LOCAL , utils.MetadataArtifactPathType.OSS , utils.MetadataArtifactPathType.CONTENT
             Specifies what type of path is to be provided for metadata artifact.
             Can be either local , oss or the actual content itself
@@ -2437,7 +2437,7 @@ def get_custom_metadata_artifact(
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)
-            logger.info(f"Artifact downloaded to location - {artifact_file_path}")
+            logger.debug(f"Artifact downloaded to location - {artifact_file_path}")
 
     def get_defined_metadata_artifact(
         self, metadata_key_name: str, target_dir: str, override: bool = False
@@ -2472,7 +2472,7 @@ def get_defined_metadata_artifact(
 
         with open(artifact_file_path, "wb") as _file:
             _file.write(file_content)
-            logger.info(f"Artifact downloaded to location - {artifact_file_path}")
+            logger.debug(f"Artifact downloaded to location - {artifact_file_path}")
 
     def delete_custom_metadata_artifact(
         self, metadata_key_name: str
diff --git a/ads/model/model_metadata.py b/ads/model/model_metadata.py
@@ -341,17 +341,22 @@ def _to_oci_metadata(self):
     def _from_oci_metadata(cls, oci_metadata_item) -> "ModelMetadataItem":
         """Creates a new metadata item from the OCI metadata item."""
         oci_metadata_item = to_dict(oci_metadata_item)
+        print("oci_metadata_item: ",oci_metadata_item)
         key_value_map = {field: oci_metadata_item.get(field) for field in cls._FIELDS}
-
+        print("key_value_map['value'] type: ",type(key_value_map["value"]))
         if isinstance(key_value_map["value"], str):
             try:
+                print("type of oci_metadata_item: ",type(oci_metadata_item))
                 key_value_map["value"] = json.loads(oci_metadata_item.get("value"))
-                key_value_map["has_artifact"] = json.loads(
-                    oci_metadata_item.get("has_artifact")
-                )
+                try:
+                    key_value_map["has_artifact"] = json.loads(
+                        oci_metadata_item.get("has_artifact")
+                    )
+                except Exception:
+                    key_value_map["has_artifact"]=False
             except Exception:
                 pass
-
+        print("key value map: ",key_value_map)
         return cls(**key_value_map)
 
     def __hash__(self):
@@ -444,10 +449,7 @@ def has_artifact(self) -> bool:
 
     @has_artifact.setter
     def has_artifact(self, has_artifact: bool):
-        if not has_artifact:
-            self._has_artifact = False
-            return
-        self._has_artifact = has_artifact
+        self._has_artifact = has_artifact is True
 
     @property
     def value(self) -> str:
@@ -689,6 +691,8 @@ def _to_oci_metadata(self):
             oci_metadata_item.value = _METADATA_EMPTY_VALUE
         if not oci_metadata_item.category:
             oci_metadata_item.category = MetadataCustomCategory.OTHER
+        if not oci_metadata_item.has_artifact:
+            oci_metadata_item.has_artifact=False
         return oci_metadata_item
 
     def validate(self) -> bool:
@@ -1544,7 +1548,9 @@ def _from_oci_metadata(cls, metadata_list):
         """
         metadata = cls()
         for oci_item in metadata_list:
+            print("oci_item: ",oci_item)
             item = ModelTaxonomyMetadataItem._from_oci_metadata(oci_item)
+            print("item: ",item)
             if item.key in metadata.keys:
                 metadata[item.key].update(value=item.value)
             else:
diff --git a/ads/model/service/oci_datascience_model.py b/ads/model/service/oci_datascience_model.py
@@ -27,10 +27,10 @@
 from ads.common.oci_mixin import OCIWorkRequestMixin
 from ads.common.oci_resource import SEARCH_TYPE, OCIResource
 from ads.common.serializer import DataClassSerializable
-from ads.common.utils import extract_region, text_sanitizer
+from ads.common.utils import extract_region, text_sanitizer , read_file
 from ads.common.work_request import DataScienceWorkRequest
 from ads.model.deployment import ModelDeployment
-from ads.opctl.operator.common.utils import default_signer
+from ads.common.auth import default_signer
 
 logger = logging.getLogger(__name__)
 
@@ -65,8 +65,6 @@ def __init__(self, model_ocid, metadata_key: str):
             f"The model {model_ocid} does not contain the metadata with key {metadata_key}."
         )
 
-    pass
-
 
 @dataclass(repr=False)
 class ModelMetadataArtifactDetails(DataClassSerializable):
@@ -653,15 +651,13 @@ def get_metadata_content(self, artifact_path_or_content: str, path_type):
             return contents
 
         elif path_type == utils.MetadataArtifactPathType.OSS:
-            from ads.aqua.common.utils import read_file
-
             if not utils.is_path_exists(artifact_path_or_content):
                 raise FileNotFoundError(f"File not found: {artifact_path_or_content}")
 
             contents = str(
                 read_file(file_path=artifact_path_or_content, auth=default_signer())
             )
-            logger.info(f"The metadata artifact content - {contents}")
+            logger.debug(f"The metadata artifact content - {contents}")
 
             return contents
 
