diff --git a/dao/CHANGELOG.md b/dao/CHANGELOG.md index 1a2e54e8..601fd2e5 100644 --- a/dao/CHANGELOG.md +++ b/dao/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog 刀 DAO # Day Ahead Optimizer +# 2026.01.1 +Fix error with space(s) in solar_name + # 2026.01.0 With this new stable release comes a second optional method for predicting the porduction of your solar-devices. This if fully documented in the wiki: https://github.com/corneel27/day-ahead/wiki/2.-Installatie-en-basis-configuratie#pv-productie-voorspellen
diff --git a/dao/config.yaml b/dao/config.yaml index 07ebc7f0..a401738c 100644 --- a/dao/config.yaml +++ b/dao/config.yaml @@ -1,6 +1,6 @@ --- name: 刀 Day Ahead Optimizer -version: 2026.01.0 +version: 2026.01.1 slug: day_ahead_opt description: Home Assistant Community Add-ons for day ahead optimizations url: https://github.com/corneel27/day-ahead diff --git a/dao/prog/day_ahead.py b/dao/prog/day_ahead.py index 0f31ec62..ac65a8fb 100644 --- a/dao/prog/day_ahead.py +++ b/dao/prog/day_ahead.py @@ -247,7 +247,7 @@ def calc_optimum( start_hour_dt = dt.datetime.fromtimestamp(start_hour) for s in range(solar_num): if solar_ml_prediction[s]: - solar_name = self.solar[s]["name"] + solar_name = self.solar[s]["name"].replace(" ", "_") solar_prog = solar_predictor.predict_solar_device( self.solar[s], start_hour_dt, end_prog ) @@ -268,7 +268,7 @@ def calc_optimum( self.config.get(["ml_prediction"], solar_option, "False").lower() == "true" ): - solar_name = solar_option["name"] + solar_name = solar_option["name"].replace(" ", "_") solar_prog = solar_predictor.predict_solar_device( solar_option, start_hour_dt, end_prog ) @@ -306,9 +306,10 @@ def calc_optimum( hour_fraction.append(self.interval_s / 3600) interval_fraction.append(1) for s in range(solar_num): + solar_name = self.solar[s]["name"].replace(" ", "_") if solar_ml_prediction[s]: prod = ( - max(0, getattr(row, self.solar[s]["name"])) + max(0, getattr(row, solar_name)) * interval_fraction[-1] ) else: @@ -325,6 +326,7 @@ def calc_optimum( for b in range(B): for s in range(len(self.battery_options[b]["solar"])): solar_option = self.battery_options[b]["solar"][s] + solar_name = solar_option["name"].replace(" ", "_") if pv_dc_num <= 9: pv_dc_varcode.append("pv_dc_" + str(pv_dc_num)) pv_dc_num += 1 @@ -335,7 +337,7 @@ def calc_optimum( == "true" ): prod = ( - max(0, getattr(row, solar_option["name"])) + max(0, getattr(row, solar_name)) * interval_fraction[-1] ) else: diff --git a/release-testing/CHANGELOG.md b/release-testing/CHANGELOG.md index f83824d8..dbae21ed 100644 --- a/release-testing/CHANGELOG.md +++ b/release-testing/CHANGELOG.md @@ -1,5 +1,8 @@ # Changelog 刀 DAO # Day Ahead Optimizer +# 2026.01.1.rc1 +Fix error with space(s) in solar_name + # 2026.01.0.rc9 This version is identical to stable version 2026.01.0 diff --git a/release-testing/config.yaml b/release-testing/config.yaml index 8b20da9a..1ce87b6a 100644 --- a/release-testing/config.yaml +++ b/release-testing/config.yaml @@ -1,6 +1,6 @@ --- name: 刀 Day Ahead Optimizer (TESTING) -version: 2026.01.0.rc9 +version: 2026.01.1.rc1 stage: experimental slug: day_ahead_opt-testing description: Beta version of DAO. Use only for testing!