Refactor: target_matrix setup

tests/monitor/manager/test_monitor_setup.py

@@ -274,7 +274,18 @@ def test_set_non_iso_data_readiness_raises(monitor_setup) -> None:
     with pytest.raises(ValueError):
         monitor_setup.data_readiness_duration = "Some non-conformant string"
 
-
+def test_column_matrix_has_at_least_one_group(monitor_setup) -> None:
+    monitor_setup.config = DriftConfig(
+        metric = ComplexMetrics.histogram,
+        threshold = 0.6,
+        baseline = ReferenceProfileId(profileId="test_prof")
+    )
+
+    monitor_setup.apply()
+
+    assert isinstance(monitor_setup.target_matrix, ColumnMatrix)
+    assert monitor_setup.target_matrix.include == ["*"]
+
 def test_cron_schedule_for_analyzer(monitor_setup) -> None:
     monitor_setup.config = FixedThresholdsConfig(
         metric=DatasetMetric.classification_accuracy,

whylabs_toolkit/monitor/manager/monitor_setup.py

@@ -35,11 +35,14 @@ def __init__(self, monitor_id: str, dataset_id: Optional[str] = None, config: Co
         self._monitor_mode: Optional[Union[EveryAnomalyMode, DigestMode]] = None
         self._monitor_actions: List[GlobalAction] = []
         self._analyzer_schedule: Optional[Union[FixedCadenceSchedule, CronSchedule]] = None
-        self._target_columns: Optional[List[str]] = []
+        self._target_columns: Optional[List[str]] = ["*"]
         self._exclude_columns: Optional[List[str]] = []
-        self._target_matrix: Union[ColumnMatrix, DatasetMatrix] = ColumnMatrix(
+
+        self._default_column_matrix = ColumnMatrix(
             include=self._target_columns, exclude=self._exclude_columns, segments=[]
         )
+
+        self._target_matrix: Union[ColumnMatrix, DatasetMatrix] = self._default_column_matrix
         self._analyzer_config: Union[
             DiffConfig,
             FixedThresholdsConfig,
@@ -237,9 +240,7 @@ def set_target_columns(self, columns: List[str]) -> None:
     def exclude_target_columns(self, columns: List[str]) -> None:
         if self._validate_columns_input(columns=columns):
             self._exclude_columns = columns
-            self._target_matrix = self._target_matrix or ColumnMatrix(
-                include=self._target_columns, exclude=self._exclude_columns, segments=[]
-            )
+            self._target_matrix = self._target_matrix or self._default_column_matrix
             if isinstance(self._target_matrix, ColumnMatrix):
                 self._target_matrix.exclude = self._exclude_columns
 
@@ -254,8 +255,6 @@ def set_fixed_dates_baseline(self, start_date: datetime, end_date: datetime) ->
         )
 
     def __set_analyzer(self) -> None:
-        self.__configure_target_matrix()
-
         self.__set_dataset_matrix_for_dataset_metric()
         self.__set_dataset_matrix_for_missing_data_metric()
 
@@ -288,11 +287,6 @@ def __set_monitor(
             actions=monitor_actions,
         )
 
-    def __configure_target_matrix(self) -> None:
-        self._target_matrix = self._target_matrix or ColumnMatrix(
-            include=self._target_columns or ["*"], exclude=self._exclude_columns, segments=[]
-        )
-
     def __set_dataset_matrix_for_dataset_metric(self) -> None:
         if self._analyzer_config:
             if isinstance(self._analyzer_config, (ConjunctionConfig, DisjunctionConfig)):
@@ -313,11 +307,7 @@ def __set_dataset_matrix_for_dataset_metric(self) -> None:
                     "Setting a DatasetMatrix requires a DatasetMetric to be used"
                     "Changing it to an empty ColumnMatrix instead"
                 )
-                self._target_matrix = ColumnMatrix(
-                    include=self._target_columns or ["*"],
-                    exclude=self._exclude_columns,
-                    segments=self._target_matrix.segments,
-                )
+                self._target_matrix = self._default_column_matrix
                 return None
 
     def __set_dataset_matrix_for_missing_data_metric(self) -> None: