Skip to content

Commit be72fcf

Browse files
ofekofek
authored
Merge branch 'master' into modernize-metadata
2 parents d73a2f7 + decd6eb commit be72fcf

File tree

17 files changed

+236
-40
lines changed

17 files changed

+236
-40
lines changed

‎.github/workflows/codeql.yml

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
name: "CodeQL"
2+
on:
3+
push:
4+
branches: [ "master" ]
5+
pull_request:
6+
branches: [ "master" ]
7+
schedule:
8+
- cron: '30 8 * * *'
9+
jobs:
10+
analyze:
11+
name: Analyze (${{ matrix.language }})
12+
runs-on: ${{ 'ubuntu-latest' }}
13+
permissions:
14+
security-events: write
15+
packages: read
16+
17+
strategy:
18+
matrix:
19+
include:
20+
- language: python
21+
build-mode: none
22+
- language: java-kotlin
23+
build-mode: none
24+
steps:
25+
- name: Checkout repository
26+
uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
27+
- name: Initialize CodeQL
28+
uses: github/codeql-action/init@4b1d7da102ff94aca014c0245062b1a463356d72
29+
with:
30+
languages: ${{ matrix.language }}
31+
build-mode: ${{ matrix.build-mode }}
32+
- name: Perform CodeQL Analysis
33+
uses: github/codeql-action/analyze@4b1d7da102ff94aca014c0245062b1a463356d72
34+
with:
35+
category: "/language:${{matrix.language}}"

‎src/sagemaker/estimator.py

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@
6868
from sagemaker.interactive_apps import SupportedInteractiveAppTypes
6969
from sagemaker.interactive_apps.tensorboard import TensorBoardApp
7070
from sagemaker.instance_group import InstanceGroup
71+
from sagemaker.model_card.model_card import ModelCard, TrainingDetails
7172
from sagemaker.utils import instance_supports_kms
7273
from sagemaker.job import _Job
7374
from sagemaker.jumpstart.utils import (
@@ -1797,8 +1798,17 @@ def register(
17971798
else:
17981799
if "model_kms_key" not in kwargs:
17991800
kwargs["model_kms_key"] = self.output_kms_key
1800-
model = self.create_model(image_uri=image_uri, **kwargs)
1801+
model = self.create_model(image_uri=image_uri, name=model_name, **kwargs)
18011802
model.name = model_name
1803+
if self.model_data is not None and model_card is None:
1804+
training_details = TrainingDetails.from_model_s3_artifacts(
1805+
model_artifacts=[self.model_data], sagemaker_session=self.sagemaker_session
1806+
)
1807+
model_card = ModelCard(
1808+
name="estimator_card",
1809+
training_details=training_details,
1810+
sagemaker_session=self.sagemaker_session,
1811+
)
18021812
return model.register(
18031813
content_types,
18041814
response_types,

‎src/sagemaker/fw_utils.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,6 @@
152152
"2.1.0",
153153
"2.1.2",
154154
"2.2.0",
155-
"2.3.0",
156155
"2.3.1",
157156
]
158157

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

Lines changed: 48 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
"1.2": "1.2.0",
1313
"1.3": "1.3.3",
1414
"1.4": "1.4.5",
15-
"2.0": "2.0.2"
15+
"2.0": "2.2.0"
1616
},
1717
"versions": {
1818
"0.6.0": {
@@ -672,6 +672,53 @@
672672
"container_version": {
673673
"gpu": "cu121-ubuntu22.04"
674674
}
675+
},
676+
"2.2.0": {
677+
"py_versions": [
678+
"py310"
679+
],
680+
"registries": {
681+
"af-south-1": "626614931356",
682+
"il-central-1": "780543022126",
683+
"ap-east-1": "871362719292",
684+
"ap-northeast-1": "763104351884",
685+
"ap-northeast-2": "763104351884",
686+
"ap-northeast-3": "364406365360",
687+
"ap-south-1": "763104351884",
688+
"ap-south-2": "772153158452",
689+
"ap-southeast-1": "763104351884",
690+
"ap-southeast-2": "763104351884",
691+
"ap-southeast-3": "907027046896",
692+
"ap-southeast-4": "457447274322",
693+
"ca-central-1": "763104351884",
694+
"cn-north-1": "727897471807",
695+
"cn-northwest-1": "727897471807",
696+
"eu-central-1": "763104351884",
697+
"eu-central-2": "380420809688",
698+
"eu-north-1": "763104351884",
699+
"eu-west-1": "763104351884",
700+
"eu-west-2": "763104351884",
701+
"eu-west-3": "763104351884",
702+
"eu-south-1": "692866216735",
703+
"eu-south-2": "503227376785",
704+
"me-south-1": "217643126080",
705+
"me-central-1": "914824155844",
706+
"sa-east-1": "763104351884",
707+
"us-east-1": "763104351884",
708+
"us-east-2": "763104351884",
709+
"us-gov-east-1": "446045086412",
710+
"us-gov-west-1": "442386744353",
711+
"us-iso-east-1": "886529160074",
712+
"us-isob-east-1": "094389454867",
713+
"us-west-1": "763104351884",
714+
"us-west-2": "763104351884",
715+
"ca-west-1": "204538143572"
716+
},
717+
"tag_prefix": "2.3.0-tgi2.2.0",
718+
"repository": "huggingface-pytorch-tgi-inference",
719+
"container_version": {
720+
"gpu": "cu121-ubuntu22.04-v2.0"
721+
}
675722
}
676723
}
677724
}

