Merge branch 'master' into fix-duplicate-transformer-docstring

Author: admivsn

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v2.233.0 (2024-11-04)
+
+### Features
+
+ * triton v24.09
+ * Marketplace model support in HubService
+
+### Bug Fixes and Other Changes
+
+ * Fixing JumpStart Tests
+ * bumping smp version from 2.6.0 to 2.6.1
+ * Updates for DJL 0.30.0 release
+
 ## v2.232.3 (2024-10-30)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-2.232.4.dev0
+2.233.1.dev0

hatch_build.py

@@ -20,7 +20,7 @@ def read_feature_deps(feature):
 
     optional_dependencies = {"all": []}
 
-    for feature in ("feature-processor", "huggingface", "local", "scipy"):
+    for feature in ("feature-processor", "huggingface", "local", "scipy", "sagemaker-mlflow"):
         dependencies = read_feature_deps(feature)
         optional_dependencies[feature] = dependencies
         optional_dependencies["all"].extend(dependencies)

pyproject.toml

@@ -48,7 +48,6 @@ dependencies = [
   "PyYAML~=6.0",
   "requests",
   "sagemaker-core>=1.0.0,<2.0.0",
-  "sagemaker-mlflow",
   "schema",
   "smdebug_rulesconfig==1.0.1",
   "tblib>=1.7.0,<4",

requirements/extras/sagemaker-mlflow_requirements.txt

@@ -0,0 +1 @@
+sagemaker-mlflow>=0.1.0

requirements/extras/test_requirements.txt

@@ -44,3 +44,4 @@ huggingface_hub>=0.23.4
 uvicorn>=0.30.1
 fastapi>=0.111.0
 nest-asyncio
+sagemaker-mlflow>=0.1.0

src/sagemaker/chainer/model.py

@@ -37,6 +37,7 @@
 from sagemaker.utils import to_string
 from sagemaker.workflow import is_pipeline_variable
 from sagemaker.workflow.entities import PipelineVariable
+from sagemaker.model_life_cycle import ModelLifeCycle
 
 logger = logging.getLogger("sagemaker")
 
@@ -180,6 +181,7 @@ def register(
         skip_model_validation: Optional[Union[str, PipelineVariable]] = None,
         source_uri: Optional[Union[str, PipelineVariable]] = None,
         model_card: Optional[Union[ModelPackageModelCard, ModelCard]] = None,
+        model_life_cycle: Optional[ModelLifeCycle] = None,
     ):
         """Creates a model package for creating SageMaker models or listing on Marketplace.
 
@@ -233,6 +235,7 @@ def register(
                 (default: None).
             model_card (ModeCard or ModelPackageModelCard): document contains qualitative and
                 quantitative information about a model (default: None).
+            model_life_cycle (ModelLifeCycle): ModelLifeCycle object (default: None).
 
         Returns:
             str: A string of SageMaker Model Package ARN.
@@ -274,6 +277,7 @@ def register(
             skip_model_validation=skip_model_validation,
             source_uri=source_uri,
             model_card=model_card,
+            model_life_cycle=model_life_cycle,
         )
 
     def prepare_container_def(

src/sagemaker/estimator.py

@@ -107,7 +107,6 @@
 from sagemaker.workflow.parameters import ParameterString
 from sagemaker.workflow.pipeline_context import PipelineSession, runnable_by_pipeline
 
-from sagemaker.mlflow.forward_sagemaker_metrics import log_sagemaker_job_to_mlflow
 
 logger = logging.getLogger(__name__)
 
@@ -1374,8 +1373,14 @@ def fit(
             forward_to_mlflow_tracking_server = True
         if wait:
             self.latest_training_job.wait(logs=logs)
-        if forward_to_mlflow_tracking_server:
-            log_sagemaker_job_to_mlflow(self.latest_training_job.name)
+        try:
+            if forward_to_mlflow_tracking_server:
+                from sagemaker.mlflow.forward_sagemaker_metrics import log_sagemaker_job_to_mlflow
+
+                log_sagemaker_job_to_mlflow(self.latest_training_job.name)
+        except ImportError:
+            if forward_to_mlflow_tracking_server:
+                raise ValueError("Unable to import mlflow, check if sagemaker-mlflow is installed")
 
     def _compilation_job_name(self):
         """Placeholder docstring"""
@@ -1756,6 +1761,7 @@ def register(
         data_input_configuration=None,
         skip_model_validation=None,
         source_uri=None,
+        model_life_cycle=None,
         model_card=None,
         **kwargs,
     ):
@@ -1807,6 +1813,7 @@ def register(
             source_uri (str): The URI of the source for the model package (default: None).
             model_card (ModeCard or ModelPackageModelCard): document contains qualitative and
                 quantitative information about a model (default: None).
+            model_life_cycle (ModelLifeCycle): ModelLifeCycle object (default: None).
             **kwargs: Passed to invocation of ``create_model()``. Implementations may customize
                 ``create_model()`` to accept ``**kwargs`` to customize model creation during
                 deploy. For more, see the implementation docs.
@@ -1862,6 +1869,7 @@ def register(
             skip_model_validation=skip_model_validation,
             source_uri=source_uri,
             model_card=model_card,
+            model_life_cycle=model_life_cycle,
         )
 
     @property

src/sagemaker/huggingface/model.py

@@ -36,6 +36,7 @@
 from sagemaker.utils import to_string, format_tags
 from sagemaker.workflow import is_pipeline_variable
 from sagemaker.workflow.entities import PipelineVariable
+from sagemaker.model_life_cycle import ModelLifeCycle
 
 logger = logging.getLogger("sagemaker")
 
@@ -362,6 +363,7 @@ def register(
         data_input_configuration: Optional[Union[str, PipelineVariable]] = None,
         skip_model_validation: Optional[Union[str, PipelineVariable]] = None,
         source_uri: Optional[Union[str, PipelineVariable]] = None,
+        model_life_cycle: Optional[ModelLifeCycle] = None,
         model_card: Optional[Union[ModelPackageModelCard, ModelCard]] = None,
     ):
         """Creates a model package for creating SageMaker models or listing on Marketplace.
@@ -417,6 +419,7 @@ def register(
                 (default: None).
             model_card (ModeCard or ModelPackageModelCard): document contains qualitative and
                 quantitative information about a model (default: None).
+            model_life_cycle (ModelLifeCycle): ModelLifeCycle object (default: None).
 
         Returns:
             A `sagemaker.model.ModelPackage` instance.
@@ -465,6 +468,7 @@ def register(
             data_input_configuration=data_input_configuration,
             skip_model_validation=skip_model_validation,
             source_uri=source_uri,
+            model_life_cycle=model_life_cycle,
             model_card=model_card,
         )
 

src/sagemaker/image_uri_config/djl-neuronx.json

@@ -12,6 +12,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -35,6 +36,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -58,6 +60,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -81,6 +84,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -104,6 +108,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -127,6 +132,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -150,6 +156,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",
@@ -173,6 +180,7 @@
                 "ap-south-1": "763104351884",
                 "ap-southeast-1": "763104351884",
                 "ap-southeast-2": "763104351884",
+                "ap-southeast-5": "550225433462",
                 "cn-north-1": "727897471807",
                 "cn-northwest-1": "727897471807",
                 "eu-central-1": "763104351884",