fix model tests

Author: VipulMascarenhas

tests/unitary/with_extras/aqua/test_model.py

@@ -65,7 +65,7 @@ def mock_get_container_config():
         yield mock_config
 
 
-@pytest.fixture(autouse=True, scope="class")
+@pytest.fixture(autouse=True, scope="function")
 def mock_get_hf_model_info():
     with patch.object(HfApi, "model_info") as mock_get_hf_model_info:
         test_hf_model_info = ModelInfo(
@@ -230,17 +230,17 @@ class TestDataset:
 class TestAquaModel:
     """Contains unittests for AquaModelApp."""
 
-    @pytest.fixture(autouse=True, scope="class")
-    def mock_auth(cls):
-        with patch("ads.common.auth.default_signer") as mock_default_signer:
-            yield mock_default_signer
-
-    @pytest.fixture(autouse=True, scope="class")
-    def mock_init_client(cls):
-        with patch(
-            "ads.common.oci_datascience.OCIDataScienceMixin.init_client"
-        ) as mock_client:
-            yield mock_client
+    # @pytest.fixture(autouse=True, scope="class")
+    # def mock_auth(cls):
+    #     with patch("ads.common.auth.default_signer") as mock_default_signer:
+    #         yield mock_default_signer
+    #
+    # @pytest.fixture(autouse=True, scope="class")
+    # def mock_init_client(cls):
+    #     with patch(
+    #         "ads.common.oci_datascience.OCIDataScienceMixin.init_client"
+    #     ) as mock_client:
+    #         yield mock_client
 
     def setup_method(self):
         self.default_signer_patch = patch(
@@ -658,6 +658,9 @@ def test_get_model_fine_tuned(
             (False, False),
         ],
     )
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.sync")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
     @patch.object(AquaModelApp, "_find_matching_aqua_model")
     @patch("ads.aqua.common.utils.copy_file")
     @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
@@ -672,16 +675,15 @@ def test_import_verified_model(
         mock_list_objects,
         mock_copy_file,
         mock__find_matching_aqua_model,
+        mock_upload_artifact,
+        mock_sync,
+        mock_ocidsc_create,
         artifact_location_set,
         download_from_hf,
         mock_get_hf_model_info,
+        mock_init_client,
     ):
         ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-        ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-        DataScienceModel.upload_artifact = MagicMock()
-        DataScienceModel.sync = MagicMock()
-        OCIDataScienceModel.create = MagicMock()
-
         # The name attribute cannot be mocked during creation of the mock object,
         # hence attach it separately to the mocked objects.
         artifact_path = "service_models/model-name/commit-id/artifact"
@@ -780,17 +782,21 @@ def test_import_verified_model(
         assert model.ready_to_deploy is True
         assert model.ready_to_finetune is False
 
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.sync")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
     @patch.object(AquaModelApp, "_validate_model")
     @patch("ads.aqua.common.utils.load_config", return_value={})
     def test_import_any_model_no_containers_specified(
-        self, mock_load_config, mock__validate_model, mock_get_hf_model_info
+        self,
+        mock_load_config,
+        mock__validate_model,
+        mock_upload_artifact,
+        mock_sync,
+        mock_ocidsc_create,
+        mock_get_hf_model_info,
     ):
         ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-        ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-        DataScienceModel.upload_artifact = MagicMock()
-        DataScienceModel.sync = MagicMock()
-        OCIDataScienceModel.create = MagicMock()
-
         os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
         model_name = "oracle/aqua-1t-mega-model"
         ds_freeform_tags = {
@@ -827,6 +833,9 @@ def test_import_any_model_no_containers_specified(
         "download_from_hf",
         [True, False],
     )
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.sync")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
     @patch.object(AquaModelApp, "_find_matching_aqua_model")
     @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
     @patch("ads.aqua.common.utils.load_config", return_value={})
@@ -839,14 +848,13 @@ def test_import_model_with_project_compartment_override(
         mock_load_config,
         mock_list_objects,
         mock__find_matching_aqua_model,
+        mock_upload_artifact,
+        mock_sync,
+        mock_ocidsc_create,
         download_from_hf,
         mock_get_hf_model_info,
     ):
         ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-        ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-        DataScienceModel.upload_artifact = MagicMock()
-        DataScienceModel.sync = MagicMock()
-        OCIDataScienceModel.create = MagicMock()
 
         mock_list_objects.return_value = MagicMock(objects=[])
         ds_model = DataScienceModel()
@@ -908,6 +916,8 @@ def test_import_model_with_project_compartment_override(
         "download_from_hf",
         [True, False],
     )
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
     @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
     @patch("ads.aqua.common.utils.load_config", side_effect=AquaFileNotFoundError)
     @patch("huggingface_hub.snapshot_download")
@@ -918,17 +928,18 @@ def test_import_model_with_missing_config(
         mock_snapshot_download,
         mock_load_config,
         mock_list_objects,
+        mock_upload_artifact,
+        mock_ocidsc_create,
         mock_get_container_config,
         download_from_hf,
         mock_get_hf_model_info,
+        mock_init_client,
     ):
         """Test for validating if error is returned when model artifacts are incomplete or not available."""
 
         os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
         model_name = "oracle/aqua-1t-mega-model"
         ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-        ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-        DataScienceModel.upload_artifact = MagicMock()
         mock_list_objects.return_value = MagicMock(objects=[])
         reload(ads.aqua.model.model)
         app = AquaModelApp()
@@ -952,21 +963,24 @@ def test_import_model_with_missing_config(
                     download_from_hf=False,
                 )
 
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.sync")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
     @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
     @patch.object(HfApi, "model_info")
     @patch("ads.aqua.common.utils.load_config", return_value={})
     def test_import_any_model_smc_container(
         self,
         mock_load_config,
         mock_list_objects,
+        mock_upload_artifact,
+        mock_sync,
+        mock_ocidsc_create,
         mock_get_hf_model_info,
+        mock_init_client,
     ):
         my_model = "oracle/aqua-1t-mega-model"
         ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-        ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-        DataScienceModel.upload_artifact = MagicMock()
-        DataScienceModel.sync = MagicMock()
-        OCIDataScienceModel.create = MagicMock()
 
         os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
         ds_freeform_tags = {
@@ -1014,86 +1028,89 @@ def test_import_any_model_smc_container(
             assert model.ready_to_deploy is True
             assert model.ready_to_finetune is True
 
-    # @pytest.mark.parametrize(
-    #     "download_from_hf",
-    #     [True, False],
-    # )
-    # @patch.object(AquaModelApp, "_find_matching_aqua_model")
-    # @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
-    # @patch("ads.aqua.common.utils.load_config", return_value={})
-    # @patch("huggingface_hub.snapshot_download")
-    # @patch("subprocess.check_call")
-    # def test_import_tei_model_byoc(
-    #     self,
-    #     mock_subprocess,
-    #     mock_snapshot_download,
-    #     mock_load_config,
-    #     mock_list_objects,
-    #     mock__find_matching_aqua_model,
-    #     download_from_hf,
-    #     mock_get_hf_model_info,
-    # ):
-    #     ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
-    #     ads.common.oci_datascience.OCIDataScienceMixin.init_client = MagicMock()
-    #     DataScienceModel.upload_artifact = MagicMock()
-    #     DataScienceModel.sync = MagicMock()
-    #     OCIDataScienceModel.create = MagicMock()
-    #
-    #     artifact_path = "service_models/model-name/commit-id/artifact"
-    #     obj1 = MagicMock(etag="12345-1234-1234-1234-123456789", size=150)
-    #     obj1.name = f"{artifact_path}/config.json"
-    #     objects = [obj1]
-    #     mock_list_objects.return_value = MagicMock(objects=objects)
-    #     ds_model = DataScienceModel()
-    #     os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
-    #     model_name = "oracle/aqua-1t-mega-model"
-    #     ds_freeform_tags = {
-    #         "OCI_AQUA": "ACTIVE",
-    #         "license": "aqua-license",
-    #         "organization": "oracle",
-    #         "task": "text_embedding",
-    #     }
-    #     ds_model = (
-    #         ds_model.with_compartment_id("test_model_compartment_id")
-    #         .with_project_id("test_project_id")
-    #         .with_display_name(model_name)
-    #         .with_description("test_description")
-    #         .with_model_version_set_id("test_model_version_set_id")
-    #         .with_freeform_tags(**ds_freeform_tags)
-    #         .with_version_id("ocid1.version.id")
-    #     )
-    #     custom_metadata_list = ModelCustomMetadata()
-    #     custom_metadata_list.add(
-    #         **{"key": "deployment-container", "value": "odsc-tei-serving"}
-    #     )
-    #     ds_model.with_custom_metadata_list(custom_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
-    #     reload(ads.aqua.model.model)
-    #     app = AquaModelApp()
-    #
-    #     if download_from_hf:
-    #         with tempfile.TemporaryDirectory() as tmpdir:
-    #             model: AquaModel = app.register(
-    #                 model=model_name,
-    #                 os_path=os_path,
-    #                 local_dir=str(tmpdir),
-    #                 download_from_hf=True,
-    #                 inference_container="odsc-tei-serving",
-    #                 inference_container_uri="region.ocir.io/your_tenancy/your_image",
-    #             )
-    #     else:
-    #         model: AquaModel = app.register(
-    #             model="ocid1.datasciencemodel.xxx.xxxx.",
-    #             os_path=os_path,
-    #             download_from_hf=False,
-    #             inference_container="odsc-tei-serving",
-    #             inference_container_uri="region.ocir.io/your_tenancy/your_image",
-    #         )
-    #     assert model.inference_container == "odsc-tei-serving"
-    #     assert model.ready_to_deploy is True
-    #     assert model.ready_to_finetune is False
+    @pytest.mark.parametrize(
+        "download_from_hf",
+        [True, False],
+    )
+    @patch("ads.model.service.oci_datascience_model.OCIDataScienceModel.create")
+    @patch("ads.model.datascience_model.DataScienceModel.sync")
+    @patch("ads.model.datascience_model.DataScienceModel.upload_artifact")
+    @patch.object(AquaModelApp, "_find_matching_aqua_model")
+    @patch("ads.common.object_storage_details.ObjectStorageDetails.list_objects")
+    @patch("ads.aqua.common.utils.load_config", return_value={})
+    @patch("huggingface_hub.snapshot_download")
+    @patch("subprocess.check_call")
+    def test_import_tei_model_byoc(
+        self,
+        mock_subprocess,
+        mock_snapshot_download,
+        mock_load_config,
+        mock_list_objects,
+        mock__find_matching_aqua_model,
+        mock_upload_artifact,
+        mock_sync,
+        mock_ocidsc_create,
+        download_from_hf,
+        mock_get_hf_model_info,
+        mock_init_client,
+    ):
+        ObjectStorageDetails.is_bucket_versioned = MagicMock(return_value=True)
+
+        artifact_path = "service_models/model-name/commit-id/artifact"
+        obj1 = MagicMock(etag="12345-1234-1234-1234-123456789", size=150)
+        obj1.name = f"{artifact_path}/config.json"
+        objects = [obj1]
+        mock_list_objects.return_value = MagicMock(objects=objects)
+        ds_model = DataScienceModel()
+        os_path = "oci://aqua-bkt@aqua-ns/prefix/path"
+        model_name = "oracle/aqua-1t-mega-model"
+        ds_freeform_tags = {
+            "OCI_AQUA": "ACTIVE",
+            "license": "aqua-license",
+            "organization": "oracle",
+            "task": "text_embedding",
+        }
+        ds_model = (
+            ds_model.with_compartment_id("test_model_compartment_id")
+            .with_project_id("test_project_id")
+            .with_display_name(model_name)
+            .with_description("test_description")
+            .with_model_version_set_id("test_model_version_set_id")
+            .with_freeform_tags(**ds_freeform_tags)
+            .with_version_id("ocid1.version.id")
+        )
+        custom_metadata_list = ModelCustomMetadata()
+        custom_metadata_list.add(
+            **{"key": "deployment-container", "value": "odsc-tei-serving"}
+        )
+        ds_model.with_custom_metadata_list(custom_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
+        reload(ads.aqua.model.model)
+        app = AquaModelApp()
+
+        if download_from_hf:
+            with tempfile.TemporaryDirectory() as tmpdir:
+                model: AquaModel = app.register(
+                    model=model_name,
+                    os_path=os_path,
+                    local_dir=str(tmpdir),
+                    download_from_hf=True,
+                    inference_container="odsc-tei-serving",
+                    inference_container_uri="region.ocir.io/your_tenancy/your_image",
+                )
+        else:
+            model: AquaModel = app.register(
+                model="ocid1.datasciencemodel.xxx.xxxx.",
+                os_path=os_path,
+                download_from_hf=False,
+                inference_container="odsc-tei-serving",
+                inference_container_uri="region.ocir.io/your_tenancy/your_image",
+            )
+        assert model.inference_container == "odsc-tei-serving"
+        assert model.ready_to_deploy is True
+        assert model.ready_to_finetune is False
 
     @pytest.mark.parametrize(
         "data, expected_output",