fix: escape input before returning

.github/workflows/codeql.yml

@@ -0,0 +1,35 @@
+name: "CodeQL"
+on:
+  push:
+    branches: [ "master" ]
+  pull_request:
+    branches: [ "master" ]
+  schedule:
+    - cron: '30 8 * * *'
+jobs:
+  analyze:
+    name: Analyze (${{ matrix.language }})
+    runs-on: ${{ 'ubuntu-latest' }}
+    permissions:
+      security-events: write
+      packages: read
+
+    strategy:
+      matrix:
+        include:
+          - language: python
+            build-mode: none
+          - language: java-kotlin
+            build-mode: none
+    steps:
+      - name: Checkout repository
+        uses: actions/checkout@6ccd57f4c5d15bdc2fef309bd9fb6cc9db2ef1c6
+      - name: Initialize CodeQL
+        uses: github/codeql-action/init@4b1d7da102ff94aca014c0245062b1a463356d72
+        with:
+          languages: ${{ matrix.language }}
+          build-mode: ${{ matrix.build-mode }}
+      - name: Perform CodeQL Analysis
+        uses: github/codeql-action/analyze@4b1d7da102ff94aca014c0245062b1a463356d72
+        with:
+          category: "/language:${{matrix.language}}"

CHANGELOG.md

@@ -1,5 +1,19 @@
 # Changelog
 
+## v2.226.1 (2024-07-17)
+
+## v2.226.0 (2024-07-12)
+
+### Features
+
+ * Curated hub improvements
+ * InferenceSpec support for MMS and testing
+
+### Bug Fixes and Other Changes
+
+ * ModelBuilder not passing HF_TOKEN to model.
+ * update image_uri_configs  07-10-2024 07:18:04 PST
+
 ## v2.225.0 (2024-07-10)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.225.1.dev0
+2.226.2.dev0

src/sagemaker/config/config_utils.py

@@ -18,8 +18,10 @@
 from collections import deque
 
 import logging
+import re
 import sys
 from typing import Callable
+from copy import deepcopy
 
 
 def get_sagemaker_config_logger():
