Skip to content

Commit 5ede728

Browse files
committed
fix(jumpstart): decouple JumpStart buckets from Neo
Resolve draft-model buckets from their provider before a Neo lookup. This permits JumpStart artifacts in regions where Neo is unavailable. Raise a clear Neo error when a launched region has no Neo bucket. Report JumpStart lookup failures as JumpStart errors. --- X-AI-Prompt: Can you fix JumpStart bucket resolution when Neo is unavailable in SDK v3? X-AI-Tool: claude-code
1 parent 1382c97 commit 5ede728

2 files changed

Lines changed: 25 additions & 11 deletions

File tree

‎sagemaker-core/src/sagemaker/core/jumpstart/utils.py‎

Lines changed: 6 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -204,7 +204,7 @@ def get_jumpstart_content_bucket(
204204
except KeyError:
205205
formatted_launched_regions_str = get_jumpstart_launched_regions_message()
206206
raise ValueError(
207-
f"Unable to get content bucket for Neo in {region} region. "
207+
f"Unable to get content bucket for JumpStart in {region} region. "
208208
f"{formatted_launched_regions_str}"
209209
)
210210

@@ -236,12 +236,10 @@ def get_neo_content_bucket(
236236
info_log = f"Using Neo bucket override: '{bucket_to_return}'"
237237
constants.JUMPSTART_LOGGER.info(info_log)
238238
else:
239-
try:
240-
bucket_to_return = constants.JUMPSTART_REGION_NAME_TO_LAUNCHED_REGION_DICT[
241-
region
242-
].neo_content_bucket
243-
except KeyError:
239+
region_info = constants.JUMPSTART_REGION_NAME_TO_LAUNCHED_REGION_DICT.get(region)
240+
if region_info is None or region_info.neo_content_bucket is None:
244241
raise ValueError(f"Unable to get content bucket for Neo in {region} region.")
242+
bucket_to_return = region_info.neo_content_bucket
245243

246244
return bucket_to_return
247245

@@ -1700,16 +1698,15 @@ def _add_model_access_configs_to_model_data_sources(
17001698

17011699
def get_draft_model_content_bucket(provider: Dict, region: str) -> str:
17021700
"""Returns the correct content bucket for a 1p draft model."""
1703-
neo_bucket = get_neo_content_bucket(region=region)
17041701
if not provider:
1705-
return neo_bucket
1702+
return get_neo_content_bucket(region=region)
17061703
provider_name = provider.get("name", "")
17071704
if provider_name == "JumpStart":
17081705
classification = provider.get("classification", "ungated")
17091706
if classification == "gated":
17101707
return get_jumpstart_gated_content_bucket(region=region)
17111708
return get_jumpstart_content_bucket(region=region)
1712-
return neo_bucket
1709+
return get_neo_content_bucket(region=region)
17131710

17141711

17151712
def remove_env_var_from_estimator_kwargs_if_accept_eula_present(

‎sagemaker-core/tests/unit/test_jumpstart_utils.py‎

Lines changed: 19 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -491,7 +491,7 @@ def test_get_jumpstart_content_bucket_with_override(self):
491491
def test_get_jumpstart_content_bucket_invalid_region(self):
492492
"""Test with invalid region"""
493493
with patch.object(constants, "JUMPSTART_REGION_NAME_TO_LAUNCHED_REGION_DICT", {}):
494-
with pytest.raises(ValueError, match="Unable to get content bucket for Neo"):
494+
with pytest.raises(ValueError, match="Unable to get content bucket for JumpStart"):
495495
utils.get_jumpstart_content_bucket("invalid-region")
496496

497497

@@ -513,6 +513,21 @@ def test_get_neo_content_bucket_invalid_region(self):
513513
with pytest.raises(ValueError, match="Unable to get content bucket for Neo"):
514514
utils.get_neo_content_bucket("invalid-region")
515515

516+
def test_get_neo_content_bucket_unavailable_in_launched_region(self):
517+
"""A launched region without a Neo content bucket raises an error."""
518+
region_info = Mock()
519+
region_info.neo_content_bucket = None
520+
with patch.object(
521+
constants,
522+
"JUMPSTART_REGION_NAME_TO_LAUNCHED_REGION_DICT",
523+
{"eusc-de-east-1": region_info},
524+
):
525+
with pytest.raises(
526+
ValueError,
527+
match=r"^Unable to get content bucket for Neo in eusc-de-east-1 region\.$",
528+
):
529+
utils.get_neo_content_bucket("eusc-de-east-1")
530+
516531

517532
class TestParseSagemakerVersionEdgeCases:
518533
"""Test cases for parse_sagemaker_version edge cases"""
@@ -1876,13 +1891,15 @@ def test_get_draft_model_content_bucket_jumpstart_gated(self, mock_gated):
18761891
result = utils.get_draft_model_content_bucket(provider, "us-west-2")
18771892
assert result == "gated-bucket"
18781893

1894+
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket")
18791895
@patch("sagemaker.core.jumpstart.utils.get_jumpstart_content_bucket")
1880-
def test_get_draft_model_content_bucket_jumpstart_ungated(self, mock_content):
1896+
def test_get_draft_model_content_bucket_jumpstart_ungated(self, mock_content, mock_neo):
18811897
"""Test with JumpStart ungated provider"""
18821898
mock_content.return_value = "content-bucket"
18831899
provider = {"name": "JumpStart", "classification": "ungated"}
18841900
result = utils.get_draft_model_content_bucket(provider, "us-west-2")
18851901
assert result == "content-bucket"
1902+
mock_neo.assert_not_called()
18861903

18871904
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket")
18881905
def test_get_draft_model_content_bucket_other_provider(self, mock_neo):

0 commit comments

Comments
 (0)