chore: Merge from main (#1600)

* 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]>

Author: 19 people

requirements/extras/test_requirements.txt

@@ -25,7 +25,10 @@ pyvis==0.2.1
 pandas==1.4.4
 scikit-learn==1.3.0
 cloudpickle>=2.2.1
+<<<<<<< HEAD
 jsonpickle<4.0.0
+=======
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
 PyYAML==6.0
 # TODO find workaround
 xgboost>=1.6.2,<=1.7.6

src/sagemaker/jumpstart/hub/parser_utils.py

@@ -18,6 +18,7 @@
 from typing import Any, Dict, List, Optional
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 def camel_to_snake(camel_case_string: str) -> str:
     """Converts camelCase to snake_case_string using a regex.
@@ -29,6 +30,12 @@ def pascal_to_snake(camel_case_string: str) -> str:
 
     This regex cannot handle whitespace ("PascalString TwoWords")
 >>>>>>> ff3eae05 (feat: Adding Bedrock Store model support for HubService (#1539))
+=======
+def camel_to_snake(camel_case_string: str) -> str:
+    """Converts camelCase to snake_case_string using a regex.
+
+    This regex cannot handle whitespace ("camelString TwoWords")
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
     """
     return re.sub(r"(?<!^)(?=[A-Z])", "_", camel_case_string).lower()
 

src/sagemaker/jumpstart/hub/parsers.py

@@ -27,7 +27,7 @@
     HubModelDocument,
 )
 from sagemaker.jumpstart.hub.parser_utils import (
-    pascal_to_snake,
+    camel_to_snake,
     snake_to_upper_camel,
     walk_and_apply_json,
 )
@@ -86,7 +86,7 @@ def get_model_spec_arg_keys(
         arg_keys = []
 
     if naming_convention == NamingConventionType.SNAKE_CASE:
-        arg_keys = [pascal_to_snake(key) for key in arg_keys]
+        arg_keys = [camel_to_snake(key) for key in arg_keys]
     elif naming_convention == NamingConventionType.UPPER_CAMEL_CASE:
         return arg_keys
     else:
@@ -207,7 +207,7 @@ def make_model_specs_from_describe_hub_content_response(
     default_payloads: Dict[str, Any] = {}
     if hub_model_document.default_payloads is not None:
         for alias, payload in hub_model_document.default_payloads.items():
-            default_payloads[alias] = walk_and_apply_json(payload.to_json(), pascal_to_snake)
+            default_payloads[alias] = walk_and_apply_json(payload.to_json(), camel_to_snake)
         specs["default_payloads"] = default_payloads
     specs["gated_bucket"] = hub_model_document.gated_bucket
     specs["inference_volume_size"] = hub_model_document.inference_volume_size

src/sagemaker/jumpstart/hub/utils.py

@@ -219,22 +219,29 @@ def get_hub_model_version(
     except Exception as ex:
         raise Exception(f"Failed calling list_hub_content_versions: {str(ex)}")
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
     marketplace_hub_content_version = _get_hub_model_version_for_marketplace_version(
         hub_content_summaries, hub_model_version
     )
 
 >>>>>>> ff3eae05 (feat: Adding Bedrock Store model support for HubService (#1539))
+=======
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
     try:
         return _get_hub_model_version_for_open_weight_version(
             hub_content_summaries, hub_model_version
         )
 <<<<<<< HEAD
+<<<<<<< HEAD
+=======
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
     except KeyError:
         marketplace_hub_content_version = _get_hub_model_version_for_marketplace_version(
             hub_content_summaries, hub_model_version
         )
+<<<<<<< HEAD
         if marketplace_hub_content_version:
             return marketplace_hub_content_version
         raise
@@ -244,6 +251,11 @@ def get_hub_model_version(
             return marketplace_hub_content_version
         raise e
 >>>>>>> ff3eae05 (feat: Adding Bedrock Store model support for HubService (#1539))
+=======
+        if marketplace_hub_content_version:
+            return marketplace_hub_content_version
+        raise
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
 
 
 def _get_hub_model_version_for_open_weight_version(

src/sagemaker/jumpstart/types.py

@@ -40,7 +40,7 @@
 from sagemaker.compute_resource_requirements.resource_requirements import ResourceRequirements
 from sagemaker.enums import EndpointType
 from sagemaker.jumpstart.hub.parser_utils import (
-    pascal_to_snake,
+    camel_to_snake,
     walk_and_apply_json,
 )
 from sagemaker.model_life_cycle import ModelLifeCycle
@@ -241,7 +241,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
             return
 
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
 
         self.framework = json_obj.get("framework")
         self.framework_version = json_obj.get("framework_version")
@@ -295,7 +295,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
         """
 
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.name = json_obj["name"]
         self.type = json_obj["type"]
         self.default = json_obj["default"]
