Skip to content

Commit 127d835

Browse files
haozhx23haozhx23
authored
Merge branch 'aws:master' into asyncWaiterTimeoutHandle
2 parents e7b9bee + daa5518 commit 127d835

File tree

11 files changed

+90
-19
lines changed

11 files changed

+90
-19
lines changed

‎src/sagemaker/image_uri_config/huggingface-llm-neuronx.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"ap-southeast-1": "763104351884",
1919
"ap-southeast-2": "763104351884",
2020
"ap-southeast-4": "457447274322",
21+
"ap-southeast-5": "550225433462",
2122
"cn-north-1": "727897471807",
2223
"cn-northwest-1": "727897471807",
2324
"eu-central-1": "763104351884",
@@ -51,6 +52,7 @@
5152
"ap-southeast-1": "763104351884",
5253
"ap-southeast-2": "763104351884",
5354
"ap-southeast-4": "457447274322",
55+
"ap-southeast-5": "550225433462",
5456
"cn-north-1": "727897471807",
5557
"cn-northwest-1": "727897471807",
5658
"eu-central-1": "763104351884",
@@ -84,6 +86,7 @@
8486
"ap-southeast-1": "763104351884",
8587
"ap-southeast-2": "763104351884",
8688
"ap-southeast-4": "457447274322",
89+
"ap-southeast-5": "550225433462",
8790
"cn-north-1": "727897471807",
8891
"cn-northwest-1": "727897471807",
8992
"eu-central-1": "763104351884",
@@ -117,6 +120,7 @@
117120
"ap-southeast-1": "763104351884",
118121
"ap-southeast-2": "763104351884",
119122
"ap-southeast-4": "457447274322",
123+
"ap-southeast-5": "550225433462",
120124
"cn-north-1": "727897471807",
121125
"cn-northwest-1": "727897471807",
122126
"eu-central-1": "763104351884",
@@ -150,6 +154,7 @@
150154
"ap-southeast-1": "763104351884",
151155
"ap-southeast-2": "763104351884",
152156
"ap-southeast-4": "457447274322",
157+
"ap-southeast-5": "550225433462",
153158
"cn-north-1": "727897471807",
154159
"cn-northwest-1": "727897471807",
155160
"eu-central-1": "763104351884",
@@ -183,6 +188,7 @@
183188
"ap-southeast-1": "763104351884",
184189
"ap-southeast-2": "763104351884",
185190
"ap-southeast-4": "457447274322",
191+
"ap-southeast-5": "550225433462",
186192
"cn-north-1": "727897471807",
187193
"cn-northwest-1": "727897471807",
188194
"eu-central-1": "763104351884",
@@ -216,6 +222,7 @@
216222
"ap-southeast-1": "763104351884",
217223
"ap-southeast-2": "763104351884",
218224
"ap-southeast-4": "457447274322",
225+
"ap-southeast-5": "550225433462",
219226
"cn-north-1": "727897471807",
220227
"cn-northwest-1": "727897471807",
221228
"eu-central-1": "763104351884",
@@ -247,6 +254,7 @@
247254
"ap-southeast-1": "763104351884",
248255
"ap-southeast-2": "763104351884",
249256
"ap-southeast-4": "457447274322",
257+
"ap-southeast-5": "550225433462",
250258
"cn-north-1": "727897471807",
251259
"cn-northwest-1": "727897471807",
252260
"eu-central-1": "763104351884",
@@ -280,6 +288,7 @@
280288
"ap-southeast-1": "763104351884",
281289
"ap-southeast-2": "763104351884",
282290
"ap-southeast-4": "457447274322",
291+
"ap-southeast-5": "550225433462",
283292
"cn-north-1": "727897471807",
284293
"cn-northwest-1": "727897471807",
285294
"eu-central-1": "763104351884",
@@ -313,6 +322,7 @@
313322
"ap-southeast-1": "763104351884",
314323
"ap-southeast-2": "763104351884",
315324
"ap-southeast-4": "457447274322",
325+
"ap-southeast-5": "550225433462",
316326
"cn-north-1": "727897471807",
317327
"cn-northwest-1": "727897471807",
318328
"eu-central-1": "763104351884",

‎src/sagemaker/image_uri_config/huggingface-neuron.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323
"ap-southeast-1": "763104351884",
2424
"ap-southeast-2": "763104351884",
2525
"ap-southeast-4": "457447274322",
26+
"ap-southeast-5": "550225433462",
2627
"eu-central-1": "763104351884",
2728
"eu-central-2": "380420809688",
2829
"eu-south-2": "503227376785",

