Merge branch 'master' into neo_dca

Author: TusharKanekiDey

src/sagemaker/image_uri_config/model-monitor.json

@@ -11,6 +11,7 @@
                 "ap-south-1": "126357580389",
                 "ap-southeast-1": "245545462676",
                 "ap-southeast-2": "563025443158",
+                "ap-southeast-3": "669540362728",
                 "ca-central-1": "536280801234",
                 "cn-north-1": "453000072557",
                 "cn-northwest-1": "453252182341",

src/sagemaker/session.py

@@ -4987,7 +4987,12 @@ def _rule_statuses_changed(current_statuses, last_statuses):
 def _logs_init(sagemaker_session, description, job):
     """Placeholder docstring"""
     if job == "Training":
-        instance_count = description["ResourceConfig"]["InstanceCount"]
+        if description["ResourceConfig"]["InstanceCount"] is not None:
+            instance_count = description["ResourceConfig"]["InstanceCount"]
+        else:
+            instance_count = 0
+            for instanceGroup in description["ResourceConfig"]["InstanceGroups"]:
+                instance_count += instanceGroup["InstanceCount"]
     elif job == "Transform":
         instance_count = description["TransformResources"]["InstanceCount"]
     elif job == "Processing":

tests/unit/sagemaker/image_uris/test_model_monitor.py

@@ -24,6 +24,7 @@
     "ap-south-1": "126357580389",
     "ap-southeast-1": "245545462676",
     "ap-southeast-2": "563025443158",
+    "ap-southeast-3": "669540362728",
     "ca-central-1": "536280801234",
     "cn-north-1": "453000072557",
     "cn-northwest-1": "453252182341",