improve unit test

Author: ahosler

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

@@ -153,9 +153,8 @@ def generate_report(self):
                     model_description,
                     other_sections,
                 ) = self._generate_report()
-                report_title = self.config.spec.report_title or "Forecast Report"
                 header_section = rc.Block(
-                    rc.Heading(report_title, level=1),
+                    rc.Heading(self.spec.report_title, level=1),
                     rc.Text(
                         f"You selected the {self.spec.model} model.\nBased on your dataset, you could have also selected any of the models: {SupportedModels.keys()}."
                     ),
@@ -572,7 +571,7 @@ def _save_report(
         if self.spec.generate_explanations:
             try:
                 if not self.formatted_global_explanation.empty:
-                    if not self.spec.generate_explanations_file:
+                    if self.spec.generate_explanation_files:
                         write_data(
                             data=self.formatted_global_explanation,
                             filename=os.path.join(
@@ -589,7 +588,7 @@ def _save_report(
                     )
 
                 if not self.formatted_local_explanation.empty:
-                    if not self.spec.generate_explanations_file:
+                    if self.spec.generate_explanation_files:
                         write_data(
                             data=self.formatted_local_explanation,
                             filename=os.path.join(

ads/opctl/operator/lowcode/forecast/operator_config.py

@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 
-# Copyright (c) 2023, 2024 Oracle and/or its affiliates.
+# Copyright (c) 2023, 2025 Oracle and/or its affiliates.
 # Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl/
 
 import os
@@ -117,7 +117,7 @@ class ForecastOperatorSpec(DataClassSerializable):
     generate_metrics: bool = None
     generate_metrics_file: bool = None
     generate_explanations: bool = None
-    generate_explanations_file: bool = None
+    generate_explanation_files: bool = None
     explanations_accuracy_mode: str = None
     horizon: int = None
     model: str = None
@@ -136,9 +136,7 @@ def __post_init__(self):
         self.output_directory = self.output_directory or OutputDirectory(
             url=find_output_dirname(self.output_directory)
         )
-        self.generate_model_pickle = (
-            True if self.generate_model_pickle or self.what_if_analysis else False
-        )
+        self.generate_model_pickle = self.generate_model_pickle or self.what_if_analysis
         self.metric = (self.metric or "").lower() or SupportedMetrics.SMAPE.lower()
         self.model = self.model or SupportedModels.Prophet
         self.confidence_interval_width = self.confidence_interval_width or 0.80
@@ -166,9 +164,9 @@ def __post_init__(self):
             if self.generate_forecast_file is not None
             else True
         )
-        self.generate_explanations_file = (
-            self.generate_explanations_file
-            if self.generate_explanations_file is not None
+        self.generate_explanation_files = (
+            self.generate_explanation_files
+            if self.generate_explanation_files is not None
             else True
         )
         # For Explanations Generation. When user doesn't specify defaults to False
@@ -191,6 +189,7 @@ def __post_init__(self):
             if self.generate_model_pickle is not None
             else False
         )
+        self.report_title = self.report_title or "Forecast Report"
         self.report_theme = self.report_theme or "light"
         self.metrics_filename = self.metrics_filename or "metrics.csv"
         self.test_metrics_filename = self.test_metrics_filename or "test_metrics.csv"

tests/operators/forecast/test_errors.py

@@ -929,19 +929,24 @@ def test_generate_files(operator_setup, model):
     )
 
     yaml_i = TEMPLATE_YAML.copy()
-    yaml_i["spec"]["horizon"] = 10
+    yaml_i["spec"]["horizon"] = 3
     yaml_i["spec"]["model"] = model
     yaml_i["spec"]["historical_data"] = {"format": "pandas"}
+    yaml_i["spec"]["additional_data"] = {"format": "pandas"}
     yaml_i["spec"]["target_column"] = TARGET_COL.name
     yaml_i["spec"]["datetime_column"]["name"] = HISTORICAL_DATETIME_COL.name
-    yaml_i["spec"]["report_title"] = "Skibidi ADS Skibidi"
     yaml_i["spec"]["output_directory"]["url"] = operator_setup
-    yaml_i["spec"]["generate_explanations_file"] = False
+    yaml_i["spec"]["generate_explanation_files"] = False
     yaml_i["spec"]["generate_forecast_file"] = False
     yaml_i["spec"]["generate_metrics_file"] = False
+    yaml_i["spec"]["generate_explanations"] = True
 
     df = pd.concat([HISTORICAL_DATETIME_COL[:15], TARGET_COL[:15]], axis=1)
+    df_add = pd.concat([HISTORICAL_DATETIME_COL[:18], ADD_COLS[:18]], axis=1)
+    print(f"df: {df}")
+    print(f"df_add: {df_add}")
     yaml_i["spec"]["historical_data"]["data"] = df
+    yaml_i["spec"]["additional_data"]["data"] = df_add
     operator_config = ForecastOperatorConfig.from_dict(yaml_i)
     results = operate(operator_config)
     files = os.listdir(operator_setup)
@@ -952,8 +957,28 @@ def test_generate_files(operator_setup, model):
     assert (
         "metrics.csv" not in files
     ), "Generated metrics file, but `generate_metrics_file` was set False"
+    assert (
+        "local_explanations.csv" not in files
+    ), "Generated metrics file, but `generate_explanation_files` was set False"
+    assert (
+        "global_explanations.csv" not in files
+    ), "Generated metrics file, but `generate_explanation_files` was set False"
     assert not results.get_forecast().empty
     assert not results.get_metrics().empty
+    assert not results.get_global_explanations().empty
+    assert not results.get_local_explanations().empty
+
+    yaml_i["spec"].pop("generate_explanation_files")
+    yaml_i["spec"].pop("generate_forecast_file")
+    yaml_i["spec"].pop("generate_metrics_file")
+    operator_config = ForecastOperatorConfig.from_dict(yaml_i)
+    results = operate(operator_config)
+    files = os.listdir(operator_setup)
+    assert "report.html" in files, "Failed to generate report"
+    assert "forecast.csv" in files, "Failed to generate forecast file"
+    assert "metrics.csv" in files, "Failed to generated metrics file"
+    assert "local_explanation.csv" in files, "Failed to generated local expl file"
+    assert "global_explanation.csv" in files, "Failed to generated global expl file"
 
 
 if __name__ == "__main__":