Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: Marketplace model support in HubService #4916

Merged
merged 10 commits into from
Oct 31, 2024

Conversation

chrstfu
Copy link
Contributor

@chrstfu chrstfu commented Oct 30, 2024

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.

@chrstfu chrstfu changed the title feat: Marketplace model support in HubS feat: Marketplace model support in HubService Oct 30, 2024
@chrstfu chrstfu marked this pull request as ready for review October 30, 2024 21:34
@chrstfu chrstfu requested a review from a team as a code owner October 30, 2024 21:35
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
pintaoz-aws
pintaoz-aws previously approved these changes Oct 30, 2024
@pintaoz-aws pintaoz-aws merged commit e710f1d into aws:master Oct 31, 2024
14 checks passed
Copy link
Contributor

@JGuinegagne JGuinegagne left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Few post-merge clean-ups

@@ -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"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

# 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.
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Inconsistent regex and method name.

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

Copy link
Contributor Author

@chrstfu chrstfu Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

@@ -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],
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

just curious, what happens if model_id is None?

Copy link
Contributor Author

@chrstfu chrstfu Oct 31, 2024

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

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",
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants