fix the unit test

Author: z7ye

ads/opctl/model/cmds.py

@@ -49,12 +49,14 @@ def download_model(**kwargs):
 
 
 def _download_model(
-    ocid, artifact_directory, region, bucket_uri, timeout, force_overwrite, auth, profile
+    ocid, artifact_directory, region, bucket_uri, timeout, force_overwrite, auth, profile=None
 ):
     os.makedirs(artifact_directory, exist_ok=True)
-
+    kwargs = {"auth": auth}
+    if profile:
+        kwargs["profile"] = profile
     try:
-        with AuthContext(auth=auth, profile=profile):
+        with AuthContext(**kwargs):
             dsc_model = DataScienceModel.from_id(ocid)
             dsc_model.download_artifact(
                 target_dir=artifact_directory,

tests/unitary/with_extras/opctl/test_opctl_local_model_deployment_backend.py

@@ -115,17 +115,7 @@ def test_predict(self, mock_path_exists, mock_list_dir):
                         backend.predict()
                         mock__download.assert_not_called()
                         mock__run_with_conda_pack.assert_called_once_with(
-                            {
-                                os.path.expanduser("~/.oci"): {
-                                    "bind": "/home/datascience/.oci"
-                                },
-                                os.path.expanduser("~/.ads_ops/models/fake_id"): {
-                                    "bind": "/opt/ds/model/deployed_model/"
-                                },
-                            },
-                            "/opt/ds/model/deployed_model/ fake_data",
-                            install=True,
-                            conda_uri="fake_path",
+                            {os.path.expanduser('~/.oci'): {'bind': '/home/datascience/.oci'}, os.path.expanduser('~/.ads_ops/models/fake_id'): {'bind': '/opt/ds/model/deployed_model/'}}, "--artifact-directory /opt/ds/model/deployed_model/ --payload 'fake_data' --auth api_key --profile DEFAULT", install=True, conda_uri='fake_path'
                         )
 
     @patch("ads.opctl.backend.local.os.listdir", return_value=["path"])
@@ -151,7 +141,8 @@ def test_predict_download(
 
                         backend.predict()
                         mock__download.assert_called_once_with(
-                            oci_auth=backend.oci_auth,
+                            auth='api_key',
+                            profile='DEFAULT',
                             ocid="fake_id",
                             artifact_directory=os.path.expanduser(
                                 "~/.ads_ops/models/fake_id"
@@ -162,15 +153,5 @@ def test_predict_download(
                             force_overwrite=True,
                         )
                         mock__run_with_conda_pack.assert_called_once_with(
-                            {
-                                os.path.expanduser("~/.oci"): {
-                                    "bind": "/home/datascience/.oci"
-                                },
-                                os.path.expanduser("~/.ads_ops/models/fake_id"): {
-                                    "bind": "/opt/ds/model/deployed_model/"
-                                },
-                            },
-                            "/opt/ds/model/deployed_model/ fake_data",
-                            install=True,
-                            conda_uri="fake_path",
+                            {os.path.expanduser('~/.oci'): {'bind': '/home/datascience/.oci'}, os.path.expanduser('~/.ads_ops/models/fake_id'): {'bind': '/opt/ds/model/deployed_model/'}}, "--artifact-directory /opt/ds/model/deployed_model/ --payload 'fake_data' --auth api_key --profile DEFAULT", install=True, conda_uri='fake_path'
                         )

tests/unitary/with_extras/opctl/test_opctl_model.py

@@ -11,32 +11,30 @@ def test_model__download_model(mock_from_id):
     mock_datascience_model = MagicMock()
     mock_from_id.return_value = mock_datascience_model
     _download_model(
-        "fake_model_id", "fake_dir", "fake_auth", "region", "bucket_uri", 36, False
+        "fake_model_id", "fake_dir", "region", "bucket_uri", 36, False, "api_key", 
     )
     mock_from_id.assert_called_with("fake_model_id")
     mock_datascience_model.download_artifact.assert_called_with(
         target_dir="fake_dir",
         force_overwrite=False,
         overwrite_existing_artifact=True,
         remove_existing_artifact=True,
-        auth="fake_auth",
         region="region",
         timeout=36,
         bucket_uri="bucket_uri",
     )
 
 
-@patch.object(DataScienceModel, "from_id", side_effect=Exception("Fake error."))
+@patch.object(DataScienceModel, "from_id", side_effect=Exception())
 def test_model__download_model_error(mock_from_id):
-    with pytest.raises(Exception, match="Fake error."):
+    with pytest.raises(Exception):
         _download_model(
-            "fake_model_id", "fake_dir", "fake_auth", "region", "bucket_uri", 36, False
+            "fake_model_id", "fake_dir", "region", "bucket_uri", 36, False,  "api_key",
         )
 
 
 @patch("ads.opctl.model.cmds._download_model")
-def test_download_model( mock__download_model):
-    auth_mock = MagicMock()
+def test_download_model(mock__download_model):
     download_model(ocid="fake_model_id")
     mock__download_model.assert_called_once_with(
         ocid="fake_model_id",
@@ -45,5 +43,6 @@ def test_download_model( mock__download_model):
         bucket_uri=None,
         timeout=None,
         force_overwrite=False,
-        oci_auth=auth_mock,
+        auth='api_key',
+        profile='DEFAULT'
     )