‎src/sagemaker/image_uri_config/huggingface-neuronx.json

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,7 @@
2525
"ap-southeast-1": "763104351884",
2626
"ap-southeast-2": "763104351884",
2727
"ap-southeast-4": "457447274322",
28+
"ap-southeast-5": "550225433462",
2829
"cn-north-1": "727897471807",
2930
"cn-northwest-1": "727897471807",
3031
"eu-central-1": "763104351884",
@@ -65,6 +66,7 @@
6566
"ap-southeast-1": "763104351884",
6667
"ap-southeast-2": "763104351884",
6768
"ap-southeast-4": "457447274322",
69+
"ap-southeast-5": "550225433462",
6870
"cn-north-1": "727897471807",
6971
"cn-northwest-1": "727897471807",
7072
"eu-central-1": "763104351884",
@@ -105,6 +107,7 @@
105107
"ap-southeast-1": "763104351884",
106108
"ap-southeast-2": "763104351884",
107109
"ap-southeast-4": "457447274322",
110+
"ap-southeast-5": "550225433462",
108111
"cn-north-1": "727897471807",
109112
"cn-northwest-1": "727897471807",
110113
"eu-central-1": "763104351884",
@@ -162,6 +165,7 @@
162165
"ap-southeast-1": "763104351884",
163166
"ap-southeast-2": "763104351884",
164167
"ap-southeast-4": "457447274322",
168+
"ap-southeast-5": "550225433462",
165169
"ca-central-1": "763104351884",
166170
"cn-north-1": "727897471807",
167171
"cn-northwest-1": "727897471807",
@@ -214,6 +218,7 @@
214218
"ap-southeast-1": "763104351884",
215219
"ap-southeast-2": "763104351884",
216220
"ap-southeast-4": "457447274322",
221+
"ap-southeast-5": "550225433462",
217222
"ca-central-1": "763104351884",
218223
"cn-north-1": "727897471807",
219224
"cn-northwest-1": "727897471807",
@@ -267,6 +272,7 @@
267272
"ap-southeast-1": "763104351884",
268273
"ap-southeast-2": "763104351884",
269274
"ap-southeast-4": "457447274322",
275+
"ap-southeast-5": "550225433462",
270276
"ca-central-1": "763104351884",
271277
"cn-north-1": "727897471807",
272278
"cn-northwest-1": "727897471807",
@@ -314,6 +320,7 @@
314320
"ap-southeast-1": "763104351884",
315321
"ap-southeast-2": "763104351884",
316322
"ap-southeast-4": "457447274322",
323+
"ap-southeast-5": "550225433462",
317324
"ca-central-1": "763104351884",
318325
"cn-north-1": "727897471807",
319326
"cn-northwest-1": "727897471807",

‎src/sagemaker/image_uri_config/huggingface-training-compiler.json

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,7 @@
6969
"ap-southeast-2": "763104351884",
7070
"ap-southeast-3": "907027046896",
7171
"ap-southeast-4": "457447274322",
72+
"ap-southeast-5": "550225433462",
7273
"ca-central-1": "763104351884",
7374
"eu-central-1": "763104351884",
7475
"eu-central-2": "380420809688",
@@ -109,6 +110,7 @@
109110
"ap-southeast-2": "763104351884",
110111
"ap-southeast-3": "907027046896",
111112
"ap-southeast-4": "457447274322",
113+
"ap-southeast-5": "550225433462",
112114
"ca-central-1": "763104351884",
113115
"eu-central-1": "763104351884",
114116
"eu-central-2": "380420809688",
@@ -154,6 +156,7 @@
154156
"ap-southeast-2": "763104351884",
155157
"ap-southeast-3": "907027046896",
156158
"ap-southeast-4": "457447274322",
159+
"ap-southeast-5": "550225433462",
157160
"ca-central-1": "763104351884",
158161
"eu-central-1": "763104351884",
159162
"eu-central-2": "380420809688",

