Skip to content

Commit f7ca908

Browse files
author
Dan
authored
fix flake8 (#8)
1 parent f9e6105 commit f7ca908

File tree

7 files changed

+19
-20
lines changed

7 files changed

+19
-20
lines changed

src/sagemaker_mxnet_serving_container/default_inference_handler.py

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,9 +15,9 @@
1515
import os
1616

1717
import mxnet as mx
18-
from sagemaker_inference import encoder, errors, decoder, content_types, default_inference_handler
18+
from sagemaker_inference import content_types, decoder, default_inference_handler, encoder, errors
1919

20-
from sagemaker_mxnet_serving_container.utils import read_data_shapes, get_default_context
20+
from sagemaker_mxnet_serving_container.utils import get_default_context, read_data_shapes
2121

2222
PREFERRED_BATCH_SIZE_PARAM = 'SAGEMAKER_DEFAULT_MODEL_FIRST_DIMENSION_SIZE'
2323
INFERENCE_ACCELERATOR_PRESENT_ENV = 'SAGEMAKER_INFERENCE_ACCELERATOR_PRESENT'
@@ -39,7 +39,8 @@ def default_model_fn(self, model_dir, preferred_batch_size=1):
3939
4040
Args:
4141
model_dir (str): The directory where model files are stored
42-
preferred_batch_size (int): The preferred batch size of the model's data shape (default: 1)
42+
preferred_batch_size (int): preferred batch size of the model's data shape.
43+
Defaults to 1.
4344
4445
Returns:
4546
mxnet.mod.Module: the loaded model.
@@ -162,8 +163,7 @@ def default_input_fn(self, input_data, content_type, model=None):
162163
padding = mx.ndarray.zeros(shape=padding_shape)
163164
ndarray = mx.ndarray.concat(ndarray, padding, dim=0)
164165

165-
model_input = mx.io.NDArrayIter(ndarray, batch_size=model_batch_size,
166-
last_batch_handle='pad')
166+
model_input = mx.io.NDArrayIter(ndarray, batch_size=model_batch_size, last_batch_handle='pad')
167167

168168
if pad_rows:
169169
# Update the getpad method on the model_input data iterator to return the amount of

src/sagemaker_mxnet_serving_container/handler_service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,8 @@
1919
from sagemaker_inference.default_handler_service import DefaultHandlerService
2020
from sagemaker_inference.transformer import Transformer
2121

22-
from sagemaker_mxnet_serving_container.default_inference_handler import \
23-
DefaultMXNetInferenceHandler, DefaultGluonBlockInferenceHandler
22+
from sagemaker_mxnet_serving_container.default_inference_handler import DefaultGluonBlockInferenceHandler, \
23+
DefaultMXNetInferenceHandler
2424
from sagemaker_mxnet_serving_container.mxnet_module_transformer import MXNetModuleTransformer
2525

2626

src/sagemaker_mxnet_serving_container/mxnet_module_transformer.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@
1515
import inspect
1616

1717
from sagemaker_inference.transformer import Transformer
18+
1819
from sagemaker_mxnet_serving_container.default_inference_handler import DefaultModuleInferenceHandler
1920

2021

src/sagemaker_mxnet_serving_container/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@
1313
from __future__ import absolute_import
1414

1515
import json
16+
1617
import mxnet as mx
1718

1819

test/unit/test_default_inference_handler.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,13 @@
1515
import json
1616
import os
1717

18+
from mock import call, Mock, mock_open, patch
1819
import mxnet as mx
1920
import pytest
21+
from sagemaker_inference import content_types, errors
2022

21-
from mock import patch, Mock, mock_open, call
22-
from sagemaker_inference import errors, content_types
23-
24-
from sagemaker_mxnet_serving_container.default_inference_handler import DefaultMXNetInferenceHandler, \
25-
DefaultModuleInferenceHandler, DefaultGluonBlockInferenceHandler
23+
from sagemaker_mxnet_serving_container.default_inference_handler import DefaultGluonBlockInferenceHandler, \
24+
DefaultModuleInferenceHandler, DefaultMXNetInferenceHandler
2625

2726
MODEL_DIR = 'foo/model'
2827

@@ -31,8 +30,7 @@
3130

3231

3332
def test_default_mxnet_valid_content_types():
34-
assert DefaultMXNetInferenceHandler().VALID_CONTENT_TYPES == \
35-
(content_types.JSON, content_types.NPY)
33+
assert DefaultMXNetInferenceHandler().VALID_CONTENT_TYPES == (content_types.JSON, content_types.NPY)
3634

3735

3836
@patch('mxnet.cpu')
@@ -162,7 +160,7 @@ def test_mxnet_default_output_fn_invalid_content_type():
162160

163161
def test_default_module_valid_content_types():
164162
assert DefaultModuleInferenceHandler().VALID_CONTENT_TYPES == \
165-
(content_types.JSON, content_types.CSV, content_types.NPY)
163+
(content_types.JSON, content_types.CSV, content_types.NPY)
166164

167165

168166
@patch('mxnet.io.NDArrayIter')
@@ -219,8 +217,7 @@ def test_module_default_input_fn_with_npy(decode, mx_ndarray_iter):
219217
@patch('mxnet.io.NDArrayIter')
220218
@patch('sagemaker_inference.decoder.decode', return_value=[0])
221219
@patch.dict(os.environ, {'SAGEMAKER_INFERENCE_ACCELERATOR_PRESENT': 'true'}, clear=True)
222-
def test_module_default_input_fn_with_accelerator(decode, mx_ndarray_iter, mx_ndarray,
223-
mx_eia):
220+
def test_module_default_input_fn_with_accelerator(decode, mx_ndarray_iter, mx_ndarray, mx_eia):
224221
ndarray = Mock(shape=(1, (1,)))
225222
ndarray.as_in_context.return_value = ndarray
226223
mx_ndarray.return_value = ndarray

test/unit/test_handler_service.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@
1212
# language governing permissions and limitations under the License.
1313
from __future__ import absolute_import
1414

15+
from mock import Mock, patch
1516
import mxnet as mx
1617
import pytest
17-
from mock import patch, Mock
1818
from sagemaker_inference.transformer import Transformer
1919

2020
from sagemaker_mxnet_serving_container.handler_service import HandlerService
@@ -60,7 +60,7 @@ def test_user_module_mxnet_module_transformer(import_module, input_fn, predict_f
6060

6161

6262
@patch('sagemaker_mxnet_serving_container.default_inference_handler.DefaultMXNetInferenceHandler.default_model_fn')
63-
@patch('sagemaker_mxnet_serving_container.default_inference_handler.DefaultGluonBlockInferenceHandler.default_predict_fn')
63+
@patch('sagemaker_mxnet_serving_container.default_inference_handler.DefaultGluonBlockInferenceHandler.default_predict_fn') # noqa E501
6464
@patch('importlib.import_module', return_value=object())
6565
def test_user_module_mxnet_gluon_transformer(import_module, predict_fn, model_fn):
6666
model_fn.return_value = mx.gluon.block.Block()

test/unit/test_utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414

1515
import json
1616

17-
from mock import Mock, patch, mock_open
17+
from mock import Mock, mock_open, patch
1818

1919
from sagemaker_mxnet_serving_container.utils import get_default_context, read_data_shapes
2020

0 commit comments

Comments
 (0)