feat: combined model + script artifact #3715

evakravi · 2023-03-13T20:28:41Z

Issue #, if available:

Description of changes:
model_uris.retrieve returns a combined model + script artifact if it's found in metadata for model.

Testing done:

Merge Checklist

Put an x in the boxes that apply. You can also fill these out after creating the PR. If you're unsure about any of them, don't hesitate to ask. We're here to help! This is simply a reminder of what we are going to look for before merging your pull request.

General

I have read the CONTRIBUTING doc
I certify that the changes I am introducing will be backward compatible, and I have discussed concerns about this, if any, with the Python SDK team
I used the commit message format described in CONTRIBUTING
I have passed the region in to all S3 and STS clients that I've initialized as part of this change.
I have updated any necessary documentation, including READMEs and API docs (if appropriate)

Tests

I have added tests that prove my fix is effective or that my feature works (if appropriate)
I have added unit and/or integration tests as appropriate to ensure backward compatibility of the changes
I have checked that my tests are not configured for a specific region or account (if appropriate)
I have used unique_name_from_base to create resource names in integ tests (if appropriate)

By submitting this pull request, I confirm that my contribution is made under the terms of the Apache 2.0 license.

sagemaker-bot · 2023-03-13T20:35:04Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 8bb9cba
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

src/sagemaker/jumpstart/artifacts.py

whittech1 · 2023-03-13T20:48:09Z

src/sagemaker/jumpstart/types.py

@@ -293,6 +293,7 @@ class JumpStartModelSpecs(JumpStartDataHolderType):
        "training_vulnerabilities",
        "deprecated",
        "metrics",
+        "hosting_prepacked_artifact_key",


Would you be opposed to adding the training_prepacked_script_key in this PR along with similar logic for retrieval?

Let's do that in another PR

sagemaker-bot · 2023-03-13T21:06:05Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 8bb9cba
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-13T21:41:19Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 02f3a82
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-13T21:54:48Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 02f3a82
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

codecov-commenter · 2023-03-13T21:56:21Z

Codecov Report

Merging #3715 (1bd89e5) into master (c02d74b) will decrease coverage by 0.77%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #3715      +/-   ##
==========================================
- Coverage   89.84%   89.08%   -0.77%     
==========================================
  Files         984      231     -753     
  Lines       92360    22853   -69507     
==========================================
- Hits        82984    20358   -62626     
+ Misses       9376     2495    -6881

Impacted Files	Coverage Δ
src/sagemaker/jumpstart/artifacts.py	`92.30% <100.00%> (ø)`
src/sagemaker/jumpstart/types.py	`95.06% <100.00%> (ø)`
src/sagemaker/workflow/emr_step.py	`100.00% <100.00%> (ø)`

... and 1212 files with indirect coverage changes

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

sagemaker-bot · 2023-03-13T22:00:44Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 02f3a82
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-13T22:02:51Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 02f3a82
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-13T22:39:57Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 02f3a82
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

JGuinegagne · 2023-03-14T12:41:52Z

src/sagemaker/jumpstart/artifacts.py

@@ -218,10 +221,24 @@ def _retrieve_model_uri(
        tolerate_deprecated_model=tolerate_deprecated_model,
    )

+    error_msg_no_combined_artifact = (
+        "No combined script + model tarball available "


nit: No combined script and model tarball [...]

sagemaker-bot · 2023-03-14T14:39:41Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 38f8634
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T14:41:41Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 38f8634
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T14:46:14Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 38f8634
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T14:49:51Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 38f8634
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T16:20:43Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 29243ae
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T16:21:21Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 29243ae
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T16:24:13Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 29243ae
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T16:27:12Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 29243ae
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-14T16:28:47Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 29243ae
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-15T22:16:00Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 939c77c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-22T17:47:33Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 39bb144
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-22T20:22:17Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 39bb144
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T14:30:48Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 1949f9c
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T15:11:53Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 1949f9c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T15:14:20Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 1949f9c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T15:19:09Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 1949f9c
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T15:21:32Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 1949f9c
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T18:09:12Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 65a5543
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T19:00:31Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 65a5543
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T19:01:58Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 65a5543
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T19:13:53Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 65a5543
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T19:23:59Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 65a5543
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T20:45:44Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: 1bd89e5
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T21:26:56Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: 1bd89e5
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T21:29:31Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: 1bd89e5
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T21:34:08Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: 1bd89e5
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-23T21:42:51Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: 1bd89e5
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-24T16:57:52Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-slow-tests
Commit ID: c1f9587
Result: FAILED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-24T17:37:29Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-pr
Commit ID: c1f9587
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-24T17:39:11Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-unit-tests
Commit ID: c1f9587
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-24T17:45:29Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-local-mode-tests
Commit ID: c1f9587
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

sagemaker-bot · 2023-03-24T17:48:17Z

AWS CodeBuild CI Report

CodeBuild project: sagemaker-python-sdk-notebook-tests
Commit ID: c1f9587
Result: SUCCEEDED
Build Logs (available for 30 days)

Powered by github-codebuild-logs, available on the AWS Serverless Application Repository

* feat: combined model + script artifact * chore: use ValueError * chore: improve error msg for no combined artifact * fix: jumpstart unit tests * chore: always include inference script if available

feat: combined model + script artifact

8bb9cba

evakravi requested a review from a team as a code owner March 13, 2023 20:28

evakravi requested review from claytonparnell and removed request for a team March 13, 2023 20:28

evakravi marked this pull request as draft March 13, 2023 20:28

whittech1 reviewed Mar 13, 2023

View reviewed changes

chore: use ValueError

02f3a82

knikure assigned claytonparnell Mar 13, 2023

JGuinegagne reviewed Mar 14, 2023

View reviewed changes

chore: improve error msg for no combined artifact

38f8634

fix: jumpstart unit tests

29243ae

chore: always include inference script if available

939c77c

Merge branch 'master' into feat/model-uri-with-script

1949f9c

Merge branch 'master' into feat/model-uri-with-script

65a5543

Merge branch 'master' into feat/model-uri-with-script

1bd89e5

Merge branch 'master' into feat/model-uri-with-script

c1f9587

claytonparnell merged commit 07dd8ba into aws:master Mar 24, 2023

feat: combined model + script artifact #3715

feat: combined model + script artifact #3715

Uh oh!

Conversation

evakravi commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Merge Checklist

General

Tests

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

Uh oh!

whittech1 Mar 13, 2023

Choose a reason for hiding this comment

Uh oh!

evakravi Mar 14, 2023

Choose a reason for hiding this comment

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

codecov-commenter commented Mar 13, 2023 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Codecov Report

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 13, 2023

AWS CodeBuild CI Report

Uh oh!

JGuinegagne Mar 14, 2023

Choose a reason for hiding this comment

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 14, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 15, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 22, 2023

AWS CodeBuild CI Report

Uh oh!

sagemaker-bot commented Mar 22, 2023

AWS CodeBuild CI Report

evakravi commented Mar 13, 2023 •

edited

Loading

codecov-commenter commented Mar 13, 2023 •

edited

Loading