Skip to content

breaking: rename record_deserializer to RecordDeserializer #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 8, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 13 additions & 14 deletions src/sagemaker/amazon/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@
import numpy as np

from sagemaker.amazon.record_pb2 import Record
from sagemaker.deserializers import BaseDeserializer
from sagemaker.utils import DeferredError


Expand Down Expand Up @@ -48,26 +49,24 @@ def __call__(self, array):
return buf


class record_deserializer(object):
"""Placeholder docstring"""
class RecordDeserializer(BaseDeserializer):
"""Deserialize RecordIO Protobuf data from an inference endpoint."""

def __init__(self, accept="application/x-recordio-protobuf"):
"""
Args:
accept:
"""
self.accept = accept
ACCEPT = "application/x-recordio-protobuf"

def deserialize(self, data, content_type):
"""Deserialize RecordIO Protobuf data from an inference endpoint.

def __call__(self, stream, content_type):
"""
Args:
stream:
content_type:
data (object): The protobuf message to deserialize.
content_type (str): The MIME type of the data.
Returns:
list: A list of records.
"""
try:
return read_records(stream)
return read_records(data)
finally:
stream.close()
data.close()


def _write_feature_tensor(resolved_type, record, vector):
Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/factorization_machines.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin, ge
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -290,7 +290,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/kmeans.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin, ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -223,7 +223,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/knn.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -211,7 +211,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/lda.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -195,7 +195,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/linear_learner.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import isin, gt, lt, ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -454,7 +454,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/ntm.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, le, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -225,7 +225,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/pca.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import gt, isin
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -207,7 +207,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
4 changes: 2 additions & 2 deletions src/sagemaker/amazon/randomcutforest.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@
from __future__ import absolute_import

from sagemaker.amazon.amazon_estimator import AmazonAlgorithmEstimatorBase, registry
from sagemaker.amazon.common import numpy_to_record_serializer, record_deserializer
from sagemaker.amazon.common import numpy_to_record_serializer, RecordDeserializer
from sagemaker.amazon.hyperparameter import Hyperparameter as hp # noqa
from sagemaker.amazon.validation import ge, le
from sagemaker.predictor import Predictor
Expand Down Expand Up @@ -184,7 +184,7 @@ def __init__(self, endpoint_name, sagemaker_session=None):
endpoint_name,
sagemaker_session,
serializer=numpy_to_record_serializer(),
deserializer=record_deserializer(),
deserializer=RecordDeserializer(),
)


Expand Down
6 changes: 3 additions & 3 deletions tests/unit/test_common.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
import itertools
from scipy.sparse import coo_matrix
from sagemaker.amazon.common import (
record_deserializer,
RecordDeserializer,
write_numpy_to_dense_tensor,
read_recordio,
numpy_to_record_serializer,
Expand Down Expand Up @@ -51,8 +51,8 @@ def test_deserializer():
array_data = [[1.0, 2.0, 3.0], [10.0, 20.0, 30.0]]
s = numpy_to_record_serializer()
buf = s(np.array(array_data))
d = record_deserializer()
for record, expected in zip(d(buf, "who cares"), array_data):
d = RecordDeserializer()
for record, expected in zip(d.deserialize(buf, "who cares"), array_data):
assert record.features["values"].float64_tensor.values == expected


Expand Down