@@ -363,7 +363,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
         Args:
             json_obj (Dict[str, Any]): Dictionary representation of environment variable.
         """
-        json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+        json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.name = json_obj["name"]
         self.type = json_obj["type"]
         self.default = json_obj["default"]
@@ -413,7 +413,7 @@ def from_json(self, json_obj: Optional[Dict[str, Any]]) -> None:
             return
 
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.default_content_type = json_obj["default_content_type"]
         self.supported_content_types = json_obj["supported_content_types"]
         self.default_accept_type = json_obj["default_accept_type"]
@@ -467,7 +467,7 @@ def from_json(self, json_obj: Optional[Dict[str, Any]]) -> None:
             return
 
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.raw_payload = json_obj
         self.content_type = json_obj["content_type"]
         self.body = json_obj.get("body")
@@ -540,7 +540,7 @@ def from_describe_hub_content_response(self, response: Optional[Dict[str, Any]])
         if response is None:
             return
 
-        response = walk_and_apply_json(response, pascal_to_snake)
+        response = walk_and_apply_json(response, camel_to_snake)
         self.aliases: Optional[dict] = response.get("aliases")
         self.regional_aliases = None
         self.variants: Optional[dict] = response.get("variants")
@@ -1180,7 +1180,7 @@ def __init__(self, spec: Optional[Dict[str, Any]], is_hub_content=False):
             spec (Dict[str, Any]): Dictionary representation of training config ranking.
         """
         if is_hub_content:
-            spec = walk_and_apply_json(spec, pascal_to_snake)
+            spec = walk_and_apply_json(spec, camel_to_snake)
         self.from_json(spec)
 
     def from_json(self, json_obj: Dict[str, Any]) -> None:
@@ -1286,7 +1286,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
             json_obj (Dict[str, Any]): Dictionary representation of spec.
         """
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.model_id: str = json_obj.get("model_id")
         self.url: str = json_obj.get("url")
         self.version: str = json_obj.get("version")
@@ -1515,7 +1515,7 @@ def __init__(
             ValueError: If the component field is invalid.
         """
         if is_hub_content:
-            component = walk_and_apply_json(component, pascal_to_snake)
+            component = walk_and_apply_json(component, camel_to_snake)
         self.component_name = component_name
         super().__init__(component, is_hub_content)
         self.from_json(component)
