Skip to content

Commit 4c82e57

Browse files
committed
breaking: refactor Predictor attribute endpoint to endpoint_name
1 parent acbe02b commit 4c82e57

20 files changed

+125
-82
lines changed

doc/amazon_sagemaker_model_monitoring.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ Using ``DefaultMonitor.create_monitoring_schedule()``, you can create a model mo
125125
126126
my_monitor.create_monitoring_schedule(
127127
monitor_schedule_name='my-monitoring-schedule',
128-
endpoint_input=predictor.endpoint,
128+
endpoint_input=predictor.endpoint_name,
129129
statistics=my_monitor.baseline_statistics(),
130130
constraints=my_monitor.suggested_constraints(),
131131
schedule_cron_expression=CronExpressionGenerator.hourly(),

doc/frameworks/tensorflow/deploying_tensorflow_serving.rst

+1-1
Original file line numberDiff line numberDiff line change
@@ -578,7 +578,7 @@ additional ``Predictor`` instances. Here's how:
578578
# ... continuing from the previous example
579579
580580
# get the endpoint name from the default predictor
581-
endpoint = predictor.endpoint
581+
endpoint = predictor.endpoint_name
582582
583583
# get a predictor for 'model2'
584584
model2_predictor = Predictor(endpoint, model_name='model2')

src/sagemaker/amazon/factorization_machines.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -278,14 +278,18 @@ class FactorizationMachinesPredictor(RealTimePredictor):
278278
https://docs.aws.amazon.com/sagemaker/latest/dg/fm-in-formats.html
279279
"""
280280

281-
def __init__(self, endpoint, sagemaker_session=None):
281+
def __init__(self, endpoint_name, sagemaker_session=None):
282282
"""
283283
Args:
284-
endpoint:
285-
sagemaker_session:
284+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
285+
requests are sent.
286+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
287+
object, used for SageMaker interactions (default: None). If not
288+
specified, one is created using the default AWS configuration
289+
chain.
286290
"""
287291
super(FactorizationMachinesPredictor, self).__init__(
288-
endpoint,
292+
endpoint_name,
289293
sagemaker_session,
290294
serializer=numpy_to_record_serializer(),
291295
deserializer=record_deserializer(),

src/sagemaker/amazon/ipinsights.py

+11-4
Original file line numberDiff line numberDiff line change
@@ -184,14 +184,21 @@ class IPInsightsPredictor(RealTimePredictor):
184184
second column should contain the IPv4 address in dot notation.
185185
"""
186186

187-
def __init__(self, endpoint, sagemaker_session=None):
187+
def __init__(self, endpoint_name, sagemaker_session=None):
188188
"""
189189
Args:
190-
endpoint:
191-
sagemaker_session:
190+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
191+
requests are sent.
192+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
193+
object, used for SageMaker interactions (default: None). If not
194+
specified, one is created using the default AWS configuration
195+
chain.
192196
"""
193197
super(IPInsightsPredictor, self).__init__(
194-
endpoint, sagemaker_session, serializer=csv_serializer, deserializer=json_deserializer
198+
endpoint_name,
199+
sagemaker_session,
200+
serializer=csv_serializer,
201+
deserializer=json_deserializer,
195202
)
196203

197204

src/sagemaker/amazon/kmeans.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -209,14 +209,18 @@ class KMeansPredictor(RealTimePredictor):
209209
``closest_cluster`` key of the ``Record.label`` field.
210210
"""
211211

212-
def __init__(self, endpoint, sagemaker_session=None):
212+
def __init__(self, endpoint_name, sagemaker_session=None):
213213
"""
214214
Args:
215-
endpoint:
216-
sagemaker_session:
215+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
216+
requests are sent.
217+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
218+
object, used for SageMaker interactions (default: None). If not
219+
specified, one is created using the default AWS configuration
220+
chain.
217221
"""
218222
super(KMeansPredictor, self).__init__(
219-
endpoint,
223+
endpoint_name,
220224
sagemaker_session,
221225
serializer=numpy_to_record_serializer(),
222226
deserializer=record_deserializer(),

src/sagemaker/amazon/knn.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -197,14 +197,18 @@ class KNNPredictor(RealTimePredictor):
197197
key of the ``Record.label`` field.
198198
"""
199199

200-
def __init__(self, endpoint, sagemaker_session=None):
200+
def __init__(self, endpoint_name, sagemaker_session=None):
201201
"""
202202
Args:
203-
endpoint:
204-
sagemaker_session:
203+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
204+
requests are sent.
205+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
206+
object, used for SageMaker interactions (default: None). If not
207+
specified, one is created using the default AWS configuration
208+
chain.
205209
"""
206210
super(KNNPredictor, self).__init__(
207-
endpoint,
211+
endpoint_name,
208212
sagemaker_session,
209213
serializer=numpy_to_record_serializer(),
210214
deserializer=record_deserializer(),

src/sagemaker/amazon/lda.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -181,14 +181,18 @@ class LDAPredictor(RealTimePredictor):
181181
``projection`` key of the ``Record.label`` field.
182182
"""
183183

184-
def __init__(self, endpoint, sagemaker_session=None):
184+
def __init__(self, endpoint_name, sagemaker_session=None):
185185
"""
186186
Args:
187-
endpoint:
188-
sagemaker_session:
187+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
188+
requests are sent.
189+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
190+
object, used for SageMaker interactions (default: None). If not
191+
specified, one is created using the default AWS configuration
192+
chain.
189193
"""
190194
super(LDAPredictor, self).__init__(
191-
endpoint,
195+
endpoint_name,
192196
sagemaker_session,
193197
serializer=numpy_to_record_serializer(),
194198
deserializer=record_deserializer(),

src/sagemaker/amazon/linear_learner.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -442,14 +442,18 @@ class LinearLearnerPredictor(RealTimePredictor):
442442
key of the ``Record.label`` field.
443443
"""
444444

445-
def __init__(self, endpoint, sagemaker_session=None):
445+
def __init__(self, endpoint_name, sagemaker_session=None):
446446
"""
447447
Args:
448-
endpoint:
449-
sagemaker_session:
448+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
449+
requests are sent.
450+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
451+
object, used for SageMaker interactions (default: None). If not
452+
specified, one is created using the default AWS configuration
453+
chain.
450454
"""
451455
super(LinearLearnerPredictor, self).__init__(
452-
endpoint,
456+
endpoint_name,
453457
sagemaker_session,
454458
serializer=numpy_to_record_serializer(),
455459
deserializer=record_deserializer(),

src/sagemaker/amazon/ntm.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,18 @@ class NTMPredictor(RealTimePredictor):
211211
``projection`` key of the ``Record.label`` field.
212212
"""
213213

214-
def __init__(self, endpoint, sagemaker_session=None):
214+
def __init__(self, endpoint_name, sagemaker_session=None):
215215
"""
216216
Args:
217-
endpoint:
218-
sagemaker_session:
217+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
218+
requests are sent.
219+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
220+
object, used for SageMaker interactions (default: None). If not
221+
specified, one is created using the default AWS configuration
222+
chain.
219223
"""
220224
super(NTMPredictor, self).__init__(
221-
endpoint,
225+
endpoint_name,
222226
sagemaker_session,
223227
serializer=numpy_to_record_serializer(),
224228
deserializer=record_deserializer(),

src/sagemaker/amazon/pca.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -193,14 +193,18 @@ class PCAPredictor(RealTimePredictor):
193193
``projection`` key of the ``Record.label`` field.
194194
"""
195195

196-
def __init__(self, endpoint, sagemaker_session=None):
196+
def __init__(self, endpoint_name, sagemaker_session=None):
197197
"""
198198
Args:
199-
endpoint:
200-
sagemaker_session:
199+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
200+
requests are sent.
201+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
202+
object, used for SageMaker interactions (default: None). If not
203+
specified, one is created using the default AWS configuration
204+
chain.
201205
"""
202206
super(PCAPredictor, self).__init__(
203-
endpoint,
207+
endpoint_name,
204208
sagemaker_session,
205209
serializer=numpy_to_record_serializer(),
206210
deserializer=record_deserializer(),

src/sagemaker/amazon/randomcutforest.py

+8-4
Original file line numberDiff line numberDiff line change
@@ -172,14 +172,18 @@ class RandomCutForestPredictor(RealTimePredictor):
172172
``Record.label`` field.
173173
"""
174174

175-
def __init__(self, endpoint, sagemaker_session=None):
175+
def __init__(self, endpoint_name, sagemaker_session=None):
176176
"""
177177
Args:
178-
endpoint:
179-
sagemaker_session:
178+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
179+
requests are sent.
180+
sagemaker_session (sagemaker.session.Session): A SageMaker Session
181+
object, used for SageMaker interactions (default: None). If not
182+
specified, one is created using the default AWS configuration
183+
chain.
180184
"""
181185
super(RandomCutForestPredictor, self).__init__(
182-
endpoint,
186+
endpoint_name,
183187
sagemaker_session,
184188
serializer=numpy_to_record_serializer(),
185189
deserializer=record_deserializer(),

src/sagemaker/predictor.py

+11-11
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class RealTimePredictor(object):
3737

3838
def __init__(
3939
self,
40-
endpoint,
40+
endpoint_name,
4141
sagemaker_session=None,
4242
serializer=None,
4343
deserializer=None,
@@ -53,7 +53,7 @@ def __init__(
5353
sequence of bytes from the prediction result without any modifications.
5454
5555
Args:
56-
endpoint (str): Name of the Amazon SageMaker endpoint to which
56+
endpoint_name (str): Name of the Amazon SageMaker endpoint to which
5757
requests are sent.
5858
sagemaker_session (sagemaker.session.Session): A SageMaker Session
5959
object, used for SageMaker interactions (default: None). If not
@@ -74,7 +74,7 @@ def __init__(
7474
accept (str): The invocation's "Accept", overriding any accept from
7575
the deserializer (default: None).
7676
"""
77-
self.endpoint = endpoint
77+
self.endpoint_name = endpoint_name
7878
self.sagemaker_session = sagemaker_session or Session()
7979
self.serializer = serializer
8080
self.deserializer = deserializer
@@ -137,7 +137,7 @@ def _create_request_args(self, data, initial_args=None, target_model=None, targe
137137
args = dict(initial_args) if initial_args else {}
138138

139139
if "EndpointName" not in args:
140-
args["EndpointName"] = self.endpoint
140+
args["EndpointName"] = self.endpoint_name
141141

142142
if self.content_type and "ContentType" not in args:
143143
args["ContentType"] = self.content_type
@@ -175,7 +175,7 @@ def delete_endpoint(self, delete_endpoint_config=True):
175175
if delete_endpoint_config:
176176
self._delete_endpoint_config()
177177

178-
self.sagemaker_session.delete_endpoint(self.endpoint)
178+
self.sagemaker_session.delete_endpoint(self.endpoint_name)
179179

180180
def delete_model(self):
181181
"""Deletes the Amazon SageMaker models backing this predictor."""
@@ -225,10 +225,10 @@ def update_data_capture_config(self, data_capture_config):
225225
DataCaptureConfig to update the predictor's endpoint to use.
226226
"""
227227
endpoint_desc = self.sagemaker_session.sagemaker_client.describe_endpoint(
228-
EndpointName=self.endpoint
228+
EndpointName=self.endpoint_name
229229
)
230230

231-
new_config_name = name_from_base(base=self.endpoint)
231+
new_config_name = name_from_base(base=self.endpoint_name)
232232

233233
data_capture_config_dict = None
234234
if data_capture_config is not None:
@@ -241,7 +241,7 @@ def update_data_capture_config(self, data_capture_config):
241241
)
242242

243243
self.sagemaker_session.update_endpoint(
244-
endpoint_name=self.endpoint, endpoint_config_name=new_config_name
244+
endpoint_name=self.endpoint_name, endpoint_config_name=new_config_name
245245
)
246246

247247
def list_monitors(self):
@@ -254,10 +254,10 @@ def list_monitors(self):
254254
255255
"""
256256
monitoring_schedules_dict = self.sagemaker_session.list_monitoring_schedules(
257-
endpoint_name=self.endpoint
257+
endpoint_name=self.endpoint_name
258258
)
259259
if len(monitoring_schedules_dict["MonitoringScheduleSummaries"]) == 0:
260-
print("No monitors found for endpoint. endpoint: {}".format(self.endpoint))
260+
print("No monitors found for endpoint. endpoint: {}".format(self.endpoint_name))
261261
return []
262262

263263
monitors = []
@@ -292,7 +292,7 @@ def list_monitors(self):
292292
def _get_endpoint_config_name(self):
293293
"""Placeholder docstring"""
294294
endpoint_desc = self.sagemaker_session.sagemaker_client.describe_endpoint(
295-
EndpointName=self.endpoint
295+
EndpointName=self.endpoint_name
296296
)
297297
endpoint_config_name = endpoint_desc["EndpointConfigName"]
298298
return endpoint_config_name

src/sagemaker/sparkml/model.py

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class SparkMLPredictor(RealTimePredictor):
3434
list.
3535
"""
3636

37-
def __init__(self, endpoint, sagemaker_session=None):
37+
def __init__(self, endpoint_name, sagemaker_session=None):
3838
"""Initializes a SparkMLPredictor which should be used with SparkMLModel
3939
to perform predictions against SparkML models serialized via MLeap. The
4040
response is returned in text/csv format which is the default response
@@ -49,7 +49,7 @@ def __init__(self, endpoint, sagemaker_session=None):
4949
"""
5050
sagemaker_session = sagemaker_session or Session()
5151
super(SparkMLPredictor, self).__init__(
52-
endpoint=endpoint,
52+
endpoint_name=endpoint_name,
5353
sagemaker_session=sagemaker_session,
5454
serializer=csv_serializer,
5555
content_type=CONTENT_TYPE_CSV,

0 commit comments

Comments
 (0)