openstef 3.4.48__py3-none-any.whl → 3.4.50__py3-none-any.whl

openstef/feature_engineering/apply_features.py

@@ -40,13 +40,14 @@ def apply_features(
     pj: PredictionJobDataClass = None,
     feature_names: list[str] = None,
     horizon: float = 24.0,
+    years: list[int] | None = None,
 ) -> pd.DataFrame:
     """Applies the feature functions defined in ``feature_functions.py`` and returns the complete dataframe.
 
     Features requiring more recent label-data are omitted.
 
     .. note::
-        For the time deriven features only the onces in the features list will be added. But for the weather features all will be added at present.
+        For the time derived features only the ones in the features list will be added. But for the weather features all will be added at present.
         These unrequested additional features have to be filtered out later.
 
     Args:
@@ -56,8 +57,9 @@ def apply_features(
                                         columns=[label, predictor_1,..., predictor_n]
                                     )
         pj (PredictionJobDataClass): Prediction job.
-        feature_names (list[str]): list of reuqested features
+        feature_names (list[str]): list of requested features
         horizon (float): Forecast horizon limit in hours.
+        years (list[int] | None): years for which to create holiday features.
 
     Returns:
         pd.DataFrame(index = datetime, columns = [label, predictor_1,..., predictor_n, feature_1, ..., feature_m])
@@ -100,7 +102,7 @@ def apply_features(
 
     # Get holiday feature functions
     feature_functions.update(
-        generate_holiday_feature_functions(country_code=country_code)
+        generate_holiday_feature_functions(country_code=country_code, years=years)
     )
 
     # Add the features to the dataframe using previously defined feature functions

openstef/feature_engineering/holiday_features.py

@@ -15,7 +15,7 @@ HOLIDAY_CSV_PATH: str = PROJECT_ROOT / "openstef" / "data" / "dutch_holidays.csv
 
 def generate_holiday_feature_functions(
     country_code: str = "NL",
-    years: list = None,
+    years: list[int] | None = None,
     path_to_school_holidays_csv: str = HOLIDAY_CSV_PATH,
 ) -> dict:
     """Generates functions for creating holiday feature.
