Repository navigation
pytest - #3786
Merged
Merged
pytest#3786
Conversation
Contributor
There was a problem hiding this comment.
Pull request overview
Extends load-management and PV-delay handling to consumers while updating integration expectations.
Changes:
- Adds consumer-aware surplus reservation and reset logic.
- Prevents incomplete consumer creation without an EVU counter.
- Updates algorithm logging and charging tests.
Reviewed changes
Copilot reviewed 9 out of 9 changed files in this pull request and generated 4 comments.
Show a summary per file
| File | Description |
|---|---|
packages/helpermodules/command.py |
Reorders consumer creation and handles missing EVU counters. |
packages/control/counter.py |
Adds consumer-aware PV switching calculations. |
packages/control/consumer/consumer.py |
Resets delays when consumer modes change. |
packages/control/algorithm/surplus_controlled.py |
Suppresses empty load-group logs. |
packages/control/algorithm/min_current.py |
Suppresses empty load-group logs. |
packages/control/algorithm/additional_current.py |
Suppresses empty load-group logs. |
packages/control/algorithm/integration_test/conftest.py |
Adds consumer current expectations. |
packages/control/algorithm/integration_test/pv_charging_test.py |
Updates PV charging scenarios for consumers. |
packages/control/algorithm/integration_test/instant_charging_test.py |
Updates instant-charging expectations. |
💡 Add a code-review agent skill or configure MCP servers for context-aware, tailored reviews. Learn more in the docs.
| @@ -320,28 +320,31 @@ def _get_switch_on_texts(self, load: Load) -> SwitchOnTexts: | |||
| return self.SWITCH_ON_TEXTS_CP | |||
| return self.SWITCH_ON_TEXTS_CONSUMER | |||
|
|
|||
| def calc_switch_on_power(self, load: Load) -> Tuple[float, float]: | |||
| def calc_switch_on_power(self, switch_on_threshold: float) -> Tuple[float, float, float]: | |||
| return surplus, threshold | ||
|
|
||
| def get_pv_config_py_load(self, load: Load) -> Tuple[float, float, bool]: | ||
| def get_pv_config_py_load(self, load: Load) -> Tuple[float, float]: |
| evu_counter.data.set.released_surplus -= (surplus_config.vehicle.switch_on_threshold | ||
| * chargepoint.data.control_parameter.phases) | ||
| chargepoint.data.control_parameter.state = ChargepointState.NO_CHARGING_ALLOWED | ||
| evu_counter.data.set.released_surplus -= threshold |
| @@ -80,6 +80,7 @@ class ParamsExpectedSetCurrent: | |||
| expected_current_cp3: float = 0 | |||
| expected_current_cp4: float = 0 | |||
| expected_current_cp5: float = 0 | |||
| expected_current_consumer7: float = 0 | |||
Contributor
There was a problem hiding this comment.
Pull request overview
Copilot reviewed 9 out of 9 changed files in this pull request and generated no new comments.
Suppressed comments (2)
packages/control/algorithm/integration_test/conftest.py:89
- This new shared assertion makes existing parameterized cases fail because several cases still inherit
expected_current_consumer7 = 0even when the consumer is allocated 0.5 A. For example,test_instant_charging_limitimmediately asserts 0.5 A after calling this helper, and the phase-switch case also omits the consumer expectation. Set the expected consumer current explicitly in every affected case before enabling this assertion.
assert data.data.consumer_data["consumer7"].data.set.current == params.expected_current_consumer7
packages/control/counter.py:603
- An active consumer enters the switch-off delay by adding
load.data.set.required_powertoreleased_surplus(line 573), but this branch removesrequired_current * 230 * phases. Sincerequired_poweris calculated from the consumer's actual voltages, a mode change at any voltage other than exactly 230 V leaves a stale balance that affects subsequent surplus decisions. Remove the samerequired_powervalue for active consumers; retain the nominal threshold calculation only for switch-on reservations.
else:
threshold = (load.data.control_parameter.required_current *
230 *
load.data.control_parameter.phases)
LKuemmel
added a commit
to benderl/core
that referenced
this pull request
Sep 8, 2026
* fix pytest * fixes, pytest * review * fix
LKuemmel
added a commit
that referenced
this pull request
Sep 9, 2026
* draft * draft * fixes * fixes * Anlauferkennung, Betriebsmodus zurücksetzen, Befehle für Pläne (#3588) * draft * Anlauferkennung * Betriebsmodus zurücksetzen * ammend * Anlauferkennung * draft * draft scheduled charging * add scheduled und time plan commands for adding and removing * flake8 * update config * Potential fix for pull request finding Co-authored-by: Copilot Autofix powered by AI <[email protected]> * review * fix pytest --------- Co-authored-by: Copilot Autofix powered by AI <[email protected]> * on time, fixes (#3612) * on_time * eco default price, typo * on_time accessible via 1883 (#3626) * on_time accessible via 1883 * fix * Add Consumer tab and cards to koala web theme (#3630) * add consumer tab/cards * apply new design to consumer cards * add consumer time on to consumer card * fix consumer card CSS * remove redundant placeholders * imported and exported for consumers; daily, monthly log; daily yields; graph data (#3644) * update module config * imported and exported for consumers * daily, monthly log * daily yields * graph data * Consumer cards in carousel - small screen mobile view (#3637) * Intergrate consumers in koala theme charts (#3672) * Add consumer to energy flow chart * Add consumer row to daily totals chart * Add consumer total to history chart * add consumer color to store * Align legend category dropdowns * Add consumer component to display flow chart (#3673) * Add consumer component to display flow chart * Add user management role * energy percentage, set usage per json, several fixes (#3705) * energy percentage, set usage per json * consider min interval * fixes * pv * fix * pycheck, fix extra meter * ammend * fixes * ammend * fix * switch interval elapsed * flake8 * improve wait for start * shelly, pytest (#3730) * add shelly, flake8, pytest consumer chargemodes * fix shelly * existing pytests running * review * fix colors, lookup dict names and colors for consumers (#3736) * fix colors, lookup dict names and colors for consumers * review * hide mode controls for consumer measurement only (#3715) * update consumer-configuration-access (user management) (#3743) * diagram colors, pytests, remove extra meters from log data (#3742) * fix colors, lookup dict names and colors for consumers * review * extend tests * add colors for yearly graph data * remove extra meters from log data * remove comment * flake8 * ammend * fix_merge * switch mode on card * update consumer button groups * update message - data order in consumer card * linting * reapply lost changes from #3715 * usage type self controlled (#3775) * usage type self controlled * fix * review * review (#3776) * calc on time (#3777) * calc on time * review * pytest (#3786) * fix pytest * fixes, pytest * review * fix * fixes (#3794) * typo * fix * pytest * Reworked IDM and Lambda consumer and add Ovum (#3737) * IDM: send PV/Hausverbrauch/Batterie via GLT statt Leistungsvorgabe * Lambda: PV-Überschuss statt power_limit an E-Manager senden * Add OVUM CubeSpeicher/MPlus consumer module * IDM: revert scaling factor, fix flake8 formatting * flake8 * Rename send_grid_values to send_values in config.py * Adjust surplus calculation to account for charging power Include charging power in surplus calculation to avoid misreporting surplus to the heat pump. * Update send_values function to send grid power * Add Self_Controlled for IDM and Lambda * flake8: fix syntax error and whitespace in consumer modules Stray pasted line broke lambda_ consumer.py syntax; idm/lambda_/ovum files had trailing whitespace on blank lines and missing EOF newlines. * split PR: remove moduls except mqtt * fix loadmanagement, clean up (#3819) * clean up * fix loadmanagement * review * review * flake8 * fix versions * fix merge error * consider non charging for consumers and update consumer state messages (#3840) * no charge for loads * consider non charging for consumers and update consumer state messages * flake8 * review * fix rebase * pass data object as parameter in set_power_limit methode (#3854) * fix some type hints (#3866) * fix reset of consumer state string (#3887) * pass data object as parameter in set_power_limit methode, review (#3856) * improve * review: update comments * flake8 * fix rebase * Verbraucher: Fixes für Löschen & Hinzufügen (#3909) * fixes delete consumer, add consumer * review * Verbraucher: Fixes für Topics und Anlauferkennung (#3911) * fixes * type hint * fix thread handling (#3912) --------- Co-authored-by: Copilot Autofix powered by AI <[email protected]> Co-authored-by: BrettS <[email protected]> Co-authored-by: Brett-S-OWB <[email protected]> Co-authored-by: Lutz Bender <[email protected]> Co-authored-by: SeaSpotter <[email protected]> Co-authored-by: benderl <[email protected]>
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
No description provided.