fix: floor and cap are now available as extra regressor in prophet te…

…mplate. See linkedin#21

greykite/sklearn/estimator/prophet_estimator.py

@@ -181,6 +181,13 @@ def __init__(
         self.model = None
         # set by the predict method
         self.forecast = None
+        # Prophet reserved columns
+        self.reserved_names = [
+            'trend', 'additive_terms', 'daily', 'weekly', 'yearly',
+            'holidays', 'zeros', 'extra_regressors_additive', 'yhat',
+            'extra_regressors_multiplicative', 'multiplicative_terms',
+            'cap', 'floor'
+        ]
 
     def fit(self, X, y=None, time_col=TIME_COL, value_col=VALUE_COL, **fit_params):
         """Fits prophet model.
@@ -242,7 +249,8 @@ def fit(self, X, y=None, time_col=TIME_COL, value_col=VALUE_COL, **fit_params):
         # This implementation assumes that the regressor(s) are provided in time series df, alongside target column.
         if self.add_regressor_dict is not None:
             for reg_col, reg_params in self.add_regressor_dict.items():
-                self.model.add_regressor(name=reg_col, **reg_params)
+                if reg_col not in self.reserved_names:
+                    self.model.add_regressor(name=reg_col, **reg_params)
 
         # if custom seasonality is provided, we supply it to Prophet model
         if self.add_seasonality_dict is not None:

setup.py

@@ -63,6 +63,6 @@
     test_suite="tests",
     tests_require=test_requirements,
     url="https://github.com/linkedin/greykite",
-    version="0.5.0",
+    version="0.5.0.dev1",
     zip_safe=False,
 )