@@ -48,9 +48,11 @@ def generate_holiday_feature_functions(
     The 'Brugdagen' are updated untill dec 2020. (Generated using agenda)
 
     Args:
-        country: Country for which to create holiday features.
-        years: years for which to create holiday features.
+        country_code: Country for which to create holiday features.
+        years: years for which to create holiday features. If None,
+            the last 4 years, the current and next year are used.
         path_to_school_holidays_csv: Filepath to csv with school holidays.
+
         NOTE: Dutch holidays csv file is only until January 2026.
 
     Returns:

openstef/model/fallback.py

@@ -65,7 +65,7 @@ def generate_fallback(
             .merge(
                 highest_daily_loadprofile, left_on="time", right_on="time", how="outer"
             )
-            .set_index("index")
+            .set_index(forecast.index)
         )
 
     # Rename so column is called forecast

{openstef-3.4.48.dist-info → openstef-3.4.50.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: openstef
-Version: 3.4.48
+Version: 3.4.50
 Summary: Open short term energy forecaster
 Home-page: https://github.com/OpenSTEF/openstef
 Author: Alliander N.V
@@ -34,6 +34,17 @@ Requires-Dist: scipy~=1.10
 Requires-Dist: statsmodels<1.0.0,>=0.13.5
 Requires-Dist: structlog<25,>=23.1
 Requires-Dist: xgboost~=2.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 <!--
 SPDX-FileCopyrightText: 2017-2023 Contributors to the OpenSTEF project <korte.termijn.prognoses@alliander.com>

{openstef-3.4.48.dist-info → openstef-3.4.50.dist-info}/RECORD

@@ -20,14 +20,14 @@ openstef/data_classes/model_specifications.py,sha256=Uod1W3QzhRqVLb6zvXwxh9wRL3E
 openstef/data_classes/prediction_job.py,sha256=_o5_9HYv6ERTIWlcMpUE-mWwe7dRpaiP83dgNpqpa5Y,5657
 openstef/data_classes/split_function.py,sha256=ljQIQQu1t1Y_CVWGAy25jrM6wG9odIVVQVimrT1n-1s,3358
 openstef/feature_engineering/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
-openstef/feature_engineering/apply_features.py,sha256=S9HSsooDPcSSyEw9kixEhjjk3MAkAfyK1VhZKg5R0gA,4995
+openstef/feature_engineering/apply_features.py,sha256=EIxP9fvmnAjFRehQpVGBhZHt35GACL-HhDm65_ktHc0,5121
 openstef/feature_engineering/bidding_zone_to_country_mapping.py,sha256=u9aabjFDImydkO6_cXiaQxBT4gb5zy0gGTg2EoIUO_Y,2106
 openstef/feature_engineering/cyclic_features.py,sha256=0Z3wZeF_qrkmEcOq91gtdSMZucAq99kUoBuFDV0SHqk,5962
 openstef/feature_engineering/data_preparation.py,sha256=htca9LBO3ZN1D-iX4vXf0UN1fw_rRO7y6N3AuYVMpfk,5628
 openstef/feature_engineering/feature_adder.py,sha256=aSqDl_gUrB3H2TD3cNvU5JniY_KOb4u4a2A6J7zB2BQ,6835
 openstef/feature_engineering/feature_applicator.py,sha256=DR7jayrEMlra4BFL1Ps5WV2fxbkQ6VaOTa5RIKM-YNk,7447
 openstef/feature_engineering/general.py,sha256=tgU4_1stag9jJmaQAfWCMhfBscznVuQvW5hPK_z9_9g,4438
-openstef/feature_engineering/holiday_features.py,sha256=q_wJvKaVUd54GjPo3qEt1No_XsQ9d1oNmNNJD3AIHtE,8181
+openstef/feature_engineering/holiday_features.py,sha256=CbolIP5bfiQkqDct-9TbD828-lhC48bfeNQ2-VFnsJA,8274
 openstef/feature_engineering/lag_features.py,sha256=Dr6qS8UhdgEHPZZSe-w6ibtjl_lcbcQohhqdZN9fqEU,5652
 openstef/feature_engineering/missing_values_transformer.py,sha256=o_zCVEOCPn2tWzvlY44XZuDysV0TuxqeVYhilYU54YY,5010
 openstef/feature_engineering/weather_features.py,sha256=Lr9DItyHvJ2CpWQ1r6A83tJKtR2k_Wwn32FdFTGblO0,15750
@@ -38,7 +38,7 @@ openstef/metrics/reporter.py,sha256=w1Q6xWoYGmvnjwjXik-Gz7_gnb0lOeJMep-whEV5mNk,
 openstef/model/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/model/basecase.py,sha256=caI6Q-8y0ymlxGK9Js_H3Vh0q6ruNHlGD5RG0_kE5M0,2878
 openstef/model/confidence_interval_applicator.py,sha256=Bx0mm4zGKlqopMZ589cVyDN_k6jfuyqtV1FoViXxc2Y,9775
-openstef/model/fallback.py,sha256=VV9ehgnoMZtWzqKk9H1t8wnERFh5CyC4TvDIuRP_ZDI,2861
+openstef/model/fallback.py,sha256=WfmRhX_Ec6m-bTrJtrYrK_xbBKEPJRN7MrNGkRJ2_o4,2868
 openstef/model/model_creator.py,sha256=EHWB5bIq9yYfWJpMWg62K5fns1p3aHFFB7_Izt2VWnA,6018
 openstef/model/objective.py,sha256=qJdI6GAzv8l5Mxd8G7BIqQnfdJNM7aOlg9DMzMGjWqA,14558
 openstef/model/objective_creator.py,sha256=cIO-uiCEYHjqYrgZizeFEjjgLHLLwab8le9O8DJOF8I,2145
@@ -93,8 +93,8 @@ openstef/tasks/utils/predictionjobloop.py,sha256=Ysy3zF5lzPMz_asYDKeF5m0qgVT3tCt
 openstef/tasks/utils/taskcontext.py,sha256=L9K14ycwgVxbIVUjH2DIn_QWbnu-OfxcGtQ1K9T6sus,5630
 openstef/validation/__init__.py,sha256=bIyGTSA4V5VoOLTwdaiJJAnozmpSzvQooVYlsf8H4eU,163
 openstef/validation/validation.py,sha256=HVgreHvcZvPazfwC3NNE8_3lsMsZEd_42osCAg1_6W4,11128
-openstef-3.4.48.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
-openstef-3.4.48.dist-info/METADATA,sha256=w22ao36-l9Y4HXpsHvVZ8G9k3_3Iqt2EJ8-dGoArWIs,8073
-openstef-3.4.48.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-openstef-3.4.48.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
-openstef-3.4.48.dist-info/RECORD,,
+openstef-3.4.50.dist-info/LICENSE,sha256=7Pm2fWFFHHUG5lDHed1vl5CjzxObIXQglnYsEdtjo_k,14907
+openstef-3.4.50.dist-info/METADATA,sha256=HiJrf8jbS7ZeoZS-RODtWoXjcBRfDKqwIDQ2dm4J1Yo,8305
+openstef-3.4.50.dist-info/WHEEL,sha256=In9FTNxeP60KnTkGw7wk6mJPYd_dQSjEZmXdBdMCI-8,91
+openstef-3.4.50.dist-info/top_level.txt,sha256=kD0H4PqrQoncZ957FvqwfBxa89kTrun4Z_RAPs_HhLs,9
+openstef-3.4.50.dist-info/RECORD,,

{openstef-3.4.48.dist-info → openstef-3.4.50.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.6.0)
+Generator: setuptools (75.8.0)
 Root-Is-Purelib: true
 Tag: py3-none-any