combine columns to match old strucutre

Author: ahosler

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

@@ -122,24 +122,41 @@ def _train_model(self, i, series_id, df, model_kwargs):
                 upper_bound=self.get_horizon(forecast["yhat_upper"]).values,
                 lower_bound=self.get_horizon(forecast["yhat_lower"]).values,
             )
-            # Get all features that make up the forecast. Exclude CI (upper/lower) and drop yhat ([:-1])
+            # Get all features that make up the forecast. Exclude CI (upper/lower)
             core_columns = forecast.columns[
                 ~forecast.columns.str.endswith("_lower")
                 & ~forecast.columns.str.endswith("_upper")
-            ][:-1]
-            core_columns = set(core_columns) - set(
+            ]
+            core_columns = set(core_columns) - {
                 "additive_terms",
                 "extra_regressors_additive",
                 "multiplicative_terms",
                 "extra_regressors_multiplicative",
                 "cap",
                 "floor",
+                "yhat",
+            }
+            combine_terms = list(
+                core_columns.intersection(
+                    {
+                        "trend",
+                        "daily",
+                        "weekly",
+                        "yearly",
+                        "monthly",
+                        "holidays",
+                        "zeros",
+                    }
+                )
             )
-            self.explanations_info[series_id] = (
+
+            temp_df = (
                 forecast[list(core_columns)]
                 .rename({"ds": "Date"}, axis=1)
                 .set_index("Date")
             )
+            temp_df[self.spec.target_column] = temp_df[combine_terms].sum(axis=1)
+            self.explanations_info[series_id] = temp_df.drop(combine_terms, axis=1)
 
             self.models[series_id] = {}
             self.models[series_id]["model"] = model

tests/operators/forecast/test_explainers.py

@@ -221,6 +221,10 @@ def test_explanations_filenames(model, num_series):
         operator_config.spec.local_explanation_filename = local_explanation_filename
 
         results = forecast_operate(operator_config)
+        assert (
+            not results.get_global_explanations().empty
+        ), "Error generating Global Expl"
+        assert not results.get_local_explanations().empty, "Error generating Local Expl"
 
         global_explanation_path = os.path.join(
             output_directory, global_explanation_filename