Skip to content

Commit 51f1dce

Browse files
knakadknakad
committed
fix: remove unused env variable for Model Monitoring (#293)
* change: remove unnecessary env variable for baselining jobs * fix: stop asserting output_path env variable. * fix: correct bug if network_config_dict is empty.
1 parent 9760bb1 commit 51f1dce

File tree

2 files changed

+14
-92
lines changed

2 files changed

+14
-92
lines changed

‎src/sagemaker/model_monitor/model_monitoring.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -716,11 +716,12 @@ def attach(cls, monitor_schedule_name, sagemaker_session=None):
716716
if vpc_config is not None:
717717
subnets = vpc_config["Subnets"]
718718

719-
network_config = NetworkConfig(
720-
enable_network_isolation=network_config_dict["EnableNetworkIsolation"],
721-
security_group_ids=security_group_ids,
722-
subnets=subnets,
723-
)
719+
if network_config_dict:
720+
network_config = NetworkConfig(
721+
enable_network_isolation=network_config_dict["EnableNetworkIsolation"],
722+
security_group_ids=security_group_ids,
723+
subnets=subnets,
724+
)
724725

725726
tags = sagemaker_session.list_tags(resource_arn=schedule_desc["MonitoringScheduleArn"])
726727

@@ -1258,9 +1259,7 @@ def create_monitoring_schedule(
12581259
statistics_s3_uri = statistics_object.file_s3_uri
12591260

12601261
normalized_env = self._generate_env_map(
1261-
env=self.env,
1262-
output_path=normalized_monitoring_output.source,
1263-
enable_cloudwatch_metrics=enable_cloudwatch_metrics,
1262+
env=self.env, enable_cloudwatch_metrics=enable_cloudwatch_metrics
12641263
)
12651264

12661265
monitoring_output_config = {
@@ -1532,11 +1531,12 @@ def attach(cls, monitor_schedule_name, sagemaker_session=None):
15321531
if vpc_config is not None:
15331532
subnets = vpc_config["Subnets"]
15341533

1535-
network_config = NetworkConfig(
1536-
enable_network_isolation=network_config_dict["EnableNetworkIsolation"],
1537-
security_group_ids=security_group_ids,
1538-
subnets=subnets,
1539-
)
1534+
if network_config_dict:
1535+
network_config = NetworkConfig(
1536+
enable_network_isolation=network_config_dict["EnableNetworkIsolation"],
1537+
security_group_ids=security_group_ids,
1538+
subnets=subnets,
1539+
)
15401540

15411541
tags = sagemaker_session.list_tags(resource_arn=schedule_desc["MonitoringScheduleArn"])
15421542

@@ -1664,7 +1664,7 @@ def _normalize_monitoring_output(self, output_s3_uri=None):
16641664
@staticmethod
16651665
def _generate_env_map(
16661666
env,
1667-
output_path,
1667+
output_path=None,
16681668
enable_cloudwatch_metrics=None,
16691669
record_preprocessor_script_container_path=None,
16701670
post_processor_script_container_path=None,

‎tests/integ/test_model_monitor.py

Lines changed: 0 additions & 78 deletions
Original file line numberDiff line numberDiff line change
@@ -443,12 +443,6 @@ def test_default_monitor_suggest_baseline_and_create_monitoring_schedule_with_cu
443443
]
444444
== ENV_VALUE_1
445445
)
446-
assert (
447-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
448-
"output_path"
449-
]
450-
== "/opt/ml/processing/output"
451-
)
452446
assert (
453447
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
454448
"publish_cloudwatch_metrics"
@@ -622,12 +616,6 @@ def test_default_monitor_suggest_baseline_and_create_monitoring_schedule_without
622616
].get(ENV_KEY_1)
623617
is None
624618
)
625-
assert (
626-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
627-
"output_path"
628-
]
629-
== "/opt/ml/processing/output"
630-
)
631619
assert (
632620
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
633621
"publish_cloudwatch_metrics"
@@ -771,12 +759,6 @@ def test_default_monitor_create_stop_and_start_monitoring_schedule_with_customiz
771759
]
772760
== ENV_VALUE_1
773761
)
774-
assert (
775-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
776-
"output_path"
777-
]
778-
== "/opt/ml/processing/output"
779-
)
780762
assert (
781763
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
782764
"publish_cloudwatch_metrics"
@@ -937,12 +919,6 @@ def test_default_monitor_create_and_update_schedule_config_with_customizations(
937919
]
938920
== ENV_VALUE_1
939921
)
940-
assert (
941-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
942-
"output_path"
943-
]
944-
== "/opt/ml/processing/output"
945-
)
946922
assert (
947923
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
948924
"publish_cloudwatch_metrics"
@@ -1069,12 +1045,6 @@ def test_default_monitor_create_and_update_schedule_config_with_customizations(
10691045
]
10701046
== UPDATED_ENV_VALUE_1
10711047
)
1072-
assert (
1073-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1074-
"output_path"
1075-
]
1076-
== "/opt/ml/processing/output"
1077-
)
10781048
assert (
10791049
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
10801050
"publish_cloudwatch_metrics"
@@ -1185,12 +1155,6 @@ def test_default_monitor_create_and_update_schedule_config_without_customization
11851155
].get(ENV_KEY_1)
11861156
is None
11871157
)
1188-
assert (
1189-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1190-
"output_path"
1191-
]
1192-
== "/opt/ml/processing/output"
1193-
)
11941158
assert (
11951159
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
11961160
"publish_cloudwatch_metrics"
@@ -1296,12 +1260,6 @@ def test_default_monitor_create_and_update_schedule_config_without_customization
12961260
].get(ENV_KEY_1)
12971261
is None
12981262
)
1299-
assert (
1300-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1301-
"output_path"
1302-
]
1303-
== "/opt/ml/processing/output"
1304-
)
13051263
assert (
13061264
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
13071265
"publish_cloudwatch_metrics"
@@ -1446,12 +1404,6 @@ def test_default_monitor_attach_followed_by_baseline_and_update_monitoring_sched
14461404
]
14471405
== UPDATED_ENV_VALUE_1
14481406
)
1449-
assert (
1450-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1451-
"output_path"
1452-
]
1453-
== "/opt/ml/processing/output"
1454-
)
14551407
assert (
14561408
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
14571409
"publish_cloudwatch_metrics"
@@ -1697,12 +1649,6 @@ def test_byoc_monitor_suggest_baseline_and_create_monitoring_schedule_with_custo
16971649
]
16981650
== ENV_VALUE_1
16991651
)
1700-
assert (
1701-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1702-
"output_path"
1703-
]
1704-
== "/opt/ml/processing/output"
1705-
)
17061652
assert (
17071653
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
17081654
"publish_cloudwatch_metrics"
@@ -1887,12 +1833,6 @@ def test_byoc_monitor_suggest_baseline_and_create_monitoring_schedule_without_cu
18871833
]
18881834
== ENV_VALUE_1
18891835
)
1890-
assert (
1891-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
1892-
"output_path"
1893-
]
1894-
== "/opt/ml/processing/output"
1895-
)
18961836
assert (
18971837
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
18981838
"publish_cloudwatch_metrics"
@@ -2047,12 +1987,6 @@ def test_byoc_monitor_create_and_update_schedule_config_with_customizations(
20471987
]
20481988
== ENV_VALUE_1
20491989
)
2050-
assert (
2051-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
2052-
"output_path"
2053-
]
2054-
== "/opt/ml/processing/output"
2055-
)
20561990
assert (
20571991
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
20581992
"publish_cloudwatch_metrics"
@@ -2173,12 +2107,6 @@ def test_byoc_monitor_create_and_update_schedule_config_with_customizations(
21732107
]
21742108
== UPDATED_ENV_VALUE_1
21752109
)
2176-
assert (
2177-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
2178-
"output_path"
2179-
]
2180-
== "/opt/ml/processing/output"
2181-
)
21822110
assert (
21832111
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
21842112
"publish_cloudwatch_metrics"
@@ -2392,12 +2320,6 @@ def test_byoc_monitor_attach_followed_by_baseline_and_update_monitoring_schedule
23922320
]
23932321
== UPDATED_ENV_VALUE_1
23942322
)
2395-
assert (
2396-
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
2397-
"output_path"
2398-
]
2399-
== "/opt/ml/processing/output"
2400-
)
24012323
assert (
24022324
schedule_description["MonitoringScheduleConfig"]["MonitoringJobDefinition"]["Environment"][
24032325
"publish_cloudwatch_metrics"

0 commit comments

Comments
 (0)