Allow TensorFlow json serializer to accept dicts with ndarray values

CHANGELOG.rst

@@ -2,6 +2,11 @@
 CHANGELOG
 =========
 
+1.10.2
+======
+
+* bug-fix: default TensorFlow json serializer accepts dict of numpy arrays
+
 1.10.1
 ======
 

src/sagemaker/predictor.py

@@ -16,6 +16,7 @@
 import csv
 import json
 import numpy as np
+import six
 from six import StringIO, BytesIO
 
 from sagemaker.content_types import CONTENT_TYPE_JSON, CONTENT_TYPE_CSV, CONTENT_TYPE_NPY
@@ -237,48 +238,28 @@ def __call__(self, data):
         Returns:
             object: Serialized data used for the request.
         """
-        if isinstance(data, np.ndarray):
-            if not data.size > 0:
-                raise ValueError("empty array can't be serialized")
-            return _json_serialize_numpy_array(data)
-
-        if isinstance(data, list):
-            if not len(data) > 0:
-                raise ValueError("empty array can't be serialized")
-            return _json_serialize_python_object(data)
-
         if isinstance(data, dict):
-            if not len(data.keys()) > 0:
-                raise ValueError("empty dictionary can't be serialized")
-            return _json_serialize_python_object(data)
+            # convert each value in dict from a numpy array to a list if necessary, so they can be json serialized
+            return json.dumps({k: _ndarray_to_list(v) for k, v in six.iteritems(data)})
 
         # files and buffers
         if hasattr(data, 'read'):
             return _json_serialize_from_buffer(data)
 
-        raise ValueError("Unable to handle input format: {}".format(type(data)))
+        return json.dumps(_ndarray_to_list(data))
 
 
 json_serializer = _JsonSerializer()
 
 
-def _json_serialize_numpy_array(data):
-    # numpy arrays can't be serialized but we know they have uniform type
-    return _json_serialize_python_object(data.tolist())
-
-
-def _json_serialize_python_object(data):
-    return _json_serialize_object(data)
+def _ndarray_to_list(data):
+    return data.tolist() if isinstance(data, np.ndarray) else data
 
 
 def _json_serialize_from_buffer(buff):
     return buff.read()
 
 
-def _json_serialize_object(data):
-    return json.dumps(data)
-
-
 class _JsonDeserializer(object):
     def __init__(self):
         self.accept = CONTENT_TYPE_JSON

tests/unit/test_predictor.py

@@ -40,11 +40,8 @@ def test_json_serializer_numpy_valid_2dimensional():
     assert result == '[[1, 2, 3], [3, 4, 5]]'
 
 
-def test_json_serializer_numpy_invalid_empty():
-    with pytest.raises(ValueError) as invalid_input:
-        json_serializer(np.array([]))
-
-    assert "empty array" in str(invalid_input)
+def test_json_serializer_empty():
+    assert json_serializer(np.array([])) == '[]'
 
 
 def test_json_serializer_python_array():
@@ -62,15 +59,11 @@ def test_json_serializer_python_dictionary():
 
 
 def test_json_serializer_python_invalid_empty():
-    with pytest.raises(ValueError) as error:
-        json_serializer([])
-    assert "empty array" in str(error)
+    assert json_serializer([]) == '[]'
 
 
 def test_json_serializer_python_dictionary_invalid_empty():
-    with pytest.raises(ValueError) as error:
-        json_serializer({})
-    assert "empty dictionary" in str(error)
+    assert json_serializer({}) == '{}'
 
 
 def test_json_serializer_csv_buffer():

tests/unit/test_tf_predictor.py

@@ -336,3 +336,24 @@ def mock_response(expected_response, sagemaker_session, content_type):
     sagemaker_session.sagemaker_runtime_client.invoke_endpoint.return_value = {
         'ContentType': content_type,
         'Body': io.BytesIO(expected_response)}
+
+
+def test_json_serialize_dict():
+    data = {'tensor1': [1, 2, 3], 'tensor2': [4, 5, 6]}
+    serialized = tf_json_serializer(data)
+    # deserialize again for assertion, since dict order is not guaranteed
+    deserialized = json.loads(serialized)
+    assert deserialized == data
+
+
+def test_json_serialize_dict_with_numpy():
+    data = {'tensor1': np.asarray([1, 2, 3]), 'tensor2': np.asarray([4, 5, 6])}
+    serialized = tf_json_serializer(data)
+    # deserialize again for assertion, since dict order is not guaranteed
+    deserialized = json.loads(serialized)
+    assert deserialized == {'tensor1': [1, 2, 3], 'tensor2': [4, 5, 6]}
+
+
+def test_json_serialize_numpy():
+    data = np.asarray([[1, 2, 3], [4, 5, 6]])
+    assert tf_json_serializer(data) == '[[1, 2, 3], [4, 5, 6]]'