fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix"); } } catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms"); } } catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links"); } } catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); } })(); (function(){ try { var __m = "youtube.com"; var __re = new RegExp('^' + "youtube\\.com" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default"); } } catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers"); } } catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); } })(); (function(){ try { var __m = "*"; var __re = new RegExp('^' + ".*" + '
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode"); } } catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); } })(); })();
Skip to content

fix: Support for docker compose > v2 (5739) - #5740

Merged
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739
Apr 10, 2026
Merged

fix: Support for docker compose > v2 (5739)#5740
aviruthen merged 4 commits into
aws:masterfrom
aviruthen:fix/support-for-docker-compose-v2-5739

Conversation

@aviruthen

Copy link
Copy Markdown
Collaborator

Description

The bug is in the _get_compose_cmd_prefix method which checks Docker Compose version using the substring check "v2" in output. This only matches Docker Compose v2.x but rejects v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed. The fix is to replace the narrow "v2" in output check with a regex-based version extraction that accepts any version >= 2. The bug exists in three identical copies of the method across three files: (1) sagemaker-train/src/sagemaker/train/local/local_container.py (V3 sagemaker-train _LocalContainer instance method), (2) sagemaker-core/src/sagemaker/core/local/image.py (V3 sagemaker-core _SageMakerContainer static method), and (3) sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py (V3 sagemaker-core modules _LocalContainer instance method). All three need the same fix. The re module is already imported in all three files.

Related Issue

Related issue: 5739

Changes Made

  • sagemaker-train/src/sagemaker/train/local/local_container.py
  • sagemaker-core/src/sagemaker/core/local/image.py
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py
  • sagemaker-train/tests/unit/train/local/test_local_container.py
  • sagemaker-core/tests/unit/local/test_image.py
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py

AI-Generated PR

This PR was automatically generated by the PySDK Issue Agent.

  • Confidence score: 85%
  • Classification: bug
  • SDK version target: V3

Merge Checklist

  • Changes are backward compatible
  • Commit message follows prefix: description format
  • Unit tests added/updated
  • Integration tests added (if applicable)
  • Documentation updated (if applicable)

@sagemaker-botsagemaker-bot left a comment

Copy link
Copy Markdown
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🤖 AI Code Review

This PR fixes a real bug where Docker Compose v3+ was rejected due to a narrow "v2" in output check. The fix uses regex-based version extraction (>= 2) applied consistently across all three affected files. The unit tests are comprehensive, but there are a few issues with the integration test and some minor code quality concerns.

Comment threadsagemaker-train/tests/unit/train/local/test_local_container.py Outdated
Comment threadsagemaker-core/src/sagemaker/core/local/image.py
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #1 — Review Comments Addressed

Description

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files

  • sagemaker-core/src/sagemaker/core/local/image.py: Replaced if output and "v2" in output.strip() with regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Added unit tests for v3, v5, and v1-rejection scenarios
  • sagemaker-train/tests/unit/train/local/test_local_container.py: Added unit tests for v2, v3, v5, v1-fallback, and not-installed scenarios
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation; replaced hardcoded /tmp/test with tempfile.mkdtemp() per review feedback

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Integration tests verify the fix works against the real Docker Compose installation on the machine.

Comments reviewed: 2
Files modified:sagemaker-core/src/sagemaker/core/local/image.py, sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py, sagemaker-core/tests/unit/modules/local_core/test_local_container.py, sagemaker-train/src/sagemaker/train/local/local_container.py, sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py, sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-core/src/sagemaker/core/local/image.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.
  • sagemaker-train/src/sagemaker/train/local/local_container.py: The file already has the fix applied from the previous iteration. No changes needed.
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Replace hardcoded /tmp/test with tempfile.mkdtemp() per reviewer feedback.
  • sagemaker-train/tests/unit/train/local/test_local_container.py: The file already has the test cases from the previous iteration. No changes needed.

@aviruthen
aviruthen marked this pull request as ready for review April 9, 2026 17:22
@aviruthen

Copy link
Copy Markdown
CollaboratorAuthor

🤖 Iteration #3 — Review Comments Addressed

Fix Docker Compose version detection to support v2+ (including v3, v4, v5, etc.)

Description

The _get_compose_cmd_prefix method previously used a narrow substring check "v2" in output to validate the Docker Compose version. This only matched Docker Compose v2.x but silently rejected v3, v4, v5, or any future major version, causing an ImportError even when Docker Compose is fully installed and functional.

The fix replaces the narrow "v2" in output check with a regex-based version extraction (re.search(r"v(\d+)", output)) that accepts any Docker Compose version with a major number >= 2.

The bug existed in three identical copies of the method across three files:

  1. sagemaker-core/src/sagemaker/core/local/image.py_SageMakerContainer._get_compose_cmd_prefix() (static method)
  2. sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)
  3. sagemaker-train/src/sagemaker/train/local/local_container.py_LocalContainer._get_compose_cmd_prefix() (instance method)

All three have been fixed with the same approach. The re module was already imported in all three files.

Changes Made

Source files (already fixed in previous iteration)

  • sagemaker-core/src/sagemaker/core/local/image.py: Uses regex-based version check accepting major version >= 2
  • sagemaker-core/src/sagemaker/core/modules/local_core/local_container.py: Same fix
  • sagemaker-train/src/sagemaker/train/local/local_container.py: Same fix

Test files

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fixed Pydantic validation error by passing sagemaker_session=None instead of a Mock object. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient and avoids the Input should be an instance of Session validation error.
  • sagemaker-core/tests/unit/modules/local_core/test_local_container.py: Unit tests for v2, v3, v5 acceptance and v1 rejection
  • sagemaker-train/tests/integ/train/test_docker_compose_version_detection.py: Integration tests using real Docker Compose installation

Testing

Unit tests verify:

  • Docker Compose v2.x → accepted (["docker", "compose"])
  • Docker Compose v3.x → accepted (["docker", "compose"])
  • Docker Compose v5.x → accepted (["docker", "compose"])
  • Docker Compose v1.x → rejected, falls through to standalone docker-compose
  • No Docker Compose installed → raises ImportError

Comments reviewed: 1
Files modified:sagemaker-train/tests/unit/train/local/test_local_container.py

  • sagemaker-train/tests/unit/train/local/test_local_container.py: Fix _mock_session usage: pass sagemaker_session=None instead of a Mock object to avoid Pydantic validation errors. The _get_compose_cmd_prefix method doesn't use the session, so None is sufficient.

@mollyheamazon

Copy link
Copy Markdown
Contributor

Closes #5739

@aviruthen
aviruthen merged commit 404c2b3 into aws:masterApr 10, 2026
18 of 23 checks passed
Evan-W-ang added a commit to Evan-W-ang/sagemaker-python-sdk that referenced this pull request Jun 8, 2026
* fix: Support for docker compose > v2 (5739)
* Adding integ tests to verify docker compose version
* fix: address review comments (iteration aws#1)
* fix: address review comments (iteration aws#3)
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants

@aviruthen@mollyheamazon@sagemaker-bot@zhaoqizqwang@mohamedzeidan2021