feat: Marketplace model support in HubService #4916

chrstfu · 2024-10-30T21:32:44Z

Description of changes:
Adding Marketplace model support in HubService

Testing done:
Testing was completed locally with example models via a BugBash. Unit tests are added to check functionality.

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)
If adding any dependency in requirements.txt files, I have spell checked and ensured they exist in PyPi

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

src/sagemaker/jumpstart/hub/interfaces.py

src/sagemaker/jumpstart/hub/utils.py

…chrstfu/sagemaker-python-sdk into marketplace-hub-service-support

JGuinegagne

Few post-merge clean-ups

JGuinegagne · 2024-10-31T13:14:41Z

src/sagemaker/jumpstart/hub/interfaces.py

@@ -451,12 +451,14 @@ def from_json(self, json_obj: str) -> None:
 class HubModelDocument(HubDataHolderType):
    """Data class for model type HubContentDocument from session.describe_hub_content()."""

-    SCHEMA_VERSION = "2.2.0"
+    SCHEMA_VERSION = "2.3.0"


sanity-check: will the pySDK still understand previous schema?

JGuinegagne · 2024-10-31T13:16:08Z

src/sagemaker/jumpstart/hub/parser_utils.py

-        # remove any hyphen from the string for accurate conversion.
-        snake_case_string = snake_case_string.replace("-", "")
-    return re.sub("([a-z0-9])([A-Z])", r"\1_\2", snake_case_string).lower()
+    """Converts PascalCase to snake_case_string using a regex.


Inconsistent regex and method name.

Careful with renaming the method though, it would be backward incompatible.

True, let me rewrite that docstring. This regex can handle camelCase as well as PascalCase

JGuinegagne · 2024-10-31T13:19:31Z

src/sagemaker/jumpstart/utils.py

@@ -881,6 +890,37 @@ def validate_model_id_and_get_type(
    return None


+def _validate_hub_service_model_id_and_get_type(
+    model_id: Optional[str],


just curious, what happens if model_id is None?

Ah that should be just str. Thanks, good catch!

JGuinegagne · 2024-10-31T13:21:28Z

tests/integ/sagemaker/jumpstart/utils.py

+    boto_session = boto3.Session(region_name="us-west-2")
+    sagemaker = boto3.client(
+        service_name="sagemaker",
+        endpoint_url="https://sagemaker.gamma.us-west-2.ml-platform.aws.a2z.com",


Did you merge this to main? Block the release if that's the case.

Btw this code should never have been pushed to the public repo...

* prepare release v2.232.2 * update development version to v2.232.3.dev0 * fix: Use Miniforge to replace MambaForge (#4884) * Use Miniforge to replace MambaForge * Fix download url * tests: Implement integration tests covering JumpStart PrivateHub workflows (#4883) * tests: Implement integration tests covering JumpStart PrivateHub workflows * linting * formating * Only delete the pytest session specific test * change scope to session * address nits * Address test failures * address typo * address comments * resolve flake8 errors * implement throttle handling * flake8 * flake8 * Adding more assertions --------- Co-authored-by: malavhs <[email protected]> * chore: add lmi image config in me-central-1 (#4887) * changes for PT 2.4 currency upgrade (#4890) Co-authored-by: Andrew Tian <[email protected]> * chore(deps): bump pyspark from 3.3.1 to 3.3.2 in /requirements/extras (#4894) Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> * update cloudpickle version to >=2.2.1 (#4891) * update cloudpickle version to >=2.2.1 in pyproject.toml (#4899) * Revert "update cloudpickle version to >=2.2.1 in pyproject.toml (#4899)" (#4902) * release: huggingface tgi neuronx 0.0.25 image (#4893) * release: huggingface tgi neuronx 0.0.25 image * tests * add tgi 2.3.1 * update default version * update py version * fix tests * test * Revert "fix tests" This reverts commit 9374c75. * Revert "Revert "fix tests"" This reverts commit 20d46d1. * Revert "test" This reverts commit 90f6e0b. * fix: fixing typo in dependecy setup (#4905) charset-normalizer is misplet in the requirements.txt files * Fix: Returning ModelPackage object on register of PipelineModel (#4878) Co-authored-by: Keshav Chandak <[email protected]> * fix: modified pull request template (#4906) Added warning to spell check dependencies added and ensure they exist in PyPi * Fix: image_uris graviton image uri (#4909) * change: update image_uri_configs 09-27-2024 07:18:01 PST * change: update image_uri_configs 10-03-2024 07:17:59 PST * change: update image_uri_configs 10-17-2024 07:17:55 PST * change: update image_uri_configs 10-23-2024 11:26:03 PST * change: adding eu-central-2 bucket info to JS constants (#4907) * change: adding eu-central-2 bucket info to JS constants * change: adding zrh image uris for dji neuronx --------- Co-authored-by: shaernev <[email protected]> * fix: Skip pytorch tests incompatible with latest version 2.4.0 (#4910) * change: update image_uri_configs 10-29-2024 07:17:56 PST * prepare release v2.232.3 * update development version to v2.232.4.dev0 * change: Updates for DJL 0.30.0 release (#4892) Co-authored-by: pintaoz-aws <[email protected]> * bumping smp version from 2.6.0 to 2.6.1 (#4913) Co-authored-by: Andrew Tian <[email protected]> Co-authored-by: nileshvd <[email protected]> * feat: Marketplace model support in HubService (#4916) * feat: Marketplace model support in HubService * fix: removing field * fix: Reverting name change for code coverage * fix: Adding more code coverage * fix: linting * fix: Fixing coverage tests * fix: Fixing integration tests * fix: Minor fixes * feat: triton v24.09 (#4908) * fix: Fixing JumpStart Tests (#4917) * fix: Fixing tests * fix: fixing test name * fix: dummy commit * fix: reverting dummy commit * fix: Removing flakey tests --------- Co-authored-by: nileshvd <[email protected]> * fix: merge * fix: Commenting out marketplace test * fix: Linting --------- Co-authored-by: ci <ci> Co-authored-by: pintaoz-aws <[email protected]> Co-authored-by: Malav Shastri <[email protected]> Co-authored-by: malavhs <[email protected]> Co-authored-by: Haotian An <[email protected]> Co-authored-by: adtian2 <[email protected]> Co-authored-by: Andrew Tian <[email protected]> Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com> Co-authored-by: liujiaor <[email protected]> Co-authored-by: ASHWIN KRISHNA <[email protected]> Co-authored-by: Keshav Chandak <[email protected]> Co-authored-by: Keshav Chandak <[email protected]> Co-authored-by: Erick Benitez-Ramos <[email protected]> Co-authored-by: sagemaker-bot <[email protected]> Co-authored-by: Ernev Sharma <[email protected]> Co-authored-by: shaernev <[email protected]> Co-authored-by: Tyler Osterberg <[email protected]> Co-authored-by: nileshvd <[email protected]> Co-authored-by: Aaqib <[email protected]>

feat: Marketplace model support in HubService

0092ff4

chrstfu temporarily deployed to auto-approve October 30, 2024 21:32 — with GitHub Actions Inactive

chrstfu changed the title ~~feat: Marketplace model support in HubS~~ feat: Marketplace model support in HubService Oct 30, 2024

chrstfu marked this pull request as ready for review October 30, 2024 21:34

chrstfu requested a review from a team as a code owner October 30, 2024 21:35

chrstfu requested a review from sage-maker October 30, 2024 21:35

AWS-pratab approved these changes Oct 30, 2024

View reviewed changes

fix: removing field

8b0ec90

chrstfu temporarily deployed to auto-approve October 30, 2024 21:48 — with GitHub Actions Inactive

bencrabtree approved these changes Oct 30, 2024

View reviewed changes

src/sagemaker/jumpstart/hub/interfaces.py Show resolved Hide resolved

src/sagemaker/jumpstart/hub/utils.py Outdated Show resolved Hide resolved

src/sagemaker/jumpstart/hub/utils.py Show resolved Hide resolved

fix: Reverting name change for code coverage

273449c

chrstfu temporarily deployed to auto-approve October 30, 2024 22:21 — with GitHub Actions Inactive

fix: Adding more code coverage

a8a2453

chrstfu temporarily deployed to auto-approve October 30, 2024 23:07 — with GitHub Actions Inactive

fix: linting

d4430e2

chrstfu temporarily deployed to auto-approve October 30, 2024 23:14 — with GitHub Actions Inactive

pintaoz-aws previously approved these changes Oct 30, 2024

View reviewed changes

fix: Fixing coverage tests

cd82335

chrstfu dismissed pintaoz-aws’s stale review via cd82335 October 30, 2024 23:46

chrstfu temporarily deployed to auto-approve October 30, 2024 23:46 — with GitHub Actions Inactive

Merge branch 'master' into marketplace-hub-service-support

0b73463

chrstfu temporarily deployed to auto-approve October 30, 2024 23:47 — with GitHub Actions Inactive

chrstfu added 2 commits October 31, 2024 01:13

fix: Fixing integration tests

3ca1deb

Merge branch 'marketplace-hub-service-support' of https://github.com/…

4bdd822

…chrstfu/sagemaker-python-sdk into marketplace-hub-service-support

chrstfu temporarily deployed to auto-approve October 31, 2024 01:15 — with GitHub Actions Inactive

fix: Minor fixes

79a1163

chrstfu temporarily deployed to auto-approve October 31, 2024 02:02 — with GitHub Actions Inactive

pintaoz-aws merged commit e710f1d into aws:master Oct 31, 2024
14 checks passed

JGuinegagne reviewed Oct 31, 2024

View reviewed changes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat: Marketplace model support in HubService #4916

feat: Marketplace model support in HubService #4916

chrstfu commented Oct 30, 2024 •

edited

Loading

JGuinegagne left a comment

JGuinegagne Oct 31, 2024

JGuinegagne Oct 31, 2024

chrstfu Oct 31, 2024 •

edited

Loading

JGuinegagne Oct 31, 2024

chrstfu Oct 31, 2024 •

edited

Loading

JGuinegagne Oct 31, 2024

feat: Marketplace model support in HubService #4916

feat: Marketplace model support in HubService #4916

Conversation

chrstfu commented Oct 30, 2024 • edited Loading

Merge Checklist

General

Tests

JGuinegagne left a comment

Choose a reason for hiding this comment

JGuinegagne Oct 31, 2024

Choose a reason for hiding this comment

JGuinegagne Oct 31, 2024

Choose a reason for hiding this comment

chrstfu Oct 31, 2024 • edited Loading

Choose a reason for hiding this comment

JGuinegagne Oct 31, 2024

Choose a reason for hiding this comment

chrstfu Oct 31, 2024 • edited Loading

Choose a reason for hiding this comment

JGuinegagne Oct 31, 2024

Choose a reason for hiding this comment

chrstfu commented Oct 30, 2024 •

edited

Loading

chrstfu Oct 31, 2024 •

edited

Loading

chrstfu Oct 31, 2024 •

edited

Loading