Modify timeout class, README, CHANGELOG and model none check in session and transformer.

Author: Chuyang Deng

src/sagemaker/session.py

@@ -796,12 +796,8 @@ def delete_model(self, model_name):
             model_name (str): Name of the Amazon SageMaker model to delete.
 
         """
-        try:
-            self.sagemaker_client.describe_model(ModelName=model_name)
-            LOGGER.info('Deleting model with name: {}'.format(model_name))
-            self.sagemaker_client.delete_model(ModelName=model_name)
-        except Exception:
-            raise ValueError('The Sagemaker model must be deployed first before attempting to delete.')
+        LOGGER.info('Deleting model with name: {}'.format(model_name))
+        self.sagemaker_client.delete_model(ModelName=model_name)
 
     def wait_for_job(self, job, poll=5):
         """Wait for an Amazon SageMaker training job to complete.

src/sagemaker/transformer.py

@@ -52,8 +52,6 @@ def __init__(self, model_name, instance_count, instance_type, strategy=None, ass
                 using the default AWS configuration chain.
             volume_kms_key (str): Optional. KMS key ID for encrypting the volume attached to the ML
                 compute instance (default: None).
-            model (sagemaker.model.Model): A SageMaker Model object, used for SageMaker Model interactions
-                (default: None). If not specified, model object related activities will fail.
         """
         self.model_name = model_name
         self.strategy = strategy

tests/integ/timeout.py

@@ -32,13 +32,9 @@ def timeout(seconds=0, minutes=0, hours=0):
     """
     Add a signal-based timeout to any block of code.
     If multiple time units are specified, they will be added together to determine time limit.
-
     Usage:
-
     with timeout(seconds=5):
         my_slow_function(...)
-
-
     Args:
         - seconds: The time limit, in seconds.
         - minutes: The time limit, in minutes.
@@ -102,53 +98,19 @@ def timeout_and_delete_model_with_transformer(transformer, sagemaker_session, se
                 try:
                     transformer.delete_model()
                     LOGGER.info('deleted SageMaker model {}'.format(transformer.model_name))
-<<<<<<< HEAD
 
                     _show_logs(transformer.model_name, 'Models', sagemaker_session)
                     if no_errors:
                         _cleanup_logs(transformer.model_name, 'Models', sagemaker_session)
-=======
-                    if no_errors:
-                        _cleanup_model_logs(transformer.model_name, sagemaker_session)
->>>>>>> 334a0d6... Modify some functions, tests and update docs.
                         return
                 except ClientError as ce:
                     if ce.response['Error']['Code'] == 'ValidationException':
                         pass
                 sleep(10)
 
 
-<<<<<<< HEAD
 def _show_logs(resource_name, resource_type, sagemaker_session):
     log_group = '/aws/sagemaker/{}/{}'.format(resource_type, resource_name)
-=======
-def _show_model_logs(model_name, sagemaker_session):
-    log_group = '/aws/sagemaker/Models/{}'.format(model_name)
-    try:
-        LOGGER.info('cloudwatch logs for log group {}'.format(log_group))
-        logs = AWSLogs(log_group_name=log_group, log_stream_name='ALL', start='1d',
-                       aws_region=sagemaker_session.boto_session.region_name)
-        logs.list_logs()
-    except Exception:
-        LOGGER.exception('Failure occurred while listing cloudwatch log group %s. Swallowing exception but printing '
-                         'stacktrace for debugging.', log_group)
-
-
-def _cleanup_model_logs(model_name, sagemaker_session):
-    log_group = '/aws/sagemaker/Models/{}'.format(model_name)
-    try:
-        LOGGER.info('deleting cloudwatch log group {}:'.format(log_group))
-        cwl_client = sagemaker_session.boto_session.client('logs')
-        cwl_client.delete_log_group(logGroupName=log_group)
-        LOGGER.info('deleted cloudwatch log group: {}'.format(log_group))
-    except Exception:
-        LOGGER.exception('Failure occurred while cleaning up cloudwatch log group %s. '
-                         'Swallowing exception but printing stacktrace for debugging.', log_group)
-
-
-def _show_endpoint_logs(endpoint_name, sagemaker_session):
-    log_group = '/aws/sagemaker/Endpoints/{}'.format(endpoint_name)
->>>>>>> 334a0d6... Modify some functions, tests and update docs.
     try:
         # print out logs before deletion for debuggability
         LOGGER.info('cloudwatch logs for log group {}:'.format(log_group))

tests/unit/test_model.py

@@ -345,23 +345,9 @@ def test_model_delete_model(sagemaker_session, tmpdir):
     model.delete_model()
 
     sagemaker_session.delete_model.assert_called_with(model.name)
-<<<<<<< HEAD
-<<<<<<< HEAD
 
 
 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.'):
         model.delete_model()
-=======
->>>>>>> 45e5c07... Add new APIs to predictor to delete endpoint and endpoint config, and transformer to delete model.
-=======
-
-
-@patch('sagemaker.fw_utils.tar_and_upload_dir', MagicMock())
-@patch('time.strftime', MagicMock(return_value=TIMESTAMP))
-def test_delete_non_deployed_model(sagemaker_session, tmpdir):
-    model = DummyFrameworkModel(sagemaker_session, source_dir=str(tmpdir))
-    with pytest.raises(ValueError, match='The SageMaker model must be deployed first before attempting to delete.'):
-        model.delete_model()
->>>>>>> 334a0d6... Modify some functions, tests and update docs.