Skip to content

Consumer: Fix increasing daily yields #4107

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
LKuemmel merged 1 commit into from
Oct 14, 2026
Merged

Consumer: Fix increasing daily yields #4107

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions packages/helpermodules/measurement_logging/process_log_calculation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -430,6 +430,10 @@ def ensure_zero_source_keys(module_totals: Dict):
totals["hc"].setdefault("all", {})
ensure_zero_source_keys(totals["hc"]["all"])

totals.setdefault("consumer", {})
for module_totals in totals["consumer"].values():
ensure_zero_source_keys(module_totals)

totals.setdefault("cp", {})
for key, module_totals in totals["cp"].items():
ensure_zero_source_keys(module_totals)
Expand Down
24 changes: 24 additions & 0 deletions packages/helpermodules/measurement_logging/process_log_calculation_test.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@

from helpermodules.measurement_logging.process_log_calculation import (
analyse_percentage,
analyse_percentage_totals,
_calculate_average_power,
process_entry,
calc_energy_imported_by_source,
Expand Down Expand Up @@ -40,6 +41,29 @@ def test_analyse_percentage(name: str,
assert message == ""


def test_analyse_percentage_totals_clears_consumer_source_totals_on_error():
totals = {
"consumer": {"consumer1": {"energy_imported_grid": 99}},
"cp": {},
"counter": {"counter1": {}},
"hc": {},
}
entries = [{
"consumer": {"consumer1": {"energy_imported_grid": 25}},
"cp": {},
"counter": {"counter1": {"energy_imported_grid": 25}},
}]

result = analyse_percentage_totals(entries, totals)

assert result["consumer"]["consumer1"] == {
"energy_imported_grid": 0,
"energy_imported_pv": 0,
"energy_imported_bat": 0,
"energy_imported_cp": 0,
}


@pytest.mark.parametrize("test_case, entry_data, expected_energy_source, should_be_unchanged", [
(
"zero_consumption",
Expand Down
2 changes: 1 addition & 1 deletion packages/helpermodules/measurement_logging/write_log.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -371,7 +371,7 @@ def find_and_fix_value(value_name):
log.exception("Es konnte kein vorheriger Wert gefunden werden.")
if previous_entry is not None:
for group, value in new_entry.items():
if group not in ("bat", "counter", "cp", "pv", "hc"):
if group not in ("bat", "consumer", "counter", "cp", "pv", "hc"):
continue
for component, value in value.items():
find_and_fix_value("exported")
Expand Down
24 changes: 24 additions & 0 deletions packages/helpermodules/update_config.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,20 +200,44 @@ class UpdateConfig:
"^openWB/consumer/get/imported$",
"^openWB/consumer/get/daily_exported$",
"^openWB/consumer/get/daily_imported$",
"^openWB/consumer/get/fault_state$",
"^openWB/consumer/get/fault_str$",
"^openWB/consumer/[0-9]+/module$",
"^openWB/consumer/[0-9]+/config$",
"^openWB/consumer/[0-9]+/config/is_home_consumption_consumer$",
"^openWB/consumer/[0-9]+/extra_meter$",
"^openWB/consumer/[0-9]+/usage$",
"^openWB/consumer/[0-9]+/control_parameter/chargemode$",
"^openWB/consumer/[0-9]+/control_parameter/current_plan$",
"^openWB/consumer/[0-9]+/control_parameter/failed_phase_switches$",
"^openWB/consumer/[0-9]+/control_parameter/limit$",
"^openWB/consumer/[0-9]+/control_parameter/min_current$",
"^openWB/consumer/[0-9]+/control_parameter/phases$",
"^openWB/consumer/[0-9]+/control_parameter/required_current$",
"^openWB/consumer/[0-9]+/control_parameter/state$",
"^openWB/consumer/[0-9]+/control_parameter/submode$",
"^openWB/consumer/[0-9]+/control_parameter/template_phases$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_charge_start$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_last_cp_retry$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_chargemode_changed$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_last_phase_switch$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_phase_switch_buffer_start$",
"^openWB/consumer/[0-9]+/control_parameter/timestamp_switch_on_off$",
"^openWB/consumer/[0-9]+/get/charge_state$",
"^openWB/consumer/[0-9]+/get/currents$",
"^openWB/consumer/[0-9]+/get/exported$",
"^openWB/consumer/[0-9]+/get/fault_state$",
"^openWB/consumer/[0-9]+/get/fault_str$",
"^openWB/consumer/[0-9]+/get/imported$",
"^openWB/consumer/[0-9]+/get/daily_exported$",
"^openWB/consumer/[0-9]+/get/daily_imported$",
"^openWB/consumer/[0-9]+/get/plug_state$",
"^openWB/consumer/[0-9]+/get/powers$",
"^openWB/consumer/[0-9]+/get/power$",
"^openWB/consumer/[0-9]+/get/set_power$",
"^openWB/consumer/[0-9]+/get/state$",
"^openWB/consumer/[0-9]+/get/state_str$",
"^openWB/consumer/[0-9]+/get/temperatures$",
"^openWB/consumer/[0-9]+/get/voltages$",
"^openWB/consumer/[0-9]+/set/current$",
"^openWB/consumer/[0-9]+/set/on_time$",
Expand Down
Loading