@@ -67,6 +69,19 @@ def _log_sagemaker_config_single_substitution(source_value, config_value, config
     """
     logger = get_sagemaker_config_logger()
 
+    source_value_log_copy = deepcopy(source_value)
+    config_value_log_copy = deepcopy(config_value)
+
+    if isinstance(source_value_log_copy, dict):
+        for key in source_value_log_copy.keys():
+            if re.search(r'(secret|password|key|token)', key, re.IGNORECASE):
+                source_value_log_copy[key] = '***'
+
+    if isinstance(config_value_log_copy, dict):
+        for key in config_value_log_copy.keys():
+            if re.search(r'(secret|password|key|token)', key, re.IGNORECASE):
+                config_value_log_copy[key] = '***'
+
     if config_value is not None:
 
         if source_value is None:
@@ -79,7 +94,7 @@ def _log_sagemaker_config_single_substitution(source_value, config_value, config
                 logger.debug(
                     "Applied value\n  config key = %s\n  config value that will be used = %s",
                     config_key_path,
-                    config_value,
+                    config_value_log_copy,
                 )
             else:
                 logger.info(
@@ -102,8 +117,8 @@ def _log_sagemaker_config_single_substitution(source_value, config_value, config
                     "  source value that will be used = %s"
                 ),
                 config_key_path,
-                config_value,
-                source_value,
+                config_value_log_copy,
+                source_value_log_copy,
             )
         elif source_value is not None and config_value != source_value:
             # Sagemaker Config had a value defined that is NOT going to be used
@@ -117,8 +132,8 @@ def _log_sagemaker_config_single_substitution(source_value, config_value, config
                     "  source value that will be used = %s",
                 ),
                 config_key_path,
-                config_value,
-                source_value,
+                config_value_log_copy,
+                source_value_log_copy,
             )
     else:
         # nothing was specified in the config and nothing is being automatically applied

src/sagemaker/estimator.py

@@ -68,6 +68,7 @@
 from sagemaker.interactive_apps import SupportedInteractiveAppTypes
 from sagemaker.interactive_apps.tensorboard import TensorBoardApp
 from sagemaker.instance_group import InstanceGroup
+from sagemaker.model_card.model_card import ModelCard, TrainingDetails
 from sagemaker.utils import instance_supports_kms
 from sagemaker.job import _Job
 from sagemaker.jumpstart.utils import (
@@ -1797,8 +1798,17 @@ def register(
         else:
             if "model_kms_key" not in kwargs:
                 kwargs["model_kms_key"] = self.output_kms_key
-            model = self.create_model(image_uri=image_uri, **kwargs)
+            model = self.create_model(image_uri=image_uri, name=model_name, **kwargs)
         model.name = model_name
+        if self.model_data is not None and model_card is None:
+            training_details = TrainingDetails.from_model_s3_artifacts(
+                model_artifacts=[self.model_data], sagemaker_session=self.sagemaker_session
+            )
+            model_card = ModelCard(
+                name="estimator_card",
+                training_details=training_details,
+                sagemaker_session=self.sagemaker_session,
+            )
         return model.register(
             content_types,
             response_types,

src/sagemaker/fw_utils.py

@@ -152,7 +152,6 @@
     "2.1.0",
     "2.1.2",
     "2.2.0",
-    "2.3.0",
     "2.3.1",
 ]
 

src/sagemaker/image_uri_config/huggingface-llm.json

@@ -12,7 +12,7 @@
             "1.2": "1.2.0",
             "1.3": "1.3.3",
             "1.4": "1.4.5",
-            "2.0": "2.0.2"
+            "2.0": "2.2.0"
         },
         "versions": {
             "0.6.0": {
@@ -672,6 +672,53 @@
                 "container_version": {
                     "gpu": "cu121-ubuntu22.04"
                 }
+            },
+            "2.2.0": {
+                "py_versions": [
+                    "py310"
+                ],
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "il-central-1": "780543022126",
+                    "ap-east-1": "871362719292",
+                    "ap-northeast-1": "763104351884",
+                    "ap-northeast-2": "763104351884",
+                    "ap-northeast-3": "364406365360",
+                    "ap-south-1": "763104351884",
+                    "ap-south-2": "772153158452",
+                    "ap-southeast-1": "763104351884",
+                    "ap-southeast-2": "763104351884",
+                    "ap-southeast-3": "907027046896",
+                    "ap-southeast-4": "457447274322",
+                    "ca-central-1": "763104351884",
+                    "cn-north-1": "727897471807",
+                    "cn-northwest-1": "727897471807",
+                    "eu-central-1": "763104351884",
+                    "eu-central-2": "380420809688",
+                    "eu-north-1": "763104351884",
+                    "eu-west-1": "763104351884",
+                    "eu-west-2": "763104351884",
+                    "eu-west-3": "763104351884",      
+                    "eu-south-1": "692866216735",
+                    "eu-south-2": "503227376785",
+                    "me-south-1": "217643126080",
+                    "me-central-1": "914824155844",
+                    "sa-east-1": "763104351884",
+                    "us-east-1": "763104351884",
+                    "us-east-2": "763104351884",
+                    "us-gov-east-1": "446045086412",
+                    "us-gov-west-1": "442386744353",
+                    "us-iso-east-1": "886529160074",
+                    "us-isob-east-1": "094389454867",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884",
+                    "ca-west-1": "204538143572"
+                },
+                "tag_prefix": "2.3.0-tgi2.2.0",
+                "repository": "huggingface-pytorch-tgi-inference",
+                "container_version": {
+                    "gpu": "cu121-ubuntu22.04-v2.0"
+                }
             }
         }
     }

src/sagemaker/image_uri_config/pytorch-smp.json

@@ -8,7 +8,7 @@
             "2.1": "2.1.2",
             "2.2": "2.3.1",
             "2.2.0": "2.3.1",
-            "2.3": "2.4.0"
+            "2.3.1": "2.4.0"
         },
         "versions": {
             "2.0.1": {

src/sagemaker/image_uri_config/pytorch.json

@@ -1008,6 +1008,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -1051,6 +1053,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -2329,6 +2333,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -2372,6 +2378,7 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -2415,6 +2422,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },

src/sagemaker/image_uri_config/tensorflow.json

@@ -2140,6 +2140,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -2180,6 +2182,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -4352,6 +4356,8 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-east-1": "303241398832",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },
@@ -4395,6 +4401,7 @@
                     "us-gov-west-1": "442386744353",
                     "us-iso-east-1": "886529160074",
                     "us-isob-east-1": "094389454867",
+                    "us-isof-south-1": "454834333376",
                     "us-west-1": "763104351884",
                     "us-west-2": "763104351884"
                 },

src/sagemaker/jumpstart/hub/hub.py

@@ -233,7 +233,7 @@ def list_sagemaker_public_hub_models(
                     f"arn:{info.partition}:"
                     f"sagemaker:{info.region}:"
                     f"aws:hub-content/{info.hub_name}/"
-                    f"{HubContentType.MODEL}/{model[0]}"
+                    f"{HubContentType.MODEL.value}/{model[0]}"
                 )
                 hub_content_summary = {
                     "hub_content_name": model[0],