Rebase to exclude model linkage from this PR.

Author: Chuyang Deng

CHANGELOG.rst

@@ -8,9 +8,9 @@ CHANGELOG
 * doc-fix: update information about saving models in the MXNet README
 * doc-fix: change ReadTheDocs links from latest to stable
 * doc-fix: add ``transform_fn`` information and fix ``input_fn`` signature in the MXNet README
-* feature: Support for predictor class to delete endpoint configuration by default when calling ``delete_endpoint()``
-* feature: Support for model class to delete SageMaker model
-* feature: Support for transformer to delete Sagemaker model
+* feature: Support for ``Predictor`` to delete endpoint configuration by default when calling ``delete_endpoint()``
+* feature: Support for ``model`` to delete SageMaker model
+* feature: Support for ``Transformer`` to delete SageMaker model
 
 1.18.2
 ======

src/sagemaker/model.py

@@ -303,13 +303,14 @@ def transformer(self, instance_count, instance_type, strategy=None, assemble_wit
                            volume_kms_key=volume_kms_key, sagemaker_session=self.sagemaker_session)
 
     def delete_model(self):
-        """Delete an Amazon SageMaker ``Model``.
+        """Delete an Amazon SageMaker Model.
 
-        Raises: ValueError if model is not deployed yet.
+        Raises:
+            ValueError: if the model is not created yet.
 
         """
         if self.name is None:
-            raise ValueError('The SageMaker model must be deployed first before attempting to delete.')
+            raise ValueError('The SageMaker model must be created first before attempting to delete.')
         self.sagemaker_session.delete_model(self.name)
 
 

src/sagemaker/session.py

@@ -790,7 +790,7 @@ def delete_endpoint_config(self, endpoint_config_name):
         self.sagemaker_client.delete_endpoint_config(EndpointConfigName=endpoint_config_name)
 
     def delete_model(self, model_name):
-        """Delete an Amazon SageMaker ``Model``.
+        """Delete an Amazon SageMaker Model.
 
         Args:
             model_name (str): Name of the Amazon SageMaker model to delete.

tests/unit/test_model.py

@@ -349,5 +349,5 @@ def test_model_delete_model(sagemaker_session, tmpdir):
 
 def test_delete_non_deployed_model(sagemaker_session):
     model = DummyFrameworkModel(sagemaker_session)
-    with pytest.raises(ValueError, match='The SageMaker model must be deployed first before attempting to delete.'):
+    with pytest.raises(ValueError, match='The SageMaker model must be created first before attempting to delete.'):
         model.delete_model()