From b9a4dd983f947e9c376085c69c0c754b5f466486 Mon Sep 17 00:00:00 2001 From: 0z5a Date: Fri, 13 Nov 2026 17:03:44 +0100 Subject: [PATCH] fix: align regressor_predictor forecasts with unsorted predict frames _prepare_regressors_for_predict runs before setup_dataframe sorts df by ds. The regressor models return forecasts sorted by ds, which were written back by position, and the regressor sample draws kept the caller's row order while df was re-sorted later. For a frame not sorted by ds this put regressor forecasts and uncertainty on the wrong dates. Sort df by ds first when any regressor has a predictor. --- python/prophet/forecaster.py | 10 ++++++++++ python/prophet/tests/test_prophet.py | 15 +++++++++++++++ 2 files changed, 25 insertions(+) diff --git a/python/prophet/forecaster.py b/python/prophet/forecaster.py index 261776c85..d84c3b64c 100644 --- a/python/prophet/forecaster.py +++ b/python/prophet/forecaster.py @@ -805,6 +805,16 @@ def _prepare_regressors_for_predict( {} if n_samples else None ) last_history_date = self.history['ds'].max() if self.history is not None else None + if any( + props.get('predictor') is not None + for props in self.extra_regressors.values() + ): + # The regressor models return their forecasts sorted by ds, and + # setup_dataframe later sorts df by ds. Sort df the same way first, + # so the forecasts and sample draws line up with the right dates. + if df.index.name == 'ds': + df.index.name = None + df = df.sort_values('ds', kind='mergesort').reset_index(drop=True) for name, props in self.extra_regressors.items(): predictor = props.get('predictor') if props.get('predictor_spec') is None or predictor is None: diff --git a/python/prophet/tests/test_prophet.py b/python/prophet/tests/test_prophet.py index 0c5e9d0e2..bc05f2867 100644 --- a/python/prophet/tests/test_prophet.py +++ b/python/prophet/tests/test_prophet.py @@ -1111,6 +1111,21 @@ def test_regressor_predictor_cross_validation_metrics(self, backend): width_pred = np.mean(cv_pred["yhat_upper"] - cv_pred["yhat_lower"]) assert width_pred > width_base + def test_regressor_predictor_unsorted_dates(self, backend): + df = self._make_regressor_df()[["ds", "y", "reg"]] + m = Prophet(uncertainty_samples=100, stan_backend=backend) + m.add_regressor("reg", regressor_predictor=True) + m.fit(df.iloc[:70]) + # 10 history dates and 20 future dates, not sorted by ds + future = df[["ds"]].iloc[60:] + shuffled = future.sample(frac=1, random_state=0) + np.random.seed(0) + fcst = m.predict(future) + np.random.seed(0) + fcst_shuffled = m.predict(shuffled) + for col in ["yhat", "yhat_lower", "yhat_upper"]: + np.testing.assert_allclose(fcst_shuffled[col], fcst[col]) + def test_regressor_predictor_used_for_future(self, backend, monkeypatch): df = pd.DataFrame( {