Merge branch 'zwei' into deprecate-fw-utils-parse-s3-url

laurenyu · web-flow · commit 929e6397f53f · 2020-07-30T09:33:09.000-07:00
diff --git a/src/sagemaker/chainer/estimator.py b/src/sagemaker/chainer/estimator.py
@@ -32,7 +32,7 @@
 class Chainer(Framework):
     """Handle end-to-end training and deployment of custom Chainer code."""
 
-    __framework_name__ = "chainer"
+    _framework_name = "chainer"
 
     # Hyperparameters
     _use_mpi = "sagemaker_use_mpi"
@@ -131,7 +131,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -272,7 +272,7 @@ class constructor
             init_params["image_uri"] = image_uri
             return init_params
 
-        if framework != cls.__framework_name__:
+        if framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]
diff --git a/src/sagemaker/chainer/model.py b/src/sagemaker/chainer/model.py
@@ -59,7 +59,7 @@ class ChainerModel(FrameworkModel):
     ``Endpoint``.
     """
 
-    __framework_name__ = "chainer"
+    _framework_name = "chainer"
 
     def __init__(
         self,
@@ -116,7 +116,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -176,7 +176,7 @@ def serving_image_uri(self, region_name, instance_type, accelerator_type=None):
 
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,
diff --git a/src/sagemaker/deserializers.py b/src/sagemaker/deserializers.py
@@ -266,7 +266,8 @@ def deserialize(self, stream, content_type):
             list: A list of JSON serializable objects.
         """
         try:
-            lines = stream.read().rstrip().split("\n")
+            body = stream.read().decode("utf-8")
+            lines = body.rstrip().split("\n")
             return [json.loads(line) for line in lines]
         finally:
             stream.close()
diff --git a/src/sagemaker/estimator.py b/src/sagemaker/estimator.py
@@ -1417,7 +1417,7 @@ class Framework(EstimatorBase):
     such as training/deployment images and predictor instances.
     """
 
-    __framework_name__ = None
+    _framework_name = None
 
     LAUNCH_PS_ENV_NAME = "sagemaker_parameter_server_enabled"
     LAUNCH_MPI_ENV_NAME = "sagemaker_mpi_enabled"
@@ -1815,7 +1815,7 @@ def train_image(self):
         if self.image_uri:
             return self.image_uri
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             self.sagemaker_session.boto_region_name,
             instance_type=self.instance_type,
             version=self.framework_version,  # pylint: disable=no-member
diff --git a/src/sagemaker/model.py b/src/sagemaker/model.py
@@ -183,7 +183,7 @@ def _set_model_name_if_needed(self):
 
     def _framework(self):
         """Placeholder docstring"""
-        return getattr(self, "__framework_name__", None)
+        return getattr(self, "_framework_name", None)
 
     def _get_framework_version(self):
         """Placeholder docstring"""
diff --git a/src/sagemaker/mxnet/estimator.py b/src/sagemaker/mxnet/estimator.py
@@ -34,7 +34,7 @@
 class MXNet(Framework):
     """Handle end-to-end training and deployment of custom MXNet code."""
 
-    __framework_name__ = "mxnet"
+    _framework_name = "mxnet"
     _LOWEST_SCRIPT_MODE_VERSION = ["1", "3"]
 
     def __init__(
@@ -114,7 +114,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -280,7 +280,7 @@ class constructor
             init_params["image_uri"] = image_uri
             return init_params
 
-        if framework != cls.__framework_name__:
+        if framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]
diff --git a/src/sagemaker/mxnet/model.py b/src/sagemaker/mxnet/model.py
@@ -59,7 +59,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
 class MXNetModel(FrameworkModel):
     """An MXNet SageMaker ``Model`` that can be deployed to a SageMaker ``Endpoint``."""
 
-    __framework_name__ = "mxnet"
+    _framework_name = "mxnet"
     _LOWEST_MMS_VERSION = "1.4.0"
 
     def __init__(
@@ -119,7 +119,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -184,7 +184,7 @@ def serving_image_uri(self, region_name, instance_type, accelerator_type=None):
 
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,
diff --git a/src/sagemaker/pytorch/estimator.py b/src/sagemaker/pytorch/estimator.py
@@ -33,7 +33,7 @@
 class PyTorch(Framework):
     """Handle end-to-end training and deployment of custom PyTorch code."""
 
-    __framework_name__ = "pytorch"
+    _framework_name = "pytorch"
 
     def __init__(
         self,
@@ -109,7 +109,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -221,7 +221,7 @@ class constructor
             init_params["image_uri"] = image_uri
             return init_params
 
-        if framework != cls.__framework_name__:
+        if framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]
diff --git a/src/sagemaker/pytorch/model.py b/src/sagemaker/pytorch/model.py
@@ -60,7 +60,7 @@ class PyTorchModel(FrameworkModel):
     ``Endpoint``.
     """
 
