Skip to content

Commit 0e450e8

Browse files
evakravievakravi
committed
chore: use get_region_fallback throughout
1 parent 67e03bf commit 0e450e8

16 files changed

+95
-27
lines changed

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
)
2323
from sagemaker.jumpstart.utils import (
2424
get_jumpstart_gated_content_bucket,
25+
get_region_fallback,
2526
verify_model_region_and_return_specs,
2627
)
2728
from sagemaker.session import Session
@@ -71,7 +72,9 @@ def _retrieve_default_environment_variables(
7172
"""
7273

7374
if region is None:
74-
region = sagemaker_session.boto_region_name
75+
region = region or get_region_fallback(
76+
sagemaker_session=sagemaker_session,
77+
)
7578

7679
model_specs = verify_model_region_and_return_specs(
7780
model_id=model_id,
@@ -168,7 +171,9 @@ def _retrieve_gated_model_uri_env_var_value(
168171
"""
169172

170173
if region is None:
171-
region = sagemaker_session.boto_region_name
174+
region = region or get_region_fallback(
175+
sagemaker_session=sagemaker_session,
176+
)
172177

173178
model_specs = verify_model_region_and_return_specs(
174179
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
VariableScope,
2222
)
2323
from sagemaker.jumpstart.utils import (
24+
get_region_fallback,
2425
verify_model_region_and_return_specs,
2526
)
2627
from sagemaker.session import Session
@@ -70,7 +71,9 @@ def _retrieve_default_hyperparameters(
7071
"""
7172

7273
if region is None:
73-
region = sagemaker_session.boto_region_name
74+
region = region or get_region_fallback(
75+
sagemaker_session=sagemaker_session,
76+
)
7477

7578
model_specs = verify_model_region_and_return_specs(
7679
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
ModelFramework,
2424
)
2525
from sagemaker.jumpstart.utils import (
26+
get_region_fallback,
2627
verify_model_region_and_return_specs,
2728
)
2829
from sagemaker.session import Session
@@ -104,7 +105,9 @@ def _retrieve_image_uri(
104105
DeprecatedJumpStartModelError: If the version of the model is deprecated.
105106
"""
106107
if region is None:
107-
region = sagemaker_session.boto_region_name
108+
region = region or get_region_fallback(
109+
sagemaker_session=sagemaker_session,
110+
)
108111

109112
model_specs = verify_model_region_and_return_specs(
110113
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
JumpStartScriptScope,
2121
)
2222
from sagemaker.jumpstart.utils import (
23+
get_region_fallback,
2324
verify_model_region_and_return_specs,
2425
)
2526
from sagemaker.session import Session
@@ -58,7 +59,9 @@ def _model_supports_incremental_training(
5859
"""
5960

6061
if region is None:
61-
region = sagemaker_session.boto_region_name
62+
region = region or get_region_fallback(
63+
sagemaker_session=sagemaker_session,
64+
)
6265

6366
model_specs = verify_model_region_and_return_specs(
6467
model_id=model_id,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
JumpStartModelType,
2525
)
2626
from sagemaker.jumpstart.utils import (
27+
get_region_fallback,
2728
verify_model_region_and_return_specs,
2829
)
2930
from sagemaker.session import Session
@@ -76,7 +77,9 @@ def _retrieve_default_instance_type(
7677
"""
7778

7879
if region is None:
79-
region = sagemaker_session.boto_region_name
80+
region = region or get_region_fallback(
81+
sagemaker_session=sagemaker_session,
82+
)
8083

8184
model_specs = verify_model_region_and_return_specs(
8285
model_id=model_id,
@@ -163,7 +166,9 @@ def _retrieve_instance_types(
163166
"""
164167

165168
if region is None:
166-
region = sagemaker_session.boto_region_name
169+
region = region or get_region_fallback(
170+
sagemaker_session=sagemaker_session,
171+
)
167172

168173
model_specs = verify_model_region_and_return_specs(
169174
model_id=model_id,

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
JumpStartModelType,
2525
)
2626
from sagemaker.jumpstart.utils import (
27+
get_region_fallback,
2728
verify_model_region_and_return_specs,
2829
)
2930

@@ -62,7 +63,9 @@ def _retrieve_model_init_kwargs(
6263
"""
6364

6465
if region is None:
65-
region = sagemaker_session.boto_region_name
66+
region = region or get_region_fallback(
67+
sagemaker_session=sagemaker_session,
68+
)
6669

6770
model_specs = verify_model_region_and_return_specs(
6871
model_id=model_id,
@@ -121,7 +124,9 @@ def _retrieve_model_deploy_kwargs(
121124
"""
122125

123126
if region is None:
124-
region = sagemaker_session.boto_region_name
127+
region = region or get_region_fallback(
128+
sagemaker_session=sagemaker_session,
129+
)
125130

126131
model_specs = verify_model_region_and_return_specs(
127132
model_id=model_id,
@@ -176,7 +181,9 @@ def _retrieve_estimator_init_kwargs(
176181
"""
177182

178183
if region is None:
179-
region = sagemaker_session.boto_region_name
184+
region = region or get_region_fallback(
185+
sagemaker_session=sagemaker_session,
186+
)
180187

181188
model_specs = verify_model_region_and_return_specs(
182189
model_id=model_id,
@@ -233,7 +240,9 @@ def _retrieve_estimator_fit_kwargs(
233240
"""
234241

235242
if region is None:
236-
region = sagemaker_session.boto_region_name
243+
region = region or get_region_fallback(
244+
sagemaker_session=sagemaker_session,
245+
)
237246

238247
model_specs = verify_model_region_and_return_specs(
239248
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
JumpStartScriptScope,
2222
)
2323
from sagemaker.jumpstart.utils import (
24+
get_region_fallback,
2425
verify_model_region_and_return_specs,
2526
)
2627
from sagemaker.session import Session
@@ -62,7 +63,9 @@ def _retrieve_default_training_metric_definitions(
6263
"""
6364

6465
if region is None:
65-
region = sagemaker_session.boto_region_name
66+
region = region or get_region_fallback(
67+
sagemaker_session=sagemaker_session,
68+
)
6669

6770
model_specs = verify_model_region_and_return_specs(
6871
model_id=model_id,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
1818
)
1919
from sagemaker.jumpstart.utils import (
20+
get_region_fallback,
2021
verify_model_region_and_return_specs,
2122
)
2223
from sagemaker.jumpstart.enums import (
@@ -65,7 +66,9 @@ def _retrieve_model_package_arn(
6566
"""
6667

6768
if region is None:
68-
region = sagemaker_session.boto_region_name
69+
region = region or get_region_fallback(
70+
sagemaker_session=sagemaker_session,
71+
)
6972

7073
model_specs = verify_model_region_and_return_specs(
7174
model_id=model_id,
@@ -149,7 +152,9 @@ def _retrieve_model_package_model_artifact_s3_uri(
149152
if scope == JumpStartScriptScope.TRAINING:
150153

151154
if region is None:
152-
region = sagemaker_session.boto_region_name
155+
region = region or get_region_fallback(
156+
sagemaker_session=sagemaker_session,
157+
)
153158

154159
model_specs = verify_model_region_and_return_specs(
155160
model_id=model_id,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
from sagemaker.jumpstart.utils import (
2626
get_jumpstart_content_bucket,
2727
get_jumpstart_gated_content_bucket,
28+
get_region_fallback,
2829
verify_model_region_and_return_specs,
2930
)
3031
from sagemaker.session import Session
@@ -129,7 +130,9 @@ def _retrieve_model_uri(
129130
DeprecatedJumpStartModelError: If the version of the model is deprecated.
130131
"""
131132
if region is None:
132-
region = sagemaker_session.boto_region_name
133+
region = region or get_region_fallback(
134+
sagemaker_session=sagemaker_session,
135+
)
133136

134137
model_specs = verify_model_region_and_return_specs(
135138
model_id=model_id,
@@ -206,7 +209,9 @@ def _model_supports_training_model_uri(
206209
"""
207210

208211
if region is None:
209-
region = sagemaker_session.boto_region_name
212+
region = region or get_region_fallback(
213+
sagemaker_session=sagemaker_session,
214+
)
210215

211216
model_specs = verify_model_region_and_return_specs(
212217
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
)
2424
from sagemaker.jumpstart.types import JumpStartSerializablePayload
2525
from sagemaker.jumpstart.utils import (
26+
get_region_fallback,
2627
verify_model_region_and_return_specs,
2728
)
2829
from sagemaker.session import Session
@@ -63,7 +64,9 @@ def _retrieve_example_payloads(
6364
"""
6465

6566
if region is None:
66-
region = sagemaker_session.boto_region_name
67+
region = region or get_region_fallback(
68+
sagemaker_session=sagemaker_session,
69+
)
6770

6871
model_specs = verify_model_region_and_return_specs(
6972
model_id=model_id,

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

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
JumpStartModelType,
2929
)
3030
from sagemaker.jumpstart.utils import (
31+
get_region_fallback,
3132
verify_model_region_and_return_specs,
3233
)
3334
from sagemaker.session import Session
@@ -309,7 +310,9 @@ def _retrieve_default_content_type(
309310
"""
310311

311312
if region is None:
312-
region = sagemaker_session.boto_region_name
313+
region = region or get_region_fallback(
314+
sagemaker_session=sagemaker_session,
315+
)
313316

314317
model_specs = verify_model_region_and_return_specs(
315318
model_id=model_id,
@@ -359,7 +362,9 @@ def _retrieve_default_accept_type(
359362
"""
360363

361364
if region is None:
362-
region = sagemaker_session.boto_region_name
365+
region = region or get_region_fallback(
366+
sagemaker_session=sagemaker_session,
367+
)
363368

364369
model_specs = verify_model_region_and_return_specs(
365370
model_id=model_id,
@@ -410,7 +415,9 @@ def _retrieve_supported_accept_types(
410415
"""
411416

412417
if region is None:
413-
region = sagemaker_session.boto_region_name
418+
region = region or get_region_fallback(
419+
sagemaker_session=sagemaker_session,
420+
)
414421

415422
model_specs = verify_model_region_and_return_specs(
416423
model_id=model_id,
@@ -461,7 +468,9 @@ def _retrieve_supported_content_types(
461468
"""
462469

463470
if region is None:
464-
region = sagemaker_session.boto_region_name
471+
region = region or get_region_fallback(
472+
sagemaker_session=sagemaker_session,
473+
)
465474

466475
model_specs = verify_model_region_and_return_specs(
467476
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
JumpStartModelType,
2222
)
2323
from sagemaker.jumpstart.utils import (
24+
get_region_fallback,
2425
verify_model_region_and_return_specs,
2526
)
2627
from sagemaker.session import Session
@@ -60,7 +61,9 @@ def _retrieve_resource_name_base(
6061
"""
6162

6263
if region is None:
63-
region = sagemaker_session.boto_region_name
64+
region = region or get_region_fallback(
65+
sagemaker_session=sagemaker_session,
66+
)
6467

6568
model_specs = verify_model_region_and_return_specs(
6669
model_id=model_id,

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

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
JumpStartModelType,
2424
)
2525
from sagemaker.jumpstart.utils import (
26+
get_region_fallback,
2627
verify_model_region_and_return_specs,
2728
)
2829
from sagemaker.session import Session
@@ -89,7 +90,9 @@ def _retrieve_default_resources(
8990
"""
9091

9192
if region is None:
92-
region = sagemaker_session.boto_region_name
93+
region = region or get_region_fallback(
94+
sagemaker_session=sagemaker_session,
95+
)
9396

9497
model_specs = verify_model_region_and_return_specs(
9598
model_id=model_id,

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
)
2424
from sagemaker.jumpstart.utils import (
2525
get_jumpstart_content_bucket,
26+
get_region_fallback,
2627
verify_model_region_and_return_specs,
2728
)
2829
from sagemaker.session import Session
@@ -71,7 +72,9 @@ def _retrieve_script_uri(
7172
DeprecatedJumpStartModelError: If the version of the model is deprecated.
7273
"""
7374
if region is None:
74-
region = sagemaker_session.boto_region_name
75+
region = region or get_region_fallback(
76+
sagemaker_session=sagemaker_session,
77+
)
7578

7679
model_specs = verify_model_region_and_return_specs(
7780
model_id=model_id,
@@ -132,7 +135,9 @@ def _model_supports_inference_script_uri(
132135
"""
133136

134137
if region is None:
135-
region = sagemaker_session.boto_region_name
138+
region = region or get_region_fallback(
139+
sagemaker_session=sagemaker_session,
140+
)
136141

137142
model_specs = verify_model_region_and_return_specs(
138143
model_id=model_id,

‎src/sagemaker/jumpstart/utils.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -573,7 +573,9 @@ def verify_model_region_and_return_specs(
573573
"""
574574

575575
if region is None:
576-
region = sagemaker_session.boto_region_name
576+
region = region or get_region_fallback(
577+
sagemaker_session=sagemaker_session,
578+
)
577579

578580
if scope is None:
579581
raise ValueError(

0 commit comments

Comments
 (0)