Skip to content

Commit 95caeba

Browse files
authored
change: Add Data Wrangler TLV and version 3.x images (#4093)
1 parent c004f9c commit 95caeba

File tree

3 files changed

+57
-9
lines changed

3 files changed

+57
-9
lines changed

src/sagemaker/image_uri_config/data-wrangler.json

+29
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,35 @@
5656
"cn-northwest-1": "249157047649"
5757
},
5858
"repository": "sagemaker-data-wrangler-container"
59+
},
60+
"3.x": {
61+
"registries": {
62+
"af-south-1": "143210264188",
63+
"ap-east-1": "707077482487",
64+
"ap-northeast-1": "649008135260",
65+
"ap-northeast-2": "131546521161",
66+
"ap-northeast-3": "913387583493",
67+
"ap-south-1": "089933028263",
68+
"ap-southeast-1": "119527597002",
69+
"ap-southeast-2": "422173101802",
70+
"ca-central-1": "557239378090",
71+
"eu-central-1": "024640144536",
72+
"eu-north-1": "054986407534",
73+
"eu-south-1": "488287956546",
74+
"eu-west-1": "245179582081",
75+
"eu-west-2": "894491911112",
76+
"eu-west-3": "807237891255",
77+
"il-central-1": "406833011540",
78+
"me-south-1": "376037874950",
79+
"sa-east-1": "424196993095",
80+
"us-east-1": "663277389841",
81+
"us-east-2": "415577184552",
82+
"us-west-1": "926135532090",
83+
"us-west-2": "174368400705",
84+
"cn-north-1": "245909111842",
85+
"cn-northwest-1": "249157047649"
86+
},
87+
"repository": "sagemaker-data-wrangler-container"
5988
}
6089
}
6190
}

tests/unit/sagemaker/image_uris/test_data_wrangler.py

+27-8
Original file line numberDiff line numberDiff line change
@@ -40,20 +40,39 @@
4040
"cn-north-1": "245909111842",
4141
"cn-northwest-1": "249157047649",
4242
}
43-
VERSIONS = ["1.x", "2.x"]
43+
44+
# Accounts only supported in DW 3.x and beyond
45+
DATA_WRANGLER_3X_ACCOUNTS = {
46+
"il-central-1": "406833011540",
47+
}
48+
49+
VERSIONS = ["1.x", "2.x", "3.x"]
50+
51+
52+
def _test_ecr_uri(account, region, version):
53+
actual_uri = image_uris.retrieve("data-wrangler", region=region, version=version)
54+
expected_uri = expected_uris.algo_uri(
55+
"sagemaker-data-wrangler-container",
56+
account,
57+
region,
58+
version=version,
59+
)
60+
return expected_uri == actual_uri
4461

4562

4663
def test_data_wrangler_ecr_uri():
4764
for version in VERSIONS:
4865
for region in DATA_WRANGLER_ACCOUNTS.keys():
49-
actual_uri = image_uris.retrieve("data-wrangler", region=region, version="1.x")
50-
expected_uri = expected_uris.algo_uri(
51-
"sagemaker-data-wrangler-container",
52-
DATA_WRANGLER_ACCOUNTS[region],
53-
region,
54-
version="1.x",
66+
assert _test_ecr_uri(
67+
account=DATA_WRANGLER_ACCOUNTS[region], region=region, version=version
5568
)
56-
assert expected_uri == actual_uri
69+
70+
71+
def test_data_wrangler_ecr_uri_3x():
72+
for region in DATA_WRANGLER_3X_ACCOUNTS.keys():
73+
assert _test_ecr_uri(
74+
account=DATA_WRANGLER_3X_ACCOUNTS[region], region=region, version="3.x"
75+
)
5776

5877

5978
def test_data_wrangler_ecr_uri_none():

tests/unit/sagemaker/wrangler/test_processing.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
REGION = "us-west-2"
2424
DATA_WRANGLER_RECIPE_SOURCE = "s3://data_wrangler_flows/flow-26-18-43-16-0b48ac2e.flow"
2525
DATA_WRANGLER_CONTAINER_URI = (
26-
"174368400705.dkr.ecr.us-west-2.amazonaws.com/sagemaker-data-wrangler-container:2.x"
26+
"174368400705.dkr.ecr.us-west-2.amazonaws.com/sagemaker-data-wrangler-container:3.x"
2727
)
2828
MOCK_S3_URI = "s3://mock_data/mock.csv"
2929

0 commit comments

Comments
 (0)