Continue deleting models with failed delete requests.

Author: Chuyang Deng

src/sagemaker/predictor.py

@@ -132,11 +132,15 @@ def delete_model(self):
         """Deletes the Amazon SageMaker models backing this predictor.
 
         """
-        try:
-            for model_name in self._model_names:
+        request_failed = False
+        for model_name in self._model_names:
+            try:
                 self.sagemaker_session.delete_model(model_name)
-        except Exception:
-            raise Exception('One or more models cannot be deleted, the deletion is incomplete.')
+            except Exception:  # pylint: disable=broad-except
+                request_failed = True
+
+        if request_failed:
+            raise Exception('One or more models cannot be deleted, please retry.')
 
     def _get_endpoint_config_name(self):
         endpoint_desc = self.sagemaker_session.sagemaker_client.describe_endpoint(EndpointName=self.endpoint)

tests/unit/test_predictor.py

@@ -504,7 +504,7 @@ def test_delete_model():
 def test_delete_model_fail():
     sagemaker_session = empty_sagemaker_session()
     sagemaker_session.sagemaker_client.delete_model = Mock(side_effect='Could not find model.')
-    expected_error_message = 'One or more models cannot be deleted, the deletion is incomplete.'
+    expected_error_message = 'One or more models cannot be deleted, please retry.'
 
     predictor = RealTimePredictor(ENDPOINT, sagemaker_session=sagemaker_session)