Merge branch 'master' into master

Author: jerrypeng7773

CHANGELOG.md

@@ -1,5 +1,18 @@
 # Changelog
 
+## v2.224.4 (2024-07-04)
+
+### Bug Fixes and Other Changes
+
+ * allow for inf spec and server override to be passed
+
+## v2.224.3 (2024-07-03)
+
+### Bug Fixes and Other Changes
+
+ * Upgrade local dependencies
+ * Improve docstrings for estimator tags
+
 ## v2.224.2 (2024-06-27)
 
 ### Bug Fixes and Other Changes

VERSION

@@ -1 +1 @@
-2.224.3.dev0
+2.224.5.dev0

requirements/extras/local_requirements.txt

@@ -1,3 +1,3 @@
 urllib3>=1.26.8,<3.0.0
-docker>=5.0.2,<7.0.0
+docker>=5.0.2,<8.0.0
 PyYAML>=5.4.1,<7

src/sagemaker/image_uri_config/pytorch.json

@@ -1107,7 +1107,8 @@
             "1.12": "1.12.1",
             "2.0": "2.0.1",
             "2.1": "2.1.0",
-            "2.2": "2.2.1"
+            "2.2": "2.2.1",
+            "2.3": "2.3.0"
         },
         "versions": {
             "1.12.1": {
@@ -1331,6 +1332,50 @@
                     "us-west-2": "763104351884"
                 },
                 "repository": "pytorch-inference-graviton"
+            },
+            "2.3.0": {
+                "container_version": {
+                    "cpu": "ubuntu20.04"
+                },
+                "py_versions": [
+                    "py311"
+                ],
+                "registries": {
+                    "af-south-1": "626614931356",
+                    "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",
+                    "ca-west-1": "204538143572",
+                    "cn-north-1": "727897471807",
+                    "cn-northwest-1": "727897471807",
+                    "eu-central-1": "763104351884",
+                    "eu-central-2": "380420809688",
+                    "eu-north-1": "763104351884",
+                    "eu-south-1": "692866216735",
+                    "eu-south-2": "503227376785",
+                    "eu-west-1": "763104351884",
+                    "eu-west-2": "763104351884",
+                    "eu-west-3": "763104351884",
+                    "il-central-1": "780543022126",
+                    "me-central-1": "914824155844",
+                    "me-south-1": "217643126080",
+                    "sa-east-1": "763104351884",
+                    "us-east-1": "763104351884",
+                    "us-east-2": "763104351884",
+                    "us-gov-east-1": "446045086412",
+                    "us-gov-west-1": "442386744353",
+                    "us-west-1": "763104351884",
+                    "us-west-2": "763104351884"
+                },
+                "repository": "pytorch-inference-graviton"
             }
         }
     },

src/sagemaker/serve/builder/model_builder.py

@@ -881,8 +881,8 @@ def _build_for_model_server(self):  # pylint: disable=R0911, R1710
         if self.model_metadata:
             mlflow_path = self.model_metadata.get(MLFLOW_MODEL_PATH)
 
-        if not self.model and not mlflow_path:
-            raise ValueError("Missing required parameter `model` or 'ml_flow' path")
+        if not self.model and not mlflow_path and not self.inference_spec:
+            raise ValueError("Missing required parameter `model` or 'ml_flow' path or inf_spec")
 
         if self.model_server == ModelServer.TORCHSERVE:
             return self._build_for_torchserve()

tests/unit/sagemaker/serve/builder/test_model_builder.py

@@ -147,7 +147,7 @@ def test_model_server_override_djl_without_model_or_mlflow(self, mock_serve_sett
         )
         self.assertRaisesRegex(
             Exception,
-            "Missing required parameter `model` or 'ml_flow' path",
+            "Missing required parameter `model` or 'ml_flow' path or inf_spec",
             builder.build,
             Mode.SAGEMAKER_ENDPOINT,
             mock_role_arn,
@@ -168,12 +168,26 @@ def test_model_server_override_torchserve_with_model(
 
         mock_build_for_ts.assert_called_once()
 
+    @patch("sagemaker.serve.builder.model_builder._ServeSettings")
+    @patch("sagemaker.serve.builder.model_builder.ModelBuilder._build_for_torchserve")
+    def test_model_server_override_torchserve_with_inf_spec(
+        self, mock_build_for_ts, mock_serve_settings
+    ):
+        mock_setting_object = mock_serve_settings.return_value
+        mock_setting_object.role_arn = mock_role_arn
+        mock_setting_object.s3_model_data_url = mock_s3_model_data_url
+
+        builder = ModelBuilder(model_server=ModelServer.TORCHSERVE, inference_spec="some value")
+        builder.build(sagemaker_session=mock_session)
+
+        mock_build_for_ts.assert_called_once()
+
     @patch("sagemaker.serve.builder.model_builder._ServeSettings")
     def test_model_server_override_torchserve_without_model_or_mlflow(self, mock_serve_settings):
         builder = ModelBuilder(model_server=ModelServer.TORCHSERVE)
         self.assertRaisesRegex(
             Exception,
-            "Missing required parameter `model` or 'ml_flow' path",
+            "Missing required parameter `model` or 'ml_flow' path or inf_spec",
             builder.build,
             Mode.SAGEMAKER_ENDPOINT,
             mock_role_arn,