chore: code refatoring

Author: Sushanth Sathish Kumar

src/sagemaker/model_monitor/model_monitoring.py

@@ -1599,7 +1599,7 @@ def _check_automatic_dashboard_validity(
         dashboard_exists = True
         try:
             cw_client.get_dashboard(DashboardName=dashboard_name)
-        except Exception as e:
+        except Exception as _:  # noqa: F841
             dashboard_exists = False
 
         if dashboard_exists:
@@ -2266,13 +2266,14 @@ def update_monitoring_schedule(
             )
             logger.error(message)
             raise ValueError(message)
-        
+
         # error checking for dashboard
         if enable_automatic_dashboard:
-            self._check_dashboard_validity_without_checking_in_use(
+            cw_client = self.sagemaker_session.boto_session.client("cloudwatch")
+            self._check_automatic_dashboard_validity(
+                cw_client=cw_client,
                 monitor_schedule_name=self.monitoring_schedule_name,
                 enable_cloudwatch_metrics=enable_cloudwatch_metrics,
-                enable_automatic_dashboard=enable_automatic_dashboard,
                 dashboard_name=dashboard_name,
             )
 
@@ -2405,7 +2406,7 @@ def update_monitoring_schedule(
         )
 
         self._wait_for_schedule_changes_to_apply()
-        
+
         if enable_automatic_dashboard:
             if dashboard_name is None:
                 dashboard_name = self.monitoring_schedule_name
@@ -2425,7 +2426,6 @@ def update_monitoring_schedule(
                 ).to_json(),
             )
 
-
     def _update_data_quality_monitoring_schedule(
         self,
         endpoint_input=None,
@@ -2591,7 +2591,6 @@ def _update_data_quality_monitoring_schedule(
                 logger.exception(message)
             raise
 
-
     def delete_monitoring_schedule(self):
         """Deletes the monitoring schedule and its job definition."""
         super(DefaultModelMonitor, self).delete_monitoring_schedule()
@@ -3473,10 +3472,11 @@ def update_monitoring_schedule(
             raise ValueError(message)
 
         if enable_automatic_dashboard:
-            self._check_dashboard_validity_without_checking_in_use(
+            cw_client = self.sagemaker_session.boto_session.client("cloudwatch")
+            self._check_automatic_dashboard_validity(
+                cw_client=cw_client,
                 monitor_schedule_name=self.monitoring_schedule_name,
                 enable_cloudwatch_metrics=enable_cloudwatch_metrics,
-                enable_automatic_dashboard=enable_automatic_dashboard,
                 dashboard_name=dashboard_name,
             )
 

tests/unit/sagemaker/monitor/test_model_monitoring.py

@@ -957,7 +957,8 @@ def test_data_quality_monitor_invalid_create(data_quality_monitor, sagemaker_ses
             constraints=CONSTRAINTS,
             statistics=STATISTICS,
         )
-        
+
+
 def test_data_quality_monitor_invalid_dashboard_create(data_quality_monitor, sagemaker_session):
     # invalid: cannot create a monitoring schedule with an invalid dashboard name
     with pytest.raises(ValueError):
@@ -1102,6 +1103,7 @@ def _test_data_quality_monitor_create_schedule(
         **expected_arguments
     )
 
+
 def _test_data_quality_batch_transform_monitor_create_schedule(
     data_quality_monitor,
     sagemaker_session,
@@ -1598,7 +1600,7 @@ def test_model_quality_monitor_with_dashboard(model_quality_monitor, sagemaker_s
         model_quality_monitor=model_quality_monitor,
         sagemaker_session=sagemaker_session,
     )
-    
+
     _test_model_quality_monitor_delete_schedule(
         model_quality_monitor=model_quality_monitor,
         sagemaker_session=sagemaker_session,
@@ -1835,6 +1837,7 @@ def _test_model_quality_monitor_create_schedule(
         Tags=TAGS,
     )
 
+
 def _test_model_quality_monitor_batch_transform_create_schedule(
     model_quality_monitor,
     sagemaker_session,