Skip to content

Commit 5241022

Browse files
author
Bryannah Hernandez
committed
removing unnecessary loggers
1 parent 8237b7b commit 5241022

File tree

3 files changed

+166
-174
lines changed

3 files changed

+166
-174
lines changed

‎src/sagemaker/serve/app.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -42,12 +42,8 @@ def read_root():
4242
@app.get("/generate")
4343
async def generate_text(prompt: Request):
4444
"""Placeholder docstring"""
45-
logger.info("Generating Text....")
46-
4745
str_prompt = await prompt.json()
4846

49-
logger.info(str_prompt)
50-
5147
generated_text = generator(
5248
str_prompt, max_length=30, num_return_sequences=5, truncation=True
5349
)
@@ -64,7 +60,6 @@ def post(payload: dict):
6460

6561
async def main():
6662
"""Running server locally with uvicorn"""
67-
logger.info("Running")
6863
config = uvicorn.Config(
6964
"sagemaker.serve.app:app",
7065
host="127.0.0.1",

‎src/sagemaker/serve/utils/predictors.py

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -227,9 +227,6 @@ def __init__(
227227

228228
def predict(self, data):
229229
"""Placeholder docstring"""
230-
logger.info("Entering predict to make a prediction on ")
231-
logger.info(data)
232-
233230
return self._mode_obj._invoke_multi_model_server_serving(
234231
self.serializer.serialize(data),
235232
self.content_type,

‎tests/unit/sagemaker/serve/mode/test_in_process_mode.py

Lines changed: 166 additions & 166 deletions
Original file line numberDiff line numberDiff line change
@@ -1,166 +1,166 @@
1-
# # Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2-
# #
3-
# # Licensed under the Apache License, Version 2.0 (the "License"). You
4-
# # may not use this file except in compliance with the License. A copy of
5-
# # the License is located at
6-
# #
7-
# # http://aws.amazon.com/apache2.0/
8-
# #
9-
# # or in the "license" file accompanying this file. This file is
10-
# # distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11-
# # ANY KIND, either express or implied. See the License for the specific
12-
# # language governing permissions and limitations under the License.
13-
# from __future__ import absolute_import
14-
15-
# import unittest
16-
# from unittest.mock import patch, Mock
17-
18-
# from sagemaker.serve.mode.in_process_mode import InProcessMode
19-
# from sagemaker.serve import SchemaBuilder
20-
# from sagemaker.serve.utils.types import ModelServer
21-
# from sagemaker.serve.utils.exceptions import LocalDeepPingException
22-
23-
24-
# mock_prompt = "Hello, I'm a language model,"
25-
# mock_response = "Hello, I'm a language model, and I'm here to help you with your English."
26-
# mock_sample_input = {"inputs": mock_prompt, "parameters": {}}
27-
# mock_sample_output = [{"generated_text": mock_response}]
28-
29-
30-
# class TestInProcessMode(unittest.TestCase):
31-
32-
# @patch("sagemaker.serve.mode.in_process_mode.Path")
33-
# @patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
34-
# @patch("sagemaker.session.Session")
35-
# def test_load_happy(self, mock_session, mock_inference_spec, mock_path):
36-
# mock_path.return_value.exists.side_effect = lambda *args, **kwargs: True
37-
# mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: True
38-
39-
# mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
40-
41-
# mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
42-
# in_process_mode = InProcessMode(
43-
# model_server=ModelServer.MMS,
44-
# inference_spec=mock_inference_spec,
45-
# schema_builder=mock_schema_builder,
46-
# session=mock_session,
47-
# model_path="model_path",
48-
# env_vars={"key": "val"},
49-
# )
50-
51-
# res = in_process_mode.load(model_path="/tmp/model-builder/code/")
52-
53-
# self.assertEqual(res, "Dummy load")
54-
# self.assertEqual(in_process_mode.inference_spec, mock_inference_spec)
55-
# self.assertEqual(in_process_mode.schema_builder, mock_schema_builder)
56-
# self.assertEqual(in_process_mode.model_path, "model_path")
57-
# self.assertEqual(in_process_mode.env_vars, {"key": "val"})
58-
59-
# @patch("sagemaker.serve.mode.in_process_mode.Path")
60-
# @patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
61-
# @patch("sagemaker.session.Session")
62-
# def test_load_ex(self, mock_session, mock_inference_spec, mock_path):
63-
# mock_path.return_value.exists.side_effect = lambda *args, **kwargs: False
64-
# mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: True
65-
66-
# mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
67-
68-
# mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
69-
# in_process_mode = InProcessMode(
70-
# model_server=ModelServer.MMS,
71-
# inference_spec=mock_inference_spec,
72-
# schema_builder=mock_schema_builder,
73-
# session=mock_session,
74-
# model_path="model_path",
75-
# )
76-
77-
# self.assertRaises(ValueError, in_process_mode.load, "/tmp/model-builder/code/")
78-
79-
# mock_path.return_value.exists.side_effect = lambda *args, **kwargs: True
80-
# mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: False
81-
82-
# mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
83-
# mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
84-
# in_process_mode = InProcessMode(
85-
# model_server=ModelServer.MMS,
86-
# inference_spec=mock_inference_spec,
87-
# schema_builder=mock_schema_builder,
88-
# session=mock_session,
89-
# model_path="model_path",
90-
# )
91-
92-
# self.assertRaises(ValueError, in_process_mode.load, "/tmp/model-builder/code/")
93-
94-
# @patch("sagemaker.serve.mode.in_process_mode.logger")
95-
# @patch("sagemaker.base_predictor.PredictorBase")
96-
# @patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
97-
# @patch("sagemaker.session.Session")
98-
# def test_create_server_happy(
99-
# self, mock_session, mock_inference_spec, mock_predictor, mock_logger
100-
# ):
101-
# mock_start_serving = Mock()
102-
# mock_start_serving.side_effect = lambda *args, **kwargs: (
103-
# True,
104-
# None,
105-
# )
106-
107-
# mock_response = "Fake response"
108-
# mock_multi_model_server_deep_ping = Mock()
109-
# mock_multi_model_server_deep_ping.side_effect = lambda *args, **kwargs: (
110-
# True,
111-
# mock_response,
112-
# )
113-
114-
# in_process_mode = InProcessMode(
115-
# model_server=ModelServer.MMS,
116-
# inference_spec=mock_inference_spec,
117-
# schema_builder=SchemaBuilder(mock_sample_input, mock_sample_output),
118-
# session=mock_session,
119-
# model_path="model_path",
120-
# )
121-
122-
# in_process_mode._multi_model_server_deep_ping = mock_multi_model_server_deep_ping
123-
# in_process_mode._start_serving = mock_start_serving
124-
125-
# in_process_mode.create_server(predictor=mock_predictor)
126-
127-
# mock_logger.info.assert_called_once_with(
128-
# "Waiting for model server %s to start up...", ModelServer.MMS
129-
# )
130-
# mock_logger.debug.assert_called_once_with(
131-
# "Ping health check has passed. Returned %s", str(mock_response)
132-
# )
133-
134-
# @patch("sagemaker.base_predictor.PredictorBase")
135-
# @patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
136-
# @patch("sagemaker.session.Session")
137-
# def test_create_server_ex(
138-
# self,
139-
# mock_session,
140-
# mock_inference_spec,
141-
# mock_predictor,
142-
# ):
143-
# mock_start_serving = Mock()
144-
# mock_start_serving.side_effect = lambda *args, **kwargs: (
145-
# True,
146-
# None,
147-
# )
148-
149-
# mock_multi_model_server_deep_ping = Mock()
150-
# mock_multi_model_server_deep_ping.side_effect = lambda *args, **kwargs: (
151-
# False,
152-
# None,
153-
# )
154-
155-
# in_process_mode = InProcessMode(
156-
# model_server=ModelServer.MMS,
157-
# inference_spec=mock_inference_spec,
158-
# schema_builder=SchemaBuilder(mock_sample_input, mock_sample_output),
159-
# session=mock_session,
160-
# model_path="model_path",
161-
# )
162-
163-
# in_process_mode._multi_model_server_deep_ping = mock_multi_model_server_deep_ping
164-
# in_process_mode._start_serving = mock_start_serving
165-
166-
# self.assertRaises(LocalDeepPingException, in_process_mode.create_server, mock_predictor)
1+
# Copyright Amazon.com, Inc. or its affiliates. All Rights Reserved.
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License"). You
4+
# may not use this file except in compliance with the License. A copy of
5+
# the License is located at
6+
#
7+
# http://aws.amazon.com/apache2.0/
8+
#
9+
# or in the "license" file accompanying this file. This file is
10+
# distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF
11+
# ANY KIND, either express or implied. See the License for the specific
12+
# language governing permissions and limitations under the License.
13+
from __future__ import absolute_import
14+
15+
import unittest
16+
from unittest.mock import patch, Mock
17+
18+
from sagemaker.serve.mode.in_process_mode import InProcessMode
19+
from sagemaker.serve import SchemaBuilder
20+
from sagemaker.serve.utils.types import ModelServer
21+
from sagemaker.serve.utils.exceptions import LocalDeepPingException
22+
23+
24+
mock_prompt = "Hello, I'm a language model,"
25+
mock_response = "Hello, I'm a language model, and I'm here to help you with your English."
26+
mock_sample_input = {"inputs": mock_prompt, "parameters": {}}
27+
mock_sample_output = [{"generated_text": mock_response}]
28+
29+
30+
class TestInProcessMode(unittest.TestCase):
31+
32+
@patch("sagemaker.serve.mode.in_process_mode.Path")
33+
@patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
34+
@patch("sagemaker.session.Session")
35+
def test_load_happy(self, mock_session, mock_inference_spec, mock_path):
36+
mock_path.return_value.exists.side_effect = lambda *args, **kwargs: True
37+
mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: True
38+
39+
mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
40+
41+
mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
42+
in_process_mode = InProcessMode(
43+
model_server=ModelServer.MMS,
44+
inference_spec=mock_inference_spec,
45+
schema_builder=mock_schema_builder,
46+
session=mock_session,
47+
model_path="model_path",
48+
env_vars={"key": "val"},
49+
)
50+
51+
res = in_process_mode.load(model_path="/tmp/model-builder/code/")
52+
53+
self.assertEqual(res, "Dummy load")
54+
self.assertEqual(in_process_mode.inference_spec, mock_inference_spec)
55+
self.assertEqual(in_process_mode.schema_builder, mock_schema_builder)
56+
self.assertEqual(in_process_mode.model_path, "model_path")
57+
self.assertEqual(in_process_mode.env_vars, {"key": "val"})
58+
59+
@patch("sagemaker.serve.mode.in_process_mode.Path")
60+
@patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
61+
@patch("sagemaker.session.Session")
62+
def test_load_ex(self, mock_session, mock_inference_spec, mock_path):
63+
mock_path.return_value.exists.side_effect = lambda *args, **kwargs: False
64+
mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: True
65+
66+
mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
67+
68+
mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
69+
in_process_mode = InProcessMode(
70+
model_server=ModelServer.MMS,
71+
inference_spec=mock_inference_spec,
72+
schema_builder=mock_schema_builder,
73+
session=mock_session,
74+
model_path="model_path",
75+
)
76+
77+
self.assertRaises(ValueError, in_process_mode.load, "/tmp/model-builder/code/")
78+
79+
mock_path.return_value.exists.side_effect = lambda *args, **kwargs: True
80+
mock_path.return_value.is_dir.side_effect = lambda *args, **kwargs: False
81+
82+
mock_inference_spec.load.side_effect = lambda *args, **kwargs: "Dummy load"
83+
mock_schema_builder = SchemaBuilder(mock_sample_input, mock_sample_output)
84+
in_process_mode = InProcessMode(
85+
model_server=ModelServer.MMS,
86+
inference_spec=mock_inference_spec,
87+
schema_builder=mock_schema_builder,
88+
session=mock_session,
89+
model_path="model_path",
90+
)
91+
92+
self.assertRaises(ValueError, in_process_mode.load, "/tmp/model-builder/code/")
93+
94+
@patch("sagemaker.serve.mode.in_process_mode.logger")
95+
@patch("sagemaker.base_predictor.PredictorBase")
96+
@patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
97+
@patch("sagemaker.session.Session")
98+
def test_create_server_happy(
99+
self, mock_session, mock_inference_spec, mock_predictor, mock_logger
100+
):
101+
mock_start_serving = Mock()
102+
mock_start_serving.side_effect = lambda *args, **kwargs: (
103+
True,
104+
None,
105+
)
106+
107+
mock_response = "Fake response"
108+
mock_multi_model_server_deep_ping = Mock()
109+
mock_multi_model_server_deep_ping.side_effect = lambda *args, **kwargs: (
110+
True,
111+
mock_response,
112+
)
113+
114+
in_process_mode = InProcessMode(
115+
model_server=ModelServer.MMS,
116+
inference_spec=mock_inference_spec,
117+
schema_builder=SchemaBuilder(mock_sample_input, mock_sample_output),
118+
session=mock_session,
119+
model_path="model_path",
120+
)
121+
122+
in_process_mode._multi_model_server_deep_ping = mock_multi_model_server_deep_ping
123+
in_process_mode._start_serving = mock_start_serving
124+
125+
in_process_mode.create_server(predictor=mock_predictor)
126+
127+
mock_logger.info.assert_called_once_with(
128+
"Waiting for model server %s to start up...", ModelServer.MMS
129+
)
130+
mock_logger.debug.assert_called_once_with(
131+
"Ping health check has passed. Returned %s", str(mock_response)
132+
)
133+
134+
@patch("sagemaker.base_predictor.PredictorBase")
135+
@patch("sagemaker.serve.spec.inference_spec.InferenceSpec")
136+
@patch("sagemaker.session.Session")
137+
def test_create_server_ex(
138+
self,
139+
mock_session,
140+
mock_inference_spec,
141+
mock_predictor,
142+
):
143+
mock_start_serving = Mock()
144+
mock_start_serving.side_effect = lambda *args, **kwargs: (
145+
True,
146+
None,
147+
)
148+
149+
mock_multi_model_server_deep_ping = Mock()
150+
mock_multi_model_server_deep_ping.side_effect = lambda *args, **kwargs: (
151+
False,
152+
None,
153+
)
154+
155+
in_process_mode = InProcessMode(
156+
model_server=ModelServer.MMS,
157+
inference_spec=mock_inference_spec,
158+
schema_builder=SchemaBuilder(mock_sample_input, mock_sample_output),
159+
session=mock_session,
160+
model_path="model_path",
161+
)
162+
163+
in_process_mode._multi_model_server_deep_ping = mock_multi_model_server_deep_ping
164+
in_process_mode._start_serving = mock_start_serving
165+
166+
self.assertRaises(LocalDeepPingException, in_process_mode.create_server, mock_predictor)

0 commit comments

Comments
 (0)