‎src/sagemaker/image_uri_config/pytorch-smp.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
"2.1": "2.1.2",
99
"2.2": "2.3.1",
1010
"2.2.0": "2.3.1",
11-
"2.3": "2.4.0"
11+
"2.3.1": "2.4.0"
1212
},
1313
"versions": {
1414
"2.0.1": {

‎src/sagemaker/image_uri_config/pytorch.json

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1008,6 +1008,7 @@
10081008
"us-gov-west-1": "442386744353",
10091009
"us-iso-east-1": "886529160074",
10101010
"us-isob-east-1": "094389454867",
1011+
"us-isof-south-1": "454834333376",
10111012
"us-west-1": "763104351884",
10121013
"us-west-2": "763104351884"
10131014
},
@@ -1051,6 +1052,7 @@
10511052
"us-gov-west-1": "442386744353",
10521053
"us-iso-east-1": "886529160074",
10531054
"us-isob-east-1": "094389454867",
1055+
"us-isof-south-1": "454834333376",
10541056
"us-west-1": "763104351884",
10551057
"us-west-2": "763104351884"
10561058
},
@@ -2329,6 +2331,7 @@
23292331
"us-gov-west-1": "442386744353",
23302332
"us-iso-east-1": "886529160074",
23312333
"us-isob-east-1": "094389454867",
2334+
"us-isof-south-1": "454834333376",
23322335
"us-west-1": "763104351884",
23332336
"us-west-2": "763104351884"
23342337
},
@@ -2372,6 +2375,7 @@
23722375
"us-gov-west-1": "442386744353",
23732376
"us-iso-east-1": "886529160074",
23742377
"us-isob-east-1": "094389454867",
2378+
"us-isof-south-1": "454834333376",
23752379
"us-west-1": "763104351884",
23762380
"us-west-2": "763104351884"
23772381
},
@@ -2415,6 +2419,7 @@
24152419
"us-gov-west-1": "442386744353",
24162420
"us-iso-east-1": "886529160074",
24172421
"us-isob-east-1": "094389454867",
2422+
"us-isof-south-1": "454834333376",
24182423
"us-west-1": "763104351884",
24192424
"us-west-2": "763104351884"
24202425
},