@@ -1568,8 +1568,8 @@ def __init__(
                 The list of components that are used to construct the resolved config.
         """
         if is_hub_content:
-            config = walk_and_apply_json(config, pascal_to_snake)
-            base_fields = walk_and_apply_json(base_fields, pascal_to_snake)
+            config = walk_and_apply_json(config, camel_to_snake)
+            base_fields = walk_and_apply_json(base_fields, camel_to_snake)
         self.base_fields = base_fields
         self.config_components: Dict[str, JumpStartConfigComponent] = config_components
         self.benchmark_metrics: Dict[str, List[JumpStartBenchmarkStat]] = (
@@ -1735,7 +1735,7 @@ def from_json(self, json_obj: Dict[str, Any]) -> None:
         """
         super().from_json(json_obj)
         if self._is_hub_content:
-            json_obj = walk_and_apply_json(json_obj, pascal_to_snake)
+            json_obj = walk_and_apply_json(json_obj, camel_to_snake)
         self.inference_config_components: Optional[Dict[str, JumpStartConfigComponent]] = (
             {
                 component_name: JumpStartConfigComponent(component_name, component)

src/sagemaker/jumpstart/utils.py

@@ -35,7 +35,7 @@
 
 from sagemaker.jumpstart import constants, enums
 from sagemaker.jumpstart import accessors
-from sagemaker.jumpstart.hub.parser_utils import pascal_to_snake, snake_to_upper_camel
+from sagemaker.jumpstart.hub.parser_utils import camel_to_snake, snake_to_upper_camel
 from sagemaker.s3 import parse_s3_url
 from sagemaker.jumpstart.exceptions import (
     DeprecatedJumpStartModelError,
@@ -1178,7 +1178,7 @@ def get_jumpstart_configs(
         return (
             {
                 config_name: metadata_configs.configs[
-                    pascal_to_snake(snake_to_upper_camel(config_name))
+                    camel_to_snake(snake_to_upper_camel(config_name))
                 ]
                 for config_name in config_names
             }

tests/integ/sagemaker/jumpstart/model/test_jumpstart_model.py

@@ -513,25 +513,26 @@ def test_model_reference_marketplace_model(setup):
     assert model_semver.model_version == model_marketplace_version.model_version
 
 
-def test_model_reference_marketplace_model_deployment(setup):
-    session = get_sm_session()
-    public_hub_marketplace_model_id = "upstage-solar-mini-chat"
-    _setup_test_hub_with_reference(public_hub_marketplace_model_id)
-
-    marketplace_model = JumpStartModel(  # Retrieving MP model MP version -> uses MPver
-        model_id=public_hub_marketplace_model_id,
-        hub_name=TEST_HUB_WITH_REFERENCE,
-        role=session.get_caller_identity_arn(),
-        sagemaker_session=session,
-        model_version="240612.5",
-    )
-    predictor = marketplace_model.deploy(
-        tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}],
-        accept_eula=True,
-    )
-
-    predictor.delete_predictor()
-    _teardown_test_hub_with_reference(public_hub_marketplace_model_id)
+# TODO: PySDK test account not subscribed to this model
+# def test_model_reference_marketplace_model_deployment(setup):
+#     session = get_sm_session()
+#     public_hub_marketplace_model_id = "upstage-solar-mini-chat"
+#     _setup_test_hub_with_reference(public_hub_marketplace_model_id)
+
+#     marketplace_model = JumpStartModel(  # Retrieving MP model MP version -> uses MPver
+#         model_id=public_hub_marketplace_model_id,
+#         hub_name=TEST_HUB_WITH_REFERENCE,
+#         role=session.get_caller_identity_arn(),
+#         sagemaker_session=session,
+#         model_version="240612.5",
+#     )
+#     predictor = marketplace_model.deploy(
+#         tags=[{"Key": JUMPSTART_TAG, "Value": os.environ[ENV_VAR_JUMPSTART_SDK_TEST_SUITE_ID]}],
+#         accept_eula=True,
+#     )
+
+#     predictor.delete_predictor()
+#     _teardown_test_hub_with_reference(public_hub_marketplace_model_id)
 
 
 def test_bedrock_store_model_tags_from_hub_service(setup):

tests/integ/sagemaker/jumpstart/utils.py

@@ -53,6 +53,7 @@ def get_sm_session() -> Session:
     return Session(boto_session=boto3.Session(region_name=JUMPSTART_DEFAULT_REGION_NAME))
 
 
+<<<<<<< HEAD
 <<<<<<< HEAD
 =======
 def get_sm_session_with_override() -> Session:
@@ -70,6 +71,8 @@ def get_sm_session_with_override() -> Session:
 
 
 >>>>>>> ff3eae05 (feat: Adding Bedrock Store model support for HubService (#1539))
+=======
+>>>>>>> 42acb4f4 (chore: Merge from main (#1600))
 def get_training_dataset_for_model_and_version(model_id: str, version: str) -> dict:
     return TRAINING_DATASET_MODEL_DICT[(model_id, version)]
 

tests/unit/sagemaker/jumpstart/hub/test_utils.py

@@ -268,7 +268,7 @@ def test_walk_and_apply_json():
     }
 
     result = parser_utils.walk_and_apply_json(
-        test_json, parser_utils.pascal_to_snake, ["ignore_my_children"]
+        test_json, parser_utils.camel_to_snake, ["ignore_my_children"]
     )
     assert result == {
         "camel_case_key": "value",
@@ -294,7 +294,7 @@ def test_walk_and_apply_json_no_stop():
         "CamelCaseObjectListKey": {"instance.ml.type.xlarge": [{"ShouldChangeMe": "string"}]},
     }
 
-    result = parser_utils.walk_and_apply_json(test_json, parser_utils.pascal_to_snake)
+    result = parser_utils.walk_and_apply_json(test_json, parser_utils.camel_to_snake)
     assert result == {
         "camel_case_key": "value",
         "camel_case_object_key": {