Merge branch 'master' into use-local-values

Author: ajaykarpur

src/sagemaker/pipeline.py

@@ -26,7 +26,14 @@ class PipelineModel(object):
     """
 
     def __init__(
-        self, models, role, predictor_cls=None, name=None, vpc_config=None, sagemaker_session=None
+        self,
+        models,
+        role,
+        predictor_cls=None,
+        name=None,
+        vpc_config=None,
+        sagemaker_session=None,
+        enable_network_isolation=False,
     ):
         """Initialize a SageMaker `Model` instance.
 
@@ -57,13 +64,18 @@ def __init__(
                 object, used for SageMaker interactions (default: None). If not
                 specified, one is created using the default AWS configuration
                 chain.
+            enable_network_isolation (bool): Default False. if True, enables
+                network isolation in the endpoint, isolating the model
+                container. No inbound or outbound network calls can be made to
+                or from the model container.Boolean
         """
         self.models = models
         self.role = role
         self.predictor_cls = predictor_cls
         self.name = name
         self.vpc_config = vpc_config
         self.sagemaker_session = sagemaker_session
+        self.enable_network_isolation = enable_network_isolation
         self.endpoint_name = None
 
     def pipeline_container_def(self, instance_type):
@@ -157,7 +169,11 @@ def deploy(
 
         self.name = self.name or name_from_image(containers[0]["Image"])
         self.sagemaker_session.create_model(
-            self.name, self.role, containers, vpc_config=self.vpc_config
+            self.name,
+            self.role,
+            containers,
+            vpc_config=self.vpc_config,
+            enable_network_isolation=self.enable_network_isolation,
         )
 
         production_variant = sagemaker.production_variant(
@@ -214,7 +230,11 @@ def _create_sagemaker_pipeline_model(self, instance_type):
 
         self.name = self.name or name_from_image(containers[0]["Image"])
         self.sagemaker_session.create_model(
-            self.name, self.role, containers, vpc_config=self.vpc_config
+            self.name,
+            self.role,
+            containers,
+            vpc_config=self.vpc_config,
+            enable_network_isolation=self.enable_network_isolation,
         )
 
     def transformer(

src/sagemaker/processing.py

@@ -21,6 +21,7 @@
 import pathlib
 
 from six.moves.urllib.parse import urlparse
+from six.moves.urllib.request import url2pathname
 
 from sagemaker import s3
 from sagemaker.job import _Job
@@ -535,21 +536,22 @@ def _handle_user_code_url(self, code):
             user_code_s3_uri = code
         elif code_url.scheme == "" or code_url.scheme == "file":
             # Validate that the file exists locally and is not a directory.
-            if not os.path.exists(code):
+            code_path = url2pathname(code_url.path)
+            if not os.path.exists(code_path):
                 raise ValueError(
                     """code {} wasn't found. Please make sure that the file exists.
                     """.format(
                         code
                     )
                 )
-            if not os.path.isfile(code):
+            if not os.path.isfile(code_path):
                 raise ValueError(
                     """code {} must be a file, not a directory. Please pass a path to a file.
                     """.format(
                         code
                     )
                 )
-            user_code_s3_uri = self._upload_code(code)
+            user_code_s3_uri = self._upload_code(code_path)
         else:
             raise ValueError(
                 "code {} url scheme {} is not recognized. Please pass a file path or S3 url".format(

tests/unit/test_pipeline_model.py

@@ -298,3 +298,43 @@ def test_delete_model(tfo, time, sagemaker_session):
 
     pipeline_model.delete_model()
     sagemaker_session.delete_model.assert_called_with(pipeline_model.name)
+
+
+@patch("tarfile.open")
+@patch("time.strftime", return_value=TIMESTAMP)
+def test_network_isolation(tfo, time, sagemaker_session):
+    framework_model = DummyFrameworkModel(sagemaker_session)
+    sparkml_model = SparkMLModel(
+        model_data=MODEL_DATA_2, role=ROLE, sagemaker_session=sagemaker_session
+    )
+    model = PipelineModel(
+        models=[framework_model, sparkml_model],
+        role=ROLE,
+        sagemaker_session=sagemaker_session,
+        enable_network_isolation=True,
+    )
+    model.deploy(instance_type=INSTANCE_TYPE, initial_instance_count=1)
+
+    sagemaker_session.create_model.assert_called_with(
+        model.name,
+        ROLE,
+        [
+            {
+                "Image": "mi-1",
+                "Environment": {
+                    "SAGEMAKER_PROGRAM": "blah.py",
+                    "SAGEMAKER_SUBMIT_DIRECTORY": "s3://mybucket/mi-1-2017-10-10-14-14-15/sourcedir.tar.gz",
+                    "SAGEMAKER_CONTAINER_LOG_LEVEL": "20",
+                    "SAGEMAKER_REGION": "us-west-2",
+                },
+                "ModelDataUrl": "s3://bucket/model_1.tar.gz",
+            },
+            {
+                "Image": "246618743249.dkr.ecr.us-west-2.amazonaws.com/sagemaker-sparkml-serving:2.2",
+                "Environment": {},
+                "ModelDataUrl": "s3://bucket/model_2.tar.gz",
+            },
+        ],
+        vpc_config=None,
+        enable_network_isolation=True,
+    )