‎src/sagemaker/image_uri_config/tensorflow.json

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2140,6 +2140,7 @@
21402140
"us-gov-west-1": "442386744353",
21412141
"us-iso-east-1": "886529160074",
21422142
"us-isob-east-1": "094389454867",
2143+
"us-isof-south-1": "454834333376",
21432144
"us-west-1": "763104351884",
21442145
"us-west-2": "763104351884"
21452146
},
@@ -2180,6 +2181,7 @@
21802181
"us-gov-west-1": "442386744353",
21812182
"us-iso-east-1": "886529160074",
21822183
"us-isob-east-1": "094389454867",
2184+
"us-isof-south-1": "454834333376",
21832185
"us-west-1": "763104351884",
21842186
"us-west-2": "763104351884"
21852187
},
@@ -4352,6 +4354,7 @@
43524354
"us-gov-west-1": "442386744353",
43534355
"us-iso-east-1": "886529160074",
43544356
"us-isob-east-1": "094389454867",
4357+
"us-isof-south-1": "454834333376",
43554358
"us-west-1": "763104351884",
43564359
"us-west-2": "763104351884"
43574360
},
@@ -4395,6 +4398,7 @@
43954398
"us-gov-west-1": "442386744353",
43964399
"us-iso-east-1": "886529160074",
43974400
"us-isob-east-1": "094389454867",
4401+
"us-isof-south-1": "454834333376",
43984402
"us-west-1": "763104351884",
43994403
"us-west-2": "763104351884"
44004404
},

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,7 @@ def list_sagemaker_public_hub_models(
233233
f"arn:{info.partition}:"
234234
f"sagemaker:{info.region}:"
235235
f"aws:hub-content/{info.hub_name}/"
236-
f"{HubContentType.MODEL}/{model[0]}"
236+
f"{HubContentType.MODEL.value}/{model[0]}"
237237
)
238238
hub_content_summary = {
239239
"hub_content_name": model[0],

‎src/sagemaker/model.py

Lines changed: 53 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -549,7 +549,10 @@ def register(
549549
model_package_group_name = utils.base_name_from_image(
550550
self.image_uri, default_base_name=ModelPackage.__name__
551551
)
552-
if model_package_group_name is not None:
552+
if (
553+
model_package_group_name is not None
554+
and model_type is not JumpStartModelType.PROPRIETARY
555+
):
553556
container_def = self.prepare_container_def(accept_eula=accept_eula)
554557
container_def = update_container_with_inference_params(
555558
framework=framework,
@@ -2466,32 +2469,55 @@ def update_model_card(self, model_card: Union[ModelCard, ModelPackageModelCard])
24662469
desc_model_package = sagemaker_session.sagemaker_client.describe_model_package(
24672470
ModelPackageName=self.model_package_arn
24682471
)
2472+
if hasattr(model_card, "model_package_details"):
2473+
model_card.model_package_details = None
24692474
update_model_card_req = model_card._create_request_args()
2470-
if update_model_card_req["ModelCardStatus"] is not None:
2471-
if (
2472-
desc_model_package["ModelCard"]["ModelCardStatus"]
2473-
== update_model_card_req["ModelCardStatus"]
2474-
):
2475-
del update_model_card_req["ModelCardStatus"]
2476-
24772475
if update_model_card_req.get("ModelCardName") is not None:
24782476
del update_model_card_req["ModelCardName"]
2479-
if update_model_card_req.get("Content") is not None:
2480-
previous_content_hash = _hash_content_str(
2481-
desc_model_package["ModelCard"]["ModelCardContent"]
2482-
)
2483-
current_content_hash = _hash_content_str(update_model_card_req["Content"])
2484-
if (
2485-
previous_content_hash == current_content_hash
2486-
or update_model_card_req.get("Content") == "{}"
2487-
or update_model_card_req.get("Content") == "null"
2488-
):
2489-
del update_model_card_req["Content"]
2490-
else:
2491-
update_model_card_req["ModelCardContent"] = update_model_card_req["Content"]
2492-
del update_model_card_req["Content"]
2493-
update_model_package_args = {
2494-
"ModelPackageArn": self.model_package_arn,
2495-
"ModelCard": update_model_card_req,
2496-
}
2497-
sagemaker_session.sagemaker_client.update_model_package(**update_model_package_args)
2477+
if update_model_card_req["Content"] is not None:
2478+
if "model_package_details" in update_model_card_req["Content"]:
2479+
update_model_card_req["Content"].pop("model_package_details", None)
2480+
update_model_card_req["ModelCardContent"] = update_model_card_req["Content"]
2481+
del update_model_card_req["Content"]
2482+
2483+
if "ModelCard" in desc_model_package:
2484+
if update_model_card_req["ModelCardStatus"] is not None:
2485+
if (
2486+
desc_model_package["ModelCard"]["ModelCardStatus"]
2487+
!= update_model_card_req["ModelCardStatus"]
2488+
):
2489+
new_mc_mp_req = update_model_card_req
2490+
del new_mc_mp_req["ModelCardContent"]
2491+
update_model_package_args = {
2492+
"ModelPackageArn": self.model_package_arn,
2493+
"ModelCard": new_mc_mp_req,
2494+
}
2495+
sagemaker_session.sagemaker_client.update_model_package(
2496+
**update_model_package_args
2497+
)
2498+
2499+
if update_model_card_req.get("ModelCardContent") is not None:
2500+
previous_content_hash = _hash_content_str(
2501+
desc_model_package["ModelCard"]["ModelCardContent"]
2502+
)
2503+
current_content_hash = _hash_content_str(update_model_card_req["ModelCardContent"])
2504+
if not (
2505+
previous_content_hash == current_content_hash
2506+
or update_model_card_req.get("ModelCardContent") == "{}"
2507+
or update_model_card_req.get("ModelCardContent") == "null"
2508+
):
2509+
new_mc_mp_req = update_model_card_req
2510+
del new_mc_mp_req["ModelCardStatus"]
2511+
update_model_package_args = {
2512+
"ModelPackageArn": self.model_package_arn,
2513+
"ModelCard": new_mc_mp_req,
2514+
}
2515+
sagemaker_session.sagemaker_client.update_model_package(
2516+
**update_model_package_args
2517+
)
2518+
else:
2519+
update_model_package_args = {
2520+
"ModelPackageArn": self.model_package_arn,
2521+
"ModelCard": update_model_card_req,
2522+
}
2523+
sagemaker_session.sagemaker_client.update_model_package(**update_model_package_args)

‎src/sagemaker/session.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8348,7 +8348,9 @@ def _logs_for_job( # noqa: C901 - suppress complexity warning for this method
83488348
"""
83498349
sagemaker_client = sagemaker_session.sagemaker_client
83508350
request_end_time = time.time() + timeout if timeout else None
8351-
description = sagemaker_client.describe_training_job(TrainingJobName=job_name)
8351+
description = _wait_until(
8352+
lambda: sagemaker_client.describe_training_job(TrainingJobName=job_name)
8353+
)
83528354
print(secondary_training_status_message(description, None), end="")
83538355

83548356
instance_count, stream_names, positions, client, log_group, dot, color_wrap = _logs_init(

0 commit comments

Comments
 (0)