Skip to content

Commit 0fb849f

Browse files
evakravievakravi
committed
fix: sagemaker session region not being used
1 parent 36138da commit 0fb849f

File tree

37 files changed

+148
-113
lines changed

37 files changed

+148
-113
lines changed

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from typing import Dict, Optional
1616
from sagemaker.jumpstart.constants import (
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
18-
JUMPSTART_DEFAULT_REGION_NAME,
1918
SAGEMAKER_GATED_MODEL_S3_URI_TRAINING_ENV_VAR_KEY,
2019
)
2120
from sagemaker.jumpstart.enums import (
@@ -72,7 +71,7 @@ def _retrieve_default_environment_variables(
7271
"""
7372

7473
if region is None:
75-
region = JUMPSTART_DEFAULT_REGION_NAME
74+
region = sagemaker_session.boto_region_name
7675

7776
model_specs = verify_model_region_and_return_specs(
7877
model_id=model_id,
@@ -169,7 +168,7 @@ def _retrieve_gated_model_uri_env_var_value(
169168
"""
170169

171170
if region is None:
172-
region = JUMPSTART_DEFAULT_REGION_NAME
171+
region = sagemaker_session.boto_region_name
173172

174173
model_specs = verify_model_region_and_return_specs(
175174
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from typing import Dict, Optional
1616
from sagemaker.jumpstart.constants import (
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
18-
JUMPSTART_DEFAULT_REGION_NAME,
1918
)
2019
from sagemaker.jumpstart.enums import (
2120
JumpStartScriptScope,
@@ -71,7 +70,7 @@ def _retrieve_default_hyperparameters(
7170
"""
7271

7372
if region is None:
74-
region = JUMPSTART_DEFAULT_REGION_NAME
73+
region = sagemaker_session.boto_region_name
7574

7675
model_specs = verify_model_region_and_return_specs(
7776
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from sagemaker import image_uris
1818
from sagemaker.jumpstart.constants import (
1919
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
20-
JUMPSTART_DEFAULT_REGION_NAME,
2120
)
2221
from sagemaker.jumpstart.enums import (
2322
JumpStartScriptScope,
@@ -105,7 +104,7 @@ def _retrieve_image_uri(
105104
DeprecatedJumpStartModelError: If the version of the model is deprecated.
106105
"""
107106
if region is None:
108-
region = JUMPSTART_DEFAULT_REGION_NAME
107+
region = sagemaker_session.boto_region_name
109108

110109
model_specs = verify_model_region_and_return_specs(
111110
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from typing import Optional
1616
from sagemaker.jumpstart.constants import (
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
18-
JUMPSTART_DEFAULT_REGION_NAME,
1918
)
2019
from sagemaker.jumpstart.enums import (
2120
JumpStartScriptScope,
@@ -59,7 +58,7 @@ def _model_supports_incremental_training(
5958
"""
6059

6160
if region is None:
62-
region = JUMPSTART_DEFAULT_REGION_NAME
61+
region = sagemaker_session.boto_region_name
6362

6463
model_specs = verify_model_region_and_return_specs(
6564
model_id=model_id,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from sagemaker.jumpstart.exceptions import NO_AVAILABLE_INSTANCES_ERROR_MSG
1919
from sagemaker.jumpstart.constants import (
2020
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
21-
JUMPSTART_DEFAULT_REGION_NAME,
2221
)
2322
from sagemaker.jumpstart.enums import (
2423
JumpStartScriptScope,
@@ -75,7 +74,7 @@ def _retrieve_default_instance_type(
7574
"""
7675

7776
if region is None:
78-
region = JUMPSTART_DEFAULT_REGION_NAME
77+
region = sagemaker_session.boto_region_name
7978

8079
model_specs = verify_model_region_and_return_specs(
8180
model_id=model_id,
@@ -161,7 +160,7 @@ def _retrieve_instance_types(
161160
"""
162161

163162
if region is None:
164-
region = JUMPSTART_DEFAULT_REGION_NAME
163+
region = sagemaker_session.boto_region_name
165164

166165
model_specs = verify_model_region_and_return_specs(
167166
model_id=model_id,

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from sagemaker.utils import volume_size_supported
1919
from sagemaker.jumpstart.constants import (
2020
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
21-
JUMPSTART_DEFAULT_REGION_NAME,
2221
)
2322
from sagemaker.jumpstart.enums import (
2423
JumpStartScriptScope,
@@ -61,7 +60,7 @@ def _retrieve_model_init_kwargs(
6160
"""
6261

6362
if region is None:
64-
region = JUMPSTART_DEFAULT_REGION_NAME
63+
region = sagemaker_session.boto_region_name
6564

6665
model_specs = verify_model_region_and_return_specs(
6766
model_id=model_id,
@@ -118,7 +117,7 @@ def _retrieve_model_deploy_kwargs(
118117
"""
119118

120119
if region is None:
121-
region = JUMPSTART_DEFAULT_REGION_NAME
120+
region = sagemaker_session.boto_region_name
122121

123122
model_specs = verify_model_region_and_return_specs(
124123
model_id=model_id,
@@ -172,7 +171,7 @@ def _retrieve_estimator_init_kwargs(
172171
"""
173172

174173
if region is None:
175-
region = JUMPSTART_DEFAULT_REGION_NAME
174+
region = sagemaker_session.boto_region_name
176175

177176
model_specs = verify_model_region_and_return_specs(
178177
model_id=model_id,
@@ -229,7 +228,7 @@ def _retrieve_estimator_fit_kwargs(
229228
"""
230229

231230
if region is None:
232-
region = JUMPSTART_DEFAULT_REGION_NAME
231+
region = sagemaker_session.boto_region_name
233232

234233
model_specs = verify_model_region_and_return_specs(
235234
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from typing import Dict, List, Optional
1717
from sagemaker.jumpstart.constants import (
1818
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
19-
JUMPSTART_DEFAULT_REGION_NAME,
2019
)
2120
from sagemaker.jumpstart.enums import (
2221
JumpStartScriptScope,
@@ -63,7 +62,7 @@ def _retrieve_default_training_metric_definitions(
6362
"""
6463

6564
if region is None:
66-
region = JUMPSTART_DEFAULT_REGION_NAME
65+
region = sagemaker_session.boto_region_name
6766

6867
model_specs = verify_model_region_and_return_specs(
6968
model_id=model_id,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from typing import Optional
1616
from sagemaker.jumpstart.constants import (
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
18-
JUMPSTART_DEFAULT_REGION_NAME,
1918
)
2019
from sagemaker.jumpstart.utils import (
2120
verify_model_region_and_return_specs,
@@ -64,7 +63,7 @@ def _retrieve_model_package_arn(
6463
"""
6564

6665
if region is None:
67-
region = JUMPSTART_DEFAULT_REGION_NAME
66+
region = sagemaker_session.boto_region_name
6867

6968
model_specs = verify_model_region_and_return_specs(
7069
model_id=model_id,
@@ -147,7 +146,7 @@ def _retrieve_model_package_model_artifact_s3_uri(
147146
if scope == JumpStartScriptScope.TRAINING:
148147

149148
if region is None:
150-
region = JUMPSTART_DEFAULT_REGION_NAME
149+
region = sagemaker_session.boto_region_name
151150

152151
model_specs = verify_model_region_and_return_specs(
153152
model_id=model_id,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
from sagemaker.jumpstart.constants import (
1919
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
2020
ENV_VARIABLE_JUMPSTART_MODEL_ARTIFACT_BUCKET_OVERRIDE,
21-
JUMPSTART_DEFAULT_REGION_NAME,
2221
)
2322
from sagemaker.jumpstart.enums import (
2423
JumpStartScriptScope,
@@ -130,7 +129,7 @@ def _retrieve_model_uri(
130129
DeprecatedJumpStartModelError: If the version of the model is deprecated.
131130
"""
132131
if region is None:
133-
region = JUMPSTART_DEFAULT_REGION_NAME
132+
region = sagemaker_session.boto_region_name
134133

135134
model_specs = verify_model_region_and_return_specs(
136135
model_id=model_id,
@@ -207,7 +206,7 @@ def _model_supports_training_model_uri(
207206
"""
208207

209208
if region is None:
210-
region = JUMPSTART_DEFAULT_REGION_NAME
209+
region = sagemaker_session.boto_region_name
211210

212211
model_specs = verify_model_region_and_return_specs(
213212
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
from typing import Dict, Optional
1717
from sagemaker.jumpstart.constants import (
1818
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
19-
JUMPSTART_DEFAULT_REGION_NAME,
2019
)
2120
from sagemaker.jumpstart.enums import (
2221
JumpStartScriptScope,
@@ -62,7 +61,7 @@ def _retrieve_example_payloads(
6261
"""
6362

6463
if region is None:
65-
region = JUMPSTART_DEFAULT_REGION_NAME
64+
region = sagemaker_session.boto_region_name
6665

6766
model_specs = verify_model_region_and_return_specs(
6867
model_id=model_id,

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

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
CONTENT_TYPE_TO_SERIALIZER_TYPE_MAP,
2121
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
2222
DESERIALIZER_TYPE_TO_CLASS_MAP,
23-
JUMPSTART_DEFAULT_REGION_NAME,
2423
SERIALIZER_TYPE_TO_CLASS_MAP,
2524
)
2625
from sagemaker.jumpstart.enums import (
@@ -302,7 +301,7 @@ def _retrieve_default_content_type(
302301
"""
303302

304303
if region is None:
305-
region = JUMPSTART_DEFAULT_REGION_NAME
304+
region = sagemaker_session.boto_region_name
306305

307306
model_specs = verify_model_region_and_return_specs(
308307
model_id=model_id,
@@ -350,7 +349,7 @@ def _retrieve_default_accept_type(
350349
"""
351350

352351
if region is None:
353-
region = JUMPSTART_DEFAULT_REGION_NAME
352+
region = sagemaker_session.boto_region_name
354353

355354
model_specs = verify_model_region_and_return_specs(
356355
model_id=model_id,
@@ -399,7 +398,7 @@ def _retrieve_supported_accept_types(
399398
"""
400399

401400
if region is None:
402-
region = JUMPSTART_DEFAULT_REGION_NAME
401+
region = sagemaker_session.boto_region_name
403402

404403
model_specs = verify_model_region_and_return_specs(
405404
model_id=model_id,
@@ -448,7 +447,7 @@ def _retrieve_supported_content_types(
448447
"""
449448

450449
if region is None:
451-
region = JUMPSTART_DEFAULT_REGION_NAME
450+
region = sagemaker_session.boto_region_name
452451

453452
model_specs = verify_model_region_and_return_specs(
454453
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
from typing import Optional
1616
from sagemaker.jumpstart.constants import (
1717
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
18-
JUMPSTART_DEFAULT_REGION_NAME,
1918
)
2019
from sagemaker.jumpstart.enums import (
2120
JumpStartScriptScope,
@@ -59,7 +58,7 @@ def _retrieve_resource_name_base(
5958
"""
6059

6160
if region is None:
62-
region = JUMPSTART_DEFAULT_REGION_NAME
61+
region = sagemaker_session.boto_region_name
6362

6463
model_specs = verify_model_region_and_return_specs(
6564
model_id=model_id,

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

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717

1818
from sagemaker.jumpstart.constants import (
1919
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
20-
JUMPSTART_DEFAULT_REGION_NAME,
2120
)
2221
from sagemaker.jumpstart.enums import (
2322
JumpStartScriptScope,
@@ -71,7 +70,7 @@ def _retrieve_default_resources(
7170
"""
7271

7372
if region is None:
74-
region = JUMPSTART_DEFAULT_REGION_NAME
73+
region = sagemaker_session.boto_region_name
7574

7675
model_specs = verify_model_region_and_return_specs(
7776
model_id=model_id,

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

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@
1717
from sagemaker.jumpstart.constants import (
1818
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
1919
ENV_VARIABLE_JUMPSTART_SCRIPT_ARTIFACT_BUCKET_OVERRIDE,
20-
JUMPSTART_DEFAULT_REGION_NAME,
2120
)
2221
from sagemaker.jumpstart.enums import (
2322
JumpStartScriptScope,
@@ -72,7 +71,7 @@ def _retrieve_script_uri(
7271
DeprecatedJumpStartModelError: If the version of the model is deprecated.
7372
"""
7473
if region is None:
75-
region = JUMPSTART_DEFAULT_REGION_NAME
74+
region = sagemaker_session.boto_region_name
7675

7776
model_specs = verify_model_region_and_return_specs(
7877
model_id=model_id,
@@ -133,7 +132,7 @@ def _model_supports_inference_script_uri(
133132
"""
134133

135134
if region is None:
136-
region = JUMPSTART_DEFAULT_REGION_NAME
135+
region = sagemaker_session.boto_region_name
137136

138137
model_specs = verify_model_region_and_return_specs(
139138
model_id=model_id,

0 commit comments

Comments
 (0)