Removing model_card field from AquaModel

Author: kumar-shivam-ranjan

ads/aqua/model/entities.py

@@ -103,7 +103,6 @@ class AquaModelSummary(DataClassSerializable):
 class AquaModel(AquaModelSummary, DataClassSerializable):
     """Represents an Aqua model."""
 
-    model_card: str = None
     inference_container: str = None
     inference_container_uri: str = None
     finetuning_container: str = None

ads/aqua/model/model.py

@@ -84,7 +84,6 @@
     get_console_link,
     is_path_exists,
     read_file,
-    text_sanitizer,
 )
 from ads.config import (
     AQUA_DEPLOYMENT_CONTAINER_CMD_VAR_METADATA_NAME,
@@ -255,7 +254,6 @@ def get(self, model_id: str) -> "AquaModel":
             and ds_model.freeform_tags.get(Tags.AQUA_FINE_TUNED_MODEL_TAG)
         )
 
-        model_card = ""
         inference_container = ds_model.custom_metadata_list.get(
             ModelCustomMetadataFields.DEPLOYMENT_CONTAINER,
             ModelCustomMetadataItem(key=ModelCustomMetadataFields.DEPLOYMENT_CONTAINER),
@@ -282,7 +280,6 @@ def get(self, model_id: str) -> "AquaModel":
         aqua_model_attributes = dict(
             **self._process_model(ds_model, self.region),
             project_id=ds_model.project_id,
-            model_card=model_card,
             inference_container=inference_container,
             inference_container_uri=inference_container_uri,
             finetuning_container=finetuning_container,
@@ -986,13 +983,15 @@ def _create_model_catalog_entry(
                 model = model.with_model_file_description(
                     json_dict=verified_model.model_file_description
                 )
-            defined_metadata_list = self.ds_client.get_model(
-                verified_model.id
-            ).data.defined_metadata_list
+            defined_metadata_list = (
+                verified_model.defined_metadata_list._to_oci_metadata()
+            )
             for defined_metadata in defined_metadata_list:
                 if defined_metadata.has_artifact:
-                    content = self.get_config_from_metadata(
-                        verified_model.id, defined_metadata.key
+                    content = (
+                        self.ds_client.get_model_defined_metadatum_artifact_content(
+                            verified_model.id, defined_metadata.key
+                        ).data.content
                     )
                     defined_metadata_dict[defined_metadata.key] = content
         else:
@@ -1094,7 +1093,7 @@ def _create_model_catalog_entry(
         logger.debug(f"Created model catalog entry for the model:\n{model}")
         for key, value in defined_metadata_dict.items():
             model.create_defined_metadata_artifact(
-                key, text_sanitizer(value), MetadataArtifactPathType.CONTENT
+                key, value, MetadataArtifactPathType.CONTENT
             )
 
         if is_path_exists(readme_file_path):
@@ -1671,11 +1670,6 @@ def register(
         aqua_model_attributes = dict(
             **self._process_model(ds_model, self.region),
             project_id=ds_model.project_id,
-            model_card=str(
-                self.ds_client.get_model_defined_metadatum_artifact_content(
-                    ds_model.id, AquaModelMetadataKeys.README
-                ).data.content
-            ),
             inference_container=inference_container,
             inference_container_uri=inference_container_uri,
             finetuning_container=finetuning_container,

ads/model/service/oci_datascience_model.py

@@ -652,7 +652,7 @@ def get_metadata_content(
                 )
 
             with open(artifact_path_or_content, "rb") as f:
-                contents = f.read().decode("utf-8")
+                contents = f.read()
                 logger.info(f"The metadata artifact content - {contents}")
 
             return contents

tests/unitary/with_extras/aqua/test_model.py

@@ -443,7 +443,6 @@ def test_get_foundation_models(
             "id": f"{ds_model.id}",
             "is_fine_tuned_model": False,
             "license": f'{ds_model.freeform_tags["license"]}',
-            "model_card": "",
             "model_formats": [ModelFormat.SAFETENSORS],
             "model_file": "",
             "name": f"{ds_model.display_name}",
@@ -618,7 +617,6 @@ def test_get_model_fine_tuned(
                     "scores": [],
                 },
             ],
-            "model_card": "",
             "model_formats": [ModelFormat.SAFETENSORS],
             "model_file": "",
             "name": f"{ds_model.display_name}",
@@ -713,6 +711,7 @@ def test_import_verified_model(
             .with_version_id("ocid1.blah.blah")
         )
         custom_metadata_list = ModelCustomMetadata()
+        defined_metadata_list = ModelTaxonomyMetadata()
         custom_metadata_list.add(
             **{"key": "deployment-container", "value": "odsc-tgi-serving"}
         )
@@ -728,6 +727,7 @@ def test_import_verified_model(
                 }
             )
         ds_model.with_custom_metadata_list(custom_metadata_list)
+        ds_model.with_defined_metadata_list(defined_metadata_list)
         ds_model.set_spec(ds_model.CONST_MODEL_FILE_DESCRIPTION, {})
         ds_model.dsc_model = MagicMock(id="test_model_id")
         DataScienceModel.from_id = MagicMock(return_value=ds_model)
@@ -903,13 +903,15 @@ def test_import_model_with_project_compartment_override(
             .with_version_id("ocid1.blah.blah")
         )
         custom_metadata_list = ModelCustomMetadata()
+        defined_metadata_list = ModelTaxonomyMetadata()
         custom_metadata_list.add(
             **{"key": "deployment-container", "value": "odsc-tgi-serving"}
         )
         custom_metadata_list.add(
             **{"key": "evaluation-container", "value": "odsc-llm-evaluate"}
         )
         ds_model.with_custom_metadata_list(custom_metadata_list)
+        ds_model.with_defined_metadata_list(defined_metadata_list)
         ds_model.set_spec(ds_model.CONST_MODEL_FILE_DESCRIPTION, {})
         DataScienceModel.from_id = MagicMock(return_value=ds_model)
         mock__find_matching_aqua_model.return_value = "test_model_id"
@@ -1147,10 +1149,12 @@ def test_import_tei_model_byoc(
             .with_version_id("ocid1.version.id")
         )
         custom_metadata_list = ModelCustomMetadata()
+        defined_metadata_list = ModelTaxonomyMetadata()
         custom_metadata_list.add(
             **{"key": "deployment-container", "value": "odsc-tei-serving"}
         )
         ds_model.with_custom_metadata_list(custom_metadata_list)
+        ds_model.with_defined_metadata_list(defined_metadata_list)
         ds_model.set_spec(ds_model.CONST_MODEL_FILE_DESCRIPTION, {})
         DataScienceModel.from_id = MagicMock(return_value=ds_model)
         mock__find_matching_aqua_model.return_value = None