‎src/sagemaker/jumpstart/hub/utils.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ def construct_hub_model_reference_arn_from_inputs(
106106
info = get_info_from_hub_resource_arn(hub_arn)
107107
arn = (
108108
f"arn:{info.partition}:sagemaker:{info.region}:{info.account_id}:hub-content/"
109-
f"{info.hub_name}/{HubContentType.MODEL_REFERENCE}/{model_name}/{version}"
109+
f"{info.hub_name}/{HubContentType.MODEL_REFERENCE.value}/{model_name}/{version}"
110110
)
111111

112112
return arn

‎src/sagemaker/serve/model_server/multi_model_server/inference.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -46,18 +46,28 @@ def input_fn(input_data, content_type, context=None):
4646
if hasattr(schema_builder, "custom_input_translator"):
4747
deserialized_data = schema_builder.custom_input_translator.deserialize(
4848
(
49-
io.BytesIO(input_data)
50-
if type(input_data) == bytes
51-
else io.BytesIO(input_data.encode("utf-8"))
49+
io.BytesIO(input_data.encode("utf-8"))
50+
if not any(
51+
[
52+
isinstance(input_data, bytes),
53+
isinstance(input_data, bytearray),
54+
]
55+
)
56+
else io.BytesIO(input_data)
5257
),
5358
content_type,
5459
)
5560
else:
5661
deserialized_data = schema_builder.input_deserializer.deserialize(
5762
(
58-
io.BytesIO(input_data)
59-
if type(input_data) == bytes
60-
else io.BytesIO(input_data.encode("utf-8"))
63+
io.BytesIO(input_data.encode("utf-8"))
64+
if not any(
65+
[
66+
isinstance(input_data, bytes),
67+
isinstance(input_data, bytearray),
68+
]
69+
)
70+
else io.BytesIO(input_data)
6171
),
6272
content_type[0],
6373
)

‎src/sagemaker/serve/model_server/torchserve/inference.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -68,18 +68,28 @@ def input_fn(input_data, content_type):
6868
if hasattr(schema_builder, "custom_input_translator"):
6969
deserialized_data = schema_builder.custom_input_translator.deserialize(
7070
(
71-
io.BytesIO(input_data)
72-
if type(input_data) == bytes
73-
else io.BytesIO(input_data.encode("utf-8"))
71+
io.BytesIO(input_data.encode("utf-8"))
72+
if not any(
73+
[
74+
isinstance(input_data, bytes),
75+
isinstance(input_data, bytearray),
76+
]
77+
)
78+
else io.BytesIO(input_data)
7479
),
7580
content_type,
7681
)
7782
else:
7883
deserialized_data = schema_builder.input_deserializer.deserialize(
7984
(
80-
io.BytesIO(input_data)
81-
if type(input_data) == bytes
82-
else io.BytesIO(input_data.encode("utf-8"))
85+
io.BytesIO(input_data.encode("utf-8"))
86+
if not any(
87+
[
88+
isinstance(input_data, bytes),
89+
isinstance(input_data, bytearray),
90+
]
91+
)
92+
else io.BytesIO(input_data)
8393
),
8494
content_type[0],
8595
)

‎src/sagemaker/serve/model_server/torchserve/xgboost_inference.py

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,18 +71,28 @@ def input_fn(input_data, content_type):
7171
if hasattr(schema_builder, "custom_input_translator"):
7272
return schema_builder.custom_input_translator.deserialize(
7373
(
74-
io.BytesIO(input_data)
75-
if type(input_data) == bytes
76-
else io.BytesIO(input_data.encode("utf-8"))
74+
io.BytesIO(input_data.encode("utf-8"))
75+
if not any(
76+
[
77+
isinstance(input_data, bytes),
78+
isinstance(input_data, bytearray),
79+
]
80+
)
81+
else io.BytesIO(input_data)
7782
),
7883
content_type,
7984
)
8085
else:
8186
return schema_builder.input_deserializer.deserialize(
8287
(
83-
io.BytesIO(input_data)
84-
if type(input_data) == bytes
85-
else io.BytesIO(input_data.encode("utf-8"))
88+
io.BytesIO(input_data.encode("utf-8"))
89+
if not any(
90+
[
91+
isinstance(input_data, bytes),
92+
isinstance(input_data, bytearray),
93+
]
94+
)
95+
else io.BytesIO(input_data)
8696
),
8797
content_type[0],
8898
)

‎tests/integ/sagemaker/jumpstart/model/test_jumpstart_model.py

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -477,6 +477,7 @@ def _teardown_test_hub_with_reference(public_hub_model_id: str):
477477
raise e
478478

479479

480+
@pytest.mark.skip
480481
# Currently JumpStartModel does not pull from HubService for the Public Hub.
481482
def test_model_reference_marketplace_model(setup):
482483
session = get_sm_session()
@@ -535,6 +536,7 @@ def test_model_reference_marketplace_model(setup):
535536
# _teardown_test_hub_with_reference(public_hub_marketplace_model_id)
536537

537538

539+
@pytest.mark.skip
538540
def test_bedrock_store_model_tags_from_hub_service(setup):
539541

540542
session = get_sm_session()

‎tests/integ/sagemaker/jumpstart/private_hub/test_hub.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ def hub_instance():
3232
yield hub
3333

3434

35+
@pytest.mark.skip
3536
def test_private_hub(setup, hub_instance):
3637
# Createhub
3738
create_hub_response = hub_instance.create(

0 commit comments

Comments
 (0)