Skip to content

change: Add Data Wrangler TLV and version 3.x images #4093

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 11, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 29 additions & 0 deletions src/sagemaker/image_uri_config/data-wrangler.json
Original file line number Diff line number Diff line change
Expand Up @@ -56,6 +56,35 @@
"cn-northwest-1": "249157047649"
},
"repository": "sagemaker-data-wrangler-container"
},
"3.x": {
"registries": {
"af-south-1": "143210264188",
"ap-east-1": "707077482487",
"ap-northeast-1": "649008135260",
"ap-northeast-2": "131546521161",
"ap-northeast-3": "913387583493",
"ap-south-1": "089933028263",
"ap-southeast-1": "119527597002",
"ap-southeast-2": "422173101802",
"ca-central-1": "557239378090",
"eu-central-1": "024640144536",
"eu-north-1": "054986407534",
"eu-south-1": "488287956546",
"eu-west-1": "245179582081",
"eu-west-2": "894491911112",
"eu-west-3": "807237891255",
"il-central-1": "406833011540",
"me-south-1": "376037874950",
"sa-east-1": "424196993095",
"us-east-1": "663277389841",
"us-east-2": "415577184552",
"us-west-1": "926135532090",
"us-west-2": "174368400705",
"cn-north-1": "245909111842",
"cn-northwest-1": "249157047649"
},
"repository": "sagemaker-data-wrangler-container"
}
}
}
Expand Down
35 changes: 27 additions & 8 deletions tests/unit/sagemaker/image_uris/test_data_wrangler.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,20 +40,39 @@
"cn-north-1": "245909111842",
"cn-northwest-1": "249157047649",
}
VERSIONS = ["1.x", "2.x"]

# Accounts only supported in DW 3.x and beyond
DATA_WRANGLER_3X_ACCOUNTS = {
"il-central-1": "406833011540",
}

VERSIONS = ["1.x", "2.x", "3.x"]


def _test_ecr_uri(account, region, version):
actual_uri = image_uris.retrieve("data-wrangler", region=region, version=version)
expected_uri = expected_uris.algo_uri(
"sagemaker-data-wrangler-container",
account,
region,
version=version,
)
return expected_uri == actual_uri


def test_data_wrangler_ecr_uri():
for version in VERSIONS:
for region in DATA_WRANGLER_ACCOUNTS.keys():
actual_uri = image_uris.retrieve("data-wrangler", region=region, version="1.x")
expected_uri = expected_uris.algo_uri(
"sagemaker-data-wrangler-container",
DATA_WRANGLER_ACCOUNTS[region],
region,
version="1.x",
assert _test_ecr_uri(
account=DATA_WRANGLER_ACCOUNTS[region], region=region, version=version
)
assert expected_uri == actual_uri


def test_data_wrangler_ecr_uri_3x():
for region in DATA_WRANGLER_3X_ACCOUNTS.keys():
assert _test_ecr_uri(
account=DATA_WRANGLER_3X_ACCOUNTS[region], region=region, version="3.x"
)


def test_data_wrangler_ecr_uri_none():
Expand Down
2 changes: 1 addition & 1 deletion tests/unit/sagemaker/wrangler/test_processing.py
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@
REGION = "us-west-2"
DATA_WRANGLER_RECIPE_SOURCE = "s3://data_wrangler_flows/flow-26-18-43-16-0b48ac2e.flow"
DATA_WRANGLER_CONTAINER_URI = (
"174368400705.dkr.ecr.us-west-2.amazonaws.com/sagemaker-data-wrangler-container:2.x"
"174368400705.dkr.ecr.us-west-2.amazonaws.com/sagemaker-data-wrangler-container:3.x"
)
MOCK_S3_URI = "s3://mock_data/mock.csv"

Expand Down