Fixes the progress bar issue when exporting artifacts to the Model Ca…

…talog (#331)
oracle · Sep 13, 2023 · 7d39f33 · 7d39f33
2 parents 8072892 + e22c58e
commit 7d39f33
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 13 deletions.
diff --git a/ads/model/service/oci_datascience_model.py b/ads/model/service/oci_datascience_model.py
@@ -38,19 +38,19 @@
 )
 
 
-class ModelProvenanceNotFoundError(Exception):   # pragma: no cover
+class ModelProvenanceNotFoundError(Exception):  # pragma: no cover
     pass
 
 
-class ModelArtifactNotFoundError(Exception):   # pragma: no cover
+class ModelArtifactNotFoundError(Exception):  # pragma: no cover
     pass
 
 
-class ModelNotSavedError(Exception):   # pragma: no cover
+class ModelNotSavedError(Exception):  # pragma: no cover
     pass
 
 
-class ModelWithActiveDeploymentError(Exception):   # pragma: no cover
+class ModelWithActiveDeploymentError(Exception):  # pragma: no cover
     pass
 
 
@@ -410,7 +410,7 @@ def export_model_artifact(self, bucket_uri: str, region: str = None):
         # Show progress of exporting model artifacts
         self._wait_for_work_request(
             work_request_id=work_request_id,
-            num_steps=3,
+            num_steps=2,
         )
 
     @check_for_model_id(
@@ -596,3 +596,7 @@ def _wait_for_work_request(self, work_request_id: str, num_steps: int = 3) -> No
                             )
                     else:
                         break
+
+            while i < num_steps:
+                progress.update()
+                i += 1
diff --git a/docs/source/user_guide/model_catalog/model_catalog.rst b/docs/source/user_guide/model_catalog/model_catalog.rst
@@ -1204,7 +1204,7 @@ If you don't have an Object Storage bucket, create one using the OCI SDK or the
 
         Allow service datascience to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
-        Allow service objectstorage to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
+        Allow service objectstorage-<region> to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
 Saving
 ======
@@ -1545,4 +1545,3 @@ In the next example, the model that was stored in the model catalog as part of t
 .. code-block:: python3
 
     mc.delete_model(mc_model.id)
-
diff --git a/docs/source/user_guide/model_registration/large_model_artifact.rst b/docs/source/user_guide/model_registration/large_model_artifact.rst
@@ -13,7 +13,7 @@ If you don't have an Object Storage bucket, create one using the OCI SDK or the
 
         Allow service datascience to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
-        Allow service objectstorage to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
+        Allow service objectstorage-<region> to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
 See `API documentation <../../ads.model.html#id10>`__ for more details.
 

diff --git a/docs/source/user_guide/model_registration/model_load.rst b/docs/source/user_guide/model_registration/model_load.rst
@@ -119,7 +119,7 @@ If you don't have an Object Storage bucket, create one using the OCI SDK or the
 
         Allow service datascience to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
-        Allow service objectstorage to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
+        Allow service objectstorage-<region> to manage object-family in compartment <compartment> where ALL {target.bucket.name='<bucket_name>'}
 
 The following example loads a model using the large model artifact approach. The ``bucket_uri`` has the following syntax: ``oci://<bucket_name>@<namespace>/<path>/`` See `API documentation <../../ads.model.html#id4>`__ for more details.
 
@@ -169,4 +169,4 @@ Alternatively the ``.from_id()`` method can be used to load registered or deploy
         bucket_uri=<oci://<bucket_name>@<namespace>/prefix/>,
         force_overwrite=True,
         remove_existing_artifact=True,
-    )
+    )
diff --git a/tests/unitary/default_setup/model/test_oci_datascience_model.py b/tests/unitary/default_setup/model/test_oci_datascience_model.py
@@ -88,7 +88,6 @@
 
 class TestOCIDataScienceModel:
     def setup_class(cls):
-
         # Mock delete model response
         cls.mock_delete_model_response = Response(
             data=None, status=None, headers=None, request=None
@@ -229,7 +228,9 @@ def test_delete_success(self, mock_client):
                 mock_model_deployment.return_value = [
                     MagicMock(lifecycle_state="ACTIVE", identifier="md_id")
                 ]
-                with patch("ads.model.deployment.ModelDeployment.from_id") as mock_from_id:
+                with patch(
+                    "ads.model.deployment.ModelDeployment.from_id"
+                ) as mock_from_id:
                     with patch.object(OCIDataScienceModel, "sync") as mock_sync:
                         self.mock_model.delete(delete_associated_model_deployment=True)
                         mock_from_id.assert_called_with("md_id")
@@ -445,7 +446,7 @@ def test_export_model_artifact(
             )
             mock_wait_for_work_request.assert_called_with(
                 work_request_id="work_request_id",
-                num_steps=3,
+                num_steps=2,
             )
 
     @patch.object(TqdmProgressBar, "update")