Skip to content

Commit a4245fb

Browse files
committed
fix(jumpstart): raise for missing Neo metadata at processing boundary
Raise only when speculative-decoding metadata selects Neo and no Neo bucket exists. Models and configurations without this metadata do not access Neo. --- X-AI-Prompt: Can you raise for a missing Neo bucket only while processing metadata that uses it? X-AI-Tool: claude-code
1 parent d1b849a commit a4245fb

5 files changed

Lines changed: 77 additions & 76 deletions

File tree

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

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -547,9 +547,14 @@ def _add_additional_model_data_sources_to_kwargs(
547547
# Append speculative decoding data source from metadata
548548
speculative_decoding_data_sources = specs.get_speculative_decoding_s3_data_sources()
549549
for data_source in speculative_decoding_data_sources:
550-
data_source.s3_data_source.set_bucket(
551-
get_draft_model_content_bucket(provider=data_source.provider, region=kwargs.region)
550+
content_bucket = get_draft_model_content_bucket(
551+
provider=data_source.provider, region=kwargs.region
552552
)
553+
if content_bucket is None:
554+
raise ValueError(
555+
f"Unable to get content bucket for Neo in {kwargs.region} region."
556+
)
557+
data_source.s3_data_source.set_bucket(content_bucket)
553558
api_shape_additional_model_data_sources = (
554559
[
555560
camel_case_to_pascal_case(data_source.to_json())

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

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -221,10 +221,10 @@ def get_jumpstart_content_bucket(
221221
def get_neo_content_bucket(
222222
region: str = constants.NEO_DEFAULT_REGION_NAME,
223223
) -> Optional[str]:
224-
"""Returns the regionalized S3 bucket name for Neo service.
224+
"""Returns the regionalized S3 bucket name for Neo, if available.
225225
226226
Raises:
227-
ValueError: If Neo is not launched in ``region``.
227+
ValueError: If ``region`` is not a launched JumpStart region.
228228
"""
229229

230230
bucket_to_return: Optional[str] = None
@@ -1698,23 +1698,15 @@ def _add_model_access_configs_to_model_data_sources(
16981698
return acked_model_data_sources
16991699

17001700

1701-
def get_draft_model_content_bucket(provider: Dict, region: str) -> str:
1701+
def get_draft_model_content_bucket(provider: Dict, region: str) -> Optional[str]:
17021702
"""Returns the correct content bucket for a 1p draft model."""
1703-
if not provider:
1704-
neo_bucket = get_neo_content_bucket(region=region)
1705-
if neo_bucket is None:
1706-
raise ValueError(f"Unable to get content bucket for Neo in {region} region.")
1707-
return neo_bucket
1708-
provider_name = provider.get("name", "")
1703+
provider_name = provider.get("name", "") if provider else ""
17091704
if provider_name == "JumpStart":
17101705
classification = provider.get("classification", "ungated")
17111706
if classification == "gated":
17121707
return get_jumpstart_gated_content_bucket(region=region)
17131708
return get_jumpstart_content_bucket(region=region)
1714-
neo_bucket = get_neo_content_bucket(region=region)
1715-
if neo_bucket is None:
1716-
raise ValueError(f"Unable to get content bucket for Neo in {region} region.")
1717-
return neo_bucket
1709+
return get_neo_content_bucket(region=region)
17181710

17191711

17201712
def remove_env_var_from_estimator_kwargs_if_accept_eula_present(

‎sagemaker-core/tests/integ/jumpstart/test_bucket_utils.py‎

Lines changed: 0 additions & 37 deletions
This file was deleted.

‎sagemaker-core/tests/unit/jumpstart/test_factory_utils.py‎

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,14 +11,78 @@
1111
# ANY KIND, either express or implied. See the License for the specific
1212
# language governing permissions and limitations under the License.
1313

14+
from __future__ import absolute_import
15+
1416
import pytest
15-
from unittest.mock import Mock, MagicMock, patch
17+
from unittest.mock import Mock, patch
1618
from sagemaker.core.jumpstart.enums import JumpStartModelType, JumpStartScriptScope
19+
from sagemaker.core.jumpstart.factory.utils import _add_additional_model_data_sources_to_kwargs
20+
from sagemaker.core.jumpstart.types import JumpStartModelDataSource
1721

1822

1923
class TestFactoryUtilsHelpers:
2024
"""Test cases for factory utils helper functions using mocks to avoid circular imports"""
2125

26+
@staticmethod
27+
def _draft_model_source(provider):
28+
return JumpStartModelDataSource(
29+
{
30+
"channel_name": "draft_model",
31+
"provider": provider,
32+
"artifact_version": "v1",
33+
"s3_data_source": {
34+
"s3_uri": "path/to/draft/model/",
35+
"compression_type": "None",
36+
"s3_data_type": "S3Prefix",
37+
},
38+
}
39+
)
40+
41+
@patch("sagemaker.core.jumpstart.factory.utils.get_draft_model_content_bucket")
42+
def test_no_draft_model_metadata_skips_bucket_resolution(self, mock_get_bucket):
43+
kwargs = Mock(region="eusc-de-east-1", additional_model_data_sources=None)
44+
kwargs.specs.get_speculative_decoding_s3_data_sources.return_value = []
45+
46+
result = _add_additional_model_data_sources_to_kwargs(kwargs)
47+
48+
assert result.additional_model_data_sources is None
49+
mock_get_bucket.assert_not_called()
50+
51+
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket", return_value=None)
52+
def test_neo_draft_model_without_bucket_raises(self, mock_get_neo_bucket):
53+
data_source = self._draft_model_source({"name": "Neo"})
54+
kwargs = Mock(region="eusc-de-east-1", additional_model_data_sources=None)
55+
kwargs.specs.get_speculative_decoding_s3_data_sources.return_value = [data_source]
56+
57+
with pytest.raises(
58+
ValueError,
59+
match=r"^Unable to get content bucket for Neo in eusc-de-east-1 region\.$",
60+
):
61+
_add_additional_model_data_sources_to_kwargs(kwargs)
62+
63+
mock_get_neo_bucket.assert_called_once_with(region="eusc-de-east-1")
64+
65+
@patch("sagemaker.core.jumpstart.utils.get_jumpstart_content_bucket")
66+
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket")
67+
def test_jumpstart_draft_model_bypasses_neo(
68+
self, mock_get_neo_bucket, mock_get_jumpstart_bucket
69+
):
70+
mock_get_jumpstart_bucket.return_value = "jumpstart-bucket"
71+
data_source = self._draft_model_source(
72+
{"name": "JumpStart", "classification": "ungated"}
73+
)
74+
kwargs = Mock(region="eusc-de-east-1", additional_model_data_sources=None)
75+
kwargs.specs.get_speculative_decoding_s3_data_sources.return_value = [data_source]
76+
77+
result = _add_additional_model_data_sources_to_kwargs(kwargs)
78+
79+
assert (
80+
result.additional_model_data_sources[0]["S3DataSource"]["S3Uri"]
81+
== "s3://jumpstart-bucket/path/to/draft/model/"
82+
)
83+
mock_get_jumpstart_bucket.assert_called_once_with(region="eusc-de-east-1")
84+
mock_get_neo_bucket.assert_not_called()
85+
2286
def test_model_info_kwargs_structure(self):
2387
"""Test that model info kwargs have expected structure"""
2488
# Create a mock kwargs object

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

Lines changed: 0 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1905,29 +1905,6 @@ def test_get_draft_model_content_bucket_other_provider(self, mock_neo):
19051905
result = utils.get_draft_model_content_bucket(provider, "us-west-2")
19061906
assert result == "neo-bucket"
19071907

1908-
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket", return_value=None)
1909-
def test_get_draft_model_content_bucket_raises_when_neo_is_unavailable(self, mock_neo):
1910-
"""A Neo-backed data source without a Neo bucket raises an error."""
1911-
with pytest.raises(
1912-
ValueError,
1913-
match=r"^Unable to get content bucket for Neo in eusc-de-east-1 region\.$",
1914-
):
1915-
utils.get_draft_model_content_bucket({"name": "Neo"}, "eusc-de-east-1")
1916-
1917-
mock_neo.assert_called_once_with(region="eusc-de-east-1")
1918-
1919-
@patch("sagemaker.core.jumpstart.utils.get_neo_content_bucket", return_value=None)
1920-
def test_get_draft_model_content_bucket_raises_without_provider_or_neo(self, mock_neo):
1921-
"""A missing provider without a Neo bucket raises an error."""
1922-
with pytest.raises(
1923-
ValueError,
1924-
match=r"^Unable to get content bucket for Neo in eusc-de-east-1 region\.$",
1925-
):
1926-
utils.get_draft_model_content_bucket({}, "eusc-de-east-1")
1927-
1928-
mock_neo.assert_called_once_with(region="eusc-de-east-1")
1929-
1930-
19311908
class TestRemoveEnvVarFromEstimatorKwargsIfAcceptEulaPresent:
19321909
"""Test cases for remove_env_var_from_estimator_kwargs_if_accept_eula_present function"""
19331910

0 commit comments

Comments
 (0)