Skip to content

Commit 6f7dde9

Browse files
evakravievakravi
committed
chore: remove unnecessary if statement
1 parent 0e450e8 commit 6f7dde9

16 files changed

+78
-104
lines changed

‎src/sagemaker/jumpstart/artifacts/environment_variables.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ def _retrieve_default_environment_variables(
7171
dict: the inference environment variables to use for the model.
7272
"""
7373

74-
if region is None:
75-
region = region or get_region_fallback(
76-
sagemaker_session=sagemaker_session,
77-
)
74+
region = region or get_region_fallback(
75+
sagemaker_session=sagemaker_session,
76+
)
7877

7978
model_specs = verify_model_region_and_return_specs(
8079
model_id=model_id,
@@ -170,10 +169,9 @@ def _retrieve_gated_model_uri_env_var_value(
170169
ValueError: If the model specs specified are invalid.
171170
"""
172171

173-
if region is None:
174-
region = region or get_region_fallback(
175-
sagemaker_session=sagemaker_session,
176-
)
172+
region = region or get_region_fallback(
173+
sagemaker_session=sagemaker_session,
174+
)
177175

178176
model_specs = verify_model_region_and_return_specs(
179177
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/hyperparameters.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,10 +70,9 @@ def _retrieve_default_hyperparameters(
7070
dict: the hyperparameters to use for the model.
7171
"""
7272

73-
if region is None:
74-
region = region or get_region_fallback(
75-
sagemaker_session=sagemaker_session,
76-
)
73+
region = region or get_region_fallback(
74+
sagemaker_session=sagemaker_session,
75+
)
7776

7877
model_specs = verify_model_region_and_return_specs(
7978
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/image_uris.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -104,10 +104,9 @@ def _retrieve_image_uri(
104104
known security vulnerabilities.
105105
DeprecatedJumpStartModelError: If the version of the model is deprecated.
106106
"""
107-
if region is None:
108-
region = region or get_region_fallback(
109-
sagemaker_session=sagemaker_session,
110-
)
107+
region = region or get_region_fallback(
108+
sagemaker_session=sagemaker_session,
109+
)
111110

112111
model_specs = verify_model_region_and_return_specs(
113112
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/incremental_training.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -58,10 +58,9 @@ def _model_supports_incremental_training(
5858
bool: the support status for incremental training.
5959
"""
6060

61-
if region is None:
62-
region = region or get_region_fallback(
63-
sagemaker_session=sagemaker_session,
64-
)
61+
region = region or get_region_fallback(
62+
sagemaker_session=sagemaker_session,
63+
)
6564

6665
model_specs = verify_model_region_and_return_specs(
6766
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/instance_types.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -76,10 +76,9 @@ def _retrieve_default_instance_type(
7676
specified region due to lack of supported computing instances.
7777
"""
7878

79-
if region is None:
80-
region = region or get_region_fallback(
81-
sagemaker_session=sagemaker_session,
82-
)
79+
region = region or get_region_fallback(
80+
sagemaker_session=sagemaker_session,
81+
)
8382

8483
model_specs = verify_model_region_and_return_specs(
8584
model_id=model_id,
@@ -165,10 +164,9 @@ def _retrieve_instance_types(
165164
specified region due to lack of supported computing instances.
166165
"""
167166

168-
if region is None:
169-
region = region or get_region_fallback(
170-
sagemaker_session=sagemaker_session,
171-
)
167+
region = region or get_region_fallback(
168+
sagemaker_session=sagemaker_session,
169+
)
172170

173171
model_specs = verify_model_region_and_return_specs(
174172
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/kwargs.py

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ def _retrieve_model_init_kwargs(
6262
dict: the kwargs to use for the use case.
6363
"""
6464

65-
if region is None:
66-
region = region or get_region_fallback(
67-
sagemaker_session=sagemaker_session,
68-
)
65+
region = region or get_region_fallback(
66+
sagemaker_session=sagemaker_session,
67+
)
6968

7069
model_specs = verify_model_region_and_return_specs(
7170
model_id=model_id,
@@ -123,10 +122,9 @@ def _retrieve_model_deploy_kwargs(
123122
dict: the kwargs to use for the use case.
124123
"""
125124

126-
if region is None:
127-
region = region or get_region_fallback(
128-
sagemaker_session=sagemaker_session,
129-
)
125+
region = region or get_region_fallback(
126+
sagemaker_session=sagemaker_session,
127+
)
130128

131129
model_specs = verify_model_region_and_return_specs(
132130
model_id=model_id,
@@ -180,10 +178,9 @@ def _retrieve_estimator_init_kwargs(
180178
dict: the kwargs to use for the use case.
181179
"""
182180

183-
if region is None:
184-
region = region or get_region_fallback(
185-
sagemaker_session=sagemaker_session,
186-
)
181+
region = region or get_region_fallback(
182+
sagemaker_session=sagemaker_session,
183+
)
187184

188185
model_specs = verify_model_region_and_return_specs(
189186
model_id=model_id,
@@ -239,10 +236,9 @@ def _retrieve_estimator_fit_kwargs(
239236
dict: the kwargs to use for the use case.
240237
"""
241238

242-
if region is None:
243-
region = region or get_region_fallback(
244-
sagemaker_session=sagemaker_session,
245-
)
239+
region = region or get_region_fallback(
240+
sagemaker_session=sagemaker_session,
241+
)
246242

247243
model_specs = verify_model_region_and_return_specs(
248244
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/metric_definitions.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -62,10 +62,9 @@ def _retrieve_default_training_metric_definitions(
6262
list: the default training metric definitions to use for the model or None.
6363
"""
6464

65-
if region is None:
66-
region = region or get_region_fallback(
67-
sagemaker_session=sagemaker_session,
68-
)
65+
region = region or get_region_fallback(
66+
sagemaker_session=sagemaker_session,
67+
)
6968

7069
model_specs = verify_model_region_and_return_specs(
7170
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/model_packages.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -65,10 +65,9 @@ def _retrieve_model_package_arn(
6565
str: the model package arn to use for the model or None.
6666
"""
6767

68-
if region is None:
69-
region = region or get_region_fallback(
70-
sagemaker_session=sagemaker_session,
71-
)
68+
region = region or get_region_fallback(
69+
sagemaker_session=sagemaker_session,
70+
)
7271

7372
model_specs = verify_model_region_and_return_specs(
7473
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/model_uris.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,10 +129,9 @@ def _retrieve_model_uri(
129129
known security vulnerabilities.
130130
DeprecatedJumpStartModelError: If the version of the model is deprecated.
131131
"""
132-
if region is None:
133-
region = region or get_region_fallback(
134-
sagemaker_session=sagemaker_session,
135-
)
132+
region = region or get_region_fallback(
133+
sagemaker_session=sagemaker_session,
134+
)
136135

137136
model_specs = verify_model_region_and_return_specs(
138137
model_id=model_id,
@@ -208,10 +207,9 @@ def _model_supports_training_model_uri(
208207
bool: the support status for model uri with training.
209208
"""
210209

211-
if region is None:
212-
region = region or get_region_fallback(
213-
sagemaker_session=sagemaker_session,
214-
)
210+
region = region or get_region_fallback(
211+
sagemaker_session=sagemaker_session,
212+
)
215213

216214
model_specs = verify_model_region_and_return_specs(
217215
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/payloads.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,9 @@ def _retrieve_example_payloads(
6363
to the serializable payload object.
6464
"""
6565

66-
if region is None:
67-
region = region or get_region_fallback(
68-
sagemaker_session=sagemaker_session,
69-
)
66+
region = region or get_region_fallback(
67+
sagemaker_session=sagemaker_session,
68+
)
7069

7170
model_specs = verify_model_region_and_return_specs(
7271
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/predictors.py

Lines changed: 12 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -309,10 +309,9 @@ def _retrieve_default_content_type(
309309
str: the default content type to use for the model.
310310
"""
311311

312-
if region is None:
313-
region = region or get_region_fallback(
314-
sagemaker_session=sagemaker_session,
315-
)
312+
region = region or get_region_fallback(
313+
sagemaker_session=sagemaker_session,
314+
)
316315

317316
model_specs = verify_model_region_and_return_specs(
318317
model_id=model_id,
@@ -361,10 +360,9 @@ def _retrieve_default_accept_type(
361360
str: the default accept type to use for the model.
362361
"""
363362

364-
if region is None:
365-
region = region or get_region_fallback(
366-
sagemaker_session=sagemaker_session,
367-
)
363+
region = region or get_region_fallback(
364+
sagemaker_session=sagemaker_session,
365+
)
368366

369367
model_specs = verify_model_region_and_return_specs(
370368
model_id=model_id,
@@ -414,10 +412,9 @@ def _retrieve_supported_accept_types(
414412
list: the supported accept types to use for the model.
415413
"""
416414

417-
if region is None:
418-
region = region or get_region_fallback(
419-
sagemaker_session=sagemaker_session,
420-
)
415+
region = region or get_region_fallback(
416+
sagemaker_session=sagemaker_session,
417+
)
421418

422419
model_specs = verify_model_region_and_return_specs(
423420
model_id=model_id,
@@ -467,10 +464,9 @@ def _retrieve_supported_content_types(
467464
list: the supported content types to use for the model.
468465
"""
469466

470-
if region is None:
471-
region = region or get_region_fallback(
472-
sagemaker_session=sagemaker_session,
473-
)
467+
region = region or get_region_fallback(
468+
sagemaker_session=sagemaker_session,
469+
)
474470

475471
model_specs = verify_model_region_and_return_specs(
476472
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/resource_names.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -60,10 +60,9 @@ def _retrieve_resource_name_base(
6060
str: the default resource name.
6161
"""
6262

63-
if region is None:
64-
region = region or get_region_fallback(
65-
sagemaker_session=sagemaker_session,
66-
)
63+
region = region or get_region_fallback(
64+
sagemaker_session=sagemaker_session,
65+
)
6766

6867
model_specs = verify_model_region_and_return_specs(
6968
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/resource_requirements.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -89,10 +89,9 @@ def _retrieve_default_resources(
8989
retrieve default resource requirements
9090
"""
9191

92-
if region is None:
93-
region = region or get_region_fallback(
94-
sagemaker_session=sagemaker_session,
95-
)
92+
region = region or get_region_fallback(
93+
sagemaker_session=sagemaker_session,
94+
)
9695

9796
model_specs = verify_model_region_and_return_specs(
9897
model_id=model_id,

‎src/sagemaker/jumpstart/artifacts/script_uris.py

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -71,10 +71,9 @@ def _retrieve_script_uri(
7171
known security vulnerabilities.
7272
DeprecatedJumpStartModelError: If the version of the model is deprecated.
7373
"""
74-
if region is None:
75-
region = region or get_region_fallback(
76-
sagemaker_session=sagemaker_session,
77-
)
74+
region = region or get_region_fallback(
75+
sagemaker_session=sagemaker_session,
76+
)
7877

7978
model_specs = verify_model_region_and_return_specs(
8079
model_id=model_id,
@@ -134,10 +133,9 @@ def _model_supports_inference_script_uri(
134133
bool: the support status for script uri with inference.
135134
"""
136135

137-
if region is None:
138-
region = region or get_region_fallback(
139-
sagemaker_session=sagemaker_session,
140-
)
136+
region = region or get_region_fallback(
137+
sagemaker_session=sagemaker_session,
138+
)
141139

142140
model_specs = verify_model_region_and_return_specs(
143141
model_id=model_id,

‎src/sagemaker/jumpstart/utils.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -572,10 +572,9 @@ def verify_model_region_and_return_specs(
572572
DeprecatedJumpStartModelError: If the version of the model is deprecated.
573573
"""
574574

575-
if region is None:
576-
region = region or get_region_fallback(
577-
sagemaker_session=sagemaker_session,
578-
)
575+
region = region or get_region_fallback(
576+
sagemaker_session=sagemaker_session,
577+
)
579578

580579
if scope is None:
581580
raise ValueError(

‎src/sagemaker/jumpstart/validators.py

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -206,10 +206,9 @@ def validate_hyperparameters(
206206
if validation_mode is None:
207207
validation_mode = HyperparameterValidationMode.VALIDATE_PROVIDED
208208

209-
if region is None:
210-
region = region or get_region_fallback(
211-
sagemaker_session=sagemaker_session,
212-
)
209+
region = region or get_region_fallback(
210+
sagemaker_session=sagemaker_session,
211+
)
213212

214213
model_specs = verify_model_region_and_return_specs(
215214
model_id=model_id,

0 commit comments

Comments
 (0)