Skip to content

Commit f2ed8f4

Browse files
author
Raymond Liu
committed
apply formatting
1 parent e1e9ebd commit f2ed8f4

File tree

5 files changed

+59
-52
lines changed

5 files changed

+59
-52
lines changed

‎src/sagemaker/inference_recommender/inference_recommender_mixin.py

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -162,12 +162,11 @@ def right_size(
162162
vpc_config=self.vpc_config,
163163
enable_network_isolation=self.enable_network_isolation()
164164
)
165-
print(f"Creating temporary model with name: {self.temp_model_name}" \
166-
" for Inference Recommender.", flush=True)
165+
print(f"Creating temporary model with name: {self.temp_model_name}"
166+
" for Inference Recommender.", flush=True)
167167
self.sagemaker_session.create_model(**create_model_args)
168168
print("Temporary model created. Start to run Inference Recommender...", flush=True)
169169

170-
171170
ret_name = self.sagemaker_session.create_inference_recommendations_job(
172171
role=self.role,
173172
job_name=job_name,
@@ -196,8 +195,8 @@ def right_size(
196195
)
197196

198197
if self.temp_model_name is not None:
199-
print(f"Deleting temporary model with name: {self.temp_model_name} " \
200-
"for Inference Recommender.", flush=True)
198+
print(f"Deleting temporary model with name: {self.temp_model_name} "
199+
"for Inference Recommender.", flush=True)
201200
self.sagemaker_session.delete_model(self.temp_model_name)
202201
self.temp_model_name = None
203202
print("Delete complete.")

‎src/sagemaker/session.py

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -4896,9 +4896,9 @@ def _create_inference_recommendations_job_request(
48964896
}
48974897

48984898
request.get("InputConfig").update(
4899-
{ "ModelPackageVersionArn": model_package_version_arn}
4899+
{"ModelPackageVersionArn": model_package_version_arn}
49004900
if model_package_version_arn
4901-
else { "ModelName": model_name }
4901+
else {"ModelName": model_name}
49024902
)
49034903

49044904
if job_description:
@@ -4974,12 +4974,12 @@ def create_inference_recommendations_job(
49744974
"""
49754975

49764976
if model_name is None and model_package_version_arn is None:
4977-
raise ValueError("Missing model_name and model_package_version_arn,"\
4978-
" please provide one of them.")
4977+
raise ValueError("Missing model_name and model_package_version_arn,"
4978+
" please provide one of them.")
49794979

49804980
if model_name is not None and model_package_version_arn is not None:
4981-
raise ValueError("Please provide either model_name or model_package_version_arn" \
4982-
" should be provided, not both.")
4981+
raise ValueError("Please provide either model_name or model_package_version_arn"
4982+
" should be provided, not both.")
49834983

49844984
if not job_name:
49854985
unique_tail = uuid.uuid4()

‎tests/integ/test_inference_recommender.py

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,7 @@ def advanced_right_sized_model(sagemaker_session, cpu_instance_type):
156156

157157
@pytest.fixture(scope="module")
158158
def default_right_sized_unregistered_model(sagemaker_session, cpu_instance_type):
159-
with timeout(minutes=45):
159+
with timeout(minutes=45):
160160
try:
161161
ir_job_name = unique_name_from_base("test-ir-right-size-job-name")
162162
model_data = sagemaker_session.upload_data(path=IR_SKLEARN_MODEL)
@@ -225,24 +225,25 @@ def advanced_right_sized_unregistered_model(sagemaker_session, cpu_instance_type
225225
]
226226

227227
return sklearn_model.right_size(
228-
sample_payload_url=payload_data,
229-
supported_content_types=IR_SKLEARN_CONTENT_TYPE,
230-
framework=IR_SKLEARN_FRAMEWORK,
231-
job_duration_in_seconds=3600,
232-
hyperparameter_ranges=hyperparameter_ranges,
233-
phases=phases,
234-
model_latency_thresholds=model_latency_thresholds,
235-
max_invocations=100,
236-
max_tests=5,
237-
max_parallel_tests=5,
238-
log_level="Quiet",
239-
)
240-
228+
sample_payload_url=payload_data,
229+
supported_content_types=IR_SKLEARN_CONTENT_TYPE,
230+
framework=IR_SKLEARN_FRAMEWORK,
231+
job_duration_in_seconds=3600,
232+
hyperparameter_ranges=hyperparameter_ranges,
233+
phases=phases,
234+
model_latency_thresholds=model_latency_thresholds,
235+
max_invocations=100,
236+
max_tests=5,
237+
max_parallel_tests=5,
238+
log_level="Quiet",
239+
)
240+
241241
except Exception:
242242
sagemaker_session.delete_model(
243243
ModelName=sklearn_model.temp_model_name
244244
)
245-
245+
246+
246247
@pytest.mark.slow_test
247248
def test_default_right_size_and_deploy_registered_model_sklearn(
248249
default_right_sized_model, sagemaker_session
@@ -264,6 +265,7 @@ def test_default_right_size_and_deploy_registered_model_sklearn(
264265
predictor.delete_model()
265266
predictor.delete_endpoint()
266267

268+
267269
@pytest.mark.slow_test
268270
def test_default_right_size_and_deploy_unregistered_model_sklearn(
269271
default_right_sized_unregistered_model, sagemaker_session
@@ -285,6 +287,7 @@ def test_default_right_size_and_deploy_unregistered_model_sklearn(
285287
predictor.delete_model()
286288
predictor.delete_endpoint()
287289

290+
288291
@pytest.mark.slow_test
289292
def test_advanced_right_size_and_deploy_unregistered_model_sklearn(
290293
advanced_right_sized_unregistered_model, sagemaker_session
@@ -304,8 +307,7 @@ def test_advanced_right_size_and_deploy_unregistered_model_sklearn(
304307
assert 26 == len(inference)
305308
finally:
306309
predictor.delete_model()
307-
predictor.delete_endpoint()
308-
310+
predictor.delete_endpoint()
309311

310312

311313
@pytest.mark.slow_test

‎tests/unit/sagemaker/inference_recommender/test_inference_recommender_mixin.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -175,6 +175,7 @@ def default_right_sized_model(model_package):
175175
framework=IR_SAMPLE_FRAMEWORK,
176176
)
177177

178+
178179
@patch("uuid.uuid4", MagicMock(return_value="sample-unique-uuid"))
179180
def test_right_size_default_with_model_name_successful(sagemaker_session, model):
180181
inference_recommender_model = model.right_size(
@@ -229,6 +230,7 @@ def test_right_size_default_with_model_name_successful(sagemaker_session, model)
229230
# confirm that the returned object of right_size is itself
230231
assert inference_recommender_model == model
231232

233+
232234
@patch("uuid.uuid4", MagicMock(return_value="sample-unique-uuid"))
233235
def test_right_size_advanced_list_instances_model_name_successful(sagemaker_session, model):
234236
inference_recommender_model = model.right_size(
@@ -278,7 +280,8 @@ def test_right_size_advanced_list_instances_model_name_successful(sagemaker_sess
278280

279281
# confirm that the returned object of right_size is itself
280282
assert inference_recommender_model == model
281-
283+
284+
282285
@patch("uuid.uuid4", MagicMock(return_value="sample-unique-uuid"))
283286
def test_right_size_advanced_single_instances_model_name_successful(sagemaker_session, model):
284287
model.right_size(
@@ -315,7 +318,6 @@ def test_right_size_advanced_single_instances_model_name_successful(sagemaker_se
315318
)
316319

317320

318-
319321
def test_right_size_default_with_model_package_successful(sagemaker_session, model_package):
320322
inference_recommender_model_pkg = model_package.right_size(
321323
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
@@ -358,7 +360,7 @@ def test_right_size_default_with_model_package_successful(sagemaker_session, mod
358360

359361
# confirm that the returned object of right_size is itself
360362
assert inference_recommender_model_pkg == model_package
361-
363+
362364

363365
def test_right_size_advanced_list_instances_model_package_successful(
364366
sagemaker_session, model_package

‎tests/unit/test_session.py

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,6 +3244,7 @@ def create_inference_recommendations_job_default_happy_response():
32443244
"JobDescription": "#python-sdk-create",
32453245
}
32463246

3247+
32473248
def create_inference_recommendations_job_default_model_name_happy_response():
32483249
return {
32493250
"JobName": IR_USER_JOB_NAME,
@@ -3347,7 +3348,7 @@ def test_create_inference_recommendations_job_default_model_name_happy(sagemaker
33473348
role=IR_ROLE_ARN,
33483349
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
33493350
supported_content_types=IR_SUPPORTED_CONTENT_TYPES,
3350-
model_name = IR_MODEL_NAME,
3351+
model_name=IR_MODEL_NAME,
33513352
model_package_version_arn=None,
33523353
framework=IR_FRAMEWORK,
33533354
framework_version=IR_FRAMEWORK_VERSION,
@@ -3362,6 +3363,7 @@ def test_create_inference_recommendations_job_default_model_name_happy(sagemaker
33623363

33633364
assert IR_USER_JOB_NAME == job_name
33643365

3366+
33653367
@patch("uuid.uuid4", MagicMock(return_value="sample-unique-uuid"))
33663368
def test_create_inference_recommendations_job_advanced_model_name_happy(sagemaker_session):
33673369
job_name = sagemaker_session.create_inference_recommendations_job(
@@ -3388,40 +3390,42 @@ def test_create_inference_recommendations_job_advanced_model_name_happy(sagemake
33883390

33893391
assert IR_JOB_NAME == job_name
33903392

3393+
33913394
def test_create_inference_recommendations_job_missing_model_name_and_pkg(sagemaker_session):
33923395
with pytest.raises(
33933396
ValueError,
33943397
match="Missing model_name and model_package_version_arn, please provide one of them."
33953398
):
33963399
sagemaker_session.create_inference_recommendations_job(
3397-
role=IR_ROLE_ARN,
3398-
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
3399-
supported_content_types=IR_SUPPORTED_CONTENT_TYPES,
3400-
model_name = None,
3401-
model_package_version_arn=None,
3402-
framework=IR_FRAMEWORK,
3403-
framework_version=IR_FRAMEWORK_VERSION,
3404-
nearest_model_name=IR_NEAREST_MODEL_NAME,
3405-
supported_instance_types=IR_SUPPORTED_INSTANCE_TYPES,
3406-
job_name=IR_USER_JOB_NAME,
3400+
role=IR_ROLE_ARN,
3401+
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
3402+
supported_content_types=IR_SUPPORTED_CONTENT_TYPES,
3403+
model_name=None,
3404+
model_package_version_arn=None,
3405+
framework=IR_FRAMEWORK,
3406+
framework_version=IR_FRAMEWORK_VERSION,
3407+
nearest_model_name=IR_NEAREST_MODEL_NAME,
3408+
supported_instance_types=IR_SUPPORTED_INSTANCE_TYPES,
3409+
job_name=IR_USER_JOB_NAME,
34073410
)
34083411

3412+
34093413
def test_create_inference_recommendations_job_provided_model_name_and_pkg(sagemaker_session):
34103414
with pytest.raises(
34113415
ValueError,
34123416
match="Please provide either model_name or model_package_version_arn should be provided, not both."
34133417
):
34143418
sagemaker_session.create_inference_recommendations_job(
3415-
role=IR_ROLE_ARN,
3416-
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
3417-
supported_content_types=IR_SUPPORTED_CONTENT_TYPES,
3418-
model_name=IR_MODEL_NAME,
3419-
model_package_version_arn=IR_MODEL_PACKAGE_VERSION_ARN,
3420-
framework=IR_FRAMEWORK,
3421-
framework_version=IR_FRAMEWORK_VERSION,
3422-
nearest_model_name=IR_NEAREST_MODEL_NAME,
3423-
supported_instance_types=IR_SUPPORTED_INSTANCE_TYPES,
3424-
job_name=IR_USER_JOB_NAME,
3419+
role=IR_ROLE_ARN,
3420+
sample_payload_url=IR_SAMPLE_PAYLOAD_URL,
3421+
supported_content_types=IR_SUPPORTED_CONTENT_TYPES,
3422+
model_name=IR_MODEL_NAME,
3423+
model_package_version_arn=IR_MODEL_PACKAGE_VERSION_ARN,
3424+
framework=IR_FRAMEWORK,
3425+
framework_version=IR_FRAMEWORK_VERSION,
3426+
nearest_model_name=IR_NEAREST_MODEL_NAME,
3427+
supported_instance_types=IR_SUPPORTED_INSTANCE_TYPES,
3428+
job_name=IR_USER_JOB_NAME,
34253429
)
34263430

34273431

0 commit comments

Comments
 (0)