Merge branch 'master' into hmac-key-fix-v3

Author: aviruthen

sagemaker-core/pyproject.toml

@@ -9,7 +9,7 @@ description = "An python package for sagemaker core functionalities"
 authors = [
   {name = "AWS", email = "[email protected]"}
 ]
-readme = "README.rst"
+readme = "README.rst" 
 dependencies = [
   # Add your dependencies here (Include lower and upper bounds as applicable)
     "boto3>=1.42.2,<2.0.0",
@@ -34,6 +34,10 @@ dependencies = [
     "omegaconf>=2.1.0",
     "torch>=1.9.0",
     "scipy>=1.5.0",
+    # Remote function dependencies
+    "cloudpickle>=2.0.0",
+    "paramiko>=2.11.0",
+    "tblib>=1.7.0",
 ]
 requires-python = ">=3.9"
 classifiers = [

sagemaker-core/src/sagemaker/core/image_retriever/image_retriever.py

@@ -406,8 +406,8 @@ def retrieve_pytorch_uri(
 
         return ECR_URI_TEMPLATE.format(registry=registry, hostname=hostname, repository=repo)
 
-    @override_pipeline_parameter_var
     @staticmethod
+    @override_pipeline_parameter_var
     def retrieve(
         framework: str,
         region: str,

sagemaker-core/src/sagemaker/core/training/configs.py

@@ -257,15 +257,16 @@ class InputData(BaseConfig):
     Parameters:
         channel_name (StrPipeVar):
             The name of the input data source channel.
-        data_source (Union[str, S3DataSource, FileSystemDataSource, DatasetSource]):
+        data_source (Union[StrPipeVar, S3DataSource, FileSystemDataSource, DatasetSource]):
             The data source for the channel. Can be an S3 URI string, local file path string,
-            S3DataSource object, or FileSystemDataSource object.
+            S3DataSource object, FileSystemDataSource object, DatasetSource object, or a
+            pipeline variable (Properties) from a previous step.
         content_type (StrPipeVar):
             The MIME type of the data.
     """
 
     channel_name: StrPipeVar = None
-    data_source: Union[str, FileSystemDataSource, S3DataSource, DatasetSource] = None
+    data_source: Union[StrPipeVar, FileSystemDataSource, S3DataSource, DatasetSource] = None
     content_type: StrPipeVar = None
 
 

sagemaker-core/tests/integ/jumpstart/test_search_integ.py

@@ -19,6 +19,7 @@
 from sagemaker.core.resources import HubContent
 
 
+@pytest.mark.serial
 @pytest.mark.integ
 def test_search_public_hub_models_default_args():
     # Only query, uses default hub name and session
@@ -30,6 +31,7 @@ def test_search_public_hub_models_default_args():
     assert len(results) > 0, "Expected at least one matching model from the public hub"
 
 
+@pytest.mark.serial
 @pytest.mark.integ
 def test_search_public_hub_models_custom_session():
     # Provide a custom SageMaker session
@@ -41,6 +43,7 @@ def test_search_public_hub_models_custom_session():
     assert all(isinstance(m, HubContent) for m in results)
 
 
+@pytest.mark.serial
 @pytest.mark.integ
 def test_search_public_hub_models_custom_hub_name():
     # Using the default public hub but provided explicitly
@@ -51,6 +54,7 @@ def test_search_public_hub_models_custom_hub_name():
     assert all(isinstance(m, HubContent) for m in results)
 
 
+@pytest.mark.serial
 @pytest.mark.integ
 def test_search_public_hub_models_all_args():
     # Provide both hub_name and session explicitly

sagemaker-core/tests/unit/local/test_image.py

@@ -613,6 +613,7 @@ def test_process_with_multiple_inputs(self, mock_session):
                                                     "test-job",
                                                 )
 
+    @pytest.mark.skip(reason="Requires sagemaker-serve module which is not installed in sagemaker-core tests")
     def test_train_with_multiple_channels(self, mock_session):
         """Test train method with multiple input channels"""
         with patch(
@@ -701,6 +702,7 @@ def test_train_with_multiple_channels(self, mock_session):
                                                                         == "/tmp/model.tar.gz"
                                                                     )
 
+    @pytest.mark.skip(reason="Requires sagemaker-serve module which is not installed in sagemaker-core tests")
     def test_serve_with_environment_variables(self, mock_session):
         """Test serve method with environment variables"""
         with patch(
@@ -859,6 +861,7 @@ def test_write_config_files(self, mock_session):
 
             assert mock_write.call_count == 3  # hyperparameters, resourceconfig, inputdataconfig
 
+    @pytest.mark.skip(reason="Requires sagemaker-serve module which is not installed in sagemaker-core tests")
     def test_prepare_training_volumes_with_local_code(self, mock_session):
         """Test _prepare_training_volumes with local code directory"""
         with patch(

sagemaker-core/tests/unit/remote_function/test_job.py

@@ -17,7 +17,7 @@
 import os
 import pytest
 import sys
-from unittest.mock import Mock, patch, MagicMock, call
+from unittest.mock import Mock, patch, MagicMock, call, mock_open
 from io import BytesIO
 
 from sagemaker.core.remote_function.job import (
@@ -629,8 +629,9 @@ class TestPrepareAndUploadRuntimeScripts:
     @patch("sagemaker.core.remote_function.job.S3Uploader")
     @patch("sagemaker.core.remote_function.job._tmpdir")
     @patch("sagemaker.core.remote_function.job.shutil")
+    @patch("builtins.open", new_callable=mock_open)
     def test_without_spark_or_distributed(
-        self, mock_shutil, mock_tmpdir, mock_uploader, mock_session
+        self, mock_file, mock_shutil, mock_tmpdir, mock_uploader, mock_session
     ):
         """Test without Spark or distributed training."""
         mock_tmpdir.return_value.__enter__ = Mock(return_value="/tmp/test")
@@ -646,7 +647,8 @@ def test_without_spark_or_distributed(
     @patch("sagemaker.core.remote_function.job.S3Uploader")
     @patch("sagemaker.core.remote_function.job._tmpdir")
     @patch("sagemaker.core.remote_function.job.shutil")
-    def test_with_spark(self, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
+    @patch("builtins.open", new_callable=mock_open)
+    def test_with_spark(self, mock_file, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
         """Test with Spark config."""
         mock_tmpdir.return_value.__enter__ = Mock(return_value="/tmp/test")
         mock_tmpdir.return_value.__exit__ = Mock(return_value=False)
@@ -662,7 +664,8 @@ def test_with_spark(self, mock_shutil, mock_tmpdir, mock_uploader, mock_session)
     @patch("sagemaker.core.remote_function.job.S3Uploader")
     @patch("sagemaker.core.remote_function.job._tmpdir")
     @patch("sagemaker.core.remote_function.job.shutil")
-    def test_with_torchrun(self, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
+    @patch("builtins.open", new_callable=mock_open)
+    def test_with_torchrun(self, mock_file, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
         """Test with torchrun."""
         mock_tmpdir.return_value.__enter__ = Mock(return_value="/tmp/test")
         mock_tmpdir.return_value.__exit__ = Mock(return_value=False)
@@ -677,7 +680,8 @@ def test_with_torchrun(self, mock_shutil, mock_tmpdir, mock_uploader, mock_sessi
     @patch("sagemaker.core.remote_function.job.S3Uploader")
     @patch("sagemaker.core.remote_function.job._tmpdir")
     @patch("sagemaker.core.remote_function.job.shutil")
-    def test_with_mpirun(self, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
+    @patch("builtins.open", new_callable=mock_open)
+    def test_with_mpirun(self, mock_file, mock_shutil, mock_tmpdir, mock_uploader, mock_session):
         """Test with mpirun."""
         mock_tmpdir.return_value.__enter__ = Mock(return_value="/tmp/test")
         mock_tmpdir.return_value.__exit__ = Mock(return_value=False)

sagemaker-core/tests/unit/telemetry/test_telemetry_logging.py

@@ -30,7 +30,18 @@
     PYTHON_VERSION,
 )
 from sagemaker.core.user_agent import SDK_VERSION, process_studio_metadata_file
-from sagemaker.serve.utils.exceptions import ModelBuilderException, LocalModelOutOfMemoryException
+
+# Try to import sagemaker-serve exceptions, skip tests if not available
+try:
+    from sagemaker.serve.utils.exceptions import ModelBuilderException, LocalModelOutOfMemoryException
+    SAGEMAKER_SERVE_AVAILABLE = True
+except ImportError:
+    SAGEMAKER_SERVE_AVAILABLE = False
+    # Create mock exceptions for type hints
+    class ModelBuilderException(Exception):
+        pass
+    class LocalModelOutOfMemoryException(Exception):
+        pass
 
 MOCK_SESSION = Mock()
 MOCK_EXCEPTION = LocalModelOutOfMemoryException("mock raise ex")
@@ -147,6 +158,10 @@ def test_telemetry_emitter_decorator_success(
             1, [1, 2], MOCK_SESSION, None, None, expected_extra_str
         )
 
+    @pytest.mark.skipif(
+        not SAGEMAKER_SERVE_AVAILABLE,
+        reason="Requires sagemaker-serve package"
+    )
     @patch("sagemaker.core.telemetry.telemetry_logging._send_telemetry_request")
     @patch("sagemaker.core.telemetry.telemetry_logging.resolve_value_from_config")
     def test_telemetry_emitter_decorator_handle_exception_success(

sagemaker-core/tests/unit/test_jumpstart_utils.py

@@ -1479,6 +1479,7 @@ def test_add_instance_rate_stats_none_metrics(self):
         result = utils.add_instance_rate_stats_to_benchmark_metrics("us-west-2", None)
         assert result is None
 
+    @pytest.mark.skip(reason="Requires AWS Pricing API permissions which are not available in CI environment")
     @patch("sagemaker.core.common_utils.get_instance_rate_per_hour")
     def test_add_instance_rate_stats_success(self, mock_get_rate):
         """Test successfully adding instance rate stats"""

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

@@ -44,6 +44,7 @@ def to_request(self):
 class TestWorkflowUtilities:
     """Test cases for workflow utility functions"""
 
+    @pytest.mark.skip(reason="Requires sagemaker-mlops module which is not installed in sagemaker-core tests")
     def test_list_to_request_with_entities(self):
         """Test list_to_request with Entity objects"""
         entities = [MockEntity(), MockEntity()]
@@ -53,6 +54,7 @@ def test_list_to_request_with_entities(self):
         assert len(result) == 2
         assert all(item["Type"] == "MockEntity" for item in result)
 
+    @pytest.mark.skip(reason="Requires sagemaker-mlops module which is not installed in sagemaker-core tests")
     def test_list_to_request_with_step_collection(self):
         """Test list_to_request with StepCollection"""
         from sagemaker.mlops.workflow.step_collections import StepCollection
@@ -64,6 +66,7 @@ def test_list_to_request_with_step_collection(self):
 
         assert len(result) == 2
 
+    @pytest.mark.skip(reason="Requires sagemaker-mlops module which is not installed in sagemaker-core tests")
     def test_list_to_request_mixed(self):
         """Test list_to_request with mixed entities and collections"""
         from sagemaker.mlops.workflow.step_collections import StepCollection

sagemaker-core/tox.ini

@@ -63,6 +63,7 @@ markers =
     release
     image_uris_unit_test
     timeout: mark a test as a timeout.
+    serial: marks tests that must run serially (not in parallel)
 
 [testenv]
 setenv =