Merge branch 'aws:master' into hmac-key-new

Author: mollyheamazon

sagemaker-core/CHANGELOG.md

@@ -1,4 +1,25 @@
 # Changelog
+## v2.5.1 (2026-03-12)
+
+### Bug Fixes
+
+- Fix handling of training step dependencies to allow successful pipeline creation (#5618)
+- Fix model registration with a model card to support both `ModelCard` and `ModelPackageModelCard` objects (#5611)
+- Fix local mode cleanup by handling root-owned files from Docker containers with `PermissionError` recovery (#5601)
+- Fix local mode processing to allow `file://` scheme URIs for output S3 paths (#5601)
+- Relax `rich` dependency upper bound back to 15.0.0 (#5620)
+
+### Enhancements
+
+- Add EUCS region (`eusc-de-east-1`) to JumpStart region config (#5615)
+- Add ISO regions to DJL-LMI image URI config (#5595)
+- Update DJL-LMI to latest image `lmi21.0.0-cu129` for SDK v3.x (#5616)
+- Add additional ISO region domains (`us-iso-west-1`, `us-isob-west-1`) to alternate domains config
+
+### Removals
+
+- Remove unused legacy `_convert_expression` method from JumpStart search (#5593)
+
 ## v2.5.0 (2026-03-02)
 
 ### Features

sagemaker-core/VERSION

@@ -1,2 +1 @@
-2.5.0
-
+2.5.1

sagemaker-core/pyproject.toml

@@ -17,7 +17,7 @@ dependencies = [
     "PyYAML>=6.0, <7.0",
     "jsonschema<5.0.0",
     "platformdirs>=4.0.0, <5.0.0",
-    "rich>=13.0.0, <14.0.0",
+    "rich>=13.0.0, <15.0.0",
     "mock>4.0, <5.0",
     "importlib-metadata<7.0,>=1.4.0",
     "typing_extensions>=4.9.0",

sagemaker-core/src/sagemaker/core/image_uri_config/djl-lmi.json

@@ -46,7 +46,7 @@
                 "mx-central-1": "637423239942"
             },
             "repository": "djl-inference",
-            "tag_prefix": "0.36.0-lmi18.0.0-cu128"
+            "tag_prefix": "0.36.0-lmi21.0.0-cu129"
         },
         "0.35.0": {
             "registries": {

sagemaker-core/src/sagemaker/core/jumpstart/region_config.json

@@ -123,6 +123,10 @@
         "content_bucket": "jumpstart-cache-prod-eu-isoe-west-1",
         "gated_content_bucket": "jumpstart-private-cache-prod-eu-isoe-west-1"
     },
+    "eusc-de-east-1": {
+        "content_bucket": "jumpstart-cache-prod-eusc-de-east-1",
+        "gated_content_bucket": "jumpstart-private-cache-prod-eusc-de-east-1"
+    },
     "il-central-1": {
         "content_bucket": "jumpstart-cache-prod-il-central-1",
         "gated_content_bucket": "jumpstart-private-cache-prod-il-central-1"

sagemaker-core/src/sagemaker/core/model_registry.py

@@ -12,6 +12,7 @@
     MODEL_PACKAGE_INFERENCE_SPECIFICATION_CONTAINERS_PATH,
     MODEL_PACKAGE_VALIDATION_PROFILES_PATH,
 )
+from sagemaker.core.resources import ModelPackageModelCard
 from botocore.exceptions import ClientError
 import logging
 
@@ -100,12 +101,12 @@ def get_model_package_args(
     if model_life_cycle is not None:
         model_package_args["model_life_cycle"] = model_life_cycle._to_request_dict()
     if model_card is not None:
-        original_req = model_card._create_request_args()
-        if original_req.get("ModelCardName") is not None:
-            del original_req["ModelCardName"]
-        if original_req.get("Content") is not None:
-            original_req["ModelCardContent"] = original_req["Content"]
-            del original_req["Content"]
+        original_req = {}
+        if isinstance(model_card, ModelPackageModelCard):
+             original_req["ModelCardContent"] = model_card.model_card_content
+        else:
+             original_req["ModelCardContent"] = model_card.content
+        original_req["ModelCardStatus"] = model_card.model_card_status
         model_package_args["model_card"] = original_req
     return model_package_args
 

sagemaker-core/src/sagemaker/core/workflow/utilities.py

@@ -28,6 +28,7 @@
     from _hashlib import HASH as Hash
 except ImportError:
     import typing
+
     Hash = typing.Any
 
 from sagemaker.core.common_utils import base_from_name
@@ -227,7 +228,9 @@ def get_processing_code_hash(code: str, source_dir: str, dependencies: List[str]
     return None
 
 
-def get_training_code_hash(entry_point: str, source_dir: str, dependencies: List[str]) -> str:
+def get_training_code_hash(
+    entry_point: str, source_dir: str, dependencies: Optional[str] = None
+) -> str:
     """Get the hash of a training step's code artifact(s).
 
     Args:
@@ -236,9 +239,9 @@ def get_training_code_hash(entry_point: str, source_dir: str, dependencies: List
                 training
         source_dir (str): Path to a directory with any other training source
                 code dependencies aside from the entry point file
-        dependencies (str): A list of paths to directories (absolute
-                or relative) with any additional libraries that will be exported
-                to the container
+        dependencies Optional[str]: The relative path within ``source_dir`` to a
+                ``requirements.txt`` file with any additional libraries that
+                will be exported to the container
     Returns:
         str: A hash string representing the unique code artifact(s) for the step
     """
@@ -248,11 +251,17 @@ def get_training_code_hash(entry_point: str, source_dir: str, dependencies: List
         if source_dir:
             source_dir_url = urlparse(source_dir)
             if source_dir_url.scheme == "" or source_dir_url.scheme == "file":
-                return hash_files_or_dirs([source_dir] + dependencies)
+                if dependencies:
+                    return hash_files_or_dirs([source_dir] + [dependencies])
+                else:
+                    return hash_files_or_dirs([source_dir])
         elif entry_point:
             entry_point_url = urlparse(entry_point)
             if entry_point_url.scheme == "" or entry_point_url.scheme == "file":
-                return hash_files_or_dirs([entry_point] + dependencies)
+                if dependencies:
+                    return hash_files_or_dirs([entry_point] + [dependencies])
+                else:
+                    return hash_files_or_dirs([entry_point])
     return None
 
 

sagemaker-core/tests/unit/image_uris/test_djl.py

@@ -86,7 +86,7 @@ def _test_djl_uris(account, region, version, tag, djl_framework):
 # Known missing framework:version:region combinations that don't exist in ECR
 KNOWN_MISSING_COMBINATIONS = {
     "djl-lmi": {
-        "0.36.0-lmi18.0.0-cu128": {"ap-east-2"},
+        "0.36.0-lmi21.0.0-cu129": {"ap-east-2"},
         "0.35.0-lmi17.0.0-cu128": {"ap-east-2"},
         "0.34.0-lmi16.0.0-cu128": {"ap-east-2"},
         "0.33.0-lmi15.0.0-cu128": {"ap-east-2"},

sagemaker-core/tests/unit/test_model_registry.py

@@ -126,6 +126,38 @@ def test_get_model_package_args_with_all_params(self):
         assert args["skip_model_validation"] == "All"
         assert args["source_uri"] == "s3://bucket/source"
 
+    def test_get_model_package_args_model_card(self):
+        from sagemaker.core.shapes import ModelCard
+
+        model_card = ModelCard()
+        model_card.content = '{"model_details": {"name": "test"}}'
+        model_card.model_card_status = "Approved"
+
+        args = get_model_package_args(
+            model_card=model_card,
+        )
+
+        assert args["model_card"] == {
+            "ModelCardContent": '{"model_details": {"name": "test"}}',
+            "ModelCardStatus": "Approved",
+        }
+
+    def test_get_model_package_args_model_package_model_card(self):
+        from sagemaker.core.shapes import ModelPackageModelCard
+
+        model_card = ModelPackageModelCard()
+        model_card.model_card_content = '{"model_details": {"name": "test"}}'
+        model_card.model_card_status = "Approved"
+
+        args = get_model_package_args(
+            model_card=model_card,
+        )
+
+        assert args["model_card"] == {
+            "ModelCardContent": '{"model_details": {"name": "test"}}',
+            "ModelCardStatus": "Approved",
+        }
+
     def test_get_create_model_package_request_minimal(self):
         """Test get_create_model_package_request with minimal parameters"""
         request = get_create_model_package_request(

sagemaker-core/tests/unit/workflow/test_utilities.py

@@ -269,27 +269,44 @@ def test_get_training_code_hash_with_source_dir(self):
         with tempfile.TemporaryDirectory() as temp_dir:
             entry_file = Path(temp_dir, "train.py")
             entry_file.write_text("print('training')")
+            requirements_file = Path(temp_dir, "requirements.txt")
+            requirements_file.write_text("numpy==1.21.0")
 
-            result = get_training_code_hash(
-                entry_point=str(entry_file), source_dir=temp_dir, dependencies=[]
+            result_no_deps = get_training_code_hash(
+                entry_point=str(entry_file), source_dir=temp_dir, dependencies=None
+            )
+            result_with_deps = get_training_code_hash(
+                entry_point=str(entry_file), source_dir=temp_dir, dependencies=str(requirements_file)
             )
 
-            assert result is not None
-            assert len(result) == 64
+            assert result_no_deps is not None
+            assert result_with_deps is not None
+            assert len(result_no_deps) == 64
+            assert len(result_with_deps) == 64
+            assert result_no_deps != result_with_deps
 
     def test_get_training_code_hash_entry_point_only(self):
         """Test get_training_code_hash with entry_point only"""
-        with tempfile.NamedTemporaryFile(mode="w", suffix=".py", delete=False) as f:
-            f.write("print('training')")
-            temp_file = f.name
+        with tempfile.TemporaryDirectory() as temp_dir:
+            entry_file = Path(temp_dir, "train.py")
+            entry_file.write_text("print('training')")
+            requirements_file = Path(temp_dir, "requirements.txt")
+            requirements_file.write_text("numpy==1.21.0")
 
-        try:
-            result = get_training_code_hash(entry_point=temp_file, source_dir=None, dependencies=[])
+            # Without dependencies
+            result_no_deps = get_training_code_hash(
+                entry_point=str(entry_file), source_dir=None, dependencies=None
+            )
+            # With dependencies
+            result_with_deps = get_training_code_hash(
+                entry_point=str(entry_file), source_dir=None, dependencies=str(requirements_file)
+            )
 
-            assert result is not None
-            assert len(result) == 64
-        finally:
-            os.unlink(temp_file)
+            assert result_no_deps is not None
+            assert result_with_deps is not None
+            assert len(result_no_deps) == 64
+            assert len(result_with_deps) == 64
+            assert result_no_deps != result_with_deps
 
     def test_get_training_code_hash_s3_uri(self):
         """Test get_training_code_hash with S3 URI returns None"""