-    __framework_name__ = "pytorch"
+    _framework_name = "pytorch"
     _LOWEST_MMS_VERSION = "1.2"
 
     def __init__(
@@ -118,7 +118,7 @@ def __init__(
         validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -183,7 +183,7 @@ def serving_image_uri(self, region_name, instance_type, accelerator_type=None):
 
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,
diff --git a/src/sagemaker/sklearn/estimator.py b/src/sagemaker/sklearn/estimator.py
@@ -32,7 +32,7 @@
 class SKLearn(Framework):
     """Handle end-to-end training and deployment of custom Scikit-learn code."""
 
-    __framework_name__ = defaults.SKLEARN_NAME
+    _framework_name = defaults.SKLEARN_NAME
 
     def __init__(
         self,
@@ -138,7 +138,7 @@ def __init__(
 
         if image_uri is None:
             self.image_uri = image_uris.retrieve(
-                SKLearn.__framework_name__,
+                SKLearn._framework_name,
                 self.sagemaker_session.boto_region_name,
                 version=self.framework_version,
                 py_version=self.py_version,
diff --git a/src/sagemaker/sklearn/model.py b/src/sagemaker/sklearn/model.py
@@ -55,7 +55,7 @@ class SKLearnModel(FrameworkModel):
     ``Endpoint``.
     """
 
-    __framework_name__ = defaults.SKLEARN_NAME
+    _framework_name = defaults.SKLEARN_NAME
 
     def __init__(
         self,
@@ -175,7 +175,7 @@ def serving_image_uri(self, region_name, instance_type):
 
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,
diff --git a/src/sagemaker/tensorflow/estimator.py b/src/sagemaker/tensorflow/estimator.py
@@ -33,7 +33,7 @@
 class TensorFlow(Framework):
     """Handle end-to-end training and deployment of user-provided TensorFlow code."""
 
-    __framework_name__ = "tensorflow"
+    _framework_name = "tensorflow"
 
     _HIGHEST_LEGACY_MODE_ONLY_VERSION = version.Version("1.10.0")
     _HIGHEST_PYTHON_2_VERSION = version.Version("2.1.0")
@@ -116,7 +116,7 @@ def __init__(
         fw.validate_version_or_image_args(framework_version, py_version, image_uri)
         if py_version == "py2":
             logger.warning(
-                fw.python_deprecation_warning(self.__framework_name__, defaults.LATEST_PY2_VERSION)
+                fw.python_deprecation_warning(self._framework_name, defaults.LATEST_PY2_VERSION)
             )
         self.framework_version = framework_version
         self.py_version = py_version
@@ -221,7 +221,7 @@ def _prepare_init_params_from_job_description(cls, job_details, model_channel_na
         if not script_mode:
             init_params["image_uri"] = image_uri
 
-        if framework != cls.__framework_name__:
+        if framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]
diff --git a/src/sagemaker/tensorflow/model.py b/src/sagemaker/tensorflow/model.py
@@ -121,7 +121,7 @@ def predict(self, data, initial_args=None):
 class TensorFlowModel(sagemaker.model.FrameworkModel):
     """A ``FrameworkModel`` implementation for inference with TensorFlow Serving."""
 
-    __framework_name__ = "tensorflow"
+    _framework_name = "tensorflow"
     LOG_LEVEL_PARAM_NAME = "SAGEMAKER_TFS_NGINX_LOGLEVEL"
     LOG_LEVEL_MAP = {
         logging.DEBUG: "debug",
@@ -286,7 +286,7 @@ def _get_image_uri(self, instance_type, accelerator_type=None):
             return self.image_uri
 
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             self.sagemaker_session.boto_region_name,
             version=self.framework_version,
             instance_type=instance_type,
diff --git a/src/sagemaker/xgboost/estimator.py b/src/sagemaker/xgboost/estimator.py
@@ -34,7 +34,7 @@ class XGBoost(Framework):
     """Handle end-to-end training and deployment of XGBoost booster training or training using
     customer provided XGBoost entry point script."""
 
-    __framework_name__ = defaults.XGBOOST_NAME
+    _framework_name = defaults.XGBOOST_NAME
 
     def __init__(
         self,
@@ -103,7 +103,7 @@ def __init__(
 
         if image_uri is None:
             self.image_uri = image_uris.retrieve(
-                self.__framework_name__,
+                self._framework_name,
                 self.sagemaker_session.boto_region_name,
                 version=framework_version,
                 py_version=self.py_version,
@@ -252,7 +252,7 @@ def _prepare_init_params_from_job_description(cls, job_details, model_channel_na
         framework, py_version, tag, _ = framework_name_from_image(image_uri)
         init_params["py_version"] = py_version
 
-        if framework and framework != cls.__framework_name__:
+        if framework and framework != cls._framework_name:
             raise ValueError(
                 "Training job: {} didn't use image for requested framework".format(
                     job_details["TrainingJobName"]
diff --git a/src/sagemaker/xgboost/model.py b/src/sagemaker/xgboost/model.py
@@ -51,7 +51,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
 class XGBoostModel(FrameworkModel):
     """An XGBoost SageMaker ``Model`` that can be deployed to a SageMaker ``Endpoint``."""
 
-    __framework_name__ = XGBOOST_NAME
+    _framework_name = XGBOOST_NAME
 
     def __init__(
         self,
@@ -144,7 +144,7 @@ def serving_image_uri(self, region_name, instance_type):
             str: The appropriate image URI based on the given parameters.
         """
         return image_uris.retrieve(
-            self.__framework_name__,
+            self._framework_name,
             region_name,
             version=self.framework_version,
             py_version=self.py_version,
diff --git a/tests/unit/sagemaker/tensorflow/test_estimator_init.py b/tests/unit/sagemaker/tensorflow/test_estimator_init.py
@@ -65,7 +65,7 @@ def test_py2_version_is_not_deprecated(sagemaker_session):
 
 def test_framework_name(sagemaker_session):
     tf = _build_tf(sagemaker_session, framework_version="1.15.2", py_version="py3")
-    assert tf.__framework_name__ == "tensorflow"
+    assert tf._framework_name == "tensorflow"
 
 
 def test_enable_sm_metrics(sagemaker_session):
diff --git a/tests/unit/sagemaker/test_deserializers.py b/tests/unit/sagemaker/test_deserializers.py
@@ -219,16 +219,16 @@ def json_lines_deserializer():
 @pytest.mark.parametrize(
     "source, expected",
     [
-        ('["Name", "Score"]\n["Gilbert", 24]', [["Name", "Score"], ["Gilbert", 24]]),
-        ('["Name", "Score"]\n["Gilbert", 24]\n', [["Name", "Score"], ["Gilbert", 24]]),
+        (b'["Name", "Score"]\n["Gilbert", 24]', [["Name", "Score"], ["Gilbert", 24]]),
+        (b'["Name", "Score"]\n["Gilbert", 24]\n', [["Name", "Score"], ["Gilbert", 24]]),
         (
-            '{"Name": "Gilbert", "Score": 24}\n{"Name": "Alexa", "Score": 29}',
+            b'{"Name": "Gilbert", "Score": 24}\n{"Name": "Alexa", "Score": 29}',
             [{"Name": "Gilbert", "Score": 24}, {"Name": "Alexa", "Score": 29}],
         ),
     ],
 )
 def test_json_lines_deserializer(json_lines_deserializer, source, expected):
-    stream = io.StringIO(source)
+    stream = io.BytesIO(source)
     content_type = "application/jsonlines"
     actual = json_lines_deserializer.deserialize(stream, content_type)
     assert actual == expected
diff --git a/tests/unit/test_chainer.py b/tests/unit/test_chainer.py
@@ -561,7 +561,7 @@ def test_estimator_py2_warning(warning, sagemaker_session, chainer_version):
     )
 
     assert estimator.py_version == "py2"
-    warning.assert_called_with(estimator.__framework_name__, defaults.LATEST_PY2_VERSION)
+    warning.assert_called_with(estimator._framework_name, defaults.LATEST_PY2_VERSION)
 
 
 @patch("sagemaker.chainer.model.python_deprecation_warning")
@@ -575,4 +575,4 @@ def test_model_py2_warning(warning, sagemaker_session, chainer_version):
         py_version="py2",
     )
     assert model.py_version == "py2"
-    warning.assert_called_with(model.__framework_name__, defaults.LATEST_PY2_VERSION)
+    warning.assert_called_with(model._framework_name, defaults.LATEST_PY2_VERSION)
diff --git a/tests/unit/test_estimator.py b/tests/unit/test_estimator.py
@@ -107,7 +107,7 @@
 
 
 class DummyFramework(Framework):
-    __framework_name__ = "dummy"
+    _framework_name = "dummy"
 
     def train_image(self):
         return IMAGE_URI
diff --git a/tests/unit/test_job.py b/tests/unit/test_job.py
@@ -81,7 +81,7 @@ def sagemaker_session():
 
 
 class DummyFramework(Framework):
-    __framework_name__ = "dummy"
+    _framework_name = "dummy"
 
     def train_image(self):
         return IMAGE_NAME
diff --git a/tests/unit/test_mxnet.py b/tests/unit/test_mxnet.py
diff --git a/tests/unit/test_pytorch.py b/tests/unit/test_pytorch.py
