Merge branch 'master' into stacicho-modelbuilder-links

Author: stacicho

CHANGELOG.md

@@ -1,5 +1,51 @@
 # Changelog
 
+## v2.200.1 (2023-12-14)
+
+### Bug Fixes and Other Changes
+
+ * Merge branch 'master-rba' into local_merge
+ * Fix user agent tag issue
+ * update image_uri_configs  12-13-2023 14:04:54 PST
+ * update image_uri_configs  12-13-2023 12:23:06 PST
+
+## v2.200.0 (2023-12-13)
+
+### Deprecations and Removals
+
+ * remove explicit `partitions` key requirement on pysdk side.
+
+### Features
+
+ * add non-repeating config logger
+ * Add SageMaker Geospatial verison 1.x images
+ * TGI 1.2.0 Image Uri
+ * support model.register() with triton model
+ * Enable retrieving function step results for local mode
+
+### Bug Fixes and Other Changes
+
+ * TGI 1.3.1
+ * excessive jumpstart instance type logging
+ * Support local mode for remote function
+ * `Session.download_data` can not download nested objects
+ * Fix writing into non-closed file with git clone command
+ * mitigation of xgboost container incompatibility with new version
+ * update image and hardware validation with inf and graviton
+ * remove two setuptools deprecations
+ * minor jumpstart dev ex improvements
+ * save utils fix
+ * Correct DJL neuronx regions
+ * delete unused file inference-experience-dev-tester.sh
+ * Fix Experiment Run integ test w.r.t unexpected boto3 version
+ * Bump test dependencies versions
+ * fast follow on js uncompressed support - ModelBuilder
+ * Modify Region List for Neuron Images (HF neuron/neuronx, PT Neuron)
+
+### Documentation Changes
+
+ * Mention for custom Docker Image
+
 ## v2.199.0 (2023-11-30)
 
 ### Features

VERSION

@@ -1 +1 @@
-2.199.1.dev0
+2.200.2.dev0

src/sagemaker/estimator.py

@@ -578,6 +578,17 @@ def __init__(
         self.dependencies = dependencies or []
         self.uploaded_code: Optional[UploadedCode] = None
 
+        # Check that the user properly sets both subnet and secutiry_groupe_ids
+        if (
+            subnets is not None
+            and security_group_ids is None
+            or security_group_ids is not None
+            and subnets is None
+        ):
+            raise RuntimeError(
+                "When setting up custom VPC, both subnets and security_group_ids must be set"
+            )
+
         if self.instance_type in ("local", "local_gpu"):
             if self.instance_type == "local_gpu" and self.instance_count > 1:
                 raise RuntimeError("Distributed Training in Local GPU is not supported")