Merge branch 'master-v2' into fix/triton-hmac-security-v2-all-bugs

Author: pravali96

src/sagemaker/feature_store/feature_group.py

@@ -1050,7 +1050,6 @@ def load_feature_definitions(
         self.feature_definitions = feature_definitions
         return self.feature_definitions
 
-    @_telemetry_emitter(feature=Feature.FEATURE_STORE_V2, func_name="feature_group.get_record")
     def get_record(
         self,
         record_identifier_value_as_string: str,

src/sagemaker/image_uri_config/djl-lmi.json

@@ -46,7 +46,7 @@
                 "mx-central-1": "637423239942"
             },
             "repository": "djl-inference",
-            "tag_prefix": "0.36.0-lmi21.0.0-cu129"
+            "tag_prefix": "0.36.0-lmi22.0.0-cu129"
         },
         "0.35.0": {
             "registries": {

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

@@ -87,7 +87,7 @@ def test_non_prepacked_jumpstart_model(setup):
 
 def test_prepacked_jumpstart_model(setup):
 
-    model_id = "huggingface-txt2img-conflictx-complex-lineart"
+    model_id = "model-txt2img-stabilityai-stable-diffusion-v2-1-base"
 
     model = JumpStartModel(
         model_id=model_id,
@@ -251,11 +251,10 @@ def test_instantiating_model(mock_warning_logger, setup):
 
 
 def test_jumpstart_model_register(setup):
-    model_id = "huggingface-txt2img-conflictx-complex-lineart"
+    model_id = "model-txt2img-stabilityai-stable-diffusion-v2-1-base"
 
     model = JumpStartModel(
         model_id=model_id,
-        model_version="1.1.0",
         role=get_sm_session().get_caller_identity_arn(),
         sagemaker_session=get_sm_session(),
     )

tests/integ/sagemaker/jumpstart/private_hub/model/test_jumpstart_private_hub_model.py

@@ -39,7 +39,7 @@
 
 TEST_MODEL_IDS = {
     "catboost-classification-model",
-    "huggingface-txt2img-conflictx-complex-lineart",
+    "model-txt2img-stabilityai-stable-diffusion-v2-1-base",
     "meta-textgeneration-llama-2-7b",
     "meta-textgeneration-llama-3-2-1b",
     "catboost-regression-model",

tests/integ/sagemaker/serve/test_schema_builder.py

@@ -82,7 +82,6 @@ def test_model_builder_negative_path(sagemaker_session):
             None,
         ),
         ("HuggingFaceH4/zephyr-7b-beta", "text-generation", "ml.g5.2xlarge", 900),
-        ("HuggingFaceH4/zephyr-7b-alpha", "text-generation", "ml.g5.2xlarge", 900),
     ],
 )
 def test_model_builder_happy_path_with_task_provided_local_schema_mode(

tests/unit/sagemaker/image_uris/test_djl.py

@@ -86,7 +86,7 @@ def _test_djl_uris(account, region, version, tag, djl_framework):
 # Known missing framework:version:region combinations that don't exist in ECR
 KNOWN_MISSING_COMBINATIONS = {
     "djl-lmi": {
-        "0.36.0-lmi21.0.0-cu129": {"ap-east-2"},
+        "0.36.0-lmi22.0.0-cu129": {"ap-east-2"},
         "0.35.0-lmi17.0.0-cu128": {"ap-east-2"},
         "0.34.0-lmi16.0.0-cu128": {"ap-east-2"},
         "0.33.0-lmi15.0.0-cu128": {"ap-east-2"},