Merge branch 'master' into v3-docs-update

Author: mollyheamazon

requirements/extras/test_requirements.txt

@@ -12,4 +12,6 @@ omegaconf
 graphene
 typing_extensions>=4.9.0
 tensorflow>=2.16.2,<=2.19.0
-build
+build
+docker>=5.0.2,<8.0
+filelock>=3.0.0

sagemaker-core/pyproject.toml

@@ -38,6 +38,7 @@ dependencies = [
     "cloudpickle>=2.0.0",
     "paramiko>=2.11.0",
     "tblib>=1.7.0",
+    "cryptography>=46.0.0",
 ]
 requires-python = ">=3.9"
 classifiers = [

sagemaker-core/src/sagemaker/core/local/image.py

@@ -138,7 +138,7 @@ def __init__(
     def _get_compose_cmd_prefix():
         """Gets the Docker Compose command.
 
-        The method initially looks for 'docker compose' v2
+        The method initially looks for 'docker compose' v2+
         executable, if not found looks for 'docker-compose' executable.
 
         Returns:
@@ -162,10 +162,12 @@ def _get_compose_cmd_prefix():
                 "Proceeding to check for 'docker-compose' CLI."
             )
 
-        if output and "v2" in output.strip():
-            logger.info("'Docker Compose' found using Docker CLI.")
-            compose_cmd_prefix.extend(["docker", "compose"])
-            return compose_cmd_prefix
+        if output:
+            match = re.search(r"v(\d+)", output.strip())
+            if match and int(match.group(1)) >= 2:
+                logger.info("'Docker Compose' found using Docker CLI.")
+                compose_cmd_prefix.extend(["docker", "compose"])
+                return compose_cmd_prefix
 
         if shutil.which("docker-compose") is not None:
             logger.info("'Docker Compose' found using Docker Compose CLI.")

sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py

@@ -593,7 +593,7 @@ def _get_data_source_local_path(self, data_source: DataSource):
     def _get_compose_cmd_prefix(self) -> List[str]:
         """Gets the Docker Compose command.
 
-        The method initially looks for 'docker compose' v2
+        The method initially looks for 'docker compose' v2+
         executable, if not found looks for 'docker-compose' executable.
 
         Returns:
@@ -617,10 +617,12 @@ def _get_compose_cmd_prefix(self) -> List[str]:
                 "Proceeding to check for 'docker-compose' CLI."
             )
 
-        if output and "v2" in output.strip():
-            logger.info("'Docker Compose' found using Docker CLI.")
-            compose_cmd_prefix.extend(["docker", "compose"])
-            return compose_cmd_prefix
+        if output:
+            match = re.search(r"v(\d+)", output.strip())
+            if match and int(match.group(1)) >= 2:
+                logger.info("'Docker Compose' found using Docker CLI.")
+                compose_cmd_prefix.extend(["docker", "compose"])
+                return compose_cmd_prefix
 
         if shutil.which("docker-compose") is not None:
             logger.info("'Docker Compose' found using Docker Compose CLI.")

sagemaker-core/src/sagemaker/core/remote_function/client.py

@@ -369,7 +369,6 @@ def wrapper(*args, **kwargs):
                             s3_uri=s3_path_join(
                                 job_settings.s3_root_uri, job.job_name, EXCEPTION_FOLDER
                             ),
-                            
                         )
                     except ServiceError as serr:
                         chained_e = serr.__cause__
@@ -406,7 +405,6 @@ def wrapper(*args, **kwargs):
                 return serialization.deserialize_obj_from_s3(
                     sagemaker_session=job_settings.sagemaker_session,
                     s3_uri=s3_path_join(job_settings.s3_root_uri, job.job_name, RESULTS_FOLDER),
-                    
                 )
 
             if job.describe()["TrainingJobStatus"] == "Stopped":
@@ -1008,7 +1006,6 @@ def from_describe_response(describe_training_job_response, sagemaker_session):
                 job_return = serialization.deserialize_obj_from_s3(
                     sagemaker_session=sagemaker_session,
                     s3_uri=s3_path_join(job.s3_uri, RESULTS_FOLDER),
-                    
                 )
             except DeserializationError as e:
                 client_exception = e
@@ -1020,7 +1017,6 @@ def from_describe_response(describe_training_job_response, sagemaker_session):
                 job_exception = serialization.deserialize_exception_from_s3(
                     sagemaker_session=sagemaker_session,
                     s3_uri=s3_path_join(job.s3_uri, EXCEPTION_FOLDER),
-                    
                 )
             except ServiceError as serr:
                 chained_e = serr.__cause__
@@ -1110,7 +1106,6 @@ def result(self, timeout: float = None) -> Any:
                     self._return = serialization.deserialize_obj_from_s3(
                         sagemaker_session=self._job.sagemaker_session,
                         s3_uri=s3_path_join(self._job.s3_uri, RESULTS_FOLDER),
-                        
                     )
                     self._state = _FINISHED
                     return self._return
@@ -1119,7 +1114,6 @@ def result(self, timeout: float = None) -> Any:
                         self._exception = serialization.deserialize_exception_from_s3(
                             sagemaker_session=self._job.sagemaker_session,
                             s3_uri=s3_path_join(self._job.s3_uri, EXCEPTION_FOLDER),
-                            
                         )
                     except ServiceError as serr:
                         chained_e = serr.__cause__