Rebasing

Author: kumar-shivam-ranjan

ads/model/artifact_downloader.py

@@ -170,7 +170,10 @@ def _download(self):
         """Downloads model artifacts."""
         self.progress.update("Importing model artifacts from catalog")
 
-        if self.dsc_model._is_model_by_reference() and self.model_file_description:
+        if (
+            self.dsc_model.is_model_created_by_reference()
+            and self.model_file_description
+        ):
             self.download_from_model_file_description()
             self.progress.update()
             return

ads/model/datascience_model.py

@@ -1793,7 +1793,7 @@ def _update_from_oci_dsc_model(
                 artifact_info["Content-Disposition"]
             )
 
-            if self.dsc_model._is_model_by_reference():
+            if self.dsc_model.is_model_created_by_reference():
                 _, file_extension = os.path.splitext(file_name_info["filename"])
                 if file_extension.lower() == ".json":
                     bucket_uri, _ = self._download_file_description_artifact()

ads/model/service/oci_datascience_model.py

@@ -605,7 +605,7 @@ def from_id(cls, ocid: str) -> "OCIDataScienceModel":
             raise ValueError("Model OCID not provided.")
         return super().from_ocid(ocid)
 
-    def _is_model_by_reference(self):
+    def is_model_created_by_reference(self):
         """Checks if model is created by reference
         Returns
         -------

tests/unitary/default_setup/model/test_artifact_downloader.py

@@ -189,7 +189,7 @@ def test_download_large_artifact_from_model_file_description(self, mock_download
         """Tests whether model_file_description is loaded within downloader and is parsed, and also if
         #  download_from_model_file_description is appropriately called."""
 
-        self.mock_dsc_model._is_model_by_reference.return_value = True
+        self.mock_dsc_model.is_model_created_by_reference.return_value = True
         self.mock_artifact_file_path = os.path.join(
             self.curr_dir, "test_files/model_description.json"
         )

tests/unitary/default_setup/model/test_datascience_model.py

@@ -641,7 +641,7 @@ def test__to_oci_dsc_model(self):
             True,
         ],
     )
-    @patch.object(OCIDataScienceModel, "_is_model_by_reference")
+    @patch.object(OCIDataScienceModel, "is_model_created_by_reference")
     @patch.object(OCIDataScienceModel, "get_artifact_info")
     @patch.object(OCIDataScienceModel, "get_model_provenance")
     @patch.object(DataScienceModel, "_download_file_description_artifact")

tests/unitary/default_setup/model/test_files/model.pkl

@@ -476,7 +476,7 @@ def test_is_model_by_reference(self):
             category="Other",
         )
         self.mock_model.custom_metadata_list = [metadata_item]
-        assert not self.mock_model._is_model_by_reference()
+        assert not self.mock_model.is_model_created_by_reference()
 
         metadata_item = ModelCustomMetadataItem(
             key="modelDescription",
@@ -486,7 +486,7 @@ def test_is_model_by_reference(self):
         )
         self.mock_model.custom_metadata_list = [metadata_item]
 
-        assert self.mock_model._is_model_by_reference()
+        assert self.mock_model.is_model_created_by_reference()
 
     @patch.object(OCIDataScienceModel, "client")
     def test_create_defined_metadata_artifact(self, mock_client):