Skip to content

Commit de8b0b8

Browse files
committed
Merge origin/master into fix/codestyle-doc-tests-ci
Resolve conflicts in sagemaker-train (model_trainer.py and five trainer unit-test files) between the black reformat on this branch and the train() error handling (aws#6256) and constructor-hyperparameter validation (aws#6306) that landed on master. Master's logic is kept in every hunk and black 26.3.1 is re-applied; the branch's own lint fixes (logger import, `is True` asserts) are preserved. Drop the unused OmegaConf import that aws#6306 added to test_model_trainer.py so flake8 stays clean. --- X-AI-Prompt: resolve PR aws#6294 merge conflicts against master X-AI-Tool: Kiro
2 parents 323ffb6 + 8bb160f commit de8b0b8

32 files changed

Lines changed: 2486 additions & 255 deletions

‎sagemaker-core/src/sagemaker/core/common_utils.py‎

Lines changed: 37 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2449,6 +2449,42 @@ def _check_job_status(job, desc, status_key_name):
24492449
)
24502450

24512451

2452+
# Error codes and message patterns the service returns when a create call collides
2453+
# with an existing resource. The service message wording has changed over time
2454+
# (e.g. CreatePipeline/CreateExperiment now return "... names must be unique within
2455+
# an AWS account ..." instead of "... already exists"), so match every known variant.
2456+
# The uniqueness pattern deliberately includes the "within an AWS account" scope so
2457+
# that other uniqueness validation errors (e.g. duplicate step names WITHIN a
2458+
# pipeline definition) are not mistaken for a resource-name collision.
2459+
_ALREADY_EXISTS_ERROR_CODES = ("ValidationException", "ResourceInUse")
2460+
_ALREADY_EXISTS_MSG_PATTERNS = (
2461+
"Cannot create already existing",
2462+
"already exists",
2463+
"must be unique within an AWS account",
2464+
)
2465+
2466+
2467+
def _is_resource_already_exists_error(error) -> bool:
2468+
"""Check whether a botocore ClientError means "this resource already exists".
2469+
2470+
Use this predicate for every load-or-create / upsert flow instead of matching
2471+
a single hardcoded message substring, so that service message wording changes
2472+
do not silently break the already-exists branch.
2473+
2474+
Args:
2475+
error (botocore.exceptions.ClientError): The error raised by a create call.
2476+
2477+
Returns:
2478+
bool: True if the error indicates a name collision with an existing resource.
2479+
"""
2480+
error_response = getattr(error, "response", None) or {}
2481+
error_code = error_response.get("Error", {}).get("Code", "")
2482+
error_message = error_response.get("Error", {}).get("Message", "")
2483+
return error_code in _ALREADY_EXISTS_ERROR_CODES and any(
2484+
pattern in error_message for pattern in _ALREADY_EXISTS_MSG_PATTERNS
2485+
)
2486+
2487+
24522488
def _create_resource(create_fn):
24532489
"""Call create function and accepts/pass when resource already exists.
24542490
@@ -2465,14 +2501,7 @@ def _create_resource(create_fn):
24652501
# create function succeeded, resource does not exist already
24662502
return True
24672503
except ClientError as ce:
2468-
error_code = ce.response["Error"]["Code"]
2469-
error_message = ce.response["Error"]["Message"]
2470-
already_exists_exceptions = ["ValidationException", "ResourceInUse"]
2471-
already_exists_msg_patterns = ["Cannot create already existing", "already exists"]
2472-
if not (
2473-
error_code in already_exists_exceptions
2474-
and any(p in error_message for p in already_exists_msg_patterns)
2475-
):
2504+
if not _is_resource_already_exists_error(ce):
24762505
raise ce
24772506
# no new resource created as resource already exists
24782507
return False

‎sagemaker-core/src/sagemaker/core/experiments/experiment.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from sagemaker.core.apiutils import _base_types
2222
from sagemaker.core.experiments.trial import _Trial
2323
from sagemaker.core.experiments.trial_component import _TrialComponent
24-
from sagemaker.core.common_utils import format_tags
24+
from sagemaker.core.common_utils import format_tags, _is_resource_already_exists_error
2525
from sagemaker.core.telemetry.telemetry_logging import _telemetry_emitter
2626
from sagemaker.core.telemetry.constants import Feature
2727

@@ -170,9 +170,7 @@ def _load_or_create(
170170
sagemaker_session=sagemaker_session,
171171
)
172172
except ClientError as ce:
173-
error_code = ce.response["Error"]["Code"]
174-
error_message = ce.response["Error"]["Message"]
175-
if not (error_code == "ValidationException" and "already exists" in error_message):
173+
if not _is_resource_already_exists_error(ce):
176174
raise ce
177175
# already exists
178176
experiment = Experiment.load(experiment_name, sagemaker_session)

‎sagemaker-core/src/sagemaker/core/experiments/trial.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
from sagemaker.core.apiutils import _base_types
2020
import sagemaker.core.experiments._api_types as _api_types
2121
from sagemaker.core.experiments.trial_component import _TrialComponent
22-
from sagemaker.core.common_utils import format_tags
22+
from sagemaker.core.common_utils import format_tags, _is_resource_already_exists_error
2323

2424

2525
class _Trial(_base_types.Record):
@@ -281,9 +281,7 @@ def _load_or_create(
281281
sagemaker_session=sagemaker_session,
282282
)
283283
except ClientError as ce:
284-
error_code = ce.response["Error"]["Code"]
285-
error_message = ce.response["Error"]["Message"]
286-
if not (error_code == "ValidationException" and "already exists" in error_message):
284+
if not _is_resource_already_exists_error(ce):
287285
raise ce
288286
# already exists
289287
trial = _Trial.load(trial_name, sagemaker_session)

‎sagemaker-core/src/sagemaker/core/experiments/trial_component.py‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@
2121
from sagemaker.core.apiutils import _base_types
2222
import sagemaker.core.experiments._api_types as _api_types
2323
from sagemaker.core.experiments._api_types import TrialComponentSearchResult
24-
from sagemaker.core.common_utils import format_tags
24+
from sagemaker.core.common_utils import format_tags, _is_resource_already_exists_error
2525

2626

2727
class _TrialComponent(_base_types.Record):
@@ -339,9 +339,7 @@ def _load_or_create(
339339
sagemaker_session=sagemaker_session,
340340
)
341341
except ClientError as ce:
342-
error_code = ce.response["Error"]["Code"]
343-
error_message = ce.response["Error"]["Message"]
344-
if not (error_code == "ValidationException" and "already exists" in error_message):
342+
if not _is_resource_already_exists_error(ce):
345343
raise ce
346344
# already exists
347345
run_tc = _TrialComponent.load(trial_component_name, sagemaker_session)

‎sagemaker-core/src/sagemaker/core/image_uri_config/djl-lmi.json‎

Lines changed: 51 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,59 @@
33
"inference"
44
],
55
"version_aliases": {
6-
"latest": "0.36.0"
6+
"latest": "0.38.0"
77
},
88
"versions": {
9+
"0.38.0": {
10+
"registries": {
11+
"af-south-1": "626614931356",
12+
"il-central-1": "780543022126",
13+
"ap-east-1": "871362719292",
14+
"ap-northeast-1": "763104351884",
15+
"ap-northeast-2": "763104351884",
16+
"ap-northeast-3": "364406365360",
17+
"ap-south-1": "763104351884",
18+
"ap-southeast-1": "763104351884",
19+
"ap-southeast-2": "763104351884",
20+
"ap-southeast-3": "907027046896",
21+
"ca-central-1": "763104351884",
22+
"cn-north-1": "727897471807",
23+
"cn-northwest-1": "727897471807",
24+
"eu-central-1": "763104351884",
25+
"eu-north-1": "763104351884",
26+
"eu-west-1": "763104351884",
27+
"eu-west-2": "763104351884",
28+
"eu-west-3": "763104351884",
29+
"eu-south-1": "692866216735",
30+
"me-south-1": "217643126080",
31+
"me-central-1": "914824155844",
32+
"sa-east-1": "763104351884",
33+
"us-east-1": "763104351884",
34+
"us-east-2": "763104351884",
35+
"us-gov-east-1": "446045086412",
36+
"us-gov-west-1": "442386744353",
37+
"us-west-1": "763104351884",
38+
"us-west-2": "763104351884",
39+
"ca-west-1": "204538143572",
40+
"eu-central-2": "380420809688",
41+
"ap-south-2": "772153158452",
42+
"eu-south-2": "503227376785",
43+
"ap-southeast-7": "590183813437",
44+
"ap-southeast-4": "457447274322",
45+
"ap-southeast-5": "550225433462",
46+
"mx-central-1": "637423239942",
47+
"ap-east-2": "975050140332",
48+
"ap-southeast-6": "633930458069",
49+
"eu-isoe-west-1": "371248457586",
50+
"eusc-de-east-1": "204133271717",
51+
"us-iso-east-1": "886529160074",
52+
"us-isob-east-1": "094389454867",
53+
"us-isof-east-1": "303241398832",
54+
"us-isof-south-1": "454834333376"
55+
},
56+
"repository": "djl-inference",
57+
"tag_prefix": "0.38.0-lmi29.0.0-cu130"
58+
},
959
"0.36.0": {
1060
"registries": {
1161
"af-south-1": "626614931356",

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
"il-central-1": "780543022126",
4747
"me-central-1": "914824155844",
4848
"me-south-1": "217643126080",
49+
"me-west-1": "124382933778",
4950
"mx-central-1": "637423239942",
5051
"sa-east-1": "763104351884",
5152
"us-east-1": "763104351884",
@@ -102,6 +103,7 @@
102103
"il-central-1": "780543022126",
103104
"me-central-1": "914824155844",
104105
"me-south-1": "217643126080",
106+
"me-west-1": "124382933778",
105107
"mx-central-1": "637423239942",
106108
"sa-east-1": "763104351884",
107109
"us-east-1": "763104351884",
@@ -158,6 +160,7 @@
158160
"il-central-1": "780543022126",
159161
"me-central-1": "914824155844",
160162
"me-south-1": "217643126080",
163+
"me-west-1": "124382933778",
161164
"mx-central-1": "637423239942",
162165
"sa-east-1": "763104351884",
163166
"us-east-1": "763104351884",
@@ -214,6 +217,7 @@
214217
"il-central-1": "780543022126",
215218
"me-central-1": "914824155844",
216219
"me-south-1": "217643126080",
220+
"me-west-1": "124382933778",
217221
"mx-central-1": "637423239942",
218222
"sa-east-1": "763104351884",
219223
"us-east-1": "763104351884",
@@ -270,6 +274,7 @@
270274
"il-central-1": "780543022126",
271275
"me-central-1": "914824155844",
272276
"me-south-1": "217643126080",
277+
"me-west-1": "124382933778",
273278
"mx-central-1": "637423239942",
274279
"sa-east-1": "763104351884",
275280
"us-east-1": "763104351884",
@@ -326,6 +331,7 @@
326331
"il-central-1": "780543022126",
327332
"me-central-1": "914824155844",
328333
"me-south-1": "217643126080",
334+
"me-west-1": "124382933778",
329335
"mx-central-1": "637423239942",
330336
"sa-east-1": "763104351884",
331337
"us-east-1": "763104351884",
@@ -382,6 +388,7 @@
382388
"il-central-1": "780543022126",
383389
"me-central-1": "914824155844",
384390
"me-south-1": "217643126080",
391+
"me-west-1": "124382933778",
385392
"mx-central-1": "637423239942",
386393
"sa-east-1": "763104351884",
387394
"us-east-1": "763104351884",
@@ -438,6 +445,7 @@
438445
"il-central-1": "780543022126",
439446
"me-central-1": "914824155844",
440447
"me-south-1": "217643126080",
448+
"me-west-1": "124382933778",
441449
"mx-central-1": "637423239942",
442450
"sa-east-1": "763104351884",
443451
"us-east-1": "763104351884",
@@ -494,6 +502,7 @@
494502
"il-central-1": "780543022126",
495503
"me-central-1": "914824155844",
496504
"me-south-1": "217643126080",
505+
"me-west-1": "124382933778",
497506
"mx-central-1": "637423239942",
498507
"sa-east-1": "763104351884",
499508
"us-east-1": "763104351884",
@@ -550,6 +559,7 @@
550559
"il-central-1": "780543022126",
551560
"me-central-1": "914824155844",
552561
"me-south-1": "217643126080",
562+
"me-west-1": "124382933778",
553563
"mx-central-1": "637423239942",
554564
"sa-east-1": "763104351884",
555565
"us-east-1": "763104351884",
@@ -606,6 +616,7 @@
606616
"il-central-1": "780543022126",
607617
"me-central-1": "914824155844",
608618
"me-south-1": "217643126080",
619+
"me-west-1": "124382933778",
609620
"mx-central-1": "637423239942",
610621
"sa-east-1": "763104351884",
611622
"us-east-1": "763104351884",
@@ -662,6 +673,7 @@
662673
"il-central-1": "780543022126",
663674
"me-central-1": "914824155844",
664675
"me-south-1": "217643126080",
676+
"me-west-1": "124382933778",
665677
"mx-central-1": "637423239942",
666678
"sa-east-1": "763104351884",
667679
"us-east-1": "763104351884",
@@ -718,6 +730,7 @@
718730
"il-central-1": "780543022126",
719731
"me-central-1": "914824155844",
720732
"me-south-1": "217643126080",
733+
"me-west-1": "124382933778",
721734
"mx-central-1": "637423239942",
722735
"sa-east-1": "763104351884",
723736
"us-east-1": "763104351884",
@@ -774,6 +787,7 @@
774787
"il-central-1": "780543022126",
775788
"me-central-1": "914824155844",
776789
"me-south-1": "217643126080",
790+
"me-west-1": "124382933778",
777791
"mx-central-1": "637423239942",
778792
"sa-east-1": "763104351884",
779793
"us-east-1": "763104351884",

0 commit comments

Comments
 (0)