test data test

Author: ahosler

ads/opctl/operator/lowcode/anomaly/model/anomaly_dataset.py

@@ -36,7 +36,8 @@ def _ingest_data(self, spec):
         self.X_valid_dict = dict()
         self.y_valid_dict = dict()
         for s_id, df in self.get_dict_by_series().items():
-            self.X_valid_dict[s_id] = df.drop(spec.target_column, axis=1)
+            print(df, spec.target_column)
+            self.X_valid_dict[s_id] = df.drop([spec.target_column], axis=1)
             self.y_valid_dict[s_id] = df[spec.target_column]
 
 

ads/opctl/operator/lowcode/anomaly/model/base_model.py

@@ -17,7 +17,7 @@
 from ads.opctl import logger
 
 from ..operator_config import AnomalyOperatorConfig, AnomalyOperatorSpec
-from .anomaly_dataset import AnomalyDatasets, AnomalyOutput
+from .anomaly_dataset import AnomalyDatasets, AnomalyOutput, TestData
 from ads.opctl.operator.lowcode.anomaly.const import OutputColumns, SupportedMetrics
 from ..const import SupportedModels
 from ads.opctl.operator.lowcode.common.utils import (
@@ -69,7 +69,7 @@ def generate_report(self):
         test_data = None
 
         if self.spec.test_data:
-            test_data = TestData(self.spec.test_data)
+            test_data = TestData(self.spec)
             total_metrics, summary_metrics = self._test_data_evaluate_metrics(
                 anomaly_output, test_data, elapsed_time
             )
@@ -170,8 +170,6 @@ def _evaluation_metrics(self, anomaly_output):
     def _test_data_evaluate_metrics(self, anomaly_output, test_data, elapsed_time):
         total_metrics = pd.DataFrame()
         summary_metrics = pd.DataFrame()
-        if test_data.empty:
-            return total_metrics, summary_metrics, None
 
         for cat in anomaly_output.list_categories():
             output = anomaly_output.category_map[cat][0]
@@ -191,7 +189,7 @@ def _test_data_evaluate_metrics(self, anomaly_output, test_data, elapsed_time):
             total_metrics = pd.concat([total_metrics, metrics_df], axis=1)
 
         if total_metrics.empty:
-            return total_metrics, summary_metrics, data
+            return total_metrics, summary_metrics
 
         summary_metrics = pd.DataFrame(
             {

tests/operators/anomaly/test_anomaly_simple.py

@@ -173,6 +173,7 @@ def test_validation(model):
 
         yaml_i = deepcopy(TEMPLATE_YAML)
         yaml_i["spec"]["model"] = model
+        yaml_i["spec"]["target_column"] = "val_1"
         yaml_i["spec"]["input_data"]["url"] = input_data
         yaml_i["spec"]["validation_data"] = {"url": valid_data}
         yaml_i["spec"]["test_data"] = {"url": test_data}