Merge branch 'master' into pipeline-profiler-config

Author: Dan

CHANGELOG.md

@@ -1,5 +1,23 @@
 # Changelog
 
+## v2.28.0 (2021-03-03)
+
+### Features
+
+ * support creating endpoints with model images from private registries
+
+## v2.27.1 (2021-03-03)
+
+### Bug Fixes and Other Changes
+
+ * Change Estimator.logs() to use latest_training_job.name
+ * mask creds from docker commands in local mode. Closes #2118
+
+### Documentation Changes
+
+ * fix pipelines processing step typo
+ * remove double 'enable-network-isolation' description
+
 ## v2.27.0 (2021-03-01)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.27.1.dev0
+2.28.1.dev0

src/sagemaker/estimator.py

@@ -820,7 +820,7 @@ def logs(self):
         If the output is a tty or a Jupyter cell, it will be color-coded based
         on which instance the log entry is from.
         """
-        self.sagemaker_session.logs_for_job(self.latest_training_job, wait=True)
+        self.sagemaker_session.logs_for_job(self.latest_training_job.name, wait=True)
 
     def deploy(
         self,
@@ -1790,11 +1790,6 @@ def __init__(
                 API_AlgorithmSpecification.html#SageMaker-Type-AlgorithmSpecification-
                 EnableSageMakerMetricsTimeSeries>`_.
                 (default: ``None``).
-            enable_network_isolation (bool): Specifies whether container will
-                run in network isolation mode (default: ``False``). Network
-                isolation mode restricts the container access to outside networks
-                (such as the Internet). The container does not make any inbound or
-                outbound network calls. Also known as Internet-free mode.
             profiler_config (:class:`~sagemaker.debugger.ProfilerConfig`):
                 Configuration for how SageMaker Debugger collects
                 monitoring and profiling information from your training job.

src/sagemaker/model.py

@@ -53,6 +53,7 @@ def __init__(
         sagemaker_session=None,
         enable_network_isolation=False,
         model_kms_key=None,
+        image_config=None,
     ):
         """Initialize an SageMaker ``Model``.
 
@@ -90,6 +91,10 @@ def __init__(
                 or from the model container.
             model_kms_key (str): KMS key ARN used to encrypt the repacked
                 model archive file if the model is repacked
+            image_config (dict[str, str]): Specifies whether the image of
+                model container is pulled from ECR, or private registry in your
+                VPC. By default it is set to pull model container image from
+                ECR. (default: None).
         """
         self.model_data = model_data
         self.image_uri = image_uri
@@ -106,6 +111,7 @@ def __init__(
         self._is_edge_packaged_model = False
         self._enable_network_isolation = enable_network_isolation
         self.model_kms_key = model_kms_key
+        self.image_config = image_config
 
     def register(
         self,
@@ -279,7 +285,9 @@ def prepare_container_def(
         Returns:
             dict: A container definition object usable with the CreateModel API.
         """
-        return sagemaker.container_def(self.image_uri, self.model_data, self.env)
+        return sagemaker.container_def(
+            self.image_uri, self.model_data, self.env, image_config=self.image_config
+        )
 
     def enable_network_isolation(self):
         """Whether to enable network isolation when creating this Model

src/sagemaker/session.py

@@ -4018,7 +4018,7 @@ def update_args(args: Dict[str, Any], **kwargs):
             args.update({key: value})
 
 
-def container_def(image_uri, model_data_url=None, env=None, container_mode=None):
+def container_def(image_uri, model_data_url=None, env=None, container_mode=None, image_config=None):
     """Create a definition for executing a container as part of a SageMaker model.
 
     Args:
@@ -4030,6 +4030,9 @@ def container_def(image_uri, model_data_url=None, env=None, container_mode=None)
                 * MultiModel: Indicates that model container can support hosting multiple models
                 * SingleModel: Indicates that model container can support hosting a single model
                 This is the default model container mode when container_mode = None
+        image_config (dict[str, str]): Specifies whether the image of model container is pulled
+            from ECR, or private registry in your VPC. By default it is set to pull model
+            container image from ECR. (default: None).
 
     Returns:
         dict[str, str]: A complete container definition object usable with the CreateModel API if
@@ -4042,6 +4045,8 @@ def container_def(image_uri, model_data_url=None, env=None, container_mode=None)
         c_def["ModelDataUrl"] = model_data_url
     if container_mode:
         c_def["Mode"] = container_mode
+    if image_config:
+        c_def["ImageConfig"] = image_config
     return c_def
 
 

src/sagemaker/workflow/steps.py

@@ -327,7 +327,7 @@ def __init__(
         the `process` method of the `sagemaker.processing.Processor`.
 
         Args:
-            name (str): The name of the training step.
+            name (str): The name of the processing step.
             processor (Processor): A `sagemaker.processing.Processor` instance.
             inputs (List[ProcessingInput]): A list of `sagemaker.processing.ProcessorInput`
                 instances. Defaults to `None`.

tests/unit/sagemaker/model/test_model.py

@@ -54,6 +54,20 @@ def test_prepare_container_def_with_model_data_and_env():
     assert expected == container_def
 
 
+def test_prepare_container_def_with_image_config():
+    image_config = {"RepositoryAccessMode": "Vpc"}
+    model = Model(MODEL_IMAGE, image_config=image_config)
+
+    expected = {
+        "Image": MODEL_IMAGE,
+        "ImageConfig": {"RepositoryAccessMode": "Vpc"},
+        "Environment": {},
+    }
+
+    container_def = model.prepare_container_def()
+    assert expected == container_def
+
+
 def test_model_enable_network_isolation():
     model = Model(MODEL_IMAGE, MODEL_DATA)
     assert model.enable_network_isolation() is False

tests/unit/test_estimator.py

@@ -1434,7 +1434,7 @@ def test_attach_no_logs(sagemaker_session, training_job_description):
 def test_logs(sagemaker_session, training_job_description):
     estimator = Estimator.attach(training_job_name="job", sagemaker_session=sagemaker_session)
     estimator.logs()
-    sagemaker_session.logs_for_job.assert_called_with(estimator.latest_training_job, wait=True)
+    sagemaker_session.logs_for_job.assert_called_with(estimator.latest_training_job.name, wait=True)
 
 
 def test_attach_without_hyperparameters(sagemaker_session, training_job_description):