Skip to content

fix: sagemaker session region not being used #4469

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 13 commits into from
Mar 13, 2024
Merged

fix: sagemaker session region not being used #4469

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
0fb849f
fix: sagemaker session region not being used
evakravi Mar 1, 2024
18d388c
chore: add unit tests
evakravi Mar 4, 2024
e8ad3b3
Merge branch 'master' into fix/sagemaker-session-region-not-being-used
evakravi Mar 4, 2024
5b0ce21
Merge branch 'master' into fix/sagemaker-session-region-not-being-used
evakravi Mar 4, 2024
cf770dd
Merge branch 'master' into fix/sagemaker-session-region-not-being-used
evakravi Mar 5, 2024
c038acd
Merge branch 'master' into fix/sagemaker-session-region-not-being-used
evakravi Mar 5, 2024
46efb3a
Merge branch 'master' into fix/sagemaker-session-region-not-being-used
benieric Mar 12, 2024
7279028
fix: remove all JUMPSTART_DEFAULT_REGION_NAME default arguments
evakravi Mar 12, 2024
67e03bf
Merge remote-tracking branch 'origin' into fix/sagemaker-session-regi…
evakravi Mar 12, 2024
0e450e8
chore: use get_region_fallback throughout
evakravi Mar 12, 2024
6f7dde9
chore: remove unnecessary if statement
evakravi Mar 12, 2024
8576b32
chore: remove unnecessary if statement (2)
evakravi Mar 12, 2024
dff2ccd
Merge remote-tracking branch 'origin' into fix/sagemaker-session-regi…
evakravi Mar 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions src/sagemaker/jumpstart/artifacts/environment_variables.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from typing import Dict, Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
SAGEMAKER_GATED_MODEL_S3_URI_TRAINING_ENV_VAR_KEY,
)
from sagemaker.jumpstart.enums import (
Expand Down Expand Up @@ -72,7 +71,7 @@ def _retrieve_default_environment_variables(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -169,7 +168,7 @@ def _retrieve_gated_model_uri_env_var_value(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/hyperparameters.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from typing import Dict, Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -71,7 +70,7 @@ def _retrieve_default_hyperparameters(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/image_uris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from sagemaker import image_uris
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -105,7 +104,7 @@ def _retrieve_image_uri(
DeprecatedJumpStartModelError: If the version of the model is deprecated.
"""
if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/incremental_training.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from typing import Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -59,7 +58,7 @@ def _model_supports_incremental_training(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
5 changes: 2 additions & 3 deletions src/sagemaker/jumpstart/artifacts/instance_types.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from sagemaker.jumpstart.exceptions import NO_AVAILABLE_INSTANCES_ERROR_MSG
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -75,7 +74,7 @@ def _retrieve_default_instance_type(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -161,7 +160,7 @@ def _retrieve_instance_types(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
9 changes: 4 additions & 5 deletions src/sagemaker/jumpstart/artifacts/kwargs.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from sagemaker.utils import volume_size_supported
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -61,7 +60,7 @@ def _retrieve_model_init_kwargs(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -118,7 +117,7 @@ def _retrieve_model_deploy_kwargs(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -172,7 +171,7 @@ def _retrieve_estimator_init_kwargs(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -229,7 +228,7 @@ def _retrieve_estimator_fit_kwargs(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/metric_definitions.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from typing import Dict, List, Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -63,7 +62,7 @@ def _retrieve_default_training_metric_definitions(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
5 changes: 2 additions & 3 deletions src/sagemaker/jumpstart/artifacts/model_packages.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from typing import Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.utils import (
verify_model_region_and_return_specs,
Expand Down Expand Up @@ -64,7 +63,7 @@ def _retrieve_model_package_arn(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -147,7 +146,7 @@ def _retrieve_model_package_model_artifact_s3_uri(
if scope == JumpStartScriptScope.TRAINING:

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
5 changes: 2 additions & 3 deletions src/sagemaker/jumpstart/artifacts/model_uris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
ENV_VARIABLE_JUMPSTART_MODEL_ARTIFACT_BUCKET_OVERRIDE,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -130,7 +129,7 @@ def _retrieve_model_uri(
DeprecatedJumpStartModelError: If the version of the model is deprecated.
"""
if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -207,7 +206,7 @@ def _model_supports_training_model_uri(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/payloads.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
from typing import Dict, Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -62,7 +61,7 @@ def _retrieve_example_payloads(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
9 changes: 4 additions & 5 deletions src/sagemaker/jumpstart/artifacts/predictors.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@
CONTENT_TYPE_TO_SERIALIZER_TYPE_MAP,
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
DESERIALIZER_TYPE_TO_CLASS_MAP,
JUMPSTART_DEFAULT_REGION_NAME,
SERIALIZER_TYPE_TO_CLASS_MAP,
)
from sagemaker.jumpstart.enums import (
Expand Down Expand Up @@ -302,7 +301,7 @@ def _retrieve_default_content_type(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -350,7 +349,7 @@ def _retrieve_default_accept_type(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -399,7 +398,7 @@ def _retrieve_supported_accept_types(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -448,7 +447,7 @@ def _retrieve_supported_content_types(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/resource_names.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
from typing import Optional
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -59,7 +58,7 @@ def _retrieve_resource_name_base(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
3 changes: 1 addition & 2 deletions src/sagemaker/jumpstart/artifacts/resource_requirements.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@

from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -71,7 +70,7 @@ def _retrieve_default_resources(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
5 changes: 2 additions & 3 deletions src/sagemaker/jumpstart/artifacts/script_uris.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
from sagemaker.jumpstart.constants import (
DEFAULT_JUMPSTART_SAGEMAKER_SESSION,
ENV_VARIABLE_JUMPSTART_SCRIPT_ARTIFACT_BUCKET_OVERRIDE,
JUMPSTART_DEFAULT_REGION_NAME,
)
from sagemaker.jumpstart.enums import (
JumpStartScriptScope,
Expand Down Expand Up @@ -72,7 +71,7 @@ def _retrieve_script_uri(
DeprecatedJumpStartModelError: If the version of the model is deprecated.
"""
if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down Expand Up @@ -133,7 +132,7 @@ def _model_supports_inference_script_uri(
"""

if region is None:
region = JUMPSTART_DEFAULT_REGION_NAME
region = sagemaker_session.boto_region_name

model_specs = verify_model_region_and_return_specs(
model_id=model_id,
Expand Down
Loading