Compare commits

...
43 Commits
Author SHA1 Message Date
ems-agentandClaude Opus 5.5 368f24e097 EV-05 round 9: pin that no cut goes to the plan of a car another writer runs
checks / unit (pull_request) Successful in 27m11s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VSY9UpTaUYnjJF5oVtbM1w
2026-11-19 00:37:22 +01:00
ems-agentandClaude Opus 5.5 c9a95f3c10 EV-05 round 9: one test of control; another writer's phases are a hold
checks / unit (pull_request) Successful in 31m31s
infra-pin / fresh (pull_request) Successful in 2s
SolarWriter.in_control is the single test of "Solar has the charger":
writing, read-back current and phases are Solar's own, no hold, no write
refused, given up or owed. Alarm grading, banking, the own-pause grace and
the cut use it. A phase change Solar did not make is another writer:
nothing written over it, hold after 30 s, no select back after 10 min.
While Solar's own switch waits, a lower current is written at once, and
the arithmetic uses the phases the car draws on. A car another writer
starts inside the own-pause grace is no longer graded out.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01VSY9UpTaUYnjJF5oVtbM1w
2026-11-18 23:49:47 +01:00
ems-agentandClaude e348a808ff EV-05 round 8: Off respects the owed-only rule; grade out only a car Solar runs
checks / unit (pull_request) Successful in 26m14s
infra-pin / fresh (pull_request) Successful in 1s
Review of fa11dc3:
- Solar to Off writes no 0 A when Solar never had the charger (shadow or a
  stopped control since the start) or its not-writing 0 A is already taken
  (N10, Expected 11), as the shutdown does since round 7.
- car_solar_can_cut() also needs a car Solar runs: plan.a > 0, its own phase
  change, or its own 0 A inside EV-15's OWN_PAUSE_MAX_S.

Tests: the four p_off shapes (and Manual); p_paused at 1000 s and 890 s and
an own pause older than 85 s, each against an Off twin; the near-end rule
with slow batteries that keep headroom (review p_ne2).

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 22:17:21 +01:00
ems-agentandClaude fa11dc3d85 EV-05 round 7: Solar watches while not writing; shadow start writes nothing
checks / unit (pull_request) Successful in 24m28s
infra-pin / fresh (pull_request) Successful in 2s
Review of b4a222f, brief v6 Expected 11 (owner 2026-11-18):
- Solar keeps watching for another writer while it is not writing (Stop,
  shadow, safety stop), so hold is true for every reader: the exit, the
  shutdown, the peak alarms, and Start afterwards.
- car_solar_can_cut() also needs Solar to be writing: the peak alarms stand
  as in Off and the quarter is banked.
- A start or restart in Solar with shadow on writes nothing (the
  not-writing 0 A is owed only when Solar had the charger before).
- Once that exit 0 A is taken, nothing more is written, shutdown included.

Tests: alarm rows for Stop, shadow on and safety stop against an Off twin;
shutdown after another writer in shadow and Stop; a start in shadow with the
car already charging; Start after a stop; two variants inside the 30 s watch.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 20:17:58 +01:00
ems-agentandClaude b4a222f9e8 EV-05 round 6: grade the car out only while Solar can cut it
checks / unit (pull_request) Successful in 25m32s
infra-pin / fresh (pull_request) Successful in 1s
Review of 69f5818:
- Solar grades the car out of the peak alarms only while it can really cut
  it (not under another writer's hold, a refused or given-up write, an
  untaken way-out 0 A, a charger fault, an unreadable charger). Otherwise
  the alarms stand as in Off and the quarter is banked as the car's.
- A battery refusing to give counts for nothing at every N (N=1:
  Controller.batt_refused); the site safety stops leave none able; a
  battery switched Off still counts (the guard draws on it).
- Only pressing Solar lifts Solar's other-writer hold: leaving Solar, or
  setting Manual's values, no longer writes over another writer (N10).

Tests: Solar vs Off twins for another writer, a refused cut write and a
refused fault 0 A; N=1 refusing battery against a car-Off twin; N10 on every
exit and on Manual value changes; the able_w cap; batteries switched Off.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 18:50:37 +01:00
ems-agentandClaude 69f58181bc EV-05 round 5: headroom counts only the batteries that can give
checks / unit (pull_request) Successful in 24m24s
infra-pin / fresh (pull_request) Successful in 2s
Review of 8818768: the headroom test compared the output with the site
rating, which still counted a battery refusing to give (SAFETY-73) or under
a safety stop, so the 15 s wait ran at the real maximum (N4). Now only the
units that can give (above their cut-out, not refusing, not stopped,
switched on) count, in what they give and in their ratings.

Tests: R5a (A refuses, B at full rating, against a car-Off twin: the cut at
910, period 3361 W), R5b (headroom and a slow battery: the cut at exactly
15 s), R5c (floor-limited alone decides: cut at once). DOCS wrapped to 79.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 17:27:17 +01:00
ems-agentandClaude 8818768dab EV-05 round 4: the cut waits only while the batteries have headroom
checks / unit (pull_request) Successful in 23m43s
infra-pin / fresh (pull_request) Successful in 1s
Review of d2504ef, brief v5 Expected 8 (owner 2026-11-18): the 15 s wait
needs batteries that can still raise their output: above the cut-out, the
guard neither saturated nor floor-limited, and their output more than 100 W
under what they can give. Otherwise the car is cut at once.

Tests: R4/N4 rows against a car-Off twin (house to 25900 and 25950 W, aim
3400 W) land under the aim; T21/T22 cut at once beyond the batteries; the
T21b catch rows and T44 (0 cut pauses) stay green.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 16:02:01 +01:00
ems-agentandClaude d2504efa82 EV-05 round 3: a refused way-out 0 A is tried again; one cut per excess
checks / unit (pull_request) Successful in 24m5s
infra-pin / fresh (pull_request) Successful in 2s
Review of 17a7b29:
- Critical: every way out of Solar (Off, Stop, shadow, safety stop, charger
  error, stuck reading, no car) now owes a 0 A until the charger takes it:
  tried again 60 s apart, 3 times (EV-04's rule), then the gave-up row and
  CHARGER_REFUSED; never over another writer. Shutdown does not trust last_a
  while a write of ours is unconfirmed. The card no longer says paused while
  the 0 A is not taken.
- Major: an excess episode is taken off the car once, measured from the car's
  power when it began, until the car shows it and 15 s more.

Tests: refused-then-accepted 0 A for each exit, a 0 A never taken, shutdown
during a start write's read-back, a cut from 16 A with a slow car; the fuzz
checks refused exits of every kind (N9).

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 12:15:00 +01:00
ems-agentandClaude 17a7b299d2 EV-05 round 2: the peak cut waits 15 s while a battery can give
checks / unit (pull_request) Successful in 23m32s
infra-pin / fresh (pull_request) Successful in 1s
Owner 2026-11-18 (dev finding 1, brief v4 Expected 8): while a battery is
above its cut-out, the car's peak cut waits until the guard has wanted power
for 15 s in a row (CUT_WAIT_S), so a cloud edge the batteries catch does not
pause the car. It cuts at once with no battery able, or with 120 s or less of
the 15-minute period left (CUT_NEAR_END_S: waiting 15 s then costs at most
8/7 of the cut, taken off the car at once).

Tests: T21/T22 cut at 15 s and not sooner, the period lands under the aim;
T21b a house step and a cloud edge the batteries catch: no cut, no pause;
T24 (c) late in the period: the cut at once, under the aim; T12's cut row
with the batteries at their cut-out. The harness's battery level model was
1000x too fast (round 1); fixed. The 10-hour day: 0 cut pauses in both
priorities.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 10:13:02 +01:00
ems-agentandClaude 8ba3e1c337 EV-05: shutdown keeps one command_site_release() call site
checks / unit (pull_request) Successful in 24m44s
infra-pin / fresh (pull_request) Successful in 1s
CI run 1737: test_sma10_two_idle_states counts the call lines of
command_site_release() in main.py (the Stop button and shutdown, 2); the
Solar-first branch had made it 3. Same order as before: in Solar the
charger's 0 A first, in Manual the inverters first.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-18 00:29:05 +01:00
ems-agentandClaude 29480fda47 EV-05: car Solar mode (spare sun to the car, Batteries or Car first, cut first for the peak)
checks / unit (pull_request) Failing after 24m58s
infra-pin / fresh (pull_request) Successful in 1s
Solar charges the car from the signed spare sun (car + battery charge - grid
import), less the batteries' room (Batteries first) and the sun kept back,
whole amps rounded down, at most one change per 30 s and only on 1 A. It
starts after ev_start_min of enough sun, holds 6 A for ev_pause_min, then 0 A.
Auto phases through EV-04's safe sequence (4.5 kW / 3 min up, 4.0 kW / 5 min
down, one switch per 10 min). What the peak guard would ask the batteries for
is taken off the car first, at once. Every way out of Solar ends at 0 A,
written once; at shutdown before the inverters go to 0 W.

- app/carmode.py: SolarPlan (pure) and SolarWriter (ManualWriter's one write
  site, its sequence and watch); spare_w, car_target_w, amps_for.
- app/ctl_car.py: Solar inputs, the cut, the solar kWh, EV-15's grace for
  Solar's own 0 A, no "set by the car" for Solar; main.py: shutdown order.
- Home card, HA select.goodwe_car_sun_first, sensor car_today_solar_kwh,
  three options with defaults, strings EN/NL, DOCS, DECISIONS, CHANGELOG.
- test_ev05.py, test_ev05_long.py, tools/ev05_sun.py; test_ev03/ev04 checks
  that pinned "Solar is refused" / "three entities" updated.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-17 23:54:06 +01:00
admin 9fdce023e9 Merge pull request 'EV-15: the add-on's own phase change at the peak reserve raises no false alarm' (#262) from EV-15 into release/1.0
infra-pin / fresh (push) Successful in 1s
2026-11-17 17:15:51 +01:00
glenn schrooyenandClaude Opus 5.5 7788543e09 EV-15 review: reflow the _car_own_pause docstring (one 123-char line)
checks / unit (pull_request) Successful in 22m10s
infra-pin / fresh (pull_request) Successful in 1s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-17 16:51:41 +01:00
glenn schrooyenandClaude 6d7046fc45 EV-15 round 2: the grace opens when the 0 A write is sent
checks / unit (pull_request) Successful in 20m56s
infra-pin / fresh (pull_request) Successful in 1s
The writer runs beside the cycle and the car can stop before the write
returns, so no sequence existed yet and the latch set. Window now opens at
send (zero_sent_at), cleared on return; ends on another writer in the tail too.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-17 15:24:30 +01:00
glenn schrooyenandClaude 07f703d1bc EV-15: test_ev15 guards its own indexing (named absence)
checks / unit (pull_request) Successful in 21m47s
infra-pin / fresh (pull_request) Successful in 1s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-17 13:39:11 +01:00
glenn schrooyenandClaude 2cfbc4aec8 EV-15: the add-on's own phase change at the peak reserve raises no false alarm
While the add-on holds the car at 0 A for its own phase change, the car's
figure had no corroboration (not charging), so nothing was explained and the
peak-floor alarm fired once. For grading only, the car's fresh, not stuck
figure now stands in for that sequence (bounded: its own waits plus one
corroboration window), ending at once on Off, Stop, shadow, unplug, another
writer or a refused write. car_exclude, the claim, floor and writes unchanged.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-17 13:26:56 +01:00
admin f66048b287 Merge pull request 'Release 0.24.0' (#260) from release-0.24.0 into release/1.0
infra-pin / fresh (push) Successful in 2s
checks / unit (pull_request) Successful in 21m46s
infra-pin / fresh (pull_request) Successful in 1s
2026-11-17 08:38:29 +01:00
review-agentandClaude Opus 5.5 69a1ccce1f REL-0.24.0 review: CHANGELOG wording (false-alarm scope, MQTT for HA controls, OPT-31 car charger)
checks / unit (pull_request) Successful in 22m11s
infra-pin / fresh (pull_request) Successful in 1s
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-17 08:15:59 +01:00
glenn schrooyenandClaude 9a355144fc Release 0.24.0: version bump and CHANGELOG
checks / unit (pull_request) Successful in 23m22s
infra-pin / fresh (pull_request) Successful in 2s
Minor bump: car Manual mode (EV-04), car-alone peak alarm fixes
(EV-10, EV-11, EV-12, EV-10b). Two new options with defaults
(ev_batt_cover, ev_mode_start); existing installs need no option change.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-17 07:19:58 +01:00
admin 628bde8013 Merge pull request 'EV-10b: grade the alarm on the house alone, no 0 W clip' (#259) from EV-10b into release/1.0
infra-pin / fresh (push) Successful in 2s
2026-11-17 00:20:55 +01:00
review-agentandClaude Opus 5.5 ff2eebe28b EV-10b review: pin the done-part clip and the car's power now in test_ev10b
checks / unit (pull_request) Successful in 22m9s
infra-pin / fresh (pull_request) Successful in 1s
Two checks a mutant survived: crediting the car-made export in the done part,
and taking off the car's quarter average instead of its power now.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-16 23:58:13 +01:00
glenn schrooyenandClaude b12776c705 EV-10b: grade the alarm on the house alone without the 0 W clip
checks / unit (pull_request) Successful in 22m5s
infra-pin / fresh (pull_request) Successful in 2s
The period without the car was clipped at 0 W, so batteries covering the car
were charged to the house and the floor alarm fired (rig F-1). New
car_exclude_alarm keeps the sign of the rest of the period; car_exclude (the
cover-off guard input) is unchanged.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 22:16:29 +01:00
admin b86c0153cf Merge pull request 'EV-10, EV-11, EV-12: car-alone peak alarm, steady car-over row, own write is not another writer' (#258) from EV-10 into release/1.0
infra-pin / fresh (push) Successful in 2s
2026-11-16 20:54:30 +01:00
Claude 269b89d6b0 EV-10 round 3: grade the floor case on the same landing with and without the car; per-quarter latches independent of the cover option; stricter write-mute test
checks / unit (pull_request) Successful in 20m56s
infra-pin / fresh (pull_request) Successful in 1s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 19:28:02 +01:00
Claude 646f61e730 EV-10 round 2: judge the car against the alarm's own landing; test failed writes; honest hold wording
checks / unit (pull_request) Successful in 22m4s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 18:07:25 +01:00
Claude a60342e4e8 EV-10: test_ev10 points at MUTATION.md and guards its indexed reads
checks / unit (pull_request) Successful in 20m36s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 16:12:42 +01:00
Claude 50d5ae90d2 EV-11: the end of a charging session clears the car-over state at once
checks / unit (pull_request) Failing after 29m5s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 15:41:57 +01:00
Claude 8efc385956 EV-10, EV-11, EV-12: car-alone peak alarm, steady car-over row, own write not another writer
checks / unit (pull_request) Failing after 2m13s
infra-pin / fresh (pull_request) Successful in 2s
EV-10: the car is the cause when the period without it (projected minus the car's
fresh, corroborated average) is at or under the aim, also with the projection
still under it. EV-11: car_over stays on until the test has been false for 180 s.
EV-12: the tracker's own-write mute opens before the write and runs 15 s from its
return.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 15:27:46 +01:00
admin 75ebe22a4d Merge pull request 'EV-04: car Manual mode, never throttled for the peak, no false guard alarms' (#257) from EV-04 into release/1.0
infra-pin / fresh (push) Successful in 1s
2026-11-16 09:21:04 +01:00
glenn schrooyenandClaude 6e6344eb02 EV-04 round 3: guard the L4 test's reads for test_named_absence
checks / unit (pull_request) Successful in 21m33s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 08:22:16 +01:00
glenn schrooyenandClaude f31dcb62b6 EV-04 round 3: undo restores the current in shadow mode too, energy rule catches a frozen 6 A figure, settle after a refused select
checks / unit (pull_request) Failing after 21m10s
infra-pin / fresh (pull_request) Successful in 1s
N1 the undo gives the old current back (clamped) in shadow mode; DECISIONS records it as the one write shadow mode allows.
N2 the corroboration looks back to a stretch with at least 40 Wh expected (60 s at 2.4 kW and up, 104 s at 1.38 kW).
L4 the current comes back 10 s after the phase select returned, also when it was refused.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 07:59:15 +01:00
glenn schrooyenandClaude 661a3b009a EV-04 round 2: race-free another-writer check, refused phase select, undo before the select, clamped restore, energy-corroborated car figure
checks / unit (pull_request) Successful in 21m14s
infra-pin / fresh (pull_request) Successful in 1s
M1 the writer ignores a reading taken before its latest confirmed write.
M2 a refused phase select gives the current back and stops after 3 tries (amber row).
M3 Off, shadow mode or a control/safety stop before the select undoes the change.
M4 the restore on shutdown (and the undo) is clamped.
M5 the car's power reaches the alarm path only while the charger's energy meter agrees with it.
L1 fuzz other-writer branch reachable and shown to run. L2 one wording. L3 Batteries-help-off text.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 06:51:15 +01:00
glenn schrooyenandClaude 0c92239a63 EV-04: car Manual mode, never throttled for the peak, no false guard alarms
checks / unit (pull_request) Successful in 21m48s
infra-pin / fresh (pull_request) Successful in 2s
Off and Manual (runtime state, Home and Home Assistant): the current (6 A to
the clamp) and the phases (1 or 3) are written once per user change through
the safe phase sequence, read back within 10 s, clamped to
min(ev_max_a, station limit, entity range). Shadow mode gates the writes.
The car's fresh power goes to the peak guard's alarm path: no false "Load too
high" or "Battery stopped limiting the peak", one grey notice per session.
ev_batt_cover and ev_mode_start options, peak line "set by the car", HA
entities, sim writes, DOCS, CHANGELOG, test_ev04.py.

Co-Authored-By: Claude <noreply@anthropic.com>
2026-11-16 05:24:36 +01:00
admin b65609133e Merge pull request 'Release 0.23.0' (#255) from release-0.23.0 into release/1.0
infra-pin / fresh (push) Successful in 1s
checks / unit (pull_request) Successful in 23m0s
infra-pin / fresh (pull_request) Successful in 2s
Release 0.23.0 (#255)
2026-11-16 03:55:37 +01:00
glenn schrooyenandClaude Opus 5.5 568230c422 Release 0.23.0: CHANGELOG review wording fixes
checks / unit (pull_request) Successful in 20m52s
infra-pin / fresh (pull_request) Successful in 2s
- MAINT-28: say the hold is for two inverters (the code gates it on N >= 2).
- EV-03: "no longer buy energy for the car" (the profile is a 7-day median).
- TEL-19: plain wording for the PV sensor point.
- Known issues: add TEL-20 (DOCS names a car sensor id HA does not create).

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-16 03:34:13 +01:00
glenn schrooyenandClaude e3cce25cb0 Release 0.23.0: one Known issues heading
checks / unit (pull_request) Successful in 22m6s
infra-pin / fresh (pull_request) Successful in 2s
Co-Authored-By: Claude <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-16 02:36:58 +01:00
glenn schrooyenandClaude 8af35172a3 Release 0.23.0
Bump version to 0.23.0 and fold "Not in a release yet" into a new
0.23.0 CHANGELOG section (MAINT-28, CI-17, EV-03, CI-18). Four new
options (ev_*), all with defaults; no option change needed.

Co-Authored-By: Claude <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-16 02:35:46 +01:00
admin 5fc92cf6e8 Merge pull request 'CI-18: affected-test selector for dev rounds, split the longest test files, 10 workers' (#254) from CI-18 into release/1.0
infra-pin / fresh (push) Successful in 2s
2026-11-16 00:31:50 +01:00
glenn schrooyenandClaude Opus 5.5 22ef89bf10 CI-18 review: --head needs B checked out; guard the CI image against CI_ONLY
checks / unit (pull_request) Successful in 20m22s
infra-pin / fresh (pull_request) Successful in 1s
The selector reads the graph, and run-affected.sh runs the tests, from the
working tree, so a --base/--head range is only right with the head checked
out. The CI image is built from the merged tree, so an ENV CI_ONLY in its
Dockerfile would make the gate partial; test_affected_tests.py now fails on it.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
2026-11-15 23:29:34 +01:00
glenn schrooyenandClaude b2d3066966 CI-18: selector carries a change through a test that imports another test
checks / unit (pull_request) Successful in 21m20s
infra-pin / fresh (pull_request) Successful in 1s
A test first reached as text (a pattern reader) was never expanded again when a
later path reached it by import, so a test importing it was missed. Expanded and
reached are now tracked apart; the empty diff selects the safety set. Test added.

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-15 21:17:26 +01:00
glenn schrooyenandClaude 17b65785b7 CI-18: checks.yml comments carry the measured run time and the worker count
checks / unit (pull_request) Successful in 20m41s
infra-pin / fresh (pull_request) Successful in 1s
Comment-only: "~15 to run" was stale (runs took 27 min at 6 workers); the CI-18
run at 10 workers took 20 min 56 s (run 1682).

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-15 21:16:05 +01:00
glenn schrooyenandClaude a727dd7ee2 CI-18: affected-test selector for dev rounds; split the longest test files; 10 workers
infra-pin / fresh (pull_request) Successful in 2s
checks / unit (pull_request) Successful in 20m45s
- .gitea/ci/affected_tests.py: which test_*.py a diff reaches (static import
  graph plus names in strings, transitive), a fixed safety set, SELECT ALL for
  anything it cannot map. .gitea/ci/run-affected.sh runs the selection in the
  CI image. run-tests.sh takes CI_ONLY for that; checks.yml never sets it and
  test_affected_tests.py fails if it does. The merge gate still runs every file.
- test_modes_p4 -> p4/p4b/p4c/p4d, test_safety126 -> +b, test_safety125 -> +b:
  same check lines, none dropped (146, 35, 45 before and after).
- run-tests.sh: 10 workers instead of 6, new longest-first order.

Co-Authored-By: Claude <noreply@anthropic.com>
Co-Authored-By: Claude Sonnet 5.5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01Bdqr7PiaHcBnzPituu2yTC
2026-11-15 20:54:00 +01:00
admin 7513fd9439 Merge pull request 'EV-03: car charger seam, Alfen HA driver, read-only Car card' (#253) from EV-03 into release/1.0
infra-pin / fresh (push) Successful in 1s
2026-11-15 16:32:50 +01:00
49 changed files with 12270 additions and 767 deletions
+403
View File
@@ -0,0 +1,403 @@
#!/usr/bin/env python3
"""CI-18: which test_*.py files does a diff affect? For DEV and REVIEW rounds only.
python3 .gitea/ci/affected_tests.py # merge-base(origin/release/1.0) .. working tree
python3 .gitea/ci/affected_tests.py --base A --head B # a committed range (the graph is read from the working tree: check out B)
python3 .gitea/ci/affected_tests.py --files f1 f2 # explicit changed paths (no git)
... --names # only the file names, one per line
It prints what it chose and why, then the verdict line `SELECT n of N` or
`SELECT ALL`. It never replaces the merge gate: the required context
`checks / unit (pull_request)` runs every test_*.py (checks.yml, run-tests.sh).
WHAT IS SELECTED (the union of):
1. every test file that reaches a changed file through the static graph of
the tree: imports (absolute, relative, `from pkg import mod`), plus any
STRING in the source that names a file (`"predeploy_check.py"`,
`"tools/x.py"`, a dotted `app.mqtt` as in `-m` or import_module). Tests
launch tools by path and read sources as text, so imports alone miss them.
Transitive: a module that imports a changed module carries its tests.
2. every changed test file;
3. the ALWAYS-RUN SAFETY SET below.
A test that walks a directory (`HERE / "app"`, `glob("test_*.py")`) names
that directory or a pattern in a string, so it depends on every file there.
FAILS OPEN. Anything it cannot map selects ALL: a changed file that is not
.py (config.yaml, translations, static, Dockerfile, run-tests.sh, docs, ...),
a deleted or renamed file, a .py nothing references, a file that does not
parse, a base ref that does not exist, a diff it cannot read. Doubt is never "skip". (An EMPTY diff selects the
safety set only: nothing changed.)
OVER-APPROXIMATION IS THE DESIGN. A false edge runs one more file; a missing
edge would skip one. The scan favours false edges (strings, not comments;
suffix matching of module names; any directory name a test spells out).
"""
import argparse
import ast
import fnmatch
import os
import re
import subprocess
import sys
# --- the always-run safety set -------------------------------------------------
# Name and reason, one each. They run on every selection, whatever changed.
# Add a file only with a reason and say it here.
SAFETY_SET = {
"test_bytecode.py": "grades the mutation harness itself; a stale-bytecode "
"survivor makes every other 'it went red' claim void",
"test_ci_gate.py": "grades the gate's checkout/guard shell; cheap, and it "
"is the file that says what a green means",
"test_split_patches.py": "tripwire that tests patch a Controller global "
"where it is read; spans app/main.py and ctl_*.py",
"test_defaults_pin.py": "pins every schema default against config.yaml "
"and scans all modules for literal fallbacks",
"test_docs.py": "operator docs must say what the code does (validator, "
"entity ids)",
}
SKIP_DIRS = {".git", "__pycache__", "node_modules"}
class Fail(Exception):
"""The selector cannot answer; the caller selects ALL."""
def repo_root(start):
p = subprocess.run(["git", "-C", start, "rev-parse", "--show-toplevel"],
capture_output=True, text=True)
if p.returncode != 0:
raise Fail("not inside a git work tree")
return p.stdout.strip()
def all_py(root):
out = []
for d, dirs, files in os.walk(root):
dirs[:] = [x for x in dirs if x not in SKIP_DIRS]
for f in files:
if f.endswith(".py"):
out.append(os.path.relpath(os.path.join(d, f), root))
return sorted(out)
def module_names(rel):
"""Every dotted suffix a file can be imported as: a/b/c.py -> c, b.c, a.b.c."""
parts = rel[:-3].split(os.sep)
if parts[-1] == "__init__":
parts = parts[:-1]
return {".".join(parts[i:]) for i in range(len(parts))} if parts else set()
class Index:
def __init__(self, files):
self.files = files
self.by_mod = {}
self.by_base = {}
self.dirs = {}
# directories that hold test files (the project root): naming one is
# naming the whole tree, which says nothing about a dependency
self.test_dirs = {os.path.basename(os.path.dirname(f))
for f in files
if os.path.basename(f).startswith("test_")}
for f in files:
for m in module_names(f):
self.by_mod.setdefault(m, set()).add(f)
self.by_base.setdefault(os.path.basename(f), set()).add(f)
for comp in os.path.dirname(f).split(os.sep):
if comp:
self.dirs.setdefault(comp, set()).add(f)
def parents(self, rel):
"""Package __init__ files an import of `rel` also runs."""
out = set()
parts = rel.split(os.sep)[:-1]
while parts:
init = os.sep.join(parts + ["__init__.py"])
if init in self.files:
out.add(init)
parts.pop()
return out
def docstring_nodes(tree):
ids = set()
for n in ast.walk(tree):
if isinstance(n, (ast.Module, ast.ClassDef, ast.FunctionDef,
ast.AsyncFunctionDef)) and n.body:
b = n.body[0]
if isinstance(b, ast.Expr) and isinstance(b.value, ast.Constant) \
and isinstance(b.value.value, str):
ids.add(id(b.value))
return ids
# Calls that list a directory: a file making one depends on what the
# directories it names contain (`ast.walk` is not one, and is excluded).
ENUM_CALLS = {"glob", "iglob", "rglob", "listdir", "scandir", "iterdir",
"walk", "copytree"}
# Edge reasons that mean "executes the other file" (they propagate through a
# test file); every other reason means "reads it as data or text".
IMPORT_KINDS = ("import ", "from ", "package of", "dynamic import")
DOTTED = re.compile(r"[A-Za-z_][\w]*(?:\.[A-Za-z_][\w]*)+")
IDENT = re.compile(r"^[A-Za-z_]\w*$")
def edges_of(rel, root, idx):
"""{file `rel` depends on: first reason}."""
path = os.path.join(root, rel)
try:
with open(path, encoding="utf-8") as fh:
src = fh.read()
tree = ast.parse(src, filename=rel)
except (OSError, SyntaxError, UnicodeDecodeError, ValueError) as e:
raise Fail("cannot parse %s: %s" % (rel, e))
deps = {}
def add(target, why):
if target != rel:
deps.setdefault(target, why)
def add_mod(name, why):
hit = idx.by_mod.get(name)
if hit:
for t in hit:
add(t, why)
for p in idx.parents(t):
add(p, "package of " + t)
here = os.path.dirname(rel).split(os.sep) if os.path.dirname(rel) else []
dynamic = False
enumerates = False
consts = []
skip = docstring_nodes(tree)
for n in ast.walk(tree):
if isinstance(n, ast.Import):
for a in n.names:
add_mod(a.name, "import " + a.name)
elif isinstance(n, ast.ImportFrom):
base = n.module or ""
if n.level:
up = here[:len(here) - (n.level - 1)] if n.level > 1 else here
base = ".".join(up + ([base] if base else []))
if base:
add_mod(base, "from %s import" % base)
for a in n.names:
if a.name != "*":
add_mod((base + "." if base else "") + a.name,
"from %s import %s" % (base, a.name))
elif isinstance(n, ast.Call):
fn = n.func
name = fn.attr if isinstance(fn, ast.Attribute) else \
fn.id if isinstance(fn, ast.Name) else ""
obj = fn.value.id if isinstance(fn, ast.Attribute) and \
isinstance(fn.value, ast.Name) else ""
if name in ("import_module", "__import__", "run_module",
"spec_from_file_location", "run_path"):
dynamic = True
if name in ENUM_CALLS and obj != "ast":
enumerates = True
elif isinstance(n, ast.Constant) and isinstance(n.value, str) \
and id(n) not in skip and len(n.value) <= 4000:
consts.append(n.value)
named_dirs = set()
for s in consts:
for m in re.finditer(r"[\w./-]*\.py\b", s):
base = os.path.basename(m.group(0))
for t in idx.by_base.get(base, ()):
add(t, "names file %r" % base)
for tok in DOTTED.findall(s):
add_mod(tok, "names module %r" % tok)
# `app.mqtt.Thing` or `tools.x.main`: shorten from the right
parts = tok.split(".")
for i in range(len(parts) - 1, 0, -1):
add_mod(".".join(parts[:i]), "names module %r" % tok)
if dynamic and IDENT.match(s):
add_mod(s, "dynamic import of %r" % s)
for piece in set(re.split(r"[/\\]", s)) if ("/" in s or "\\" in s) \
else {s}:
if piece in idx.dirs and piece not in idx.test_dirs:
named_dirs.add(piece)
# A file that enumerates directories depends on everything in the ones it
# names, and on what a glob pattern it spells matches in its own directory.
if enumerates:
for d in named_dirs:
for t in idx.dirs[d]:
add(t, "enumerates directory %r" % d)
for s in consts:
if "*" in s and s.endswith(".py"):
pat = os.path.basename(s)
# `test_*.py` globs the tests next to this file; any other
# pattern globs the directories this file names, and only when
# it names none, its own directory.
own = pat.startswith("test_") or not named_dirs
for t in idx.files:
inside = (own and os.path.dirname(t)
== os.path.dirname(rel)) or \
any(c in named_dirs for c in os.path.dirname(t)
.split(os.sep))
if inside and fnmatch.fnmatch(os.path.basename(t), pat):
add(t, "pattern %r" % s)
return deps
def build(root, files):
idx = Index(set(files))
return {f: edges_of(f, root, idx) for f in files}
def is_test(rel):
b = os.path.basename(rel)
return os.path.dirname(rel) == "goodwe_controller" and \
b.startswith("test_") and b.endswith(".py")
def git_changes(root, base, head):
"""[(status, path)] for base..head, or merge-base..working tree."""
def run(*a):
p = subprocess.run(["git", "-C", root] + list(a),
capture_output=True, text=True)
if p.returncode != 0:
raise Fail("git %s failed: %s" % (" ".join(a), p.stderr.strip()))
return p.stdout
if head:
mb = run("merge-base", base, head).strip()
out = run("diff", "--name-status", "--no-renames", "-z", mb, head)
else:
mb = run("merge-base", base, "HEAD").strip()
out = run("diff", "--name-status", "--no-renames", "-z", mb)
toks = out.split("\0")
ch = []
i = 0
while i + 1 < len(toks):
ch.append((toks[i][:1], toks[i + 1]))
i += 2
if not head:
for u in run("ls-files", "-o", "--exclude-standard", "-z").split("\0"):
if u:
ch.append(("A", u))
return ch
def select(root, changes):
"""-> (names, reasons, all_reason). all_reason is not None when ALL."""
files = all_py(root)
tests = sorted(f for f in files if is_test(f))
if not tests:
return None, None, "no test_*.py found under the tree"
reasons = {}
def why(t, r):
reasons.setdefault(t, []).append(r)
if not changes:
for t in SAFETY_SET:
if "goodwe_controller/" + t in tests:
why("goodwe_controller/" + t, "always-run safety set (empty "
"diff): " + SAFETY_SET[t])
return sorted(reasons), reasons, None
changed_py = []
for st, p in changes:
if st not in ("M", "A"):
return None, None, "%s %s (deleted/renamed/type change: the old " \
"importers are not in this tree)" % (st, p)
if not p.endswith(".py"):
return None, None, "changed file %s is not Python (nothing here " \
"can say which tests read it)" % p
if not os.path.exists(os.path.join(root, p)):
return None, None, "changed file %s is not in the work tree" % p
changed_py.append(p)
try:
graph = build(root, files)
except Fail as e:
return None, None, str(e)
rev = {}
for f, deps in graph.items():
for d, r in deps.items():
rev.setdefault(d, {})[f] = r
for p in changed_py:
if is_test(p):
why(p, "changed test file")
continue
# reverse BFS from each changed file
for p in changed_py:
seen = {p: None}
expanded = {p}
queue = [p]
while queue:
cur = queue.pop(0)
for f, r in rev.get(cur, {}).items():
if f not in seen:
seen[f] = (cur, r)
# A test that merely READS another file (names it, globs it)
# is affected by it, but is not a dependency of a third test:
# test_inverter reading every test_*.py as text must not make
# everything that imports a module "affected by test_inverter".
# Only an import carries the change on through a test file.
if f not in expanded and (not is_test(f)
or r.startswith(IMPORT_KINDS)):
expanded.add(f)
queue.append(f)
hit = [f for f in seen if is_test(f) and f != p]
if not hit and not is_test(p):
return None, None, "changed %s is referenced by no test, " \
"directly or through another file" % p
for t in hit:
chain, cur = [], t
while seen[cur]:
nxt, r = seen[cur]
chain.append("%s (%s)" % (os.path.basename(nxt), r))
cur = nxt
why(t, "reaches changed %s via %s" % (p, " <- ".join(
reversed(chain)) if len(chain) > 1 else chain[0]))
for t, r in SAFETY_SET.items():
if "goodwe_controller/" + t in tests:
why("goodwe_controller/" + t, "always-run safety set: " + r)
names = sorted(reasons)
return names, reasons, None
def main(argv=None):
ap = argparse.ArgumentParser(description=__doc__.split("\n")[0])
ap.add_argument("--base", default="origin/release/1.0")
ap.add_argument("--head", default=None,
help="a ref; default: the working tree")
ap.add_argument("--files", nargs="*", help="changed paths, repo-relative")
ap.add_argument("--root", default=None)
ap.add_argument("--names", action="store_true",
help="print only the chosen file names (one per line), "
"or every test name on SELECT ALL")
a = ap.parse_args(argv)
try:
root = a.root or repo_root(os.getcwd())
changes = [("M", f) for f in a.files] if a.files is not None \
else git_changes(root, a.base, a.head)
names, reasons, all_reason = select(root, changes)
except Fail as e:
names, reasons, all_reason = None, None, str(e)
root = a.root or os.getcwd()
tests = sorted(f for f in all_py(root) if is_test(f)) \
if os.path.isdir(root) else []
if all_reason is not None:
if a.names:
print("\n".join(os.path.basename(t) for t in tests))
else:
print("SELECT ALL - %s" % all_reason)
print("SELECT ALL (%d of %d)" % (len(tests), len(tests)))
return 0
if a.names:
print("\n".join(os.path.basename(t) for t in names))
return 0
print("changed: %s" % (", ".join(p for _, p in changes) or "(nothing)"))
for t in names:
for r in reasons[t][:3]:
print(" %-34s %s" % (os.path.basename(t), r))
print("SELECT %d of %d" % (len(names), len(tests)))
return 0
if __name__ == "__main__":
sys.exit(main())
+35
View File
@@ -0,0 +1,35 @@
#!/bin/sh
# CI-18: run the test files a diff affects, in the CI image, for a dev or review
# round. NOT the merge gate: `checks / unit (pull_request)` runs all of them.
#
# sh .gitea/ci/run-affected.sh # merge-base(origin/release/1.0) .. working tree
# sh .gitea/ci/run-affected.sh --base A --head B # with B checked out: the tests run from the working tree
# INFRA_DIR=/path/to/admin-goodwe@pin sh .gitea/ci/run-affected.sh
#
# Arguments go to affected_tests.py (which prints what it chose and why). It
# selects ALL when it cannot map a change, so a run of this script is never a
# silent skip. Needs python3, git and docker on the host. INFRA_DIR is the
# admin/goodwe checkout at the commit in .gitea/infra-pin (test_freeze.py part 3
# needs sim/hwsim.py); without it test_freeze.py fails, as it does in CI without
# the checkout, and the script says so.
set -eu
repo=$(git rev-parse --show-toplevel)
cd "$repo"
python3 .gitea/ci/affected_tests.py "$@"
only=$(python3 .gitea/ci/affected_tests.py --names "$@" | tr '\n' ' ')
if [ -z "${only# }" ]; then echo "nothing selected"; exit 0; fi
IMG=${CI_IMAGE:-goodwe-addon-checks:1}
docker image inspect "$IMG" >/dev/null 2>&1 || docker build -q -t "$IMG" .gitea/ci >/dev/null
infra=
if [ -n "${INFRA_DIR:-}" ]; then
infra="-v $INFRA_DIR:/w/goodwe:ro"
else
echo "INFRA_DIR is not set: test_freeze.py will fail if it is selected (it needs admin/goodwe at the pin)."
fi
# --network none: the tests need none. --memory: a runaway test must not take the host.
# shellcheck disable=SC2086
exec docker run --rm ${CONTAINER_NAME:+--name "$CONTAINER_NAME"} --network none \
--memory "${CI_MEMORY:-16g}" -e PYTHONDONTWRITEBYTECODE=1 -e GOODWE_REQUIRE_HWSIM=1 \
-e CI_JOBS="${CI_JOBS:-6}" -e CI_ONLY="$only" \
-v "$repo:/w/goodwe-addon:ro" $infra "$IMG" \
sh -eu /w/goodwe-addon/.gitea/ci/run-tests.sh
+34 -10
View File
@@ -41,15 +41,21 @@
# Add a file here only with a measured reason, and say it in this list. # Add a file here only with a measured reason, and say it in this list.
SERIAL="test_loop.py test_freeze.py test_safety87.py" SERIAL="test_loop.py test_freeze.py test_safety87.py"
# #
# LONGEST FIRST (SAFETY-125's CI run, job 2580; then a local parallel run, seconds: # LONGEST FIRST. With JOBS workers pulling from one queue, starting the longest
# modes_p4 758, safety126 634 (SAFETY-126, local, one core), safety125 508 on hotfix-0.19.2 only, modes_p3 364, safety119 328, # files first keeps the tail short: the batch takes about as long as the longest
# price_run_fixes 184, safety90 160, safety103 134, safety94 114, peakguard 113, # file or the total work divided by JOBS, whichever is more. A sort order, not a
# opt20 102, safety97 101, safety81 100). With JOBS workers pulling from one # selection. Seconds, CI-18 local runs at 10 workers on the 12-core host (one
# queue, starting the longest files first keeps the tail short: the batch takes # file's time grows with the load; the order is what matters): opt36 653,
# about as long as the longest file. A sort order, not a selection. # safety119 704, opt34 515, safety126 402, safety125 388, safety126b 364,
HEAVY="test_modes_p4.py test_safety126.py test_safety125.py test_modes_p3.py test_safety119.py test_price_run_fixes.py test_safety90.py test_safety103.py test_safety94.py test_peakguard.py test_opt20.py test_safety97.py test_safety81.py" # modes_p3 377, safety94 360, modes_p4c 291, modes_p4b 238, tariff24_weather 235,
# modes_p4d 196, price_run_fixes 197, safety103 189, safety90 185, safety97 163.
# EV-05: ev05_long ~500 and ev05 ~375 alone (the Solar simulations).
# CI-18 split test_modes_p4, test_safety126 and test_safety125 so no one file
# is much over 400 s; test_opt34 and test_opt36 already fan out inside, and
# test_safety119 part 4 is one coupled block, so those three stay whole.
HEAVY="test_opt36.py test_safety119.py test_ev05_long.py test_opt34.py test_ev05.py test_safety126.py test_safety125.py test_safety126b.py test_modes_p3.py test_safety94.py test_modes_p4c.py test_modes_p4b.py test_tariff24_weather.py test_modes_p4d.py test_safety125b.py test_price_run_fixes.py test_safety103.py test_safety90.py test_safety97.py test_peakguard.py test_opt20.py test_safety81.py"
# #
JOBS=${CI_JOBS:-6} JOBS=${CI_JOBS:-10}
cd "${TESTS_DIR:-/w/goodwe-addon/goodwe_controller}" cd "${TESTS_DIR:-/w/goodwe-addon/goodwe_controller}"
# one FILE: run it, keep its output in its own file, print its block whole. # one FILE: run it, keep its output in its own file, print its block whole.
@@ -78,6 +84,21 @@ if [ "$1" = "test_*.py" ]; then
echo "NO test_*.py FOUND - the mount is empty or the layout moved. NOTHING has been checked." echo "NO test_*.py FOUND - the mount is empty or the layout moved. NOTHING has been checked."
exit 1 exit 1
fi fi
ALL_COUNT=$#
# CI-18: CI_ONLY="test_a.py test_b.py" runs just those files, for a developer's
# local round (run-affected.sh sets it). checks.yml never sets it and
# test_affected_tests.py fails if it ever does: the merge gate is the glob above.
# Every name must be an existing test_*.py here, and the last line says PARTIAL.
PARTIAL=0
if [ -n "${CI_ONLY:-}" ]; then
PARTIAL=1
for f in $CI_ONLY; do
case "$f" in test_*.py) ;; *) echo "CI_ONLY: '$f' is not a test_*.py name"; exit 1 ;; esac
[ -f "$f" ] || { echo "CI_ONLY: '$f' does not exist in $(pwd)"; exit 1; }
done
set -- $CI_ONLY
echo "PARTIAL RUN (CI_ONLY): $# of $ALL_COUNT test files. NOT the merge gate."
fi
echo "$# test file(s) to run: $JOBS at a time, then the serial group" echo "$# test file(s) to run: $JOBS at a time, then the serial group"
RUN_DIR=$(mktemp -d /tmp/ci-tests.XXXXXX) RUN_DIR=$(mktemp -d /tmp/ci-tests.XXXXXX)
@@ -86,14 +107,14 @@ export RUN_DIR
: > "$RUN_DIR/ser" : > "$RUN_DIR/ser"
for f in $HEAVY; do for f in $HEAVY; do
case " $SERIAL " in *" $f "*) continue ;; esac case " $SERIAL " in *" $f "*) continue ;; esac
if [ -f "$f" ]; then echo "$f" >> "$RUN_DIR/par"; fi case " $* " in *" $f "*) if [ -f "$f" ]; then echo "$f" >> "$RUN_DIR/par"; fi ;; esac
done done
for f in "$@"; do for f in "$@"; do
case " $SERIAL $HEAVY " in *" $f "*) continue ;; esac case " $SERIAL $HEAVY " in *" $f "*) continue ;; esac
echo "$f" >> "$RUN_DIR/par" echo "$f" >> "$RUN_DIR/par"
done done
for f in $SERIAL; do for f in $SERIAL; do
if [ -f "$f" ]; then echo "$f" >> "$RUN_DIR/ser"; fi case " $* " in *" $f "*) if [ -f "$f" ]; then echo "$f" >> "$RUN_DIR/ser"; fi ;; esac
done done
echo "parallel: $(wc -l < "$RUN_DIR/par") file(s); serial: $(wc -l < "$RUN_DIR/ser") file(s)" echo "parallel: $(wc -l < "$RUN_DIR/par") file(s); serial: $(wc -l < "$RUN_DIR/ser") file(s)"
@@ -121,5 +142,8 @@ for f in "$@"; do
fi fi
done done
echo "$ran file(s), $bad failed, $(( $(date +%s) - t0 ))s wall" echo "$ran file(s), $bad failed, $(( $(date +%s) - t0 ))s wall"
if [ "$PARTIAL" = 1 ]; then
echo "PARTIAL RUN: $ran of $ALL_COUNT test files ran. This is NOT the merge gate; CI runs all $ALL_COUNT."
fi
if [ "$bad" = 0 ] && [ "$rc" = 0 ]; then exit 0; fi if [ "$bad" = 0 ] && [ "$rc" = 0 ]; then exit 0; fi
exit 1 exit 1
+3 -2
View File
@@ -209,7 +209,7 @@ on:
jobs: jobs:
unit: unit:
runs-on: [self-hosted, goodwe-rig] runs-on: [self-hosted, goodwe-rig]
timeout-minutes: 40 # ~15 to run (CI-15: 6 files at a time; the serial suite was ~60 and hit the runner cap); the rest is margin for a busy host timeout-minutes: 40 # ~21 to run, measured (CI-18: 10 files at a time; was ~27 at 6, ~60 serial, 22-37 on a busy host); the rest is margin for a busy host
env: env:
# ⚠️ UNDER /home/homelab, NOT $GITHUB_WORKSPACE (ENV-01, and re-measured # ⚠️ UNDER /home/homelab, NOT $GITHUB_WORKSPACE (ENV-01, and re-measured
# during CI-01). act's workspace is `/root/.cache/act/<id>/hostexecutor`, a # during CI-01). act's workspace is `/root/.cache/act/<id>/hostexecutor`, a
@@ -534,7 +534,8 @@ jobs:
# shorter timeout - a 60 s limit was tried during CI-01 and reported # shorter timeout - a 60 s limit was tried during CI-01 and reported
# exactly the false hang the docstring predicts. # exactly the false hang the docstring predicts.
# #
# ⚠️ CI-15: THE FILES RUN SIX AT A TIME, NOT ONE AFTER ANOTHER. The serial # ⚠️ CI-15: THE FILES RUN SEVERAL AT A TIME (TEN SINCE CI-18, SIX BEFORE),
# NOT ONE AFTER ANOTHER. The serial
# loop summed 3 557 s on SAFETY-125's run (job 2580) and ran past the # loop summed 3 557 s on SAFETY-125's run (job 2580) and ran past the
# runner's 60-minute cap. The loop now lives in .gitea/ci/run-tests.sh (it # runner's 60-minute cap. The loop now lives in .gitea/ci/run-tests.sh (it
# comes from the merged tree, like the Dockerfile), so the same script runs # comes from the merged tree, like the Dockerfile), so the same script runs
+13 -1
View File
@@ -107,10 +107,22 @@ on real hardware, and the comments in `control.py` say which.
### CI and the infra pin ### CI and the infra pin
CI (`.gitea/workflows/checks.yml`) runs every `test_*.py` (six at a time, the wall-clock ones alone afterwards: `.gitea/ci/run-tests.sh`), with `admin/goodwe` checked out next to this repo at the commit in `.gitea/infra-pin`, so `test_freeze.py` grades against the real `sim/hwsim.py`. If that checkout fails, the job fails. The local stub is used only in local runs, and it prints `STUB USED` when it is. CI (`.gitea/workflows/checks.yml`) runs every `test_*.py` (ten at a time, the wall-clock ones alone afterwards: `.gitea/ci/run-tests.sh`), with `admin/goodwe` checked out next to this repo at the commit in `.gitea/infra-pin`, so `test_freeze.py` grades against the real `sim/hwsim.py`. If that checkout fails, the job fails. The local stub is used only in local runs, and it prints `STUB USED` when it is.
The pin tracks `admin/goodwe` **release/1.0**, not master. Two non-required checks go red when release/1.0 has moved past the pin: `infra-pin / fresh` here, on any add-on PR or push to release/1.0, and `addon-pin / fresh` in `admin/goodwe`, on every push to its release/1.0. Nothing re-runs `addon-pin` after a bump, so it stays red on that admin/goodwe commit; `infra-pin / fresh` green on the bump is the all-clear. The pin tracks `admin/goodwe` **release/1.0**, not master. Two non-required checks go red when release/1.0 has moved past the pin: `infra-pin / fresh` here, on any add-on PR or push to release/1.0, and `addon-pin / fresh` in `admin/goodwe`, on every push to its release/1.0. Nothing re-runs `addon-pin` after a bump, so it stays red on that admin/goodwe commit; `infra-pin / fresh` green on the bump is the all-clear.
**Bump the pin** whenever either is red. Set `.gitea/infra-pin` to the new release/1.0 SHA (`git ls-remote <gitea>/admin/goodwe.git refs/heads/release/1.0`) in a PR, and let `checks / unit` grade the tests against it. CI reads `admin/goodwe` with the Actions secret `INFRA_READ_TOKEN`. **Bump the pin** whenever either is red. Set `.gitea/infra-pin` to the new release/1.0 SHA (`git ls-remote <gitea>/admin/goodwe.git refs/heads/release/1.0`) in a PR, and let `checks / unit` grade the tests against it. CI reads `admin/goodwe` with the Actions secret `INFRA_READ_TOKEN`.
### Running only the affected tests (dev and review rounds)
`checks / unit` runs every `test_*.py` and stays the only merge gate. For a local round, `sh .gitea/ci/run-affected.sh` runs just the files your diff reaches, in the same `goodwe-addon-checks:1` image and through the same `run-tests.sh`:
```bash
INFRA_DIR=~/path/to/admin-goodwe-at-the-pin sh .gitea/ci/run-affected.sh # release/1.0 .. working tree
sh .gitea/ci/run-affected.sh --base origin/release/1.0 --head my-branch # a committed range, with my-branch checked out (the tests run from the working tree)
python3 .gitea/ci/affected_tests.py --files goodwe_controller/app/price.py # only list, with the reasons
```
It prints each chosen file and why, then `SELECT n of N`. A test file is chosen if it imports a changed file, directly or through other modules, or names it in a string (a tool launched by path); a changed test file is chosen; and so is a fixed safety set (`SAFETY_SET` in `affected_tests.py`, one reason each). Anything it cannot map (a non-Python file such as `config.yaml`, a deletion, a `.py` no test reaches) prints `SELECT ALL`. Most modules are imported by `app/main.py`, so a change to `app/` usually selects nearly everything; the saving is for test-only, tool and helper changes. A partial run ends with `PARTIAL RUN ... NOT the merge gate`. `INFRA_DIR` is the `admin/goodwe` checkout at `.gitea/infra-pin`, which `test_freeze.py` needs.
## Compatibility ## Compatibility
**Check the serial number, not the model name.** Characters 6-8 of the serial are **Check the serial number, not the model name.** Characters 6-8 of the serial are
+241 -2
View File
@@ -2,8 +2,247 @@
### Not in a release yet ### Not in a release yet
- A new *Car* card on Home shows an Alfen charger: whether a car is connected, its power and today's energy. It only reads the charger, and the car's power no longer counts in the House tile or in what the batteries plan for the night. It is off until you choose a charger in Settings ([[EV-03]]). - When the add-on changes the car's phases while the batteries are at the peak reserve, there is no longer a false "Battery stopped limiting the peak" for a moment ([[EV-15]]).
- During a real peak, a battery in its maintenance charge now stays paused instead of switching between charging and giving, and the batteries give only what keeps the peak under the limit ([[MAINT-28]]). - The car can charge from spare sun only (Solar mode), with the batteries or the car first, and it is cut first when the 15-minute period heads over the peak limit. Three new options with defaults ([[EV-05]]).
## 0.24.0
**A minor bump: the add-on can now charge the car (Manual mode), and a car that alone takes the batteries to the peak reserve no longer raises a false peak alarm. Two new options were added, both with defaults, and none needs setting.**
Two options were added (`ev_batt_cover` and `ev_mode_start`), none was removed or renamed, and no default changed (92 options, 90 before). **Existing installs need no option change:** the new options have defaults, and `ev_charger` is still off, so an install that does not use the car charger runs as 0.23.0 did. It is a minor bump because it adds a feature and new options; every saved setting still starts.
**The add-on can now charge the car.** This is the first version that writes to the car charger. On the *Car* card, choose **Manual** and set the current (6 A up to the charger limit) and 1 or 3 phases, on Home, or from Home Assistant when MQTT is on. **Off writes nothing.** The car is never slowed for the peak limit; the batteries help cover it unless you switch *Batteries help with the peak* off. **If your own automation in Home Assistant writes the same charger, switch it off before you choose Manual:** two writers fight over one setting. See "Car charger" in DOCS ([[EV-04]]).
**Car charger fixes.** When the car alone takes the batteries to the peak reserve, the add-on no longer says "Battery stopped limiting the peak"; a grey "Car over the peak limit" note says it instead, and the note stays steady instead of flickering. A change the add-on makes itself is no longer shown as "Something else changes the charger". A real overload of the house still raises the normal alarm ([[EV-10]], [[EV-11]], [[EV-12]]).
Contents of this release, in merge order since 0.23.0 (`b656091`):
| | |
|---|---|
| `75ebe22` | The add-on can charge the car: choose Manual on the *Car* card and set the current (6 A up to the charger limit) and 1 or 3 phases. Off writes nothing, the car is never slowed for the peak limit, and the batteries help cover it unless you switch that off. This is the first version that writes to the charger, so switch off any other automation that writes it ([[EV-04]], #257) |
| `b86c015` | When the car alone takes the batteries to the peak reserve, there is no false "Battery stopped limiting the peak". The "Car over the peak limit" note stays steady, and the add-on's own change is not shown as "Something else changes the charger" ([[EV-10]], [[EV-11]], [[EV-12]], #258) |
| `628bde8` | The false "Battery stopped limiting the peak" is now gone also when the batteries cover the car down to the reserve: the check counts the house alone. A real overload of the house still raises the alarm ([[EV-10]], #259, called EV-10b) |
### Known issues
- A false "Battery is not keeping up" can still show when the peak guard pauses a maintenance charge ([[SAFETY-92]]).
- A battery capped at a low limit with a perfectly flat reading can still trip the stale check ([[SAFETY-74]]).
- A battery whose reading at rest is beyond about ±175 W is still not caught when it refuses ([[SAFETY-97]]).
- The peak guard can still back off near the end of a 15-minute period when a meter reading is late, by less than 30 s. This is about the guard's discharge only; a grid charge is cut back since 0.19.2 ([[SAFETY-99]]).
- Two inverters: the maintenance charge can switch on and off while the house is above the peak aim ([[SAFETY-88]]).
- Two inverters: the "circulating" figure counts a battery's reading at rest ([[SAFETY-98]]).
- Two inverters: a drain that starts during a big step in house use can send the other battery to full power, and about 1 kW goes to the grid for about 10 s ([[SAFETY-104]]).
- Two inverters: when a battery comes back during a maintenance charge, the grid can step by several kW at once ([[SAFETY-101]]).
- Two inverters: when a battery drops out during a solar surplus, the others can swing by up to 1.5 kW in a simulation ([[SAFETY-105]]).
- Two inverters: after a drain ends, a change in house use can go unanswered for about 9 s, because some readings are old ([[SAFETY-106]]).
- Two inverters: when one battery's level is missing, both batteries are held at 0 W, and for about 15 s the last command stays on ([[SAFETY-108]]).
- Two inverters: if one battery's level stays missing for 12 h, the other battery's cycle can be marked failed, with a 7-day wait and a notice, though it is healthy. This comes from reading the code; it has not been seen on a site ([[MAINT-17]]).
- When the 15-minute demand forecast sensor counts the battery's own charge, the maintenance charge runs at about half the power the peak limit leaves, so it takes about twice as long (seen on a site: about 1.2 kW instead of 2.5 kW; the peak limit was kept). At the start of a month, before a peak above the limit, that is about 2 kWh a night in a rig test: the cycle can reach its 36 h limit after about 4 nights and fail, and since 0.22.0 the other battery gets no grid charge on those nights ([[SAFETY-111]]).
- One inverter: after a link drop, the battery's own safety stop to 0 W can be taken as a refusal, and the site stays at 0 W for up to 15 min ([[SAFETY-102]]).
- After a Home Assistant restart, control still waits until Home Assistant has finished starting, which can take several minutes, though the readings are already there ([[SAFETY-115]]).
- While Home Assistant is not answering, the page can list inverters as refusing commands and sensors as missing, and send you to Developer Tools, though they are fine ([[UX-37]]).
- If Home Assistant hangs or stops, the page keeps saying "Waiting for Home Assistant" and never turns into an alarm ([[SAFETY-113]]).
- Right after Home Assistant has started, the page can say for about 4 s that an inverter cannot be controlled, and the first command can come late ([[SAFETY-114]]).
- After a Home Assistant restart, the controller status sensor can still say "running" while the add-on cannot control. It was seen once, and the cause is not known ([[SAFETY-116]]).
- Battery modes on: after a planned top-up from the grid, the Batteries screen can say "Enough sun is forecast" ([[UX-32]]).
- Battery modes on: the forecast line "we count on" can show more sun than the plan counts, because the plan takes house use off first ([[UX-33]]).
- Battery modes on: before a planned top-up, the Today list shows a smaller "gives" amount than the plan will use; it grows as the charge happens ([[UX-34]]).
- Two inverters, battery modes on: while the other battery is in its maintenance charge, a battery's card can say it charges from the grid while it stays at 0 W ([[OPT-18]]).
- Two inverters, battery modes on: while a battery refuses to charge in a cheap run, the action log on the page gets about 8 lines an hour for its retries, and the page hint says "waiting for a better price" ([[UX-38]]).
- A battery in a safety stop, or one the add-on cannot reach, can still be started for a cycle, and its drain then waits about 12 h and ends in a failed-cycle notice. This comes from reading the code; it has not been seen on a site ([[MAINT-19]]).
- On the Settings page, the rows of the solar forecast lists are labelled "Phase 1", "Phase 2" instead of "Sensor 1", "Sensor 2" ([[UX-27]]).
- In the solar forecast list, a blank or repeated row makes "source 2 of 2" count differently from the rows on the Settings page ([[UX-28]]).
- The solar forecast message says "has no reading" also when the sensor shows a number that is too old or in the wrong unit ([[UX-29]]).
- If you use only the forecast lists, two Settings notes sit on the single-sensor field, and one of them tells you to set that field ([[UX-30]]).
- After a restart during a price outage, the "No prices" message can say "yet" when prices did come in earlier ([[UX-39]]).
- On the new settings page, you cannot see whether a price service token is set. Check the Configuration tab ([[UX-41]]).
- On the classic settings page, the first click on Save after editing a field can do nothing. Click again ([[UX-42]]).
- A steady overload on a 1 s meter can warn, and send the Home Assistant notification, 2 or 3 times at the start of each 15-minute period instead of once. The peak limit is still kept ([[SAFETY-122]]).
- A fixed tariff is priced once per hour, so a price window that starts or ends at :15, :30 or :45 gets the wrong price for part of that hour. Windows that start and end on the hour are right ([[TARIFF-23]]).
- Step 6 of the setup wizard stays empty because of an error in the page, in English and in Dutch ([[UX-51]]).
- On Dutch pages, refusal texts, the last-event line under the Home buttons, the installer details and the trading status sentences are still English, and a few Dutch texts read badly, such as "1 metingen geweigerd" ([[UX-52]]).
- Some price texts say "hour" where the add-on acts on a 15-minute period, such as "cheapest hour" ([[UX-47]]).
- After the add-on restarts, the Home price chart shows no price for the earlier part of today, and the setup check can say "12 of 24 hours", though the prices are known ([[UX-48]]).
- With battery modes on and only batteries on "Leftover solar", the Home price chart can mark a cheap period where no battery charges ([[UX-49]]).
- On a phone, the bars of the Home price chart are too thin to tap one 15-minute period. The arrow keys work ([[UX-50]]).
- In the last second of a 15-minute period, being a few watts over the aim can make the peak guard ask a battery for full power for one second. When a charge ends on a period edge, the last-second give can fade out over about 10 s, and a rig test exported up to 7.4 kW for about 8 s ([[SAFETY-124]]).
- During the night grid charge, a 15-minute period can end 6 to 14 W over the peak aim, because the battery charges harder than asked. This was seen in simulation; a rig test saw 2 to 8 W ([[OPT-35]]).
- The test rig could not bring back the false peak alarm that [[SAFETY-126]] fixes, so that fix is shown in simulation only. Watch the notifications for a few nights ([[TEST-35]]).
- The night cheap run is sized for the batteries' full charging power, not for what the peak limit leaves. Under a tight limit the run can end before the batteries reach their level, and Home can show a level they do not reach (79.9 % against a shown 95 % in a rig test) ([[OPT-25]]).
- By day, a Leftover solar plan that has only a daily forecast figure counts the sun from now, not from when the figure was read. It counts about 22 % too much for a figure one hour old; the night plan is not affected ([[OPT-30]]).
- The night charge can buy too much in a house that uses more at night than by day, such as one with a heat pump or a car charger that is not set up in the add-on, and on a sunny day, because spare sun in one expensive hour does not count for the later ones ([[OPT-31]]).
- A cheap run that has already started can overlap a new give run after a re-plan, so a battery can charge from the grid at the dearest price for part of an hour. This was seen in a test case, not on a site. Also in 0.19.2 ([[OPT-32]]).
- If the solar forecast sensors stop updating before 17:00, as in winter or further north, there is no forecast from three hours after their last update until 20:00 ([[OPT-33]]).
- With a forecast that gives only a daily total, the sun is spread an hour off on the two clock-change days after the change. The day's total is right ([[OPT-24]]).
- The add-on learns the house's use only once a solar forecast is set, so a site that adds a forecast later waits one more day for its first plan ([[OPT-26]]).
- Home says "No trading on price yet: no prices have arrived" when every battery is on Solar first, though the prices are shown ([[UX-55]]).
- The Home plan header can say "Charges in the cheapest hour, gives power in the dearest" when Home draws no charge, and it says "hour" for 15-minute prices ([[UX-56]]).
- While the peak guard holds back charging, Home hides the rest of the cheap run and gives no reason. The charge starts again when the guard lets go ([[UX-57]]).
- With battery modes on and selling on, Home can draw a "Sells up to" block when the add-on judges the trade not worth it, and then it will not sell ([[UX-58]]).
- Home, the plan and the Forecast tab stop drawing a battery's give at the trading floor, though control goes on giving down to the battery's cut-out ([[UX-59]]).
- During a price outage, the Batteries screen says "Prices differ too little" and Home says "The price gap is too small" ([[UX-60]]).
- With battery modes on and no meter, or a meter that is a Home Assistant entity, a grid charge is not possible and nothing says so ([[UX-61]]).
- On the Batteries screen, a charge the add-on refused in a cheap run reads as "Saves its power for ...", for up to 15 minutes ([[UX-62]]).
- A Leftover solar battery with no capacity set never charges from the grid when a solar forecast is set, and nothing warns about it ([[UX-63]]).
- The "How the modes work" box on the Batteries screen does not describe Cheap hours only ([[UX-64]]).
- With battery modes on, Settings still shows "Trade on the price spread", which the modes ignore. A site with modes on and no price source starts, and the Batteries screen says "No prices, so it follows the house" without pointing to Settings ([[UX-65]]).
- With battery modes off and several equal prices in a row, Home and the Forecast tab draw one price quarter, while the add-on trades every quarter of the run ([[UX-67]]).
- Late in the day, the Forecast tab's "now" line and last bars sit over the axis labels at the right edge ([[UX-68]]).
- The Forecast tab's level curve charges at each battery's full rating. Under a peak limit the levels it draws are too high and a charge block can end early (54.6 % shown against 39.7 % in a rig test) ([[UX-70]]).
- The peak forecast check says maintenance charging is not kept under the peak limit when no peak forecast is set, but since 0.19.2 it is ([[UX-73]]).
- The peak guard row can show the same figure twice, such as "at this rate 3 500 W, over 3 500 W". Also in 0.19.2 ([[UX-74]]).
- If the inverter's setpoint entity appears in Home Assistant after the add-on has started, the page keeps saying "Inverter control: not found in Home Assistant" and the batteries say "An alarm stopped control" until a restart, though control runs ([[UX-75]]).
- In the last minute of a 15-minute period, with Home Assistant readings 30 s late, the period can end about 80 W over the peak aim and over the limit: 3 530 W against a 3 450 W aim and a 3 500 W limit in a rig test with a 2 kW load added 45 s before the end. The peak guard sees the load too late to hold it back ([[SAFETY-133]]).
- With Home Assistant readings 10 s late, the grid charge in a cheap run can swing by several kW. In a test the add-on asked for an 8.7 kW charge (9.6 kW on 0.20.0) ([[SAFETY-132]]).
- A plan rebuilt while the battery levels are missing for a moment can drop a cheap run that has not started yet, so the battery does not charge that day. Seen in a replay of real prices, where it cost about EUR 0.40 of extra grid use; the Leftover solar change in 0.20.1 no longer triggers it in those replays, but the cause stays ([[OPT-37]]).
- On a 5 s meter, Home Assistant readings 10 s late are still not caught, and readings 15 s late only after about 4 minutes. Control now follows the meter more gently, so less goes to the grid: in a simulation with a changing load, 340 Wh became 189 Wh at 10 s late and 363 Wh became 296 Wh at 15 s late. In a rig test, 15 s late exported 13 to 19 % more than before ([[SAFETY-136]], [[SAFETY-134]]).
- With readings 10 to 15 s late, the hold can end in the middle of the delay and the swing can come back. Seen in rig tests with a 2 s and a 5 s meter ([[SAFETY-134]]).
- With readings 10 s late on a 1 s meter, the grid can still move between -422 and +340 W while the batteries are held. With a very long delay (30 to 90 s) the request can swing by about 900 W every few seconds. Seen in review tests ([[SAFETY-130]]).
- A battery that answers very slowly (10 s or more) can be taken for late Home Assistant readings and held, and the page then blames Home Assistant. A GoodWe battery settles in about 6 s and this has not been seen on one ([[SAFETY-131]]).
- The page row for late readings reads awkwardly in English ("Home Assistant readings show requests about N seconds late, so control holds the batteries"), and the Dutch text misses a word ([[UX-78]]).
- When the add-on stops, a write that takes more than 2 s can still land after the 0 W, and the 30 s safety timer on the ESPHome board then sets 0 W. After the Stop button, a cycle that had already decided can send its share (560 to 670 W) just after the 0 W; the next cycle sends 0 W again ([[SAFETY-138]]).
- In the last hour of a cheap run, Home can draw a battery's grid charge up to an hour past the time control stops charging it. It only draws too much, never too little ([[UX-79]]).
- A tomorrow solar forecast sensor that reports just after midnight with yesterday's value can be used as the new day's forecast for up to 12 hours. This has not been seen on a site ([[OPT-39]]).
- During a cheap-hours charge, at some 15-minute boundaries the add-on sends 0 W for one tick ("no trade (headroom)") and then goes on. Seen in a rig test, in 5 of 8 cases; once, with a frozen battery reading, it left a battery at 0 W until 23:45 ([[OPT-40]]).
- While one battery's monthly cycle charges, the other battery's card on Home says "Saves its power for higher prices", and the plan still shows its grid charge in the cheap hours, though it will not charge ([[UX-80]]).
- After a failed monthly cycle, the plan line shows the day the wait ends, such as 18 November, not when the cycle tries again, such as 19 November at 19:00 ([[MAINT-26]]).
- At the start of a cheap window the peak guard can step once although the period is under the aim, and the step can land on a battery in its monthly charge. In a rig test it gave 1.7 to 2.3 kW for 6 s ([[SAFETY-140]]).
- A grid charge at full power in the last seconds of a 15-minute period can run into the next period, where the peak guard cuts it back ([[SAFETY-139]]).
- In a long real peak, the peak guard can end a 15-minute period up to 10 W over its aim, as 0.22.0 does (up to 31 W there). In a rig test the month's highest peak did not rise ([[SAFETY-141]]).
- The peak reserve notification can be created again and again, 24 to 47 times in 2 hours in a rig test, while the guard holds a battery at its reserve. 0.22.0 does the same ([[MAINT-29]]).
- When you switch the car charger off, its three sensors stay in Home Assistant with their last values. From reading the code, the PV power sensor does the same when it is switched off ([[TEL-19]]).
- In Settings, the choice for no car charger says "None", while its help says "Off" ([[UX-81]]).
- DOCS names the car's energy sensor `goodwe_car_today_kwh`, but Home Assistant creates it as `sensor.goodwe_car_energy_today` ([[TEL-20]]).
- When the charger refuses a current, the Car card can show two amber rows: "Charger did not take it" and "Charger reading may be stuck" ([[EV-13]]).
- In shadow mode, and after a phase change was given up, the Car card's *Why* line says what you set, not what the charger does ([[EV-14]]).
- When the add-on changes the car's phases while the batteries are at the peak reserve, "Battery stopped limiting the peak" can show for a moment, with one notification ([[EV-15]]).
- With *Batteries help with the peak* on, the Car card's *Why* line can switch between two wordings while the car is over the peak limit ([[EV-16]]).
### If you are crossing from a version older than 0.10.0
`## 0.10.0` below can refuse an old config: `slew_w` above its limit, and the
withdrawn `price_provider` ids `engie_dynamic`, `totalenergies_dynamic` and
`eneco_eddy`. Read it before you update. Run `tools/predeploy_check.py` with the
bare options (`jq '.data.options'`) first.
## 0.23.0
**A minor bump: the add-on can now read a car charger (Alfen, through Home Assistant), and with two inverters a maintenance charge stays paused during a real peak. Four new options were added, all with defaults, and none needs setting.**
Four options were added (`ev_charger`, `ev_current_entity`, `ev_max_a` and `ev_phases`), none was removed or renamed, and no default changed (90 options, 86 before). **Existing installs need no option change:** the new options have defaults, and `ev_charger` is off, so an install that sets none of them runs as 0.22.0 did. It is a minor bump because it adds a feature and new options; every saved setting still starts.
**A car charger can be read.** The add-on can now read an Alfen charger through its Home Assistant integration. Home gets a *Car* card that shows whether a car is connected, its power and today's energy. The car's power is left out of the House tile and out of what the batteries plan for the night, so they no longer buy energy for the car. The page shows a note when something else changes the charger, and three sensors go to Home Assistant. It is off until you choose a charger in Settings. **The add-on never changes the charger in this version.** The peak limit works as before: the car still counts in what the grid meter sees. See "Car charger" in DOCS ([[EV-03]]).
**A maintenance charge stays paused in a real peak.** With two inverters, during a real peak, a battery in its maintenance charge now stays paused instead of switching between charging and giving, and the batteries give only what the peak guard needs. In one rig test, with a 6.5 kW load for 90 minutes, that battery switched 0 times, against 325 to 385 times on 0.22.0. The night charge was the same as before ([[MAINT-28]]).
**No change in behaviour:** a peak-guard test no longer fails when the build machine is busy, and the test runs are quicker.
Contents of this release, in merge order since 0.22.0 (`b700c0b`):
| | |
|---|---|
| `6c0546b` | Two inverters: during a real peak, a battery in its maintenance charge stays paused instead of switching between charging and giving, and the batteries give only what the peak guard needs. This was taken out of 0.22.0 and is back, fixed ([[MAINT-28]], #248) |
| `6bf3759` | A peak-guard test no longer fails when the build machine is busy. It is a test only, so there is no change in behaviour ([[CI-17]], #252) |
| `7513fd9` | The add-on can read an Alfen car charger through Home Assistant: a *Car* card on Home, the car's power left out of House and out of the batteries' night plan, a note when something else changes the charger, and three Home Assistant sensors. It is off by default, and the add-on never changes the charger in this version ([[EV-03]], #253) |
| `5fc92cf` | The test runs are quicker: a developer can run only the tests a change reaches, the longest test files are split, and ten run at a time. It touches the build and tests only, so there is no change in behaviour ([[CI-18]], #254) |
### Known issues
- A false "Battery is not keeping up" can still show when the peak guard pauses a maintenance charge ([[SAFETY-92]]).
- A battery capped at a low limit with a perfectly flat reading can still trip the stale check ([[SAFETY-74]]).
- A battery whose reading at rest is beyond about ±175 W is still not caught when it refuses ([[SAFETY-97]]).
- The peak guard can still back off near the end of a 15-minute period when a meter reading is late, by less than 30 s. This is about the guard's discharge only; a grid charge is cut back since 0.19.2 ([[SAFETY-99]]).
- Two inverters: the maintenance charge can switch on and off while the house is above the peak aim ([[SAFETY-88]]).
- Two inverters: the "circulating" figure counts a battery's reading at rest ([[SAFETY-98]]).
- Two inverters: a drain that starts during a big step in house use can send the other battery to full power, and about 1 kW goes to the grid for about 10 s ([[SAFETY-104]]).
- Two inverters: when a battery comes back during a maintenance charge, the grid can step by several kW at once ([[SAFETY-101]]).
- Two inverters: when a battery drops out during a solar surplus, the others can swing by up to 1.5 kW in a simulation ([[SAFETY-105]]).
- Two inverters: after a drain ends, a change in house use can go unanswered for about 9 s, because some readings are old ([[SAFETY-106]]).
- Two inverters: when one battery's level is missing, both batteries are held at 0 W, and for about 15 s the last command stays on ([[SAFETY-108]]).
- Two inverters: if one battery's level stays missing for 12 h, the other battery's cycle can be marked failed, with a 7-day wait and a notice, though it is healthy. This comes from reading the code; it has not been seen on a site ([[MAINT-17]]).
- When the 15-minute demand forecast sensor counts the battery's own charge, the maintenance charge runs at about half the power the peak limit leaves, so it takes about twice as long (seen on a site: about 1.2 kW instead of 2.5 kW; the peak limit was kept). At the start of a month, before a peak above the limit, that is about 2 kWh a night in a rig test: the cycle can reach its 36 h limit after about 4 nights and fail, and since 0.22.0 the other battery gets no grid charge on those nights ([[SAFETY-111]]).
- One inverter: after a link drop, the battery's own safety stop to 0 W can be taken as a refusal, and the site stays at 0 W for up to 15 min ([[SAFETY-102]]).
- After a Home Assistant restart, control still waits until Home Assistant has finished starting, which can take several minutes, though the readings are already there ([[SAFETY-115]]).
- While Home Assistant is not answering, the page can list inverters as refusing commands and sensors as missing, and send you to Developer Tools, though they are fine ([[UX-37]]).
- If Home Assistant hangs or stops, the page keeps saying "Waiting for Home Assistant" and never turns into an alarm ([[SAFETY-113]]).
- Right after Home Assistant has started, the page can say for about 4 s that an inverter cannot be controlled, and the first command can come late ([[SAFETY-114]]).
- After a Home Assistant restart, the controller status sensor can still say "running" while the add-on cannot control. It was seen once, and the cause is not known ([[SAFETY-116]]).
- Battery modes on: after a planned top-up from the grid, the Batteries screen can say "Enough sun is forecast" ([[UX-32]]).
- Battery modes on: the forecast line "we count on" can show more sun than the plan counts, because the plan takes house use off first ([[UX-33]]).
- Battery modes on: before a planned top-up, the Today list shows a smaller "gives" amount than the plan will use; it grows as the charge happens ([[UX-34]]).
- Two inverters, battery modes on: while the other battery is in its maintenance charge, a battery's card can say it charges from the grid while it stays at 0 W ([[OPT-18]]).
- Two inverters, battery modes on: while a battery refuses to charge in a cheap run, the action log on the page gets about 8 lines an hour for its retries, and the page hint says "waiting for a better price" ([[UX-38]]).
- A battery in a safety stop, or one the add-on cannot reach, can still be started for a cycle, and its drain then waits about 12 h and ends in a failed-cycle notice. This comes from reading the code; it has not been seen on a site ([[MAINT-19]]).
- On the Settings page, the rows of the solar forecast lists are labelled "Phase 1", "Phase 2" instead of "Sensor 1", "Sensor 2" ([[UX-27]]).
- In the solar forecast list, a blank or repeated row makes "source 2 of 2" count differently from the rows on the Settings page ([[UX-28]]).
- The solar forecast message says "has no reading" also when the sensor shows a number that is too old or in the wrong unit ([[UX-29]]).
- If you use only the forecast lists, two Settings notes sit on the single-sensor field, and one of them tells you to set that field ([[UX-30]]).
- After a restart during a price outage, the "No prices" message can say "yet" when prices did come in earlier ([[UX-39]]).
- On the new settings page, you cannot see whether a price service token is set. Check the Configuration tab ([[UX-41]]).
- On the classic settings page, the first click on Save after editing a field can do nothing. Click again ([[UX-42]]).
- A steady overload on a 1 s meter can warn, and send the Home Assistant notification, 2 or 3 times at the start of each 15-minute period instead of once. The peak limit is still kept ([[SAFETY-122]]).
- A fixed tariff is priced once per hour, so a price window that starts or ends at :15, :30 or :45 gets the wrong price for part of that hour. Windows that start and end on the hour are right ([[TARIFF-23]]).
- Step 6 of the setup wizard stays empty because of an error in the page, in English and in Dutch ([[UX-51]]).
- On Dutch pages, refusal texts, the last-event line under the Home buttons, the installer details and the trading status sentences are still English, and a few Dutch texts read badly, such as "1 metingen geweigerd" ([[UX-52]]).
- Some price texts say "hour" where the add-on acts on a 15-minute period, such as "cheapest hour" ([[UX-47]]).
- After the add-on restarts, the Home price chart shows no price for the earlier part of today, and the setup check can say "12 of 24 hours", though the prices are known ([[UX-48]]).
- With battery modes on and only batteries on "Leftover solar", the Home price chart can mark a cheap period where no battery charges ([[UX-49]]).
- On a phone, the bars of the Home price chart are too thin to tap one 15-minute period. The arrow keys work ([[UX-50]]).
- In the last second of a 15-minute period, being a few watts over the aim can make the peak guard ask a battery for full power for one second. When a charge ends on a period edge, the last-second give can fade out over about 10 s, and a rig test exported up to 7.4 kW for about 8 s ([[SAFETY-124]]).
- During the night grid charge, a 15-minute period can end 6 to 14 W over the peak aim, because the battery charges harder than asked. This was seen in simulation; a rig test saw 2 to 8 W ([[OPT-35]]).
- The test rig could not bring back the false peak alarm that [[SAFETY-126]] fixes, so that fix is shown in simulation only. Watch the notifications for a few nights ([[TEST-35]]).
- The night cheap run is sized for the batteries' full charging power, not for what the peak limit leaves. Under a tight limit the run can end before the batteries reach their level, and Home can show a level they do not reach (79.9 % against a shown 95 % in a rig test) ([[OPT-25]]).
- By day, a Leftover solar plan that has only a daily forecast figure counts the sun from now, not from when the figure was read. It counts about 22 % too much for a figure one hour old; the night plan is not affected ([[OPT-30]]).
- The night charge can buy too much in a house that uses more at night than by day, such as one with a car charger or heat pump, and on a sunny day, because spare sun in one expensive hour does not count for the later ones ([[OPT-31]]).
- A cheap run that has already started can overlap a new give run after a re-plan, so a battery can charge from the grid at the dearest price for part of an hour. This was seen in a test case, not on a site. Also in 0.19.2 ([[OPT-32]]).
- If the solar forecast sensors stop updating before 17:00, as in winter or further north, there is no forecast from three hours after their last update until 20:00 ([[OPT-33]]).
- With a forecast that gives only a daily total, the sun is spread an hour off on the two clock-change days after the change. The day's total is right ([[OPT-24]]).
- The add-on learns the house's use only once a solar forecast is set, so a site that adds a forecast later waits one more day for its first plan ([[OPT-26]]).
- Home says "No trading on price yet: no prices have arrived" when every battery is on Solar first, though the prices are shown ([[UX-55]]).
- The Home plan header can say "Charges in the cheapest hour, gives power in the dearest" when Home draws no charge, and it says "hour" for 15-minute prices ([[UX-56]]).
- While the peak guard holds back charging, Home hides the rest of the cheap run and gives no reason. The charge starts again when the guard lets go ([[UX-57]]).
- With battery modes on and selling on, Home can draw a "Sells up to" block when the add-on judges the trade not worth it, and then it will not sell ([[UX-58]]).
- Home, the plan and the Forecast tab stop drawing a battery's give at the trading floor, though control goes on giving down to the battery's cut-out ([[UX-59]]).
- During a price outage, the Batteries screen says "Prices differ too little" and Home says "The price gap is too small" ([[UX-60]]).
- With battery modes on and no meter, or a meter that is a Home Assistant entity, a grid charge is not possible and nothing says so ([[UX-61]]).
- On the Batteries screen, a charge the add-on refused in a cheap run reads as "Saves its power for ...", for up to 15 minutes ([[UX-62]]).
- A Leftover solar battery with no capacity set never charges from the grid when a solar forecast is set, and nothing warns about it ([[UX-63]]).
- The "How the modes work" box on the Batteries screen does not describe Cheap hours only ([[UX-64]]).
- With battery modes on, Settings still shows "Trade on the price spread", which the modes ignore. A site with modes on and no price source starts, and the Batteries screen says "No prices, so it follows the house" without pointing to Settings ([[UX-65]]).
- With battery modes off and several equal prices in a row, Home and the Forecast tab draw one price quarter, while the add-on trades every quarter of the run ([[UX-67]]).
- Late in the day, the Forecast tab's "now" line and last bars sit over the axis labels at the right edge ([[UX-68]]).
- The Forecast tab's level curve charges at each battery's full rating. Under a peak limit the levels it draws are too high and a charge block can end early (54.6 % shown against 39.7 % in a rig test) ([[UX-70]]).
- The peak forecast check says maintenance charging is not kept under the peak limit when no peak forecast is set, but since 0.19.2 it is ([[UX-73]]).
- The peak guard row can show the same figure twice, such as "at this rate 3 500 W, over 3 500 W". Also in 0.19.2 ([[UX-74]]).
- If the inverter's setpoint entity appears in Home Assistant after the add-on has started, the page keeps saying "Inverter control: not found in Home Assistant" and the batteries say "An alarm stopped control" until a restart, though control runs ([[UX-75]]).
- In the last minute of a 15-minute period, with Home Assistant readings 30 s late, the period can end about 80 W over the peak aim and over the limit: 3 530 W against a 3 450 W aim and a 3 500 W limit in a rig test with a 2 kW load added 45 s before the end. The peak guard sees the load too late to hold it back ([[SAFETY-133]]).
- With Home Assistant readings 10 s late, the grid charge in a cheap run can swing by several kW. In a test the add-on asked for an 8.7 kW charge (9.6 kW on 0.20.0) ([[SAFETY-132]]).
- A plan rebuilt while the battery levels are missing for a moment can drop a cheap run that has not started yet, so the battery does not charge that day. Seen in a replay of real prices, where it cost about EUR 0.40 of extra grid use; the Leftover solar change in 0.20.1 no longer triggers it in those replays, but the cause stays ([[OPT-37]]).
- On a 5 s meter, Home Assistant readings 10 s late are still not caught, and readings 15 s late only after about 4 minutes. Control now follows the meter more gently, so less goes to the grid: in a simulation with a changing load, 340 Wh became 189 Wh at 10 s late and 363 Wh became 296 Wh at 15 s late. In a rig test, 15 s late exported 13 to 19 % more than before ([[SAFETY-136]], [[SAFETY-134]]).
- With readings 10 to 15 s late, the hold can end in the middle of the delay and the swing can come back. Seen in rig tests with a 2 s and a 5 s meter ([[SAFETY-134]]).
- With readings 10 s late on a 1 s meter, the grid can still move between -422 and +340 W while the batteries are held. With a very long delay (30 to 90 s) the request can swing by about 900 W every few seconds. Seen in review tests ([[SAFETY-130]]).
- A battery that answers very slowly (10 s or more) can be taken for late Home Assistant readings and held, and the page then blames Home Assistant. A GoodWe battery settles in about 6 s and this has not been seen on one ([[SAFETY-131]]).
- The page row for late readings reads awkwardly in English ("Home Assistant readings show requests about N seconds late, so control holds the batteries"), and the Dutch text misses a word ([[UX-78]]).
- When the add-on stops, a write that takes more than 2 s can still land after the 0 W, and the 30 s safety timer on the ESPHome board then sets 0 W. After the Stop button, a cycle that had already decided can send its share (560 to 670 W) just after the 0 W; the next cycle sends 0 W again ([[SAFETY-138]]).
- In the last hour of a cheap run, Home can draw a battery's grid charge up to an hour past the time control stops charging it. It only draws too much, never too little ([[UX-79]]).
- A tomorrow solar forecast sensor that reports just after midnight with yesterday's value can be used as the new day's forecast for up to 12 hours. This has not been seen on a site ([[OPT-39]]).
- During a cheap-hours charge, at some 15-minute boundaries the add-on sends 0 W for one tick ("no trade (headroom)") and then goes on. Seen in a rig test, in 5 of 8 cases; once, with a frozen battery reading, it left a battery at 0 W until 23:45 ([[OPT-40]]).
- While one battery's monthly cycle charges, the other battery's card on Home says "Saves its power for higher prices", and the plan still shows its grid charge in the cheap hours, though it will not charge ([[UX-80]]).
- After a failed monthly cycle, the plan line shows the day the wait ends, such as 18 November, not when the cycle tries again, such as 19 November at 19:00 ([[MAINT-26]]).
- At the start of a cheap window the peak guard can step once although the period is under the aim, and the step can land on a battery in its monthly charge. In a rig test it gave 1.7 to 2.3 kW for 6 s ([[SAFETY-140]]).
- A grid charge at full power in the last seconds of a 15-minute period can run into the next period, where the peak guard cuts it back ([[SAFETY-139]]).
- In a long real peak, the peak guard can end a 15-minute period up to 10 W over its aim, as 0.22.0 does (up to 31 W there). In a rig test the month's highest peak did not rise ([[SAFETY-141]]).
- The peak reserve notification can be created again and again, 24 to 47 times in 2 hours in a rig test, while the guard holds a battery at its reserve. 0.22.0 does the same ([[MAINT-29]]).
- When you switch the car charger off, its three sensors stay in Home Assistant with their last values. From reading the code, the PV power sensor does the same when it is switched off ([[TEL-19]]).
- In Settings, the choice for no car charger says "None", while its help says "Off" ([[UX-81]]).
- DOCS names the car's energy sensor `goodwe_car_today_kwh`, but Home Assistant creates it as `sensor.goodwe_car_energy_today` ([[TEL-20]]).
### If you are crossing from a version older than 0.10.0
`## 0.10.0` below can refuse an old config: `slew_w` above its limit, and the
withdrawn `price_provider` ids `engie_dynamic`, `totalenergies_dynamic` and
`eneco_eddy`. Read it before you update. Run `tools/predeploy_check.py` with the
bare options (`jq '.data.options'`) first.
## 0.22.0 ## 0.22.0
@@ -0,0 +1,178 @@
# EV-04 — Manual mode: the first write to a car charger
The design is `reports/EV-01-design-report.md` (sections 2 to 5), accepted on
2026-11-15 with all eight decisions as recommended. This record keeps what the
code had to decide that the design left open.
## What writes, and who may
`app/carmode.py` `ManualWriter` is the only caller of `write_current` and
`write_phases` (test_ev03.py greps for any other). It runs in a background task
(`ctl_car.CarMixin.car_kick`), never in the control cycle: a write waits up to
10 s for the charger's read-back, and the cycle must never wait for a charger.
- **Off writes nothing.** The mode is runtime state in the store (`car_mode`,
`car_current`, `car_phases`), changed on Home or from Home Assistant with no
restart. Solar and Night are not accepted (EV-05, EV-02).
- **Once per user change.** A user change sets a flag the writer clears when the
charger has what was asked. A difference nobody asked for is the other-writer
detector's business, not a reason to write.
- **No car or a full car: nothing is written**, and the setting waits for a car.
- **Shadow mode and a stopped control write nothing**; the card says what the add-on
would set.
- **The clamp is the driver's too.** The writer asks for at most the clamp, and
`AlfenHaDriver.write_current` refuses anything above
`min(ev_max_a, station limit read now, entity range max)`: it sends nothing,
logs `CHARGER_CLAMP` at ERROR (the OUTPUT_CLAMP shape) and answers False.
- **"Taken"** means the read-back followed within 10 s. A write that was not
taken is tried again after a minute, three times, then it waits for the user
(an amber row). A late read-back is adopted, never called another writer.
## The phase sequence
0 A, wait until the charger reports under 100 W or mode3 leaves C (20 s at most),
select the phases, wait 10 s, write the current. One switch per 10 minutes. A
charger that does not take the 0 A never gets the phases select. A sequence that
has begun is finished whatever the mode, because it leaves the car at 0 A
otherwise; a stop of the add-on in the middle gives the car its current back
(`car_shutdown`).
## Another writer
A read-back that differs from what the add-on last wrote (or tried to write, or
saw before a refused write) for 30 s is another writer: a grey row, and no write
until the user changes the mode or a value. EV-03's detector still serves Off;
the tracker mutes its own detector for 15 s after each of our writes, so Manual
back to Off does not show the add-on as a second writer.
## The peak guard's alarm path
`Controller` passes the car's power to the guard's alarm path (`car_cycle`).
**The car explains the excess when the house alone would land the period under
the aim**: the car's average over the whole period (what it drew so far, and its
power now for the rest, `car_avg_w`) is at least how far the projected period is
over the aim. With decision 1 on it also needs the guard to be unable to hold
it (saturated or at the peak reserve). Then "Load too high" and "Battery stopped
limiting the peak" are not raised, the rows are not red, and one grey notice per
charging session says so. The claim, the floor and the commands are unchanged.
The brief's wording is `car_w >= projected excess over the aim`. The
instantaneous form (`car_w >= excess_w`, the watts to come off the meter now)
stops holding late in a period that the car already pushed over, because
`excess_w` grows as the seconds run out; the average form does not, and it is the
same test for a steady car.
**A stale, stuck or frozen car figure must never hide a real overload.** Only
`CarTracker.car_w_trusted` is used: fresh (the EV-03 rules, which also make an
unavailable reading None at once), not stuck after a write (SAFETY-37's shape),
never above what the read-back allows, and CORROBORATED by the charger's energy
meter (round 2). The rule (`CarTracker.corroborated`, constants `CORR_*` in
`chargers.py`): the charger reports charging (mode3 C) and has an energy entity,
and, looking back over unbroken charging readings to the shortest stretch that
is at least 55 s long and over which the reported power adds up to at least
40 Wh, the meter has gained at least 50 % of that, less 15 Wh (the meter shows
10 Wh steps, so at 40 Wh it must show one step; an honest car can fall one step
short and still passes). Readings are kept 180 s. A gap, a state other than C or
a meter that goes back starts the history again. With no such stretch yet (a
session just began, or the add-on just started) the figure is believed, so a
charge does not raise false alarms for its first minute; a frozen figure is
believed for that long only. No energy entity: never corroborated, so the normal
alarms stand. **Bound:** a frozen figure of P watts on a car that has really
stopped is caught within max(60 s, 40 Wh / P): 60 s from 2.4 kW up, 104 s at
1.38 kW (6 A, 1 phase, the lowest charge), plus the alarms' own 10 s hold. Below
about 0.8 kW (40 Wh over the 180 s kept) the figure is believed; it cannot hide
an overload that matters. (Round 2 had a 15 Wh slack that cancelled the 50 % rule
up to 1.8 kW; the 40 Wh floor fixes that.)
## EV-10, EV-11, EV-12: the rig's three findings (EV-04 test F-1 to F-3)
- **The car is the cause when the alarm's own test says so, on the same
landing** (EV-10). `car_cycle` (`_car_explains_alarm`) runs the alarm's test on
the period as it is and on the period without the car's fresh, corroborated
average (`car_exclude_alarm`, EV-10b below): the car explains the alarm only if it is true with the
car and false without it. A saturated guard, and a floor with other batteries
left, use `load_too_high` on the landing (the batteries give only what they
still can). A floor that leaves nothing uses SAFETY-126's `misses_aim` (the
batteries at 0 W from now on), which is latched for the quarter; the add-on keeps
that latch twice, with and without the car, from the same readings. Both reset
at a new quarter and when the guard stops wanting power, and they run every
cycle, so the cover option does not touch them. This holds with the projection
still under the aim (rig: 5888 W against 6000 W). A car of 0 W makes the two the
same, so it explains nothing; a stale, stuck or uncorroborated figure is `None`,
sets the latch without the car, and the normal alarms stand. There is no minimum
car power: the comparison itself is what separates car from house.
- **The period without the car is not clipped at 0 W** (EV-10b). The rig showed
EV-10 failing: house 3 kW, car 11 kW, batteries 8.1 kW, aim 6 kW. The batteries
give more than the house uses, so the house alone is an export; `car_exclude`
clipped it at 0 W, `misses_aim` added the batteries' full 8.1 kW back, the
"house needs the batteries" latch set early in the quarter, and the floor alarm
could never be explained. `car_exclude_alarm` (alarm grading only) builds the
house alone as: rest of the period `held - car_w`, keeping its sign, so
`misses_aim` adds the batteries back to `held - car_w + batt` = the house; done
part `max(0, done - car so far)` in Ws (no export is credited that only the
car caused); landing `(done + max(held, 0) * left) / 900`. Without a fresh
car reading it is the period as it is. `car_exclude` (the projection the guard
sees with the cover off) is unchanged, with its clip.
- **Steady row, no hold on the alarm** (EV-11). Cause: after the car's own quarter
became the month peak, the aim sat on the grid it made (14.04 kW +-40 W), so
the test crossed the aim every few seconds. `car_over` (row, card, notice) now
stays on until the test has been false for `OVER_OFF_HOLD_S` = 180 s (longer than
the gaps seen on the rig, 150 to 250 s at 50 s sampling, and shorter than a
quarter) and a gap does not restart the 10 s
on-count. `car_explains`, which the alarms read, has no hold.
- **Our own phase change is not a reason to alarm** (EV-15). Rig, twice: at the
reserve, with the car covering, the add-on's 3 -> 1 switch set the car to 0 A.
A car that is not charging has no corroboration (`CarTracker._corr_note` clears
the window, `corroborated` is False), so `car_alarm_w()` was None, the car
explained nothing and `_car_need_excl` latched for the quarter: one
PEAK_GUARD_FLOOR_LIMITED and one `goodwe_peak_soc_floor`. Now, only for grading
(`car_cycle`), `ctl_car._car_own_pause` lets the car's fresh, not stuck figure
(`CarTracker.car_w_paused`, 0 W while paused) stand in without corroboration:
from the moment our 0 A write is SENT (`zero_sent_at`: the cycle runs beside
the writer and the car stops before the write returns), until the current is
set again, at most
`OWN_PAUSE_MAX_S` (85 s, the sequence's own waits), then at most one
corroboration window (60 s). It ends at once on Off, Stop, shadow, unplug,
another writer, or a refused select or write (`seq["failed"]`). The energy it
drew in the pause is kept apart (`ws_p`), so `car_exclude`, the guard's
input, the claim, floor and writes are unchanged. A house overload still fails
the test without the car, so it alarms as on Off.
- **Our own write is ours until its mute ends** (EV-12). The mute of the tracker's
own detector opens before the write and runs 15 s from when it returns, because
the read-back reaches the cycle while the write still waits for it.
## The one write shadow mode allows
When the add-on has paused the car (0 A) for a phase change and has not yet
selected the phases, Off, a stop of control, a safety latch or shadow mode ends
the change. The old current is given back (clamped, `_restore_a`) in every one of
those cases, shadow mode included. With the shipped `shadow_mode: auto`, stopping
control turns shadow on, so without this the car would stay at 0 A for as long
as control is stopped, while the design's Manual column says the current
stands. Undoing our own half-done change is not a new command; it is the same
write the shutdown restore makes. Nothing else is written in shadow mode: no
phase switch, and no write afterwards.
## Decision 1 (`ev_batt_cover`)
On (the default): the guard works as it does and the batteries cover the car down
to the peak reserve. Off: the projection the guard sees leaves the car out
(`house - car_w`, with the car's average so far), so it does not force the
batteries to discharge for it, and the period goes over by the car alone. The
car is never throttled either way. The projection the guard sees is also the
one `charge_room_w` reads, so with the switch off a grid charge of the batteries
sees the room the car leaves; that is the owner's trade and DOCS says so.
## Deviations from the design text
- **Titles and setting names** follow STYLE.md (at most 5 and 6 words):
"Car over the peak limit" (the design: "Car charge over the peak limit"),
setting "Batteries help with the peak" (the design: "... while the car
charges", which is in its description).
- **No "or choose Solar"** in the Why or the notice: Solar is not in this card.
- **The Why lines** are two sentences of at most 12 words, as test_messages.py
asks; `peak.car` says "The car takes {car} and the batteries cover {cov}."
without "of it".
- **`peak.set_by_car`** keeps its first sentence only ("The batteries were at the
peak reserve" is not true with decision 1 off). A quarter counts as set by the
car when the car drew half the peak or more over it.
@@ -0,0 +1,162 @@
# EV-05 — Solar mode: spare sun to the car
The design is `reports/EV-01-design-report.md` (sections 2 to 5, decisions 2 and
5) and the EV-05 brief v3 (owner answers Q1 and Q4, 2026-11-17). This record
keeps what the code had to decide.
## Where it lives
`carmode.SolarPlan` decides (pure, monotonic clock): what current, on what
phases. `carmode.SolarWriter` makes the charger match it. It is a subclass of
`ManualWriter`, so the write, the read-back, the phase sequence and the
other-writer watch are Manual's and there is still one `write_current` and one
`write_phases` call in `app/` (test_ev04.py's AST check). `ctl_car` builds the
inputs (`car_sun_inputs`) and runs the writer in the same background task.
## The rules the brief left open
- **Entering Solar starts at 0 A.** Choosing Solar, a restart in Solar, the
charger or Home Assistant coming back, a charger error or a stuck reading
clearing, and control starting again all reset the plan: 0 A if the charger
shows more, then the start rule. Switching from Manual to Solar therefore
pauses a Manual charge for the start dwell. Simple and on the safe side.
- **The peak cut is what the guard would ask the batteries for.** The excess is
taken off the car only when the guard is engaged and wants a discharge
(`wanted_w > 0`), and by `min(excess, wanted)`. Batteries that only stop
charging in a cloud's first seconds are not "asked", so a cloud does not cut
the car. A partial cut caps the car for the rest of that 15-minute period.
- **The cut waits 15 s while a battery can still give** (owner 2026-11-18,
round 2): `ctl_car.CUT_WAIT_S`, counted from the first cycle in a row in
which the guard wants power. A battery "can give" when it is above its own
cut-out level, not refusing to give and not under a safety stop
(`_car_batt_able`). It cuts at once with nothing able, or with 120 s or less
of the period left (`CUT_NEAR_END_S`): waiting 15 s with R s left raises what
must come off afterwards by R / (R - 15), at most 8/7 at 120 s, and the cut
then takes it off the car at once. test_ev05.py T21 (a step beyond the
batteries, cut at 15 s) and T24 (c) (a late step, cut at once) show the period
landing under the aim; the 10-hour day of test_ev05_long.py has no cut
pause at the shipped `slew_w` 0.
- **The 4.0 to 4.14 kW band on 3 phases.** 3 phases need 4.14 kW at 6 A, the
switch back to 1 phase is under 4.0 kW. Inside that band the car holds 6 A on
3 phases with no pause count (the hysteresis the design chose). Under 4.0 kW
the down-switch comes after 5 minutes; if the 10-minute gap blocks it, the
pause rule does instead.
- **A phase switch also waits for the 30 s write rule**, so the current set
after a switch is never sooner than 30 s after the one before it.
- **The meter's age.** The spare is not computed from a meter reading older
than `stale_input_s`, also when `meter_max_age_s` (P1) is longer.
- **A stale, stuck or not corroborated charging car makes the spare unknown**:
hold, then 0 A after *Pause after*. A paused or idle car with a fresh reading
counts 0 W (`car_w_trusted` is None outside mode3 C).
- **A stuck reading's 0 A is written whatever the frozen read-back says**, since
that read-back means nothing then. Every other exit skips the write when the
charger already shows 0 A, and never writes over another writer.
- **The guard's alarm path** uses the Solar car like Manual's
(`car_alarm_w`), and Solar's own 0 A (pause, cut, phase change) gets EV-15's
bounded grace (`_car_solar_pause`). A Solar quarter is never banked as "set
by the car", and Solar shows no *Car over the peak limit*.
- **Shadow mode** runs the plan without writing, so the card says what it would
set; the charger got its one 0 A when shadow mode came on.
## Round 3 (review of 17a7b29)
- **A way-out 0 A is written until the charger takes it** (`SolarWriter.
_exit_zero`): Off, Stop, shadow, a safety stop, a charger error, a stuck
reading and no car each owe a 0 A; one that is not taken is tried again by
EV-04's rule (`RETRY_S` 60 s apart, `MAX_TRIES` 3), then the gave-up row and
`CHARGER_REFUSED`. Once taken, or once the charger shows 0 A, nothing more.
Never over another writer. A stuck reading cannot confirm a write, so there
only a taken write counts (up to 3 tries). At shutdown there is one try, and
a write of ours not yet confirmed (cancelled during its read-back) means the
current is unknown, so the 0 A is written.
- **One excess, one cut** (`SolarPlan.ep`): an excess episode is measured from
the car's power when it began, so the same excess is not taken off again
while the meter still shows the old power. A new cut needs the car to show
the lower power and `CUT_SETTLE_S` (15 s) more for the meter.
## Round 4 (review of d2504ef, brief v5)
- **The wait needs headroom** (owner 2026-11-18): `ctl_car._car_batt_headroom`.
The 15 s wait runs only while a battery is above its cut-out, the guard is
neither saturated nor floor-limited (peak reserve), and the batteries'
output is more than `HEADROOM_W` (100 W) under what they can give
(`guard.able_w`, else the site rating). Otherwise the cut comes at once.
Before, "above the cut-out" alone let the car run 15 s while the batteries
were already at full output, and the period landed over the aim (review
repro: house 25 900 and 25 950 W, test_ev05.py R4/N4 against a car-Off twin).
## Round 5 (review of 8818768)
- **Headroom counts only the batteries that can give** (`ctl_car._car_giving`):
above their cut-out, not refusing to give (SAFETY-73), not under a safety
stop, switched on. Their output is compared with their own ratings (and
`guard.able_w` when the guard names it). Before, the site rating still
counted a refusing unit, so a battery that gave its full rating looked like
it had headroom and the cut waited (review repro: battery A refuses, house to
20 950 W, period 3436 W against the twin's 3363 W).
## Round 6 (review of 69f5818)
- **Solar grades the car out of the peak alarms only while it can cut it**
(`ctl_car.car_solar_can_cut`): not while another writer holds the charger,
a write of ours was refused or given up, a way-out 0 A is not taken, the
charger shows a fault or cannot be read. Otherwise the normal alarms stand
as in Off, and the quarter is banked as the car's (it can set the peak).
- **A refusing battery counts for nothing at every N**: at N=1 the refusal is
`Controller.batt_refused` (SAFETY-52). The site's own safety stops (circulation,
site sign) leave no battery able to give.
- **A battery switched Off still counts for the headroom**: the peak guard's
floor draws on it, so it can catch a cloud edge.
- **Only pressing Solar lifts Solar's other-writer hold.** Leaving Solar (Off,
Manual) or setting Manual's current or phases is not the user taking the
charger back, so nothing is written over that writer (N10).
## Round 7 (review of b4a222f, brief v6 Expected 11)
- **Solar keeps watching for another writer while it is not writing** (Stop,
shadow, a safety stop), so `hold` is true for every reader: the exit 0 A,
the shutdown, the peak alarms and Start afterwards (Solar holds off until
Solar is pressed or the read-back matches).
- **The peak alarms stand while Solar is not writing**: `car_solar_can_cut()`
also needs `car_writing()`. The quarter is banked as the car's.
- **A start or restart in Solar with shadow on writes nothing** (owner
2026-11-18), even with a car already charging under another writer: N10
wins over the restart 0 A. The not-writing 0 A is owed only when Solar had
the charger before (`had_control`).
- **Once that exit 0 A is taken, nothing more is written**, shutdown
included. A shutdown while Solar is writing still sends its 0 A before the
inverters (T26).
## Round 8 (review of fa11dc3)
- **Off follows the same owed-only rule as the shutdown**: no 0 A when Solar
never had the charger (shadow or a stopped control since the start), or
when its not-writing 0 A is already taken. Manual writes only as Manual
does (nothing in shadow).
- **Solar grades out only a car it runs**: `car_solar_can_cut()` also needs
`plan.a > 0`, a phase change of its own, or its own 0 A still inside EV-15's
`OWN_PAUSE_MAX_S`. A car another writer starts while Solar waits at 0 A for
sun gets the alarms as in Off.
## Round 9 (review of e348a80)
- **One test of control**: `SolarWriter.in_control`. Solar writes, the
read-back current AND phases are what it set (`own_rb`), there is no hold,
and no write of its own is refused, given up or owed. The alarm grading,
the banking, EV-15's own-pause grace and the cut all use it.
- **A phase change Solar did not make is another writer**, like a current
change: nothing is written over it, and after `WRITER_S` the hold
(CHARGER_OTHER). Solar no longer selects its own phases back after the
10 minutes. A select the charger did not confirm counts both phases as
Solar's until the read-back shows one.
- **While Solar's own phase switch waits** (`PHASE_GAP_S`), a lower current
(the cut, the hold's 6 A) is written at once. The arithmetic uses the
phases the car draws on.
- **The own-pause grace ends when the read-back is not Solar's 0 A**: a car
another writer starts inside it gets the alarms as in Off.
## Solar kWh
Per cycle in Solar: `min(car power, max(0, spare - room))` Batteries first,
`min(car power, max(0, spare))` Car first; never above today's kWh; reset at the
day change; kept in the store (`car_sun`).
+151 -23
View File
@@ -251,10 +251,15 @@ The label and description each setting shows on the Configuration tab, in tab or
| Safety | Opposing inverters time (s) | `circulation_hold_s` | For two or more inverters: how long they may push against each other before a safety stop. Derived value, leave it unchanged. | | Safety | Opposing inverters time (s) | `circulation_hold_s` | For two or more inverters: how long they may push against each other before a safety stop. Derived value, leave it unchanged. |
| Safety | Not delivering alarm after (s) | `delivery_hold_s` | For two or more inverters: how long one may fall short of its share before an alarm, which changes nothing. Derived value, leave it unchanged. | | Safety | Not delivering alarm after (s) | `delivery_hold_s` | For two or more inverters: how long one may fall short of its share before an alarm, which changes nothing. Derived value, leave it unchanged. |
| Safety | Shadow mode | `shadow_mode` | The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never. | | Safety | Shadow mode | `shadow_mode` | The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never. |
| Car charger | Charger | `ev_charger` | Which car charger the add-on reads. Off leaves everything as it is. This version only reads the charger and never changes it. | | Car charger | Charger | `ev_charger` | Which car charger the add-on drives. Off leaves everything as it is. In Off mode the add-on only reads the charger and never changes it. |
| Car charger | Current setting entity | `ev_current_entity` | The entity that sets the charger's current. The add-on finds the charger's other entities from its name. | | Car charger | Current setting entity | `ev_current_entity` | The entity that sets the charger's current. The add-on finds the charger's other entities from its name. |
| Car charger | Charger limit (A) | `ev_max_a` | The most current the charger may ever be asked for. Never above what the charger reports. Lower it for a weaker fuse or cable. | | Car charger | Charger limit (A) | `ev_max_a` | The most current the charger may ever be asked for. Never above what the charger reports. Lower it for a weaker fuse or cable. |
| Car charger | Phases | `ev_phases` | How many phases the charger may use: 1, 3, or 1 and 3 (auto). | | Car charger | Phases | `ev_phases` | How many phases the charger may use: 1, 3, or 1 and 3 (auto). |
| Car charger | Batteries help with the peak | `ev_batt_cover` | While the car charges. On: the batteries cover it down to the peak reserve. Off: the peak guard leaves the car out, so the car alone can set the peak. |
| Car charger | Mode after a restart | `ev_mode_start` | Keep the last mode, or start in Off. In Solar a restart sets the charger to 0 A first, other modes leave its current. |
| Car charger | Sun kept back (W) | `ev_margin_w` | Solar: this much spare sun is never given to the car. |
| Car charger | Start after (minutes) | `ev_start_min` | Solar: the car starts after this long with enough spare sun. |
| Car charger | Pause after (minutes) | `ev_pause_min` | Solar: with too little sun the car holds 6 A this long, then pauses. |
| Advanced | Start control on boot | `auto_start` | Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart. | | Advanced | Start control on boot | `auto_start` | Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart. |
| Advanced | Control gain | `gain` | How much of the remaining error control corrects each cycle. Measured on real hardware, do not raise it. | | Advanced | Control gain | `gain` | How much of the remaining error control corrects each cycle. Measured on real hardware, do not raise it. |
| Advanced | Largest change per cycle (W) | `slew_w` | How far the command may move in one cycle. 0 follows “Inverter rating” and is recommended. | | Advanced | Largest change per cycle (W) | `slew_w` | How far the command may move in one cycle. 0 follows “Inverter rating” and is recommended. |
@@ -3275,9 +3280,11 @@ it.
### Car charger ### Car charger
The add-on can read your car charger and show it on **Home**, on a *Car* card. In The add-on can drive your car charger and shows it on **Home**, on a *Car* card.
this version it only reads. It never changes the charger, so it is safe to run The card has three modes in this version: **Off** (the add-on only reads the
beside your own automation. Later versions will add charging modes. charger and writes nothing), **Manual** (the add-on sets the current and the
phases you choose) and **Solar** (the car charges from spare sun only). Night
mode comes in a later version.
| option | meaning | | option | meaning |
|---|---| |---|---|
@@ -3285,44 +3292,149 @@ beside your own automation. Later versions will add charging modes.
| `ev_current_entity` | The charger's current setting, for example `number.wallbox_power_connector_max_current_socket_1`. The add-on finds the charger's other entities from this name. | | `ev_current_entity` | The charger's current setting, for example `number.wallbox_power_connector_max_current_socket_1`. The add-on finds the charger's other entities from this name. |
| `ev_max_a` | The most current the charger may ever be asked for. It cannot be higher than the station limit the charger reports. | | `ev_max_a` | The most current the charger may ever be asked for. It cannot be higher than the station limit the charger reports. |
| `ev_phases` | `1`, `3` or `auto` (1 and 3). | | `ev_phases` | `1`, `3` or `auto` (1 and 3). |
| `ev_batt_cover` | On (the default): the batteries help cover the car down to the peak reserve. Off: the car is left out of what the peak guard protects. |
| `ev_mode_start` | `keep` (the default) or `off`: the mode after a restart. |
| `ev_margin_w` | Solar: spare sun never given to the car, 0 to 1000 W (default 100). |
| `ev_start_min` | Solar: minutes of enough sun before the car starts, 1 to 30 (default 2). |
| `ev_pause_min` | Solar: minutes the car holds 6 A with too little sun before it pauses, 1 to 30 (default 5). |
**What the Car card shows.** The state (Charging, Connected waiting, No car **What the Car card shows.** The state (Charging, Connected waiting, No car
connected, Car is full, Charger not reachable), the power and current, and the connected, Car is full, Charger not reachable), the power and current, and the
energy charged today. The car's power is taken out of the **House** tile and out energy charged today. The car's power is taken out of the **House** tile and out
of the house profile that plans the batteries' night charge, so the batteries of the house profile that plans the batteries' night charge, so the batteries
no longer buy energy for a car that charged last night. The peak limit works as no longer buy energy for a car that charged last night.
before: the car is still part of what the grid meter sees.
**Manual mode.** Choose *Manual* on Home, then set the current (6 A up to the
charger limit) and 1 or 3 phases. The same three are Home Assistant entities
when MQTT is on: `select.goodwe_car_mode` (Off, Manual), `number.goodwe_car_current`
and `select.goodwe_car_phases`. The mode, the current and the phases apply at
once, with no restart. The add-on writes each one once, when you change it, and
checks within 10 seconds that the charger took it.
- The current is never higher than the smallest of the charger limit, the station
limit the charger reports and the charger's own range. A value above that is a
software fault: it is logged and never sent.
- With no car connected, or a full car, nothing is written. The setting waits
until a car is connected.
- A phase change always goes through the same steps: 0 A, wait until the
charger draws under 100 W (at most 20 seconds), select the phases, wait 10
seconds, set the current again. At most one phase change per 10 minutes.
- Shadow mode keeps the charger alone, as it keeps the inverters alone: the card
says what the add-on *would* set. Nothing is written either while control is
stopped.
- A restart, stopping control and a safety stop leave the charger at its
current. When the charger answers again after being away, the add-on sets your
current again only if the charger shows a different one.
- Off writes nothing, ever.
**Solar mode.** Choose *Solar* on Home (or `Solar` on
`select.goodwe_car_mode`) and where spare sun goes first: **Batteries** or
**Car** (`select.goodwe_car_sun_first`). Both apply at once, with no restart.
- *Spare sun* is solar production less the house, measured without a solar
sensor: the car's power, plus what the batteries charge, less what the grid
gives. A grid charge of the batteries, or batteries giving more than the
house uses, is never spare sun.
- *Batteries first*: the car gets what is left after the full rating of every
battery that may still charge (switched on, not refusing, not full), less
*Sun kept back*. So the car gets sun only when the batteries charge at full
power or are full. *Car first*: the car gets the spare sun less *Sun kept
back*, and the batteries charge with what it leaves.
- The current is whole amps, rounded down, from 6 A to the charger limit. It
changes at most once per 30 seconds, and only by 1 A or more.
- The car starts after *Start after* (2 minutes) of sun for at least 7 A. With
too little sun it holds 6 A for *Pause after* (5 minutes), from the batteries
where they can, then pauses at 0 A: the card says *Waiting for sun*.
- With `ev_phases` `auto` a start goes on 1 phase. It moves to 3 phases after
3 minutes at 4.5 kW or more, and back to 1 phase after 5 minutes under 4 kW,
at most once per 10 minutes, always through the safe phase steps above. A car
that draws one phase while three are allowed is counted on one phase.
- **The car is cut first for the peak limit.** When the 15-minute period heads
over the limit and the peak guard would ask the batteries for power, that is
taken off the car first, down to 0 A if needed. While the batteries can
still raise their output, the add-on first waits 15 seconds, so a cloud
the batteries catch does not pause the car. It cuts at once when they
cannot: already at full power, at the peak reserve, at their cut-out
level or refusing to give. It also cuts at once in the last 2 minutes of
the 15-minute period. A Solar charge never sets the month's peak.
- **Every way out of Solar leaves the charger at 0 A**: a stop or
restart of the add-on (before the inverters go to 0 W), stopping control, a
safety stop, shadow mode turned on, choosing Off, an unplugged car, a charger
error or a stuck reading. If the charger does not take the 0 A, the add-on
tries again a minute later, three times, then shows *Charger did not take
it* and a warning. Once taken, nothing more is written. After the charger
or Home Assistant was away, the add-on first sets 0 A, then starts again
by the rules. A meter that stops gives a hold for *Pause after*, then 0 A.
Choosing Manual leaves it to Manual.
- Another writer stops the add-on's writes after 30 seconds, with an amber row
and a warning, until you press the mode again or the charger shows the
add-on's value again. A change of the current or of the phases counts. In
the meantime nothing is written over it and the peak alarms stand.
- The card shows *{kWh} charged today, {kWh} from the sun*, also as
`sensor.goodwe_car_today_solar_kwh`. Only the sun the car could take counts,
not the battery or grid share of a hold, and not Manual.
**The car is never slowed for the peak limit in Manual.** A Manual charge goes
on whatever the 15-minute peak does. With the default `ev_batt_cover` on, the
batteries help cover it down to the peak reserve; a 3-phase 16 A charge (11 kW)
can empty two batteries to the reserve in about 1.5 hours, and the month's peak
then rises by what the car drew. When the car alone is why the batteries cannot
hold the period, the add-on does **not** raise *Battery stopped limiting the
peak* or *Load too high for battery*. It shows a grey note *Car over the peak
limit* once per charging session, a grey row, and says so in the car's *Why*.
This holds only while the car's reading is fresh and the charger's energy meter
confirms it (the meter must have gained at least half of what the power adds up
to over the last minute). A stale, stuck or frozen reading, or a charger with
no energy entity, never hides a real overload of the house: the normal alarms
stand. With `ev_batt_cover` off, the peak guard protects the house without the
car, so it does not spend the batteries on it. Normal zero-grid control can
still discharge them for the car, and a grid charge of the batteries can bring
the period to the peak limit plus the car. The period can go over by the car
alone. When the month's peak was set by a car charge, Home's peak line says so.
**When the charger does not answer.** After 30 seconds the card says *Charger **When the charger does not answer.** After 30 seconds the card says *Charger
not reachable* and one amber row appears. After 5 minutes one notification not reachable* and one amber row appears. After 5 minutes one notification
follows. While the car reading is older than 15 seconds the House tile shows no follows. While the car reading is older than 15 seconds the House tile shows no
reading, and that moment is left out of the house profile, rather than guessing reading, and that moment is left out of the house profile, rather than guessing
how much the car took. how much the car took. A reading that does not move for a minute after the
add-on changed the current shows the amber row *Charger reading may be stuck*;
the add-on goes on writing. If the charger does not take a phase change three
times, an amber row says so and the add-on stops trying until you change
something; the car gets its current back each time.
**Another controller.** If the charger's current changes while the add-on writes **Another writer.** In Manual, if the charger shows a different current than the
nothing, something else sets it, usually your own automation. The page then shows add-on set, for 30 seconds, something else is setting it, usually your own
the grey row *Another controller changes the charger*. That is expected while automation. The page shows a grey row, and the add-on writes nothing over it until
you migrate. you change the mode or a value. In Off the grey row *Something else changes the
charger* shows for an hour after a change. That is expected while you migrate.
**Moving your own automation to the add-on.** Each step can be undone. **Moving your own automation to the add-on.** Each step can be undone.
1. Install this version and set `ev_charger` to `alfen_ha`. The add-on reads the 1. Install this version and set `ev_charger` to `alfen_ha`. The mode starts in
charger and writes nothing. Compare the card with your automation for a few **Off**: the add-on reads the charger and writes nothing. Compare the card
days. with your automation for a few days.
2. When a later version adds charging modes, switch your automation **off** 2. Cut-over, in the evening with the car unplugged: in Home Assistant switch your
(do not delete it) in the evening with the car unplugged, then choose the automation **off** (do not delete it). On the card choose **Manual** with the
add-on's Manual mode with the current your helper held. Plug in and check the current your helper held (`input_number.ev_manual_current`). Plug in and check
current on the card and on the charger's display. the current on the card and on the charger's display.
3. On the next sunny day, choose Solar, with *spare sun goes first to* set as 3. On the next sunny day, choose **Solar**, with *Spare sun goes first to* set
your priority switch was. as your priority switch was (*Batteries* or *Car*), and *Sun kept back* as
your automation's margin. Watch the card's *Why* through a cloud: the car
holds 6 A for 5 minutes, then waits for the sun.
4. Keep your Home Assistant helpers for a week. To go back, set the add-on mode 4. Keep your Home Assistant helpers for a week. To go back, set the add-on mode
to Off and switch the automation on. After that you can delete the helpers and to Off and switch the automation on. After that you can delete the helpers and
the automation. the automation.
Never let the automation and the add-on both write the charger. **Never let the automation and the add-on both write the charger.** Two writers
fight over the one setting and neither can tell which won. Turn the automation
off before you choose Manual, and the add-on off (mode Off) before you turn the
automation on.
**Home Assistant entities.** With MQTT the add-on adds three sensors: **Home Assistant entities.** With MQTT the add-on adds the sensors
`goodwe_car_power`, `goodwe_car_state` and `goodwe_car_today_kwh`. `goodwe_car_power`, `goodwe_car_state`, `goodwe_car_today_kwh` and
`goodwe_car_today_solar_kwh`, and the four controls named above. A saved
("retained") command is never applied, so a restart of Home Assistant cannot
change the charger.
### Site ### Site
@@ -3451,6 +3563,21 @@ last setting. The add-on changes nothing on the charger in any case. Check the
charger's integration in Home Assistant. The notification goes by itself when charger's integration in Home Assistant. The notification goes by itself when
the charger answers again. the charger answers again.
### Car over the peak limit
The car charge you set (Manual) takes the 15-minute period over the peak limit,
and the batteries cannot hold it because they are at the peak reserve or at
their full power. The add-on never slows the car, so this is information, not an
alarm. It is raised once per charging session. To stay under the limit, lower the
current.
### Charger error, car paused
In Solar mode the charger reports an error, so the add-on set the car to 0 A
and writes nothing more until the error clears. Then the car starts again by
the Solar rules. Check the charger itself. The notification goes by itself when
the error clears.
### For installers: notifications ### For installers: notifications
A fixed tariff beside the price service raises no notification: it is the A fixed tariff beside the price service raises no notification: it is the
@@ -3478,6 +3605,7 @@ default `info` hides it.
| Battery cycle did not finish | warning | `goodwe_maint_failed_<name>` | MAINT-13 | | Battery cycle did not finish | warning | `goodwe_maint_failed_<name>` | MAINT-13 |
| No prices | warning | `goodwe_no_prices` | PRICE-01 | | No prices | warning | `goodwe_no_prices` | PRICE-01 |
| Charger not reachable | warning | `goodwe_charger_unreachable` | EV-03 | | Charger not reachable | warning | `goodwe_charger_unreachable` | EV-03 |
| Car over the peak limit | info | `goodwe_car_over` | EV-04 |
**The Details link.** Home Assistant 2026.2 and newer show add-on pages at **The Details link.** Home Assistant 2026.2 and newer show add-on pages at
`/config/app/<slug>/documentation`; 2026.5 removed the old `/config/app/<slug>/documentation`; 2026.5 removed the old
File diff suppressed because it is too large Load Diff
+255 -18
View File
@@ -5,10 +5,12 @@ actuator per site, a census key, a read, a clamped write that says whether the
charger took it, and a hand-back. A charger is a modulated actuator with a fail charger took it, and a hand-back. A charger is a modulated actuator with a fail
state, not one of DEV-01's on/off loads. state, not one of DEV-01's on/off loads.
THIS CARD NEVER WRITES TO THE CHARGER. `write_current`, `write_phases` and EV-04 IS THE FIRST CARD THAT WRITES TO THE CHARGER, in Manual and (EV-05) in
`release` are defined so the seam is whole, and NOTHING in the controller calls Solar (`app/carmode.py` is the one caller). `write_current` is clamped to
them: Off is the only mode. test_ev03.py greps the controller for a call and `min(ev_max_a, the station limit the charger reports, the entity's own range)`
proves a full cycle makes no service call that names a charger entity. and a value above that is NEVER SENT: it is a software fault, logged in the
OUTPUT_CLAMP shape. It says True only when the charger's read-back followed
within `TOOK_S`. Off writes nothing (EV-03's no-write test still holds for it).
VALUES ARE BELIEVED ONLY IN THEIR OWN UNIT (as TEL-11 does for power): power in VALUES ARE BELIEVED ONLY IN THEIR OWN UNIT (as TEL-11 does for power): power in
a power unit, energy in a kWh unit, current in A. A reading in another unit is a power unit, energy in a kWh unit, current in A. A reading in another unit is
@@ -20,12 +22,17 @@ as an argument, so the checks need no sleep.
from __future__ import annotations from __future__ import annotations
import asyncio
import logging
import re import re
from dataclasses import dataclass import time
from dataclasses import dataclass, field
from .hass import BAD_STATES from .hass import BAD_STATES
from .solarfc import KWH_PER from .solarfc import KWH_PER
_LOG = logging.getLogger("goodwe")
OFF = "off" OFF = "off"
ALFEN_HA = "alfen_ha" ALFEN_HA = "alfen_ha"
#: the `ev_charger` values the options accept #: the `ev_charger` values the options accept
@@ -34,7 +41,14 @@ PHASES_CHOICES = ("1", "3", "auto")
# config.yaml's shipped defaults, mirrored (test_defaults_pin.py checks it). # config.yaml's shipped defaults, mirrored (test_defaults_pin.py checks it).
EV_OPTION_DEFAULTS = {"ev_charger": "off", "ev_current_entity": "", EV_OPTION_DEFAULTS = {"ev_charger": "off", "ev_current_entity": "",
"ev_max_a": 16, "ev_phases": "auto"} "ev_max_a": 16, "ev_phases": "auto",
"ev_batt_cover": True, "ev_mode_start": "keep",
# EV-05, Solar: the sun kept back, and the two dwells
"ev_margin_w": 100, "ev_pause_min": 5,
"ev_start_min": 2}
#: EV-05: the ranges config.yaml's schema and the validator both hold.
SOLAR_RANGES = {"ev_margin_w": (0, 1000), "ev_pause_min": (1, 30),
"ev_start_min": (1, 30)}
def max_a(opts: dict): def max_a(opts: dict):
@@ -58,6 +72,31 @@ FULL_C_S = 600.0 # mode3 C under FULL_C_W this long: car full
FULL_C_W = 200.0 FULL_C_W = 200.0
WRITER_HOLD_S = 3600.0 # "another controller" stays shown this long WRITER_HOLD_S = 3600.0 # "another controller" stays shown this long
IDLE_A = 1.0 # a phase under this draws nothing IDLE_A = 1.0 # a phase under this draws nothing
TOOK_S = 10.0 # a write is "taken" when the read-back follows by then
TOOK_TOL_A = 0.5 # ... to within this
STUCK_S = 60.0 # EV-04: power and read-back unchanged after a write
STUCK_MIN_A = 1.0 # ... that moved the setpoint by at least this
OWN_WRITE_MUTE_S = 15.0 # the tracker's two-writer detector ignores our own
# Volts used to bound a car figure by what the read-back allows (a physical
# ceiling for the alarm path, never a setpoint).
CEILING_V = 253.0
# EV-04 round 2: the car's power may be used by the peak guard's alarm path only
# while the charger's energy meter CORROBORATES it. Looking back over readings
# (all in mode3 C, no gap) to the shortest stretch that is at least CORR_WINDOW_S
# long AND over which the reported power adds up to at least CORR_MIN_WH, the
# meter must have advanced by at least CORR_RATIO of that, less CORR_SLACK_WH (the
# meter shows 10 Wh steps, so at 40 Wh expected it must show one step). Readings
# are kept for CORR_KEEP_S. Until such a stretch exists (a session just began, or
# the add-on just started) the figure is believed, as it was before. A frozen
# figure of P watts on a car that has really stopped is caught within
# max(CORR_WINDOW_S, CORR_MIN_WH / P) seconds: 60 s at 2.4 kW and up, 104 s at
# 1.38 kW (6 A, 1 phase). Below CORR_MIN_WH over CORR_KEEP_S (about 0.8 kW) the
# figure is believed; it cannot hide an overload that matters.
CORR_WINDOW_S = 60.0
CORR_RATIO = 0.5
CORR_SLACK_WH = 15.0
CORR_MIN_WH = 40.0
CORR_KEEP_S = 180.0
# role -> (entity domain, suffix after `<x>_`). `current` is the setpoint, the # role -> (entity domain, suffix after `<x>_`). `current` is the setpoint, the
# one the installer names; the rest are derived by swapping its suffix. # one the installer names; the rest are derived by swapping its suffix.
@@ -350,7 +389,12 @@ class ChargerDriver:
async def read(self) -> ChargerReading: async def read(self) -> ChargerReading:
raise NotImplementedError raise NotImplementedError
# --- the write side. DEFINED, UNUSED BY THE CONTROLLER IN THIS CARD. ---- # --- the write side (EV-04). `app/carmode.py` is the one caller. ---------
async def clamp_a(self) -> float:
"""The most a write may ask for: `min(ev_max_a, the station limit read
from the charger, the entity's own range max)`."""
raise NotImplementedError
async def write_current(self, a: float) -> bool: async def write_current(self, a: float) -> bool:
raise NotImplementedError raise NotImplementedError
@@ -376,6 +420,12 @@ class AlfenHaDriver(ChargerDriver):
self._ents = entities_for(self.current_entity) self._ents = entities_for(self.current_entity)
self._hass = None self._hass = None
self._getter = None self._getter = None
# Seams for the checks: how a write waits for the read-back, and the
# clock it counts on.
self._sleep = asyncio.sleep
self._clock = time.monotonic
self.clamp_faults = [] # (asked, clamp), newest last, for the log
self.sent = [] # every number value actually sent
@classmethod @classmethod
def from_options(cls, opts: dict) -> "AlfenHaDriver": def from_options(cls, opts: dict) -> "AlfenHaDriver":
@@ -414,7 +464,6 @@ class AlfenHaDriver(ChargerDriver):
return dict(self._ents) return dict(self._ents)
async def _states(self, roles=_ROLE_ORDER) -> dict: async def _states(self, roles=_ROLE_ORDER) -> dict:
import asyncio
hass = self._h() hass = self._h()
got = await asyncio.gather(*(hass.state(self._ents[r]) for r in roles)) got = await asyncio.gather(*(hass.state(self._ents[r]) for r in roles))
return dict(zip(roles, got)) return dict(zip(roles, got))
@@ -434,20 +483,86 @@ class AlfenHaDriver(ChargerDriver):
by_ent = {self._ents[r]: o for r, o in st.items()} by_ent = {self._ents[r]: o for r, o in st.items()}
return probe_from(self.current_entity, by_ent.get) return probe_from(self.current_entity, by_ent.get)
# --- the write side, UNUSED in EV-03 -------------------------------------- # --- the write side -------------------------------------------------------
async def clamp_a(self) -> float:
"""`min(ev_max_a, station limit, entity range max)`. A limit the charger
did not answer is not a limit (the other two still bound the write)."""
st = await self._states(("current", "station", "station_active"))
station = _first(_amps(st["station_active"]), _amps(st["station"]))
rng = ENTITY_MAX_A
attrs = (st["current"] or {}).get("attributes") \
if isinstance(st.get("current"), dict) else None
if isinstance(attrs, dict):
try:
rng = min(rng, float(attrs["max"]))
except (KeyError, TypeError, ValueError):
pass
return min(x for x in (self.max_a, station, rng) if x is not None)
async def write_current(self, a: float) -> bool: async def write_current(self, a: float) -> bool:
a = max(0.0, min(float(a), self.max_a, ENTITY_MAX_A)) """Set the current, once. True only when the charger took it: the
return await self._h().set_number(self.current_entity, a) read-back followed within `TOOK_S`. A value above `clamp_a()` is a
SOFTWARE FAULT: nothing is sent, it is logged (the clamp watchdog's
shape) and the answer is False."""
try:
a = float(a)
except (TypeError, ValueError):
a = float("nan")
clamp = await self.clamp_a()
if a != a or a < 0.0 or a > clamp + 1e-9:
self.clamp_faults.append((a, clamp))
del self.clamp_faults[:-20]
_LOG.error("Software fault: the add-on was about to ask the charger "
"for more than its limit, so nothing was sent: "
"CHARGER_CLAMP.")
_LOG.debug("Asked for %.1f A against a limit of %.1f A.", a, clamp)
return False
hass = self._h()
self.sent.append(a)
del self.sent[:-50]
if not await hass.set_number(self.current_entity, a):
return False
return await self._took(a)
async def _took(self, a: float) -> bool:
"""Did the read-back follow the write, within `TOOK_S`?"""
t0 = self._clock()
while True:
st = await self._states(("readback", "current"))
seen = _first(_amps(st["readback"]), _amps(st["current"]))
if seen is not None and abs(seen - a) <= TOOK_TOL_A:
return True
if self._clock() - t0 >= TOOK_S:
return False
await self._sleep(1.0)
async def write_phases(self, n: int) -> bool: async def write_phases(self, n: int) -> bool:
"""Select 1 or 3 phases. ONLY THROUGH `carmode`'s safe sequence: the
setting moves the contactors, so it is touched with the car paused."""
if n not in (1, 3): if n not in (1, 3):
return False return False
return await self._h().call("select", "select_option", { want = "1 Phase" if n == 1 else "3 Phases"
"entity_id": self._ents["phases_set"], if not await self._h().call("select", "select_option", {
"option": "1 Phase" if n == 1 else "3 Phases"}) "entity_id": self._ents["phases_set"], "option": want}):
return False
t0 = self._clock()
while True:
st = await self._states(("phases_read", "phases_set"))
seen = _phases(st["phases_read"])
if seen is None:
seen = _phases(st["phases_set"])
if seen == n:
return True
if self._clock() - t0 >= TOOK_S:
return False
await self._sleep(1.0)
async def release(self, mode: str) -> bool: async def release(self, mode: str) -> bool:
return await self.write_current(0.0) if mode == "solar" else True """The mode's fail state. Manual and Off keep the current (the charger
is a stand-alone device and the current is the user's setting). Solar's
0 A goes through `carmode` (`SolarWriter.release`), the one write
site, so nothing is written here."""
return True
class UnavailableCharger(ChargerDriver): class UnavailableCharger(ChargerDriver):
@@ -473,6 +588,9 @@ class UnavailableCharger(ChargerDriver):
async def limits(self) -> tuple: async def limits(self) -> tuple:
return None, None, None return None, None, None
async def clamp_a(self) -> float:
return 0.0
async def read(self) -> ChargerReading: async def read(self) -> ChargerReading:
return ChargerReading(why=self.why) return ChargerReading(why=self.why)
@@ -546,6 +664,14 @@ class CarTracker:
c_low_since: float | None = None c_low_since: float | None = None
writer_at_utc: object = None writer_at_utc: object = None
_prev: tuple | None = None _prev: tuple | None = None
# EV-04: our own writes, and the stuck-reading rule (SAFETY-37's shape)
mute_until: float = 0.0
armed_at: float | None = None
armed_sig: tuple | None = None
sig: tuple | None = None
stuck_now: bool = False
obs_at: float | None = None # monotonic second of the latest reading
_hist: list = field(default_factory=list) # (t, power W, energy Wh)
# today's energy # today's energy
day: str | None = None day: str | None = None
today_kwh: float | None = None today_kwh: float | None = None
@@ -554,6 +680,8 @@ class CarTracker:
def observe(self, r: ChargerReading, now: float, now_utc, day: str): def observe(self, r: ChargerReading, now: float, now_utc, day: str):
self.reading = r self.reading = r
self.obs_at = now
self._corr_note(r, now)
usable = r.available and r.power_w is not None usable = r.available and r.power_w is not None
if r.available: if r.available:
self.bad_since = None self.bad_since = None
@@ -564,7 +692,8 @@ class CarTracker:
self.last_ok = now self.last_ok = now
self.last_good, self.last_good_utc = r, now_utc self.last_good, self.last_good_utc = r, now_utc
if r.available: if r.available:
self._writer(r, now_utc) self._sig(r, now)
self._writer(r, now_utc, now)
self._energy(r, day) self._energy(r, day)
self._timers(r, now) self._timers(r, now)
self._status_edge(now, now_utc) self._status_edge(now, now_utc)
@@ -594,11 +723,119 @@ class CarTracker:
except (TypeError, ValueError): except (TypeError, ValueError):
return None return None
# -- EV-04: the stuck-reading rule -------------------------------------------
def begin_write(self) -> None:
"""EV-12: a write of ours is in flight. Its read-back can reach the
tracker before `note_write` runs (the write waits for it), so the mute
is open until `end_write`."""
self.mute_until = float("inf")
def end_write(self, now: float) -> None:
"""EV-12: the write returned (or failed). The mute runs
`OWN_WRITE_MUTE_S` from now, not from before the write."""
self.mute_until = now + OWN_WRITE_MUTE_S
def note_write(self, now: float, was_a, to_a) -> None:
"""The add-on wrote the current. Its own change is not "another
writer" for `OWN_WRITE_MUTE_S`, and a write that moved the setpoint by
`STUCK_MIN_A` or more arms the stuck check: power and read-back that
have not changed `STUCK_S` later are a stuck reading, not a car."""
self.mute_until = now + OWN_WRITE_MUTE_S
try:
moved = was_a is None or abs(float(to_a) - float(was_a)) \
>= STUCK_MIN_A
except (TypeError, ValueError):
moved = False
if moved and self.armed_at is None:
self.armed_at, self.armed_sig = now, self.sig
def _sig(self, r, now: float) -> None:
sig = (r.power_w, r.allowed_a)
if self.armed_at is not None and self.armed_sig is not None \
and sig != self.armed_sig:
self.armed_at = self.armed_sig = None # it moved: alive
self.stuck_now = False
elif self.armed_at is not None and self.armed_sig is None:
self.armed_sig = sig
self.sig = sig
if self.armed_at is not None and now - self.armed_at >= STUCK_S:
self.stuck_now = True
def _corr_note(self, r, now: float) -> None:
"""Keep the last `CORR_WINDOW_S` of (power, energy) while the charger is
charging. Any gap, a car that is not in mode3 C, a reading without
power or energy, or a meter that goes back starts the window again."""
h = self._hist
ok = (r.available and r.charging is True and r.power_w is not None
and r.energy_kwh is not None)
if not ok or (h and r.energy_kwh * 1000.0 < h[-1][2] - 0.5):
h.clear()
if not ok:
return
h.append((now, float(r.power_w), r.energy_kwh * 1000.0))
while len(h) > 2 and now - h[1][0] >= CORR_KEEP_S:
h.pop(0)
def corroborated(self, now: float) -> bool:
"""Does the charger's energy meter agree with the power it reports? No
energy entity, or not charging: no. Less than a window of readings: yes
(the first minute of a session is believed). Otherwise the energy the
meter gained over the window must be at least `CORR_RATIO` of what the
power adds up to, less `CORR_SLACK_WH`. A frozen power figure on a car
that has stopped fails this within a window, and so does everything
frozen together."""
r = self.reading
h = self._hist
if r is None or not r.available or r.charging is not True \
or r.energy_kwh is None or not h:
return False
exp_wh = 0.0
for k in range(len(h) - 1, 0, -1):
(t0, p0, e0), (t1, _p1, _e1) = h[k - 1], h[k]
exp_wh += p0 * (t1 - t0) / 3600.0
if h[-1][0] - t0 >= CORR_WINDOW_S - 5.0 and exp_wh >= CORR_MIN_WH:
got_wh = h[-1][2] - e0
return got_wh >= CORR_RATIO * exp_wh - CORR_SLACK_WH
return True
def stuck(self, now: float) -> bool:
"""Power and read-back unchanged `STUCK_S` after a write that moved the
setpoint. Cleared the moment either moves."""
return self.stuck_now
def car_w_trusted(self, now: float):
"""The car's power for the peak guard's ALARM PATH, or None. Fresh (the
EV-03 rules), not stuck after a write, corroborated by the energy meter
(`corroborated`), and never above what the read-back allows the car to
draw: an old or frozen figure must not hide a house overload."""
return self._capped_w(now, True)
def car_w_paused(self, now: float):
"""EV-15: the same figure as `car_w_trusted` without the energy-meter
corroboration, which a car held at 0 A by the add-on's own phase change
cannot give (the meter's window restarts when it stops charging). Fresh,
not stuck, and capped by the read-back. Only for grading the alarm
during that sequence (`ctl_car._car_own_pause`)."""
return self._capped_w(now, False)
def _capped_w(self, now: float, corroborate: bool):
w = self.car_w(now)
if w is None or self.stuck(now) \
or (corroborate and not self.corroborated(now)):
return None
r = self.reading
a = r.allowed_a if r.allowed_a is not None else r.setpoint_a
if a is not None:
n = r.phases_allowed if r.phases_allowed in (1, 3) else 3
w = min(w, max(0.0, float(a)) * CEILING_V * n)
return w
# -- the two-writer detector ---------------------------------------------- # -- the two-writer detector ----------------------------------------------
def _writer(self, r, now_utc): def _writer(self, r, now_utc, now=None):
cur = (r.setpoint_a, r.allowed_a) cur = (r.setpoint_a, r.allowed_a)
prev = self._prev prev = self._prev
if prev is not None: muted = now is not None and now < self.mute_until
if prev is not None and not muted:
for a, b in zip(prev, cur): for a, b in zip(prev, cur):
if a is not None and b is not None and a != b: if a is not None and b is not None and a != b:
self.writer_at_utc = now_utc self.writer_at_utc = now_utc
+5 -1
View File
@@ -233,6 +233,9 @@ class AlarmsMixin:
# persistent overload is still notified once per quarter. # persistent overload is still notified once per quarter.
high = bool( high = bool(
g is not None and g.saturated and p is not None g is not None and g.saturated and p is not None
# EV-04: not when the car you set explains the excess (a fresh,
# trusted car reading only; `ctl_car.car_cycle`).
and not getattr(self, "car_explains", False)
and p.block_start is not None and not self._peak_rolled and p.block_start is not None and not self._peak_rolled
and peakguard.load_too_high( and peakguard.load_too_high(
p, batt_w=batt, ceiling_w=g.ceiling_w, p, batt_w=batt, ceiling_w=g.ceiling_w,
@@ -276,7 +279,8 @@ class AlarmsMixin:
the floor binds this guard only; the loop has no SoC floor and goes on the floor binds this guard only; the loop has no SoC floor and goes on
discharging. Edge-triggered. (DECISIONS/MAIN-orchestration-archive.md)""" discharging. Edge-triggered. (DECISIONS/MAIN-orchestration-archive.md)"""
g = self.peak_guard g = self.peak_guard
limited = bool(g is not None and g.floor_limited) limited = bool(g is not None and g.floor_limited
and not getattr(self, "car_explains", False))
if limited and (g.floor_w or 0.0) > 0.0: if limited and (g.floor_w or 0.0) > 0.0:
limited = self._reserve_short(g) limited = self._reserve_short(g)
else: else:
+791
View File
@@ -0,0 +1,791 @@
"""EV-04 and EV-05: the Controller's side of the car's Manual and Solar modes.
The writes themselves are `carmode.ManualWriter`'s; this mixin owns the state
(mode, current, phases: runtime state in the store, like OPT-11's modes), the
actions, the background step that never holds up a control cycle, and what the
car means for the peak guard's ALARM PATH. DECISIONS/EV-04-manual-mode.md.
EV-05 (DECISIONS/EV-05-solar-mode.md): Solar's inputs (`car_sun_inputs`), the
peak guard's excess taken off the car first (`car_cycle`), the 0 A at shutdown
before the inverters, and the solar kWh of today.
"""
import asyncio
import dataclasses
import logging
import math
from datetime import timezone
from . import carmode, chargers, messages, packmode, packshare, peakguard
from .tariff import QUARTER_S
_LOG = logging.getLogger("goodwe")
CAR_PEAK_KEY = "car_peak_q" # {quarter start iso: the car's average W}
CAR_PEAK_MIN_W = 50.0 # a quarter the car hardly touched is not kept
CAR_PEAK_KEEP = 3200 # about a month of quarters
OVER_HOLD_S = peakguard.ALARM_HOLD_S
# EV-11: the card, the row and Why stay on this long after the car stops being
# the cause: longer than the gaps seen on the rig (150 to 250 s at 50 s
# sampling) and shorter than a quarter, or until the session really ends.
OVER_OFF_HOLD_S = 180.0
# EV-15: the longest our own phase change can take (0 A wait, settle, three
# tries of a write at 5 s apart and up to 10 s each, the select's own wait);
# the grace for the alarm never outlasts it, and after the current is set
# again it lasts at most one corroboration window.
OWN_PAUSE_MAX_S = (carmode.ZERO_WAIT_S + carmode.SETTLE_S
+ carmode.MAX_TRIES * 15.0 + 10.0)
OWN_PAUSE_TAIL_S = chargers.CORR_WINDOW_S
CAR_SUN_KEY = "car_sun" # EV-05: {day, kwh} charged from the sun today
# EV-05 round 2 (owner 2026-11-18): while a battery can still give power the
# peak cut waits until the guard has wanted power this long in a row, so a
# cloud edge the batteries catch does not pause the car. It cuts at once when
# no battery can give (all at their cut-out) or with this little of the
# 15-minute period left: waiting 15 s with R s left raises what must come off
# afterwards by R / (R - 15), at most 8/7 at R = 120 s, and the cut takes it
# off the car at once then (test_ev05.py T21, T21b, T24c: the period lands
# under the aim).
CUT_WAIT_S = 15.0
CUT_NEAR_END_S = 120.0
# Round 4 (owner 2026-11-18, brief v5): the wait needs HEADROOM, batteries that
# can still raise their output. Within this many W of their rating they are
# at full output.
HEADROOM_W = 100.0
# EV-05: at shutdown the charger's 0 A waits at most this long, then the
# inverters are released whatever the charger did.
RELEASE_WAIT_S = 15.0
class CarMixin:
# ------------------------------------------------------------------ state
def car_init(self, opts, store) -> None:
"""Mode, current and phases from the store; `ev_mode_start` says what a
restart does with the mode. A site with no charger keeps defaults and
writes nothing."""
data = getattr(store, "data", None) or {}
self.car_mode = carmode.start_mode(opts, data.get(carmode.KEY_MODE))
if carmode.start_mode(opts, carmode.MANUAL) == carmode.OFF \
and data.get(carmode.KEY_MODE) not in (None, carmode.OFF):
store.set(carmode.KEY_MODE, carmode.OFF)
clamp = carmode.clamp_for(opts, None)
a = carmode.value_a(data.get(carmode.KEY_A, carmode.DEFAULT_A), clamp)
self.car_a = carmode.DEFAULT_A if a is None else a
n = data.get(carmode.KEY_PHASES, carmode.DEFAULT_PHASES)
ok = carmode.allowed_phases(opts)
self.car_n = n if n in ok else ok[0]
self.car_rev = 0
self.car_writer = carmode.ManualWriter()
self.car_solar = carmode.SolarWriter() # EV-05
first = data.get(carmode.KEY_FIRST)
self.car_first = first if first in carmode.FIRSTS \
else carmode.DEFAULT_FIRST
self.car_cut_w = 0.0
self._car_key = None
self._car_late_s = None
self._car_want_since = None # EV-05: the guard wants power since
self._car_sun_last = None
self._car_error_notified = False
sun = data.get(CAR_SUN_KEY)
self.car_sun = {"day": None, "kwh": 0.0}
if isinstance(sun, dict):
try:
self.car_sun = {"day": sun.get("day"),
"kwh": max(0.0, float(sun.get("kwh") or 0.0))}
except (TypeError, ValueError):
pass
self._car_sun_mono = None
self._car_sun_saved = round(self.car_sun["kwh"], 2)
self._car_task = None
self._car_step_failed = False
self.car_explains = False # the car alone explains the excess
self.car_over = False # ... held: the card and row say so
self._car_over_since = None
self._car_over_gone = None
self._car_batt_prev = None
self._car_need_real = self._car_need_excl = False # EV-10 latches
self._car_latch_block = None
self._car_over_notified = None # the session a notice was raised for
self._car_session = 0
self._car_prev_state = None
self._carq = {"key": None, "ws": 0.0, "ws_p": 0.0, "mono": None}
self._peak_proj_real = None
saved = data.get(CAR_PEAK_KEY)
self.car_peak_q = dict(saved) if isinstance(saved, dict) else {}
@property
def car_cover(self) -> bool:
"""Decision 1: do the batteries help cover the car down to the peak
reserve? Default yes."""
v = self.o.get("ev_batt_cover")
return bool(chargers.EV_OPTION_DEFAULTS["ev_batt_cover"]
if v is None else v)
def car_manual(self) -> bool:
return (self.charger.configured()
and self.car_mode == carmode.MANUAL)
def car_solar_mode(self) -> bool:
"""EV-05: a charger is set up and the mode is Solar."""
ch = getattr(self, "charger", None)
return bool(ch is not None and ch.configured()
and getattr(self, "car_mode", None) == carmode.SOLAR)
def car_clamp(self):
return carmode.clamp_for(self.o, self.car.reading)
def car_writing(self) -> bool:
"""May the add-on write to the charger now? Control runs, shadow mode is
off, no safety stop is latched and the add-on is not shutting down. Shadow mode gates charger
writes exactly as it gates inverter writes."""
latched = (any(i.sign_wd.tripped for i in self.inverters)
or self.site_sign_wd.tripped or self.circ_wd.tripped)
return bool(self.auto and not self.shadow and not latched
and not getattr(self, "stopping", False))
# ---------------------------------------------------------------- actions
def _car_action(self, what, value, now) -> dict:
"""The mode, the current or the phases, from the page or from Home
Assistant. Store state, applied by the next step with no restart."""
if not self.charger.configured():
return {"error": messages.car_refused("off")}
if what == "car_mode":
if value not in carmode.MODES:
return {"error": messages.car_refused("value")}
self.car_mode = value
self.store.set(carmode.KEY_MODE, value)
elif what == "car_sun_first":
# EV-05: arithmetic only, from the next cycle; not a user change of
# the writers (the 30 s rule and the other-writer hold stand).
if value not in carmode.FIRSTS:
return {"error": messages.car_refused("value")}
self.car_first = value
self.store.set(carmode.KEY_FIRST, value)
self.log_event(f"car sun first set to {value} by operator",
hint=messages.hint("car_sun_first"))
return {"mode": self.car_mode, "current": self.car_a,
"phases": self.car_n, "sun_first": self.car_first}
elif what == "car_current":
clamp = self.car_clamp()
if isinstance(value, bool):
return {"error": messages.car_refused("value")}
a = carmode.value_a(value, clamp)
try:
inside = a is not None and abs(float(value) - a) < 0.5
except (TypeError, ValueError):
inside = False
if not inside:
return {"error": messages.car_refused("value")}
self.car_a = a
self.store.set(carmode.KEY_A, a)
else:
if value not in (1, 3) or isinstance(value, bool):
return {"error": messages.car_refused("value")}
if value not in carmode.allowed_phases(self.o):
return {"error": messages.car_refused("phases")}
self.car_n = value
self.store.set(carmode.KEY_PHASES, value)
self.car_rev += 1
self.car_writer.user_changed()
if what == "car_mode" and value == carmode.SOLAR:
# EV-05 round 6: only pressing Solar lifts Solar's other-writer
# hold. Leaving Solar, or setting Manual's current or phases, is
# not the user taking the charger back, so nothing is written over
# that writer (N10).
self.car_solar.user_changed()
self.log_event(f"car {what[4:]} set to {value} by operator",
hint=messages.hint(what))
return {"mode": self.car_mode, "current": self.car_a,
"phases": self.car_n}
def car_command_values(self) -> dict:
"""The MQTT state of the three car entities."""
return {"car_mode": carmode.MODE_LABELS[self.car_mode],
"car_current": round(self.car_a),
"car_phases": str(self.car_n),
"car_sun_first": carmode.FIRST_LABELS[self.car_first]}
# ------------------------------------------------------------- the writer
def car_kick(self) -> None:
"""Start one writer step in the background, unless one is running. A
write waits up to 10 s for the charger's read-back, and a control cycle
never waits for the charger."""
if not self.charger.configured():
return
t = self._car_task
if t is not None and not t.done():
return
self._car_task = asyncio.ensure_future(self._car_run())
def _car_hold_kick(self) -> None:
"""EV-05: a cycle that holds for a missing or late reading returns
before `car_kick()`. Solar still steps (it holds, counts its dwell from
the first missing reading, and an exit still writes its 0 A); Manual is
left exactly as it was."""
if self.car_solar_engaged():
self.car_cut_w = 0.0
self.car_kick()
async def car_settle(self) -> None:
"""Wait for the writer step in flight (the checks use it)."""
t = self._car_task
if t is not None:
await asyncio.gather(t, return_exceptions=True)
async def _car_run(self) -> None:
try:
await self.car_step()
except asyncio.CancelledError:
raise
except Exception: # noqa: BLE001
# Once at WARNING-and-above, then quietly: a step that fails
# fails every second.
if not self._car_step_failed:
self._car_step_failed = True
_LOG.exception("The car charger step failed")
else:
_LOG.debug("The car charger step failed again", exc_info=True)
else:
self._car_step_failed = False
def car_solar_engaged(self) -> bool:
"""EV-05: Solar is the mode, or its 0 A on the way out is still due."""
w = getattr(self, "car_solar", None)
return bool(self.charger.configured() and w is not None
and (self.car_mode == carmode.SOLAR or w.engaged))
async def car_shutdown(self) -> None:
"""The add-on stops: no new write. Manual: a phase change in the middle
is undone by giving the car its current back, the current stands
otherwise. Solar (EV-05): 0 A, once, waited for at most
`RELEASE_WAIT_S` (`Controller.shutdown` calls this first in Solar)."""
t, self._car_task = getattr(self, "_car_task", None), None
if t is not None and not t.done():
t.cancel()
await asyncio.gather(t, return_exceptions=True)
if self.car_solar_engaged():
try:
await asyncio.wait_for(self.car_solar.release(
self.charger, self.car.reading, self.car_now(), self.car),
RELEASE_WAIT_S)
except Exception: # noqa: BLE001
_LOG.warning("The car charger could not be set to 0 A before "
"the add-on stopped: CHARGER_RELEASE.")
return
if not self.charger.configured() \
or getattr(self, "car_writer", None) is None \
or self.car_writer.seq is None:
return
try:
await asyncio.wait_for(self.car_writer.abandon(
self.charger, self.car_now(), self.car, self.car_clamp()),
15.0)
except Exception: # noqa: BLE001
_LOG.warning("The car could not be given its current back "
"before the add-on stopped: CHARGER_RESTORE.")
async def car_step(self) -> None:
"""One step of Manual. Reads nothing from the world (the cycle's read
did) and writes only through `carmode.ManualWriter`."""
if not self.charger.configured():
return
now = self.car_now()
if self.car_mode != carmode.SOLAR:
await self.car_writer.step(
self.charger, self.car.reading, mode=self.car_mode,
want_a=self.car_a, want_phases=self.car_n, rev=self.car_rev,
clamp=self.car_clamp(), now=now, tracker=self.car,
writing=self.car_writing(), shadow=bool(self.shadow),
status=self.car.status(now, True), clock=self.car_now)
w = self.car_solar
if self.car_mode == carmode.SOLAR or w.engaged:
await w.step(
self.charger, self.car.reading, mode=self.car_mode,
sun=(self.car_sun_inputs(now)
if self.car_mode == carmode.SOLAR else None),
clamp=self.car_clamp(), now=now, tracker=self.car,
writing=self.car_writing(), status=self.car.status(now, True),
clock=self.car_now)
# ------------------------------------------------------- EV-05: Solar
def car_may_charge(self, inv) -> bool:
"""May this battery take the sun? On (battery modes), not refusing a
charge, its level read and under full."""
if self.modes_on and not self.pack_mode(inv).use:
return False
if (inv.refused or 0) < 0 or inv.sign_wd.tripped:
return False
if len(self.inverters) == 1 and (self.batt_refused or 0) < 0:
return False
return inv.soc is not None and float(inv.soc) < packshare.FULL_PCT
def car_room_w(self) -> float:
"""Batteries first: the RATINGS of the batteries that may charge."""
return float(sum(inv.rating_w() for inv in self.inverters
if self.car_may_charge(inv)))
def car_spare_w(self, mono):
"""The signed spare sun now, or None when it cannot be measured: a
missing meter or battery figure, readings late past the stale bound,
or a charging car whose figure is stale, stuck or not corroborated. A
paused or idle car with a fresh reading counts as 0 W."""
if not self.inputs_ok:
return None
stale = float(self.o.get("stale_input_s", 15))
late = self._car_late_s
if late is not None and late >= stale:
return None
if self.p1_enabled:
# The meter's own bound (`meter_max_age_s`) may be longer than
# `stale_input_s`; a car write never comes from an older reading.
age = self.p1.age_s()
if age is None or age > stale:
return None
r = self.car.reading
if r is None or not r.available or not self.car.fresh(mono):
return None
if r.charging is True:
car = self.car.car_w_trusted(mono)
else:
car = 0.0
return carmode.spare_w(car, self.site_batt_w, self.grid)
def car_sun_inputs(self, mono) -> "carmode.SunInputs":
o = self.o
spare = self.car_spare_w(mono)
late = self._car_late_s
hold = late is not None and late < float(o.get("stale_input_s", 15))
room = self.car_room_w()
margin = carmode.solar_option(o, "ev_margin_w")
ph = str(o.get("ev_phases", chargers.EV_OPTION_DEFAULTS["ev_phases"]))
self._car_sun_last = carmode.SunInputs(
target_w=carmode.car_target_w(spare, room, margin,
self.car_first),
hold=hold, cut_w=self.car_cut_w,
car_w=self.car.car_w(mono), key=self._car_key,
auto=ph not in ("1", "3"), fixed_n=3 if ph == "3" else 1,
start_s=60.0 * carmode.solar_option(o, "ev_start_min"),
pause_s=60.0 * carmode.solar_option(o, "ev_pause_min"),
spare_w=spare, room_w=room, margin_w=margin,
first=self.car_first)
return self._car_sun_last
def _car_sun_tick(self, mono) -> None:
"""Solar kWh: per cycle, in Solar only, the car's power up to the sun
it may take (`spare - room` Batteries first, `spare` Car first). The
hold's battery or grid share and Manual do not count."""
if not self.car_solar_mode():
self._car_sun_mono = None
return
day = self.car.day
if day is not None and self.car_sun.get("day") != day:
self.car_sun = {"day": day, "kwh": 0.0}
self.store.set(CAR_SUN_KEY, dict(self.car_sun))
self._car_sun_saved = 0.0
last, self._car_sun_mono = self._car_sun_mono, mono
if last is None:
return
dt = min(max(mono - last, 0.0), 5.0)
p = self.car.car_w(mono)
spare = self.car_spare_w(mono)
if p is None or spare is None or dt <= 0.0:
return
sun = spare - (self.car_room_w() if self.car_first == carmode.FIRST_BATT
else 0.0)
share = min(float(p), max(0.0, sun))
if share <= 0.0:
return
self.car_sun["kwh"] += share * dt / 3.6e6
if round(self.car_sun["kwh"], 2) != self._car_sun_saved:
self._car_sun_saved = round(self.car_sun["kwh"], 2)
self.store.set(CAR_SUN_KEY, {"day": self.car_sun["day"],
"kwh": round(self.car_sun["kwh"], 4)})
def car_sun_kwh(self):
"""Today's kWh from the sun, never above today's kWh; None without a
reading of today."""
if self.car.today_kwh is None or self.car_sun.get("day") != self.car.day:
return None if self.car.today_kwh is None else 0.0
return max(0.0, min(float(self.car_sun["kwh"]),
float(self.car.today_kwh)))
async def check_car_error(self) -> None:
"""EV-05: in Solar a charger error sets the car to 0 A and raises one
warning notification; it is taken down when the error clears."""
bad = self.car_solar_mode() and self.car_solar.fault == "error"
if bad and not self._car_error_notified:
self._car_error_notified = True
await self.hass.call("persistent_notification", "create",
messages.charger_error().data())
elif not bad and self._car_error_notified:
self._car_error_notified = False
await self.hass.call("persistent_notification", "dismiss",
messages.charger_error_gone().data())
# ------------------------------------------- the car and the peak guard
def car_alarm_w(self):
"""The car's power for the guard's alarm path: Manual and Solar, fresh,
not stuck (`CarTracker.car_w_trusted`), and never above what the
read-back allows. None otherwise, and then the normal alarms stand."""
if not (self.car_manual() or self.car_solar_mode()):
return None
return self.car.car_w_trusted(self.car_now())
def _car_own_pause(self, mono) -> bool:
"""EV-15: is the car held at 0 A by the add-on's OWN phase change? From
the moment its 0 A write is SENT (the cycle runs beside the write)
until the current is set again, then at most one corroboration window.
No when it was aborted (Off, Stop, shadow, unplug, another writer), a
write was refused, or it ran past its own maximum."""
if self.car_solar_mode():
return self._car_solar_pause(mono)
wr = getattr(self, "car_writer", None)
if wr is None or (wr.seq is None and wr.phase_done_at is None
and wr.zero_sent_at is None) or wr.hold:
return False
r = self.car.reading
if not (self.car_manual() and self.car_writing()
and r is not None and r.available and r.state != "A"):
return False
q = wr.seq
if q is None and wr.zero_sent_at is not None: # sent, not yet back
return 0.0 <= mono - wr.zero_sent_at <= OWN_PAUSE_MAX_S
if q is not None:
return not q.get("failed") and 0.0 <= mono - q["t0"] \
<= OWN_PAUSE_MAX_S
return 0.0 <= mono - wr.phase_done_at <= OWN_PAUSE_TAIL_S
def car_solar_can_cut(self) -> bool:
"""EV-05 round 6: can Solar really cut the car now? Not while another
writer holds the charger, a write of ours was refused or given up, a
way-out 0 A is not taken, the charger shows a fault, or it cannot be
read, and not while Solar is not writing (Stop, shadow, a safety stop:
round 7), and not a car Solar is not running (round 8). Only then may
the car be graded out of the peak alarms. Round 9: all of that, and a
read-back current and phases that are Solar's own, is
`SolarWriter.in_control`, the one test."""
w = getattr(self, "car_solar", None)
r = self.car.reading
if not (w is not None and r is not None and r.available
and self.car_writing() # round 7: Stop, shadow, latch
and w.in_control):
return False
# Round 8: Solar cuts only a car it runs (`plan.a > 0`). While paused
# at 0 A a car that draws is someone else's, unless it is Solar's own
# 0 A or phase change still inside EV-15's bound.
return bool(w.plan.a > 0.0 or w.seq is not None
or self._car_solar_pause(self.car_now()))
def _car_giving(self) -> list:
"""EV-05: the batteries the peak guard can draw on now: above their
own cut-out level, not refusing to give (SAFETY-73: `inv.refused` at
N>=2, `Controller.batt_refused` at N=1), not under a safety stop (the
unit's own, the site's, the circulation stop). A battery switched Off
in battery modes still counts: the guard's floor uses it (round 6)."""
n = len(self.inverters)
if self.circ_wd.tripped or (n > 1 and self.site_sign_wd.tripped):
return []
out = []
for inv in self.inverters:
soc, floor = inv.soc, inv.bms_soc_floor
refused = inv.refused if n > 1 else self.batt_refused
if soc is None or floor is None or inv.sign_wd.tripped \
or (refused or 0) > 0:
continue
if float(soc) > float(floor):
out.append(inv)
return out
def _car_batt_able(self) -> bool:
"""EV-05: can a battery still give power at all?"""
return bool(self._car_giving())
def _car_batt_headroom(self, guard) -> bool:
"""EV-05 rounds 4 and 5: can the batteries still RAISE their output?
The guard is neither saturated nor at the peak reserve, and the units
that can give (`_car_giving`) give more than `HEADROOM_W` under their
own ratings (and under `guard.able_w` when the guard names it). A unit
that refuses or is stopped counts neither in what is given nor in what
could be."""
giving = self._car_giving()
if not giving or guard is None or guard.saturated \
or guard.floor_limited:
return False
if any(inv.batt is None for inv in giving):
return False
batt = sum(float(inv.batt) for inv in giving)
top = sum(float(inv.rating_w()) for inv in giving)
if guard.able_w is not None:
top = min(top, float(guard.able_w))
return batt < top - HEADROOM_W
def _car_solar_pause(self, mono) -> bool:
"""EV-05: Solar's own 0 A (a pause, the peak cut, the phase change)
gets EV-15's grace, bounded the same way: from the moment it is sent,
at most `OWN_PAUSE_MAX_S`; a phase change as in Manual. None for Stop,
shadow, an unplugged car or another writer."""
wr = getattr(self, "car_solar", None)
r = self.car.reading
if wr is None or not wr.in_control or not self.car_writing() \
or r is None or not r.available or r.state == "A":
return False # round 9: only a charger Solar has
q = wr.seq
if q is not None:
return not q.get("failed") and 0.0 <= mono - q["t0"] \
<= OWN_PAUSE_MAX_S
if wr.zero_sent_at is not None:
return 0.0 <= mono - wr.zero_sent_at <= OWN_PAUSE_MAX_S
if wr.zero_at is not None and 0.0 <= mono - wr.zero_at \
<= OWN_PAUSE_MAX_S:
return True
return wr.phase_done_at is not None \
and 0.0 <= mono - wr.phase_done_at <= OWN_PAUSE_TAIL_S
def _car_quarter(self, proj, w, mono, wg=None) -> None:
"""The car's energy in the open quarter, for the average the guard's
house leaves out and for the peak line. `wg` (EV-15) is the figure for
grading during our own pause; its energy is kept apart (`ws_p`) so the
guard's input is unchanged."""
q = self._carq
key = None if proj is None else proj.block_start
last = q["mono"]
if key != q["key"]:
self._car_bank(q)
q["key"], q["ws"], q["ws_p"], q["ws_b"] = key, 0.0, 0.0, 0.0
if key is not None and last is not None:
dt = min(max(mono - last, 0.0), 5.0)
if w is not None:
q["ws"] += float(w) * dt
if not self.car_solar_mode() or not self.car_solar_can_cut():
# EV-05: a Solar charge runs on spare sun and is cut first,
# so it is not "set by the car"; one the add-on cannot cut
# (round 6: another writer, a refused write, a fault) is.
q["ws_b"] = q.get("ws_b", 0.0) + float(w) * dt
elif wg is not None:
q["ws_p"] = q.get("ws_p", 0.0) + float(wg) * dt
q["mono"] = mono
def _car_bank(self, q) -> None:
"""A closed quarter in which the car drew its share goes on the list."""
key = q["key"]
if key is None:
return
avg = q.get("ws_b", q["ws"]) / QUARTER_S
if avg < CAR_PEAK_MIN_W:
return
self.car_peak_q[key.astimezone(timezone.utc).isoformat()] = round(avg)
if len(self.car_peak_q) > CAR_PEAK_KEEP:
for k in sorted(self.car_peak_q)[:-CAR_PEAK_KEEP]:
del self.car_peak_q[k]
self.store.set(CAR_PEAK_KEY, dict(self.car_peak_q))
def car_avg_w(self, proj, w, graded=False) -> float:
"""The car's average over the whole open quarter: what it drew so far
and `w` for the rest. `graded` (EV-15) adds what it drew during our
own pause."""
if proj is None or w is None:
return 0.0
left = max(0.0, QUARTER_S - float(proj.elapsed_s))
so_far = self._carq["ws"] if self._carq["key"] == proj.block_start \
else 0.0
if graded and self._carq["key"] == proj.block_start:
so_far += self._carq.get("ws_p", 0.0)
return (so_far + float(w) * left) / QUARTER_S
def car_exclude(self, proj, w):
"""Decision 1 off: the projection the guard sees without the car
(`house - car_w`). Unchanged without a fresh car reading."""
if proj is None or w is None or proj.block_start is None:
return proj
avg = self.car_avg_w(proj, w)
return dataclasses.replace(
proj, projected_w=max(0.0, float(proj.projected_w) - avg),
held_w=max(0.0, float(proj.held_w) - float(w)))
def car_exclude_alarm(self, proj, w):
"""EV-10b: the period as it would be without the car, for grading the
alarm. The house alone, the batteries giving only what the house
would draw from them: the car's share of their power is not charged to
the house. The rest of the period keeps its sign (`held - car`, an
export while the batteries give more than the house uses), so
`misses_aim` adds the batteries back to exactly the house. What is
already done is clipped at 0 Ws: no export is credited for power only
the car asked for. Unchanged without a fresh car reading."""
if proj is None or w is None or proj.block_start is None:
return proj
avg = self.car_avg_w(proj, w, graded=True)
left = max(0.0, QUARTER_S - float(proj.elapsed_s))
held = float(proj.held_w)
done_ws = QUARTER_S * float(proj.projected_w) - max(held, 0.0) * left
car_ws = avg * QUARTER_S - float(w) * left # the car so far
held_x = held - float(w)
return dataclasses.replace(
proj, held_w=held_x,
projected_w=(max(0.0, done_ws - car_ws)
+ max(held_x, 0.0) * left) / QUARTER_S)
def car_cycle(self, real_proj, guard, target_w, now_utc) -> None:
"""After the guard has decided: does the car alone explain the excess?
`real_proj` is the projection WITH the car, whatever the guard saw."""
mono = self.car_now()
# EV-05: the period's own key, and the excess Solar takes off the car
# first (the writer step that follows this cycle acts on it at once).
self._car_key = None if real_proj is None else real_proj.block_start
self.car_cut_w = 0.0
# What the guard would ASK the batteries to give (`wanted_w`, its floor
# before the rating) is taken off the car instead, up to the excess:
# batteries that only stop charging are not asked for anything.
cut = 0.0
if self.car_solar_mode() and real_proj is not None \
and target_w is not None and real_proj.block_start is not None \
and guard is not None and guard.engaged and guard.blind is None:
ex = peakguard.excess_w(real_proj, target_w)
want = guard.wanted_w
if ex is not None and want is not None and math.isfinite(ex) \
and math.isfinite(want) and ex > 0.0 and want > 0.0:
cut = float(min(ex, want))
if cut > 0.0:
if self._car_want_since is None:
self._car_want_since = mono
left = QUARTER_S - float(real_proj.elapsed_s)
w9 = self.car_solar
if (not self._car_batt_headroom(guard) or left <= CUT_NEAR_END_S
or mono - self._car_want_since >= CUT_WAIT_S) \
and w9.own_rb and not w9.hold:
# Round 9: never for a car another writer runs (its current
# or phases): the plan keeps no cut it cannot write.
self.car_cut_w = cut
else:
self._car_want_since = None
self._car_sun_tick(mono)
w = self.car_alarm_w()
# EV-15: the figure for grading only. Our own phase change holds the
# car at 0 A and the energy meter cannot corroborate it then, so for
# that bounded time its fresh, not stuck figure stands in.
wg = w
if w is None and self._car_own_pause(mono):
wg = self.car.car_w_paused(mono)
self._car_quarter(real_proj, w, mono, wg)
self._car_session_tick(mono)
explains = over = False
if real_proj is not None and target_w is not None \
and real_proj.block_start is not None:
# EV-10: every cycle, so the latches do not depend on the option.
graded = self._car_explains_alarm(real_proj, guard, target_w, wg)
if self.car_solar_mode():
# EV-05: Solar is cut first, so it is never "over"; its own
# 0 A must not leave the house's alarm graded with the car.
# Round 6: only while it really can cut the car. Otherwise
# the normal alarms stand, as in Off.
explains = graded and self.car_solar_can_cut()
elif self.car_cover:
explains = over = graded
elif w is not None:
ex = float(real_proj.projected_w) - float(target_w)
over = ex > 0.0 and self.car_avg_w(real_proj, w) >= ex
self.car_explains = explains
# EV-11: on once the condition has stood for OVER_HOLD_S, a short gap
# in it not starting that count again; off only after it has been gone
# for OVER_OFF_HOLD_S. `car_explains` (the alarm decision) has no hold.
if over:
self._car_over_gone = None
if self._car_over_since is None:
self._car_over_since = mono
if mono - self._car_over_since >= OVER_HOLD_S:
self.car_over = True
else:
if self._car_over_gone is None:
self._car_over_gone = mono
if mono - self._car_over_gone >= OVER_OFF_HOLD_S:
self.car_over, self._car_over_since = False, None
self._car_over_gone = None
def _car_explains_alarm(self, real_proj, guard, target_w, w) -> bool:
"""EV-10: is the alarm's own test true with the car and false without
its fresh, corroborated share (`car_exclude_alarm`), on the same landing? The
tests are the alarms': a saturated guard and a floor with other
batteries left are graded by `load_too_high` on where the period lands
(SAFETY-81 / 87); a floor that leaves nothing is graded by SAFETY-126's
`misses_aim` (the batteries at 0 W from now on), latched for the
quarter. That latch is kept here twice, on the period as it is
(`_car_need_real`) and without the car (`_car_need_excl`), from the
same `misses_aim` and the same batteries reading. Both reset at a new
quarter and when the guard no longer wants power, whatever the cover
option says (this runs every cycle). A car that is 0 W, or untrusted
(`w` None sets the second latch), makes the two equal and explains
nothing."""
batt, prev = self.site_batt_w, self._car_batt_prev
self._car_batt_prev = batt
wants = bool(guard is not None and guard.engaged
and guard.blind is None
and (guard.wanted_w or 0.0) > 0.0)
if real_proj.block_start != self._car_latch_block:
self._car_latch_block = real_proj.block_start
self._car_need_real = self._car_need_excl = False
if not wants:
self._car_need_real = self._car_need_excl = False
if batt is not None and prev is not None:
batt = min(float(batt), float(prev))
excl = self.car_exclude_alarm(real_proj, w)
if wants:
if batt is None:
self._car_need_real = self._car_need_excl = True
else:
self._car_need_real = self._car_need_real or \
peakguard.misses_aim(real_proj, batt_w=batt,
target_w=target_w)
self._car_need_excl = self._car_need_excl or w is None or \
peakguard.misses_aim(excl, batt_w=batt, target_w=target_w)
if w is None or batt is None or not wants \
or not (guard.saturated or guard.floor_limited):
return False
if guard.saturated:
rating = self.site_rating_w
elif (guard.floor_w or 0.0) > 0.0 and guard.able_w is not None:
rating = guard.able_w
else:
return bool(not guard.within_aim and self._car_need_real
and not self._car_need_excl)
def high(p):
return peakguard.load_too_high(
p, batt_w=batt, ceiling_w=guard.ceiling_w,
achievable_w=rating)
return bool(high(real_proj) and not high(excl))
def _car_session_tick(self, mono) -> None:
"""A charging session is a plug-in: the state goes from no car to a
car. The notice is raised once per session."""
s = self.car.status(mono, True)
if s in (chargers.NONE_,) and self._car_prev_state not in (
None, chargers.NONE_):
self._car_over_notified = None
# The session is over: that is a real end, with no hold.
self.car_over = False
self._car_over_since = self._car_over_gone = None
if s not in (chargers.NONE_, None) and self._car_prev_state in (
chargers.NONE_, None):
self._car_session += 1
self._car_prev_state = s
async def check_car_over(self) -> None:
"""One grey notice per charging session: the charge you set takes the
15-minute period over the peak limit. Raised nowhere else."""
if not self.car_over or self._car_over_notified == self._car_session:
return
self._car_over_notified = self._car_session
_LOG.info("The car charge you set takes this 15-minute period over "
"the peak limit: CAR_OVER_PEAK.")
await self.hass.call("persistent_notification", "create",
messages.car_over(f"{self.car_a:.0f}").data())
def car_peak_by_car(self, reading, now):
"""`(True, local time)` when the month's peak quarter was one the car
mostly made (it drew half the peak or more), else `(False, None)`."""
if reading is None or not getattr(reading, "is_observed", False) \
or reading.quarter_start is None or not self.car_peak_q:
return False, None
avg = self.car_peak_q.get(
reading.quarter_start.astimezone(timezone.utc).isoformat())
if avg is None or reading.peak_w is None \
or 2.0 * float(avg) < float(reading.peak_w):
return False, None
return True, reading.quarter_start
+22
View File
@@ -253,6 +253,7 @@ class CycleMixin:
stale_after = float(self.o.get("stale_input_s", 15)) stale_after = float(self.o.get("stale_input_s", 15))
late_s = self._readings_late(site_standing) # SAFETY-128 late_s = self._readings_late(site_standing) # SAFETY-128
self._car_late_s = late_s # EV-05: Solar holds, then the stale rule
self._late_zero = late_s is not None and late_s >= stale_after self._late_zero = late_s is not None and late_s >= stale_after
# ⚠️ `any`, NOT the sole unit's. The hold exists so a single missed # ⚠️ `any`, NOT the sole unit's. The hold exists so a single missed
# poll does not become a fault; a LATCHED inverter must still reach the # poll does not become a fault; a LATCHED inverter must still reach the
@@ -272,6 +273,7 @@ class CycleMixin:
# this cycle's. (DECISIONS/MAIN-orchestration-archive.md) # this cycle's. (DECISIONS/MAIN-orchestration-archive.md)
self.why_words = messages.why_waiting(bad_for) self.why_words = messages.why_waiting(bad_for)
self._why_waiting_since = now - timedelta(seconds=bad_for) self._why_waiting_since = now - timedelta(seconds=bad_for)
self._car_hold_kick() # EV-05: Solar counts from now
return return
if late_s is not None and late_s < stale_after and self.inputs_ok \ if late_s is not None and late_s < stale_after and self.inputs_ok \
and (self.auto or self.shadow) \ and (self.auto or self.shadow) \
@@ -279,6 +281,7 @@ class CycleMixin:
and not (n_units > 1 and self.site_sign_wd.tripped): and not (n_units > 1 and self.site_sign_wd.tripped):
self.reason = f"readings late {late_s:.0f}s" # SAFETY-128: hold self.reason = f"readings late {late_s:.0f}s" # SAFETY-128: hold
self.why_words = messages.why_late() self.why_words = messages.why_late()
self._car_hold_kick() # EV-05: Solar holds its current
return return
claims = [] claims = []
@@ -391,6 +394,15 @@ class CycleMixin:
if self._peak_proj is not None and len(self.inverters) > 1: if self._peak_proj is not None and len(self.inverters) > 1:
self._peak_proj = next_quarter(self._peak_proj, self._peak_proj = next_quarter(self._peak_proj,
self.p1.averager.max_hold_s) self.p1.averager.max_hold_s)
# EV-04, decision 1: with "Batteries help with the peak while the car
# charges" OFF, the guard's house leaves the car out (`house - car_w`).
# `_peak_proj_real` keeps the quarter as the meter will bill it, for
# the car's own words. Only a fresh, trusted car reading is left out.
self._peak_proj_real = self._peak_proj
if (self._peak_proj is not None and not self.car_cover
and self.car_manual()):
self._peak_proj = self.car_exclude(self._peak_proj,
self.car_alarm_w())
self.peak_guard = None if not self.p1_enabled else peakguard.decide( self.peak_guard = None if not self.p1_enabled else peakguard.decide(
self._peak_proj, self._peak_proj,
# ⚠️ THE SITE SUM. The guard sizes a floor from what the battery is # ⚠️ THE SITE SUM. The guard sizes a floor from what the battery is
@@ -440,6 +452,13 @@ class CycleMixin:
self.peak_guard = self._peak_landing(self.peak_guard) self.peak_guard = self._peak_landing(self.peak_guard)
self.peak_guard = peakguard.cap_floor( # SAFETY-128 self.peak_guard = peakguard.cap_floor( # SAFETY-128
self.peak_guard, self.answer.peak_cap(site_standing)) self.peak_guard, self.answer.peak_cap(site_standing))
# EV-04: does the car alone explain what the guard cannot hold? Fresh
# car readings only; the claim, the floor and the commands above are
# not touched by it.
self.car_cycle(self._peak_proj_real, self.peak_guard,
peakguard.quarter_target_w(
float(self.o.get("peak_cap_w", 3500)),
self.peak_margin_w, _reading), now)
# SITE, and peakguard.claim() says so on the object it builds: the # SITE, and peakguard.claim() says so on the object it builds: the
# quantity is the 15-minute average OFFTAKE AT THE GRID CONNECTION, # quantity is the 15-minute average OFFTAKE AT THE GRID CONNECTION,
# which the capacity tariff bills (one quarter-hour peak per site, not # which the capacity tariff bills (one quarter-hour peak per site, not
@@ -1048,6 +1067,9 @@ class CycleMixin:
# and, on a change only, one Home Assistant call. # and, on a change only, one Home Assistant call.
await self.check_price_gap() await self.check_price_gap()
await self.check_charger() await self.check_charger()
await self.check_car_over()
await self.check_car_error() # EV-05: Solar's charger error
self.car_kick() # EV-04/05: in the background
await self.check_fixed_note() await self.check_fixed_note()
# SAFETY-31's alarm, and its boundary is the LATCH, not a number: it # SAFETY-31's alarm, and its boundary is the LATCH, not a number: it
+82 -3
View File
@@ -15,8 +15,8 @@ from .freeze import rail_unreachable, rail_w
from .hass import OUTAGE from .hass import OUTAGE
from .maintenance import IDLE from .maintenance import IDLE
from .mqtt import ( from .mqtt import (
PAYLOAD_NONE, announced_units, optional_keys, parse_command, unit_slugs, BASE, PAYLOAD_NONE, announced_units, optional_keys, parse_car_command,
unit_state_key, parse_command, unit_slugs, unit_state_key,
) )
from . import peakguard from . import peakguard
from . import pv as pv_read from . import pv as pv_read
@@ -35,6 +35,9 @@ class StatusMixin:
already holds the last choice). Never raises: MQTT must not reach already holds the last choice). Never raises: MQTT must not reach
control. (DECISIONS/MAIN-orchestration-archive.md)""" control. (DECISIONS/MAIN-orchestration-archive.md)"""
try: try:
if isinstance(topic, str) and topic.startswith(f"{BASE}/car/"):
await self._car_mqtt_command(topic, payload, retained)
return
slug, action, value, why = parse_command( slug, action, value, why = parse_command(
topic, payload, retained, packmode.MODES) topic, payload, retained, packmode.MODES)
if why is None: if why is None:
@@ -68,6 +71,29 @@ class StatusMixin:
except Exception: # noqa: BLE001 except Exception: # noqa: BLE001
_LOG.exception("Home Assistant command could not be handled") _LOG.exception("Home Assistant command could not be handled")
async def _car_mqtt_command(self, topic, payload, retained) -> None:
"""EV-04: one command from the car's HA entities, through
handle_action(). A retained command is never applied. Never raises."""
action, value, why = parse_car_command(topic, payload, retained)
result = None
if why is None:
result = await self.handle_action(action, value=value)
if isinstance(result, dict) and "error" not in result:
self.mqtt.publish(self.car_command_values())
return
why = result["error"] if isinstance(result, dict) else "refused"
else:
why = messages.car_refused("topic") if why == "topic" else \
messages.pack_refused(why)
topic_s = "".join(c if c.isprintable() else "?" for c in str(topic)[:128])
_LOG.debug("Home Assistant command %s %s refused: %s", topic_s,
repr(payload)[:48], why)
if (topic_s, why) not in self._mqtt_refused \
and len(self._mqtt_refused) < 32:
self._mqtt_refused.add((topic_s, why))
_LOG.warning("Home Assistant command on %s ignored: %s", topic_s,
why)
@property @property
def why_words(self) -> str: def why_words(self) -> str:
"""The page's "Why" line. While control waits for a missing reading """The page's "Why" line. While control waits for a missing reading
@@ -178,9 +204,50 @@ class StatusMixin:
out.append({"ok": False, "warn": True, "id": "charger", out.append({"ok": False, "warn": True, "id": "charger",
"text": messages.row_charger_unreach( "text": messages.row_charger_unreach(
f"{brussels(self.car.bad_since_utc):%H:%M}")}) f"{brussels(self.car.bad_since_utc):%H:%M}")})
if self.car.other_writer(datetime.now(timezone.utc)): w = self.car_writer
sw = self.car_solar
if self.car_mode == "solar":
# EV-05: in Solar another writer stops the add-on's writes: amber,
# the same words as in Manual.
if sw.other:
out.append({"ok": False, "warn": True, "id": "charger_other",
"text": messages.row_charger_other()})
if sw.gave_up:
out.append({"ok": False, "warn": True, "id": "charger_refused",
"text": messages.row_charger_refused()})
if sw.phases_gave_up:
out.append({"ok": False, "warn": True, "id": "charger_phases",
"text": messages.row_charger_phases()})
elif self.car_mode == "manual":
# EV-04: in Manual the add-on's own writes are not "another
# writer"; its own detector (a read-back that differs from the
# last write for 30 s) says so, in grey.
if w.other:
out.append({"ok": True, "warn": True, "id": "charger_other",
"text": messages.row_charger_other()})
if w.gave_up:
out.append({"ok": False, "warn": True, "id": "charger_refused",
"text": messages.row_charger_refused()})
if w.phases_gave_up:
out.append({"ok": False, "warn": True, "id": "charger_phases",
"text": messages.row_charger_phases()})
elif self.car_mode != "manual" and sw.engaged and sw.gave_up:
# EV-05: Solar to Off whose 0 A the charger never took.
out.append({"ok": False, "warn": True, "id": "charger_refused",
"text": messages.row_charger_refused()})
elif self.car.other_writer(datetime.now(timezone.utc)):
out.append({"ok": True, "warn": True, "id": "charger_writer", out.append({"ok": True, "warn": True, "id": "charger_writer",
"text": messages.row_charger_writer()}) "text": messages.row_charger_writer()})
if self.car.stuck(self.car_now()):
out.append({"ok": False, "warn": True, "id": "charger_stuck",
"text": messages.row_charger_stuck()})
r = self.car.reading
if r is not None and r.available and r.error:
out.append({"ok": True, "warn": True, "id": "charger_error",
"text": messages.row_charger_error(r.error)})
if self.car_over:
out.append({"ok": True, "warn": True, "id": "car_over",
"text": messages.row_car_over()})
return out return out
def car_values(self) -> dict: def car_values(self) -> dict:
@@ -192,6 +259,7 @@ class StatusMixin:
with homeview.in_lang("en"): with homeview.in_lang("en"):
word = homeview.car_state_word(state) word = homeview.car_state_word(state)
return { return {
**self.car_command_values(),
"car_state": word, "car_state": word,
# `ABSENT_AS_UNKNOWN` stays the one PV key (test_pv.py): an absent # `ABSENT_AS_UNKNOWN` stays the one PV key (test_pv.py): an absent
# car figure is HA's own "no value" payload, sent by name. # car figure is HA's own "no value" payload, sent by name.
@@ -199,6 +267,8 @@ class StatusMixin:
or r.power_w is None else round(r.power_w, 1)), or r.power_w is None else round(r.power_w, 1)),
"car_today_kwh": (PAYLOAD_NONE if self.car.today_kwh is None "car_today_kwh": (PAYLOAD_NONE if self.car.today_kwh is None
else round(self.car.today_kwh, 3)), else round(self.car.today_kwh, 3)),
"car_today_solar_kwh": (PAYLOAD_NONE if self.car_sun_kwh() is None
else round(self.car_sun_kwh(), 3)),
} }
# -- UI ------------------------------------------------------------------ # -- UI ------------------------------------------------------------------
@@ -335,6 +405,13 @@ class StatusMixin:
if _pg is None: if _pg is None:
out.append({"ok": True, "warn": True, "id": "peak_guard", out.append({"ok": True, "warn": True, "id": "peak_guard",
"text": messages.row_peak_guard_waiting()}) "text": messages.row_peak_guard_waiting()})
elif self.car_explains and (_pg.saturated or _pg.floor_limited):
# EV-04: the car you set is what the batteries cannot hold, so
# no red row. The grey row `car_over` says what is going on.
out.append({"ok": True, "warn": False, "id": "peak_guard",
"text": messages.row_peak_guard_on(
_pg.floor_w or 0.0, _pg.ceiling_w,
shadow=self.shadow)})
elif _pg.saturated and not _pg.within_aim: elif _pg.saturated and not _pg.within_aim:
out.append({"ok": False, "warn": False, "id": "peak_guard", out.append({"ok": False, "warn": False, "id": "peak_guard",
"runs": True, "runs": True,
@@ -864,6 +941,8 @@ class StatusMixin:
now = datetime.now(timezone.utc) now = datetime.now(timezone.utc)
if what in ("pack_use", "pack_mode", "pack_sell"): if what in ("pack_use", "pack_mode", "pack_sell"):
return self._pack_action(what, unit, value, now) return self._pack_action(what, unit, value, now)
if what in ("car_mode", "car_current", "car_phases", "car_sun_first"):
return self._car_action(what, value, now)
if what == "auto_toggle": if what == "auto_toggle":
self.auto = not self.auto self.auto = not self.auto
self.store.set("auto", self.auto) self.store.set("auto", self.auto)
+157 -7
View File
@@ -19,7 +19,8 @@ section at the bottom and is held to STYLE.md by test_messages.py.
import contextlib import contextlib
from datetime import datetime, timedelta, timezone from datetime import datetime, timedelta, timezone
from . import arbitrage, cheaproll, handback, messages, peakguard, priceruns, uitext from . import (arbitrage, carmode, cheaproll, handback, messages, peakguard,
priceruns, uitext)
from .dayplan import EFF from .dayplan import EFF
from .maintenance import CHARGE as M_CHARGE, DRAIN as M_DRAIN, HOLD as M_HOLD from .maintenance import CHARGE as M_CHARGE, DRAIN as M_DRAIN, HOLD as M_HOLD
from .maintenance import IDLE as M_IDLE, next_slot_start from .maintenance import IDLE as M_IDLE, next_slot_start
@@ -871,8 +872,10 @@ def peak_engaged(c) -> bool:
only), so no battery gives power for it. Nor when the quarter ends on only), so no battery gives power for it. Nor when the quarter ends on
the aim anyway (SAFETY-126, `within_aim`).""" the aim anyway (SAFETY-126, `within_aim`)."""
pg = getattr(c, "peak_guard", None) pg = getattr(c, "peak_guard", None)
# EV-04: not for a cause the car's own Why explains.
return bool(pg is not None and pg.engaged and (pg.floor_w or 0.0) > 0.0 return bool(pg is not None and pg.engaged and (pg.floor_w or 0.0) > 0.0
and not pg.within_aim) and not pg.within_aim
and not getattr(c, "car_explains", False))
def battery_rows(c, shadow, running, held=False): def battery_rows(c, shadow, running, held=False):
@@ -1129,10 +1132,31 @@ def month_peak(c, now):
if pg is not None: if pg is not None:
out["period_w"] = pg.projected_w out["period_w"] = pg.projected_w
ceiling = pg.ceiling_w or limit_w ceiling = pg.ceiling_w or limit_w
real = getattr(c, "_peak_proj_real", None)
if getattr(c, "car_enabled", False) and c.charger.configured() \
and not c.car_cover and c.car_manual() and real is not None \
and getattr(real, "block_start", None) is not None:
# EV-04, decision 1 off: the guard's own projection leaves the car
# out; the period as the meter will bill it does not.
out["period_w"] = real.projected_w
out["line"] = line_period(out["period_w"], ceiling, c.shadow, out["line"] = line_period(out["period_w"], ceiling, c.shadow,
unmeasured=getattr(c, "peak_unmeasured_s", 0.0) unmeasured=getattr(c, "peak_unmeasured_s", 0.0)
> 0.0, > 0.0,
cut=getattr(c, "room_charge", False)) cut=getattr(c, "room_charge", False))
# EV-04: when a car charge you asked for is in this period, and when one
# set the month's peak. Both empty without a charger in Manual.
out["car_line"] = out["set_by"] = ""
if getattr(c, "car_enabled", False) and c.charger.configured():
# EV-05: Manual only. A Solar charge is cut first for the peak.
w = c.car_alarm_w() if c.car_manual() else None
if pg is not None and w is not None and w >= 500.0 \
and out["period_w"] is not None and (pg.engaged or c.car_over):
out["car_line"] = _t("peak.car", kw=_kw(out["period_w"]),
car=_kw(w),
cov=_kw(max(0.0, float(c.site_batt_w or 0))))
by_car, at = c.car_peak_by_car(reading, now)
if by_car:
out["set_by"] = _t("peak.set_by_car", t=f"{brussels(at):%H:%M}")
return out return out
@@ -1278,6 +1302,97 @@ def _car_why(key, c, good):
return _t("car.why." + (key if key else "wait")) return _t("car.why." + (key if key else "wait"))
def _car_manual_why(c, key):
"""The Why of Manual: what you set, and what the peak limit does about it.
Plan lines: two sentences of at most 12 words."""
a = f"{float(c.car_a):.0f}"
w = c.car_writer
pct = _pct(c.o.get("peak_soc_floor", peakguard.PEAK_OPTION_DEFAULTS[
"peak_soc_floor"]))
if c.car_over:
pg = getattr(c, "peak_guard", None)
if not c.car_cover:
return _t("car.why.manual_nocover", a=a)
return _t("car.why.manual_over" if pg is not None and pg.floor_limited
else "car.why.manual_full", a=a, pct=pct)
if c.shadow:
t, n = w.would if w.would is not None else (c.car_a, c.car_n)
return _t("car.why.manual_would", a=f"{float(t):.0f}",
phases=car_phases_word(n))
if not c.auto:
return _t("car.why.manual_stopped")
if key in ("none", "full"):
return _t("car.why.manual_wait", a=a)
if w.blocked:
return _t("car.why.manual_blocked")
if c.car_cover and peak_engaged(c):
giving = max(0.0, float(c.site_batt_w or 0.0))
return _t("car.why.manual_cover", a=a, kw=_kw(giving), pct=pct)
return _t("car.why.manual_set", a=a, phases=car_phases_word(c.car_n))
def _names(invs) -> str:
names = [str(i.name) for i in invs]
return " " .join(names[:1]) if len(names) == 1 else \
", ".join(names[:-1]) + " " + _t("car.and") + " " + names[-1]
def _car_solar_why(c, key):
"""EV-05: the Why of Solar, from what the plan did this cycle. Plan
lines: two sentences of at most 12 words."""
w = c.car_solar
p = w.plan
o = getattr(c, "o", {}) or {}
if w.other:
return _t("car.why.solar_other")
if w.zero_owed:
# EV-05 round 3: the way-out 0 A is not taken yet; never "paused".
return _t("car.why.solar_zero_failed" if w.gave_up
else "car.why.solar_zeroing")
if c.shadow:
a, n = w.would if w.would is not None else (0.0, p.n)
if a and a >= 6:
return _t("car.why.manual_would", a=f"{float(a):.0f}",
phases=car_phases_word(n))
return _t("car.why.solar_would")
if not c.auto or not c.car_writing():
return _t("car.why.solar_stopped")
if w.fault in ("error", "stuck"):
return _t("car.why.solar_" + w.fault)
if key in ("none", "full"):
return _t("car.why." + key)
why = p.why
if why == "running":
sun = getattr(c, "_car_sun_last", None)
if sun is None or sun.spare_w is None:
return _t("car.why.solar_unknown")
if sun.first == carmode.FIRST_CAR:
return _t("car.why.solar_car",
kw=_kw(max(0.0, sun.spare_w - sun.margin_w)),
phases=car_phases_word(w.n_calc))
room = [i for i in c.inverters if c.car_may_charge(i)]
full = [i for i in c.inverters if not c.car_may_charge(i)
and i.soc is not None and float(i.soc) >= 100.0]
left = _kw(max(0.0, sun.spare_w - sun.room_w))
m = watts_text(sun.margin_w)
if room and full:
return _t("car.why.solar_batt", a=_names(room), b=_names(full),
kw=left, m=m)
if room:
return _t("car.why.solar_batt_room", a=_names(room), kw=left,
m=m)
return _t("car.why.solar_batt_full", kw=left, m=m)
mins = {"hold": "ev_pause_min"}.get(why, "ev_start_min")
s = f"{carmode.solar_option(o, mins):.0f}"
if why in ("hold", "start", "cut", "unknown"):
return _t("car.why.solar_" + why, s=s)
return _t("car.why.solar_paused", s=s)
def watts_text(w) -> str:
return f"{float(w):.0f} W"
def car_block(c, now): def car_block(c, now):
"""The Car card for `/status`, or None when no charger is switched on (the """The Car card for `/status`, or None when no charger is switched on (the
page then draws nothing, as before).""" page then draws nothing, as before)."""
@@ -1290,19 +1405,46 @@ def car_block(c, now):
good = c.car.last_good good = c.car.last_good
fresh = configured and c.car.fresh(mono) fresh = configured and c.car.fresh(mono)
today = None today = None
mode = getattr(c, "car_mode", "off") if configured else "off"
if configured and c.car.today_kwh is not None: if configured and c.car.today_kwh is not None:
today = _t("car.today", kwh=_kwh(c.car.today_kwh)) sun = c.car_sun_kwh() if hasattr(c, "car_sun_kwh") else None
return { today = (_t("car.today_sun", kwh=_kwh(c.car.today_kwh),
sun=_kwh(sun))
if mode == "solar" and sun is not None
else _t("car.today", kwh=_kwh(c.car.today_kwh)))
why = _car_why(key, c, good)
if mode == "manual" and key in ("charging", "waiting", "none", "full"):
why = _car_manual_why(c, key)
if mode == "solar" and key in ("charging", "waiting", "none", "full",
"fault"):
why = _car_solar_why(c, key)
# EV-05: a car Solar holds at 0 A is waiting for the sun.
if key == "waiting" and c.car_solar.plan.a <= 0.0:
key = "paused"
out = {
"state": key or "wait", "state": key or "wait",
"chip": car_state_word(key), "chip": car_state_word(key),
"kind": _CAR_KIND.get(key, "muted"), "kind": _CAR_KIND.get(key, "muted"),
"big": _car_big(key, c, r if fresh else None, good), "big": _car_big(key, c, r if fresh else None, good),
"today": today, "today": today,
"why": _car_why(key, c, good), "why": why,
"mode": "off", "mode": mode,
"power_w": (None if not fresh or r is None or r.power_w is None "power_w": (None if not fresh or r is None or r.power_w is None
else round(float(r.power_w), 1)), else round(float(r.power_w), 1)),
} }
if configured:
# EV-04: what the page can set. EV-05 adds Solar and where its spare
# sun goes first (Night is a later card, so it is not offered).
clamp = c.car_clamp()
hi = int(clamp) if clamp is not None and clamp >= 6 else 6
out["modes"] = list(carmode.MODES)
out["first"] = {"value": getattr(c, "car_first", carmode.DEFAULT_FIRST),
"choices": list(carmode.FIRSTS)}
out["current"] = {"value": round(float(c.car_a)), "min": 6,
"max": hi}
out["phases"] = {"value": c.car_n,
"choices": list(carmode.allowed_phases(c.o))}
return out
# =========================================================================== # # =========================================================================== #
@@ -1815,8 +1957,16 @@ def _samples() -> list:
out += [("title", _t("car.state." + k)) for k in words["car"]["state"]] out += [("title", _t("car.state." + k)) for k in words["car"]["state"]]
out += [("plan", _t("car.big." + k, t="09:12")) for k in out += [("plan", _t("car.big." + k, t="09:12")) for k in
words["car"]["big"]] words["car"]["big"]]
out += [("plan", _t("car.why." + k, a="10", brand="Alfen")) out += [("plan", _t("car.why." + k, a="10", brand="Alfen", kw="8.6 kW",
pct="20 %", phases=car_phases_word(3),
b="inverter-b", m="100 W", s="5"))
for k in words["car"]["why"]] for k in words["car"]["why"]]
out += [("plan", _t("car.why.solar_batt", a="inverter-a",
b="inverter-b", kw="2.0 kW", m="100 W")),
("plan", _t("car.today_sun", kwh="14.2 kWh", sun="3.1 kWh"))]
out += [("plan", _t("peak.car", kw="12.1 kW", car="11.0 kW",
cov="8.6 kW")),
("plan", _t("peak.set_by_car", t="19:45"))]
out += [("plan", _t("car.today", kwh="14.2 kWh")), out += [("plan", _t("car.today", kwh="14.2 kWh")),
("plan", "11.0 kW · 16 A · " + _t("car.phase_many", n=3))] ("plan", "11.0 kW · 16 A · " + _t("car.phase_many", n=3))]
out += [("plan", line_no_trade(k)) for k in out += [("plan", line_no_trade(k)) for k in
+36 -3
View File
@@ -42,6 +42,7 @@ from .arbiter import (
P_SAFETY, SET, Claim, Resolution, actuator_for, pre_resolve, resolve, P_SAFETY, SET, Claim, Resolution, actuator_for, pre_resolve, resolve,
) )
from . import allocator from . import allocator
from . import carmode
from . import chargers from . import chargers
from . import dayplan from . import dayplan
from . import modetrade from . import modetrade
@@ -83,8 +84,9 @@ from .maintenance import (
CHARGE, DRAIN, HOLD, IDLE, POWER_MOVING, MaintConfig, Maintenance, CHARGE, DRAIN, HOLD, IDLE, POWER_MOVING, MaintConfig, Maintenance,
FAIL_BACKOFF_DAYS, MaintResult, arbitrate as maint_arbitrate, site_zone, FAIL_BACKOFF_DAYS, MaintResult, arbitrate as maint_arbitrate, site_zone,
) )
from .mqtt import (MODE_CONFIGS_KEY, MODE_LABELS, USE_OFF, USE_ON, from .mqtt import (CAR_CONFIGS_KEY, MODE_CONFIGS_KEY, MODE_LABELS, USE_OFF,
MqttPublisher, announced_units, mode_configs, USE_ON, MqttPublisher, announced_units, car_configs,
mode_configs,
optional_keys, parse_command, unit_slugs, unit_state_key) optional_keys, parse_command, unit_slugs, unit_state_key)
from . import peakguard from . import peakguard
from . import packshare from . import packshare
@@ -113,6 +115,7 @@ from . import web
# stays importable from `app.main`. DECISIONS/MAIN-orchestration.md. # stays importable from `app.main`. DECISIONS/MAIN-orchestration.md.
from .ctl_tasks import TasksMixin from .ctl_tasks import TasksMixin
from .ctl_status import StatusMixin from .ctl_status import StatusMixin
from .ctl_car import CarMixin
from .ctl_alarms import ( from .ctl_alarms import (
AlarmsMixin, HANDBACK_CYCLES, REANNOUNCE_S, ROLLING_BOUND_CYCLES, AlarmsMixin, HANDBACK_CYCLES, REANNOUNCE_S, ROLLING_BOUND_CYCLES,
ROLLING_S, SHORT_CYCLES, SHORT_SPAN_S, ROLLING_S, SHORT_CYCLES, SHORT_SPAN_S,
@@ -183,7 +186,7 @@ def _load_latch(data, now=None):
class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin, class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
StatusMixin, TasksMixin): StatusMixin, TasksMixin, CarMixin):
def __init__(self, opts: dict, hass: HomeAssistant, store, mqtt_pub, *, stop, def __init__(self, opts: dict, hass: HomeAssistant, store, mqtt_pub, *, stop,
peak_db_path: str = "/data/tariff.db", peak_db_path: str = "/data/tariff.db",
price_history_path: str = "/data/price_history.json", price_history_path: str = "/data/price_history.json",
@@ -576,6 +579,8 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
self._charger_probed = False self._charger_probed = False
self._car_down_logged = False self._car_down_logged = False
self._car_announced = False self._car_announced = False
# EV-04: Manual mode's state (runtime, in the store) and its writer.
self.car_init(opts, store)
self.house_profile = None self.house_profile = None
if self.fc_entity is not None: if self.fc_entity is not None:
self.house_profile = dayplan.HouseProfile( self.house_profile = dayplan.HouseProfile(
@@ -1035,7 +1040,15 @@ class Controller(InputsMixin, WritesMixin, TradeMixin, CycleMixin, AlarmsMixin,
self.stopping = True self.stopping = True
_LOG.info(handback.log_shutdown(handback.current()) _LOG.info(handback.log_shutdown(handback.current())
or "shutting down - commanding 0 W on every inverter") or "shutting down - commanding 0 W on every inverter")
# EV-05: Solar's fail state is 0 A, and it goes out BEFORE the
# inverters go to 0 W (bounded by `ctl_car.RELEASE_WAIT_S`). Manual
# keeps EV-04's order: the inverters first, then undo a phase change.
solar = self.car_solar_engaged()
if solar:
await self.car_shutdown()
await self.command_site_release() await self.command_site_release()
if not solar:
await self.car_shutdown()
self.mqtt.close() self.mqtt.close()
@@ -1062,6 +1075,23 @@ def mode_announcement(opts, store) -> tuple:
return modes, retract return modes, retract
def car_announcement(opts, store) -> tuple:
"""EV-04: `(car, retract)` for the MQTT publisher at start-up: the three car
entities while a charger is switched on, and the config topics to remove
when it is not (`mqtt.car_configs()`). A site that never had a charger gets
nothing and its store is not written."""
car = None
if chargers.census_entity(opts):
amps = chargers.max_a(opts)
car = (chargers.EV_OPTION_DEFAULTS["ev_max_a"] if amps is None
else amps, carmode.allowed_phases(opts))
stored = store.data.get(CAR_CONFIGS_KEY)
keep, retract = car_configs(car, stored)
if keep and keep != stored:
store.set(CAR_CONFIGS_KEY, keep)
return car, retract
def control_task_done(task: asyncio.Task, *, controller, stop: asyncio.Event, def control_task_done(task: asyncio.Task, *, controller, stop: asyncio.Event,
died: list) -> None: died: list) -> None:
"""Done-callback on the control task: log its death now and wake amain() """Done-callback on the control task: log its death now and wake amain()
@@ -1231,6 +1261,7 @@ async def amain() -> None:
# OPT-11 P2: each battery's switch and mode list, only while # OPT-11 P2: each battery's switch and mode list, only while
# battery modes are on (`mode_announcement()`). # battery modes are on (`mode_announcement()`).
_modes, _retract = mode_announcement(opts, store) _modes, _retract = mode_announcement(opts, store)
_car, _car_retract = car_announcement(opts, store)
broker = await hass.mqtt_service() broker = await hass.mqtt_service()
pub = MqttPublisher( pub = MqttPublisher(
broker.get("host") if broker else None, broker.get("host") if broker else None,
@@ -1250,6 +1281,8 @@ async def amain() -> None:
units=roster_names(opts), units=roster_names(opts),
modes=_modes, modes=_modes,
retract=_retract, retract=_retract,
car=_car,
car_retract=_car_retract,
) )
except Exception as err: # noqa: BLE001 except Exception as err: # noqa: BLE001
_LOG.warning("MQTT unavailable (%s) - continuing without status entities", err) _LOG.warning("MQTT unavailable (%s) - continuing without status entities", err)
+113
View File
@@ -188,6 +188,10 @@ T_METER_FROZEN_NL = "Meter staat mogelijk vast"
TITLE_NL = {T_LOOP_BOUND: T_LOOP_BOUND_NL, T_OUTPUT_CLAMP: T_OUTPUT_CLAMP_NL} TITLE_NL = {T_LOOP_BOUND: T_LOOP_BOUND_NL, T_OUTPUT_CLAMP: T_OUTPUT_CLAMP_NL}
T_CHARGER_UNREACH = "Charger not reachable" T_CHARGER_UNREACH = "Charger not reachable"
T_CHARGER_UNREACH_NL = "Laadpaal onbereikbaar" T_CHARGER_UNREACH_NL = "Laadpaal onbereikbaar"
T_CAR_OVER = "Car over the peak limit"
T_CAR_OVER_NL = "Auto boven de piekgrens"
T_CHARGER_ERROR = "Charger error, car paused"
T_CHARGER_ERROR_NL = "Laadpaalfout, auto gepauzeerd"
T_NO_PRICES = "No prices" T_NO_PRICES = "No prices"
T_NO_PRICES_NL = "Prijzen ontbreken" T_NO_PRICES_NL = "Prijzen ontbreken"
@@ -201,6 +205,8 @@ ID_METER_FROZEN = "goodwe_meter_frozen"
ID_MAINT_FAILED = "goodwe_maint_failed_{slug}" ID_MAINT_FAILED = "goodwe_maint_failed_{slug}"
ID_NO_PRICES = "goodwe_no_prices" ID_NO_PRICES = "goodwe_no_prices"
ID_CHARGER_UNREACH = "goodwe_charger_unreachable" ID_CHARGER_UNREACH = "goodwe_charger_unreachable"
ID_CAR_OVER = "goodwe_car_over"
ID_CHARGER_ERROR = "goodwe_charger_error"
# PRICE-01: an earlier build raised a card with this id. Nothing raises it now; # PRICE-01: an earlier build raised a card with this id. Nothing raises it now;
# the add-on only dismisses it at start. # the add-on only dismisses it at start.
OLD_FIXED_CARD_ID = "goodwe_fixed_tariff_unused" OLD_FIXED_CARD_ID = "goodwe_fixed_tariff_unused"
@@ -496,6 +502,77 @@ def row_charger_writer() -> str:
"Iets anders wijzigt de laadpaal en deze add-on leest alleen.") "Iets anders wijzigt de laadpaal en deze add-on leest alleen.")
def car_over(a_text) -> Notice:
"""EV-04: a charge the user set takes the 15-minute period over the peak
limit, and the batteries cannot hold it. Grey, once per charging session.
Not an alarm: the car is never throttled, the user asked for it."""
en = (f"You set {a_text} A, which takes this 15-minute period over the "
"peak limit.")
nl = f"U stelde {a_text} A in, wat dit kwartier boven de piekgrens brengt."
return Notice(ID_CAR_OVER, INFO, T_CAR_OVER, en,
body_nl=f"{T_CAR_OVER_NL}. {nl}")
def charger_error() -> Notice:
"""EV-05: in Solar the charger reports an error, so the add-on set the car
to 0 A. Said once per error, taken down when it clears."""
en = ("The charger reports an error, so the add-on paused the car until "
"it clears.")
nl = ("De laadpaal meldt een fout, dus de add-on pauzeert de auto tot die "
"verdwijnt.")
return Notice(ID_CHARGER_ERROR, WARNING, T_CHARGER_ERROR, en,
body_nl=f"{T_CHARGER_ERROR_NL}. {nl}")
def charger_error_gone() -> Dismiss:
"""EV-05: takes the 'Charger error, car paused' notification down."""
return Dismiss(ID_CHARGER_ERROR)
def row_car_over() -> str:
"""EV-04: the grey row while the car charge you set is over the peak limit."""
return Bi("The car charge you set takes this 15-minute period over the "
"peak limit.",
"De autolading die u instelde brengt dit kwartier boven de "
"piekgrens.")
def row_charger_other() -> str:
"""EV-04: the grey row, in Manual, while something else sets the current."""
return Bi("Something else changes the charger, so the add-on writes "
"nothing until you change it.",
"Iets anders wijzigt de laadpaal, dus de add-on schrijft niets "
"tot u iets wijzigt.")
def row_charger_stuck() -> str:
"""EV-04: the amber row when the charger's reading does not move."""
return Bi("The charger reading may be stuck, so check the charger.",
"De meting van de laadpaal staat mogelijk vast, dus controleer "
"de laadpaal.")
def row_charger_refused() -> str:
"""EV-04: the amber row when the charger does not take the setting."""
return Bi("The charger did not take the setting, so check the charger.",
"De laadpaal nam de instelling niet over, dus controleer de "
"laadpaal.")
def row_charger_phases() -> str:
"""EV-04: the amber row when the charger does not take the phases."""
return Bi("The charger did not take the phases, so check the charger.",
"De laadpaal nam de fasen niet over, dus controleer de "
"laadpaal.")
def row_charger_error(text) -> str:
"""EV-04: the grey row while the charger reports an error. Writes go on."""
t = " ".join(str(text or "").split())[:60]
return Bi(f"The charger reports an error: {t}.",
f"De laadpaal meldt een fout: {t}.")
def row_charger_setup() -> str: def row_charger_setup() -> str:
"""EV-03: the amber row when the charger's entities are not found.""" """EV-03: the amber row when the charger's entities are not found."""
return Bi("The add-on cannot find the charger, so check its entity in " return Bi("The add-on cannot find the charger, so check its entity in "
@@ -1423,6 +1500,10 @@ def why_waiting(missing_s) -> str:
HINTS = { HINTS = {
"control_started": "Control started", "control_started": "Control started",
"control_stopped": "Control stopped", "control_stopped": "Control stopped",
"car_mode": "Car mode set",
"car_current": "Car current set",
"car_phases": "Car phases set",
"car_sun_first": "Where spare sun goes first set",
"settings_saved": "Settings saved, they apply after a restart", "settings_saved": "Settings saved, they apply after a restart",
"restart_requested": "Restart requested from the settings page", "restart_requested": "Restart requested from the settings page",
"setup_only": "In setup, nothing is sent to any inverter", "setup_only": "In setup, nothing is sent to any inverter",
@@ -1511,6 +1592,20 @@ def pack_refused(why: str) -> str:
return PACK_REFUSED[why] return PACK_REFUSED[why]
# EV-04: why a car mode, current or phases change was refused (the page and
# Home Assistant show it).
CAR_REFUSED = {
"off": "The car charger is not set up.",
"value": "That choice is not possible for the car charger.",
"phases": "The charger limit allows only one number of phases.",
"topic": "That is not a car command.",
}
def car_refused(why: str) -> str:
return CAR_REFUSED[why]
# MAINT-11: why a start or stop of ONE battery's cycle was refused. `{unit}` is # MAINT-11: why a start or stop of ONE battery's cycle was refused. `{unit}` is
# the battery the sentence is about (for "busy", the one that is cycling). The # the battery the sentence is about (for "busy", the one that is cycling). The
# page shows the same sentences in Dutch from app/ui_text, keyed by the code. # page shows the same sentences in Dutch from app/ui_text, keyed by the code.
@@ -1703,6 +1798,12 @@ def status_samples() -> list:
("row_no_prices", AMBER, row_no_prices()), ("row_no_prices", AMBER, row_no_prices()),
("row_charger_unreach", AMBER, row_charger_unreach("09:12")), ("row_charger_unreach", AMBER, row_charger_unreach("09:12")),
("row_charger_writer", GREEN, row_charger_writer()), ("row_charger_writer", GREEN, row_charger_writer()),
("row_car_over", GREEN, row_car_over()),
("row_charger_other", GREEN, row_charger_other()),
("row_charger_error", GREEN, row_charger_error("Socket error")),
("row_charger_stuck", AMBER, row_charger_stuck()),
("row_charger_refused", AMBER, row_charger_refused()),
("row_charger_phases", AMBER, row_charger_phases()),
("row_charger_setup", AMBER, row_charger_setup()), ("row_charger_setup", AMBER, row_charger_setup()),
] ]
@@ -1740,6 +1841,8 @@ def samples() -> list:
no_prices(*_SINCE_OLDER), no_prices(*_SINCE_OLDER),
no_prices(), no_prices(),
charger_unreachable("09:12"), charger_unreachable("09:12"),
car_over("16"),
charger_error(),
] ]
@@ -1806,7 +1909,12 @@ LABELS = {
"ev_charger": "Charger", "ev_charger": "Charger",
"ev_current_entity": "Current setting entity", "ev_current_entity": "Current setting entity",
"ev_max_a": "Charger limit", "ev_max_a": "Charger limit",
"ev_batt_cover": "Batteries help with the peak",
"ev_mode_start": "Mode after a restart",
"ev_phases": "Phases", "ev_phases": "Phases",
"ev_margin_w": "Sun kept back",
"ev_pause_min": "Pause after",
"ev_start_min": "Start after",
} }
@@ -1890,7 +1998,12 @@ LABELS_NL = {
"ev_charger": "Laadpaal", "ev_charger": "Laadpaal",
"ev_current_entity": "Entiteit van de laadstroom", "ev_current_entity": "Entiteit van de laadstroom",
"ev_max_a": "Laadpaalgrens", "ev_max_a": "Laadpaalgrens",
"ev_batt_cover": "Batterijen helpen met de piek",
"ev_mode_start": "Modus na een herstart",
"ev_phases": "Fasen", "ev_phases": "Fasen",
"ev_margin_w": "Zon achtergehouden",
"ev_pause_min": "Pauzeren na",
"ev_start_min": "Starten na",
} }
# The inverter list shows two of them under a shorter name. # The inverter list shows two of them under a shorter name.
UNIT_LABELS_NL = {"setpoint_entity": "Setpoint-entiteit", UNIT_LABELS_NL = {"setpoint_entity": "Setpoint-entiteit",
+123 -5
View File
@@ -144,6 +144,8 @@ OPTIONAL_SENSORS = [
("car_power", "goodwe_car_power", "Car power", "W", "power", "measurement", "mdi:car-electric"), ("car_power", "goodwe_car_power", "Car power", "W", "power", "measurement", "mdi:car-electric"),
("car_state", "goodwe_car_state", "Car state", None, None, None, "mdi:ev-station"), ("car_state", "goodwe_car_state", "Car state", None, None, None, "mdi:ev-station"),
("car_today_kwh", "goodwe_car_today_kwh", "Car energy today", "kWh", "energy", "total_increasing", "mdi:ev-station"), ("car_today_kwh", "goodwe_car_today_kwh", "Car energy today", "kWh", "energy", "total_increasing", "mdi:ev-station"),
# EV-05: what of today's charge came from the sun (Solar mode only).
("car_today_solar_kwh", "goodwe_car_today_solar_kwh", "Car solar energy today", "kWh", "energy", "total_increasing", "mdi:solar-power"),
] ]
# ⚠️ HA's OWN "this sensor has no value" PAYLOAD, and the one place this add-on # ⚠️ HA's OWN "this sensor has no value" PAYLOAD, and the one place this add-on
@@ -200,7 +202,8 @@ def optional_keys(opts: dict) -> tuple:
from . import chargers as _ch # EV-03: same reason from . import chargers as _ch # EV-03: same reason
out = ("pv",) if _pv.entities(opts) else () out = ("pv",) if _pv.entities(opts) else ()
if _ch.census_entity(opts): if _ch.census_entity(opts):
out += ("car_power", "car_state", "car_today_kwh") out += ("car_power", "car_state", "car_today_kwh",
"car_today_solar_kwh")
return out return out
@@ -405,7 +408,7 @@ def _unit_places(names):
yield slug, device, prefix yield slug, device, prefix
def discovery_payloads(units=(), omit=(), include=(), modes=()) -> list: def discovery_payloads(units=(), omit=(), include=(), modes=(), car=None) -> list:
"""Every `(topic, payload)` this add-on announces, in announcement order. """Every `(topic, payload)` this add-on announces, in announcement order.
Split out of `_announce()` so that the acceptance criterion can be graded as Split out of `_announce()` so that the acceptance criterion can be graded as
@@ -421,6 +424,8 @@ def discovery_payloads(units=(), omit=(), include=(), modes=()) -> list:
re-announces every entity on a live install). re-announces every entity on a live install).
`modes` (OPT-11 P2) is the battery modes offered, empty when they are off. `modes` (OPT-11 P2) is the battery modes offered, empty when they are off.
`car` (EV-04) is None, or `(max_a, phases)`: the car's three command
entities, announced after everything else so no existing row moves.
""" """
omit = set(omit) omit = set(omit)
include = [k for k in include if k not in omit] include = [k for k in include if k not in omit]
@@ -452,6 +457,7 @@ def discovery_payloads(units=(), omit=(), include=(), modes=()) -> list:
DEVICE, unit, dev_class, state_class, icon))) DEVICE, unit, dev_class, state_class, icon)))
# OPT-11 P2: last, and only when battery modes are on. # OPT-11 P2: last, and only when battery modes are on.
out.extend(mode_payloads(units, modes)) out.extend(mode_payloads(units, modes))
out.extend(car_payloads(car))
return out return out
@@ -518,6 +524,112 @@ def mode_payloads(units, modes) -> list:
return out return out
# --- EV-04: the car's mode, current and phases, as HA entities ----------------
# Announced only with a charger switched on, after every other row. A command
# goes through Controller.handle_action(); a retained one is dropped.
CAR_MODE_LABELS = {"off": "Off", "manual": "Manual", # English, pinned
"solar": "Solar"} # EV-05
# EV-05: where spare sun goes first; mirrors carmode.FIRST_LABELS (this module
# imports nothing from the package, test_ev05.py checks the two agree).
CAR_FIRST_LABELS = {"batteries": "Batteries", "car": "Car"}
CAR_MODES = tuple(CAR_MODE_LABELS)
CAR_CONFIGS_KEY = "mqtt_car_configs"
CAR_MIN_A = 6
_CAR_CMD_RE = re.compile(rf"{BASE}/car/(mode|current|phases|sun_first)/set")
_CAR_CONFIG_RE = re.compile(
rf"homeassistant/(select|number)/{BASE}_car_(mode|current|phases|sun_first)"
rf"/config")
# (key, component, name, icon)
CAR_ENTITIES = [
("mode", "select", "Car mode", "mdi:car-electric"),
("current", "number", "Car current", "mdi:current-ac"),
("phases", "select", "Car phases", "mdi:sine-wave"),
("sun_first", "select", "Car spare sun first", "mdi:solar-power"), # EV-05
]
def car_payloads(car) -> list:
"""The `(topic, payload)` for `select.goodwe_car_mode`,
`number.goodwe_car_current` and `select.goodwe_car_phases`. `car` is
`(max_a, phases)`; empty when it is None."""
if not car:
return []
max_a, phases = car
out = []
for key, component, name, icon in CAR_ENTITIES:
unique_id = f"{BASE}_car_{key}"
cfg = {
"name": name,
"object_id": f"goodwe_car_{key}",
"unique_id": unique_id,
"state_topic": f"{BASE}/car_{key}",
"command_topic": f"{BASE}/car/{key}/set",
}
if key == "mode":
cfg["options"] = list(CAR_MODE_LABELS.values())
elif key == "phases":
cfg["options"] = [str(n) for n in phases]
elif key == "sun_first":
cfg["options"] = list(CAR_FIRST_LABELS.values())
else:
cfg.update({"min": CAR_MIN_A, "max": int(max_a), "step": 1,
"unit_of_measurement": "A", "device_class": "current",
"mode": "box"})
cfg.update({"retain": False, "availability_topic": AVAILABILITY,
"device": DEVICE, "icon": icon})
out.append((f"homeassistant/{component}/{unique_id}/config", cfg))
return out
def car_configs(car, stored) -> tuple:
"""`(keep, retract)` at start-up, as `mode_configs()` does for the battery
modes: turning the charger off removes exactly the entities announced
before, and a site that never had one publishes nothing."""
current = [t for t, _ in car_payloads(car)]
old = [t for t in (stored if isinstance(stored, list) else [])
if isinstance(t, str) and _CAR_CONFIG_RE.fullmatch(t)
and t not in current]
old = list(dict.fromkeys(old))
return current + old, old
def parse_car_command(topic, payload, retained):
"""`(action, value, reject)` for one message on a car command topic.
`action` is `car_mode`, `car_current` or `car_phases`. A value that is
none of the entity's own is None (the action then refuses it)."""
m = _CAR_CMD_RE.fullmatch(topic) if isinstance(topic, str) else None
if m is None:
return None, None, "topic"
key = m.group(1)
action = f"car_{key}"
if bool(retained):
return action, None, "retained"
if not isinstance(payload, (bytes, bytearray)):
return action, None, "size"
if MAX_COMMAND_BYTES < len(payload):
return action, None, "size"
try:
text = bytes(payload).decode(encoding="utf-8").strip()
except ValueError: # UnicodeDecodeError is one
return action, None, "encoding"
value = None
if key == "mode":
value = next((k for k, v in CAR_MODE_LABELS.items() if v == text),
None)
elif key == "phases":
value = {"1": 1, "3": 3}.get(text)
elif key == "sun_first":
value = next((k for k, v in CAR_FIRST_LABELS.items() if v == text),
None)
else:
try:
f = float(text)
value = f if f == f and abs(f) < 1000 else None
except ValueError:
value = None
return action, value, None
def mode_retractions(stored, current) -> list: def mode_retractions(stored, current) -> list:
"""Config topics announced before and not now: each gets an empty """Config topics announced before and not now: each gets an empty
retained config, which removes the entity from HA. Anything in the store retained config, which removes the entity from HA. Anything in the store
@@ -574,11 +686,13 @@ class MqttPublisher:
# test fixture that builds one with __new__) behaves as before. # test fixture that builds one with __new__) behaves as before.
modes = () modes = ()
retract = () retract = ()
car = None # EV-04: `(max_a, phases)` when the charger is on
_loop = None _loop = None
_handler = None _handler = None
def __init__(self, host, port, username=None, password=None, omit=(), def __init__(self, host, port, username=None, password=None, omit=(),
units=(), include=(), modes=(), retract=()): units=(), include=(), modes=(), retract=(), car=None,
car_retract=()):
# `omit` drops sensor keys from discovery entirely. ⚠️ Announcing a # `omit` drops sensor keys from discovery entirely. ⚠️ Announcing a
# sensor that nothing will ever publish to is not harmless here: # sensor that nothing will ever publish to is not harmless here:
# p1_sample_age_s is a watchdog input, and an entity that exists but is # p1_sample_age_s is a watchdog input, and an entity that exists but is
@@ -597,7 +711,8 @@ class MqttPublisher:
# OPT-11 P2: the modes offered (empty when battery modes are off), and # OPT-11 P2: the modes offered (empty when battery modes are off), and
# the mode config topics to remove (`mode_retractions()`). # the mode config topics to remove (`mode_retractions()`).
self.modes = tuple(modes) self.modes = tuple(modes)
self.retract = [str(t) for t in retract] self.retract = [str(t) for t in retract] + [str(t) for t in car_retract]
self.car = tuple(car) if car else None
self.enabled = mqtt is not None and bool(host) self.enabled = mqtt is not None and bool(host)
self.client = None self.client = None
if not self.enabled: if not self.enabled:
@@ -636,7 +751,8 @@ class MqttPublisher:
# diffing what actually goes on the wire - and a payload built here # diffing what actually goes on the wire - and a payload built here
# instead would be one this add-on publishes and no check has ever seen. # instead would be one this add-on publishes and no check has ever seen.
for topic, cfg in discovery_payloads(self.units, self.omit, for topic, cfg in discovery_payloads(self.units, self.omit,
self.include, self.modes): self.include, self.modes,
self.car):
self.client.publish(topic, json.dumps(cfg), retain=True) self.client.publish(topic, json.dumps(cfg), retain=True)
for topic in self.retract: for topic in self.retract:
self.client.publish(topic, "", retain=True) self.client.publish(topic, "", retain=True)
@@ -647,6 +763,8 @@ class MqttPublisher:
if self.modes: if self.modes:
for key in ("mode", "use"): for key in ("mode", "use"):
self.client.subscribe(f"{BASE}/unit/+/{key}/set") self.client.subscribe(f"{BASE}/unit/+/{key}/set")
if self.car:
self.client.subscribe(f"{BASE}/car/+/set")
def bind(self, loop, handler) -> None: def bind(self, loop, handler) -> None:
"""OPT-11 P2: hand each command to `handler(topic, payload, retained)`, """OPT-11 P2: hand each command to `handler(topic, payload, retained)`,
+50
View File
@@ -158,6 +158,54 @@
$("#car-today").textContent = c.today || ""; $("#car-today").textContent = c.today || "";
$("#car-today").hidden = !c.today; $("#car-today").hidden = !c.today;
$("#car-why").textContent = c.why; $("#car-why").textContent = c.why;
renderCarControls(c);
}
// EV-04: Off and Manual; EV-05: Solar and where its spare sun goes first.
// The mode, the phases and the choice send at once; the current sends after
// two seconds of rest. A slider being dragged is left alone.
let carTouch = 0, carTimer = null, carBusy = false;
async function carAct(what, value) {
if (carBusy) return;
carBusy = true;
try {
const r = await fetch("action", { method: "POST", headers: { "Content-Type": "application/json" },
body: JSON.stringify({ action: what, value: value }) });
const j = await r.json().catch(() => ({}));
if (!r.ok) toast(j.error || t("toast.failed"));
} catch (e) { toast(t("toast.failed")); }
finally { carBusy = false; }
await refresh(true);
}
function renderCarControls(c) {
const modes = c.modes || [];
$("#car-mode").hidden = !modes.length;
$("#car-mode").replaceChildren(...modes.map((m) => h("button", {
type: "button", role: "radio", "aria-checked": String(c.mode === m),
onclick: () => carAct("car_mode", m) }, t("car.mode_" + m))));
$("#car-help").textContent = t("car.help_" + c.mode + ".description") || "";
const sol = c.mode === "solar" && !!c.first;
$("#car-solar").hidden = !sol;
if (sol) {
$("#car-first").replaceChildren(...c.first.choices.map((f) => h("button", {
type: "button", role: "radio", "aria-checked": String(c.first.value === f),
onclick: () => carAct("car_sun_first", f) }, t("car.first_" + f))));
}
const on = c.mode === "manual" && !!c.current;
$("#car-manual").hidden = !on;
if (!on) return;
const a = $("#car-a");
if (Date.now() - carTouch > 3000) {
a.min = c.current.min; a.max = c.current.max; a.value = c.current.value;
}
$("#car-a-out").textContent = a.value + " A";
a.oninput = () => {
carTouch = Date.now(); $("#car-a-out").textContent = a.value + " A";
clearTimeout(carTimer);
carTimer = setTimeout(() => carAct("car_current", Number(a.value)), 2000);
};
$("#car-phases").replaceChildren(...c.phases.choices.map((n) => h("button", {
type: "button", role: "radio", "aria-checked": String(c.phases.value === n),
onclick: () => carAct("car_phases", n) }, t("car.phases_" + n))));
} }
/* ---------------- Home: today's plan ---------------- */ /* ---------------- Home: today's plan ---------------- */
@@ -288,6 +336,8 @@
bar.className = pct >= 100 ? "bad" : pct >= 80 ? "warn" : ""; bar.className = pct >= 100 ? "bad" : pct >= 80 ? "warn" : "";
$("#peak-meter").setAttribute("aria-label", t("peak.this_month") + " " + (m.pct == null ? "–" : Math.round(m.pct) + " %")); $("#peak-meter").setAttribute("aria-label", t("peak.this_month") + " " + (m.pct == null ? "–" : Math.round(m.pct) + " %"));
$("#peak-line").textContent = m.line; $("#peak-line").textContent = m.line;
$("#peak-car").textContent = m.car_line || ""; $("#peak-car").hidden = !m.car_line;
$("#peak-setby").textContent = m.set_by || ""; $("#peak-setby").hidden = !m.set_by;
} }
function renderAttention() { function renderAttention() {
const list = S.attention; const list = S.attention;
+15 -2
View File
@@ -44,8 +44,19 @@
<div class="car-big" id="car-big"></div> <div class="car-big" id="car-big"></div>
<div class="small muted" id="car-today"></div> <div class="small muted" id="car-today"></div>
<div class="small car-lab" data-t="car.mode"></div> <div class="small car-lab" data-t="car.mode"></div>
<div class="seg" role="radiogroup" id="car-mode" data-t-label="car.mode"><button type="button" role="radio" aria-checked="true" data-t="car.mode_off"></button></div> <div class="seg" role="radiogroup" id="car-mode" data-t-label="car.mode"></div>
<p class="tiny muted" style="margin:6px 0 0" data-t="car.help_off.description"></p> <p class="tiny muted" style="margin:6px 0 0" id="car-help"></p>
<div id="car-manual" hidden>
<div class="small car-lab" data-t="car.current"></div>
<div class="slider"><input type="range" id="car-a" min="6" max="16" step="1" data-t-label="car.current"><output class="small" id="car-a-out"></output></div>
<div class="small car-lab" data-t="car.phases"></div>
<div class="seg" role="radiogroup" id="car-phases" data-t-label="car.phases"></div>
</div>
<div id="car-solar" hidden>
<div class="small car-lab" data-t="car.first"></div>
<div class="seg" role="radiogroup" id="car-first" data-t-label="car.first"></div>
<p class="tiny muted" style="margin:6px 0 0" data-t="car.first_help.description"></p>
</div>
<div class="car-why small"><span class="muted" data-t="car.why"></span><span id="car-why"></span></div> <div class="car-why small"><span class="muted" data-t="car.why"></span><span id="car-why"></span></div>
</div> </div>
@@ -71,6 +82,8 @@
<div class="row spread small" id="peak-figures"><span><span data-t="peak.this_month"></span>: <strong id="peak-now"></strong></span><span class="muted"><span data-t="peak.limit"></span> <span id="peak-limit"></span></span></div> <div class="row spread small" id="peak-figures"><span><span data-t="peak.this_month"></span>: <strong id="peak-now"></strong></span><span class="muted"><span data-t="peak.limit"></span> <span id="peak-limit"></span></span></div>
<div class="meter" id="peak-meter" role="img"><i style="width:0%"></i></div> <div class="meter" id="peak-meter" role="img"><i style="width:0%"></i></div>
<div class="tiny muted" id="peak-line"></div> <div class="tiny muted" id="peak-line"></div>
<div class="tiny muted" id="peak-car" hidden></div>
<div class="tiny muted" id="peak-setby" hidden></div>
</div> </div>
<div class="card" id="c-attn"> <div class="card" id="c-attn">
+42 -6
View File
@@ -4,7 +4,7 @@
"inverters": {"name": "Inverters and batteries", "description": "The inverters the add-on controls, and your solar."}, "inverters": {"name": "Inverters and batteries", "description": "The inverters the add-on controls, and your solar."},
"tariff": {"name": "Tariff and prices", "description": "What you pay and are paid per kWh."}, "tariff": {"name": "Tariff and prices", "description": "What you pay and are paid per kWh."},
"safety": {"name": "Safety limits", "description": "The peak limit, starting and stopping, and the safety stops."}, "safety": {"name": "Safety limits", "description": "The peak limit, starting and stopping, and the safety stops."},
"car": {"name": "Car charger", "description": "Which charger the add-on reads, and its limits."}, "car": {"name": "Car charger", "description": "Which charger the add-on drives, its limits and the mode defaults."},
"maintenance": {"name": "Maintenance", "description": "The monthly battery cycle and the log."}, "maintenance": {"name": "Maintenance", "description": "The monthly battery cycle and the log."},
"tuning": {"name": "Control tuning", "description": "For support only, because these were measured on real hardware."} "tuning": {"name": "Control tuning", "description": "For support only, because these were measured on real hardware."}
}, },
@@ -36,6 +36,7 @@
"meter_source": {"off": "One grid power entity", "ha_dsmr": "Import and export entities", "mqtt_p1": "Meter over MQTT", "ha_signed": "One net power entity", "homewizard_local": "HomeWizard meter on the network"}, "meter_source": {"off": "One grid power entity", "ha_dsmr": "Import and export entities", "mqtt_p1": "Meter over MQTT", "ha_signed": "One net power entity", "homewizard_local": "HomeWizard meter on the network"},
"ev_charger": {"off": "None", "alfen_ha": "Alfen (Home Assistant integration)"}, "ev_charger": {"off": "None", "alfen_ha": "Alfen (Home Assistant integration)"},
"ev_phases": {"1": "1 phase", "3": "3 phases", "auto": "1 and 3"}, "ev_phases": {"1": "1 phase", "3": "3 phases", "auto": "1 and 3"},
"ev_mode_start": {"keep": "Keep the last mode", "off": "Off"},
"meter_phases": {"1": "1 phase", "3": "3 phases"}, "meter_phases": {"1": "1 phase", "3": "3 phases"},
"shadow_mode": {"auto": "Automatic", "on": "Always on", "off": "Off"}, "shadow_mode": {"auto": "Automatic", "on": "Always on", "off": "Off"},
"price_provider": {"generic_dayahead": "Day-ahead market price", "custom_formula": "Your own price formula", "manual_csv": "A price file", "price_service": "Your own price service"}, "price_provider": {"generic_dayahead": "Day-ahead market price", "custom_formula": "Your own price formula", "manual_csv": "A price file", "price_service": "Your own price service"},
@@ -90,7 +91,7 @@
"loading": "Loading the forecast." "loading": "Loading the forecast."
}, },
"peak": {"name": "Peak limit", "this_month": "This month's peak", "limit": "Limit", "none": "None recorded yet", "unreadable": "Cannot be read now"}, "peak": {"name": "Peak limit", "this_month": "This month's peak", "limit": "Limit", "none": "None recorded yet", "unreadable": "Cannot be read now"},
"car": {"name": "Car", "mode": "Mode", "mode_off": "Off", "help_off": {"description": "The add-on leaves the charger alone."}, "why": "Why"}, "car": {"name": "Car", "mode": "Mode", "mode_off": "Off", "mode_manual": "Manual", "help_off": {"description": "The add-on leaves the charger alone."}, "help_manual": {"description": "Charges at the current you set, whatever the sun or the peak limit do."}, "current": "Current", "phases": "Phases", "phases_1": "1 phase", "phases_3": "3 phases", "why": "Why", "mode_solar": "Solar", "help_solar": {"description": "Charges only from spare sun and pauses when there is too little."}, "first": "Spare sun goes first to", "first_batteries": "Batteries", "first_car": "Car", "first_help": {"description": "Batteries: the car gets sun only when the batteries charge at full power or are full."}},
"attention": {"name": "Needs attention", "nothing": "Nothing to look at", "to_look": "to look at", "details": "Details", "alarm": "Alarm", "warning": "Warning", "info": "Info"}, "attention": {"name": "Needs attention", "nothing": "Nothing to look at", "to_look": "to look at", "details": "Details", "alarm": "Alarm", "warning": "Warning", "info": "Info"},
"control": {"name": "Control", "stop": "Stop control", "start": "Start control", "maint_start": "Start a battery cycle now", "maint_abort": "Stop the battery cycle", "docs": "Add-on documentation", "more": "More actions"}, "control": {"name": "Control", "stop": "Stop control", "start": "Start control", "maint_start": "Start a battery cycle now", "maint_abort": "Stop the battery cycle", "docs": "Add-on documentation", "more": "More actions"},
"details": {"name": "Details for installers", "rows": "Status rows", "checks": "Checks", "event": "Last event"}, "details": {"name": "Details for installers", "rows": "Status rows", "checks": "Checks", "event": "Last event"},
@@ -301,11 +302,11 @@
"warning": "See Needs attention below." "warning": "See Needs attention below."
}, },
"car": { "car": {
"state": {"charging": "Charging", "waiting": "Connected, waiting", "none": "No car connected", "full": "Car is full", "unreach": "Charger not reachable", "setup": "Charger not set up", "fault": "Charger fault", "wait": "No reading yet"}, "state": {"charging": "Charging", "waiting": "Connected, waiting", "none": "No car connected", "full": "Car is full", "unreach": "Charger not reachable", "setup": "Charger not set up", "fault": "Charger fault", "wait": "No reading yet", "paused": "Waiting for sun"},
"big": {"waiting": "Connected, not charging.", "none": "Nothing to charge.", "full": "The car is full.", "seen": "Last seen at {t}.", "no_reading": "No reading.", "setup": "Not set up.", "fault": "The charger reports a fault.", "wait": "No reading yet."}, "big": {"waiting": "Connected, not charging.", "none": "Nothing to charge.", "full": "The car is full.", "seen": "Last seen at {t}.", "no_reading": "No reading.", "setup": "Not set up.", "fault": "The charger reports a fault.", "wait": "No reading yet.", "paused": "Waiting for spare sun."},
"phase_one": "1 phase", "phase_one": "1 phase",
"phase_many": "{n} phases", "phase_many": "{n} phases",
"today": "{kwh} charged today.", "today": "{kwh} charged today.", "today_sun": "{kwh} charged today, {sun} from the sun.", "and": "and",
"why": { "why": {
"charging": "The charger is charging the car. The add-on leaves it alone.", "charging": "The charger is charging the car. The add-on leaves it alone.",
"waiting": "The car is connected and not charging. The add-on leaves the charger alone.", "waiting": "The car is connected and not charging. The add-on leaves the charger alone.",
@@ -319,9 +320,38 @@
"limit": "The charger limit is above what the charger allows. Lower it in Settings.", "limit": "The charger limit is above what the charger allows. Lower it in Settings.",
"name": "The current setting entity does not fit the charger. Check it in Settings.", "name": "The current setting entity does not fit the charger. Check it in Settings.",
"fault": "The charger reports a fault. Check it at the charger itself.", "fault": "The charger reports a fault. Check it at the charger itself.",
"wait": "Waiting for the first reading." "wait": "Waiting for the first reading.",
"manual_set": "You set {a} A, {phases}. The charger keeps it, whatever the peak limit does.",
"manual_cover": "You set {a} A. The batteries give {kw} and help down to {pct}.",
"manual_over": "You set {a} A. The batteries are at {pct}, so this charge sets the peak.",
"manual_full": "You set {a} A. The batteries give all they can, so this charge sets the peak.",
"manual_nocover": "You set {a} A. The guard ignores the car, so this charge can set the peak.",
"manual_wait": "You set {a} A. It is set when a car is connected.",
"manual_would": "Shadow mode: the add-on would set {a} A, {phases}.",
"manual_stopped": "Control is stopped. The charger keeps its last setting.",
"manual_blocked": "The phases change once per 10 minutes at most. This waits.",
"solar_batt": "Batteries first: {a} at full power, {b} is full. The car gets the {kw} left, less {m} kept back.",
"solar_batt_room": "Batteries first: {a} at full power. The car gets the {kw} left, less {m} kept back.",
"solar_batt_full": "Batteries first, and the batteries are full. The car gets the {kw} left, less {m} kept back.",
"solar_car": "Car first: the car takes {kw} on {phases}. The batteries get the rest of the sun.",
"solar_hold": "Too little spare sun, so the car holds 6 A for now. It pauses after {s} minutes like this.",
"solar_paused": "Too little spare sun for the car's minimum of 6 A. It starts after {s} minutes of enough sun.",
"solar_start": "There is enough spare sun now. The car starts after {s} minutes of it.",
"solar_cut": "The car was cut first to stay under the peak limit. It starts again after {s} minutes of enough sun.",
"solar_unknown": "The add-on cannot measure the spare sun now. The car pauses if this lasts.",
"solar_would": "Shadow mode: the add-on would keep the car paused.",
"solar_stopped": "Control is stopped, so the add-on paused the car.",
"solar_error": "The charger reports an error, so the add-on paused the car.",
"solar_stuck": "The charger reading may be stuck, so the add-on paused the car.",
"solar_other": "Something else changes the charger, so the add-on leaves it alone.",
"solar_zeroing": "The charger has not taken 0 A yet. The add-on tries again.",
"solar_zero_failed": "The charger did not take 0 A. Check it at the charger itself."
} }
}, },
"peak": {
"car": "This 15-minute period is heading for {kw}. The car takes {car} and the batteries cover {cov}.",
"set_by_car": "Set by the car charge you asked for, at {t}."
},
"tile": { "tile": {
"not_set_up": "Not set up", "not_set_up": "Not set up",
"no_reading": "No reading", "no_reading": "No reading",
@@ -527,6 +557,12 @@
"solar_forecast": "Solar forecast", "solar_forecast": "Solar forecast",
"charger": "Charger not reachable", "charger": "Charger not reachable",
"charger_writer": "Something else changes the charger", "charger_writer": "Something else changes the charger",
"charger_other": "Something else changes the charger",
"charger_phases": "Charger did not take phases",
"charger_stuck": "Charger reading may be stuck",
"charger_refused": "Charger did not take it",
"charger_error": "The charger reports an error",
"car_over": "Car over the peak limit",
"charger_setup": "Charger not set up", "charger_setup": "Charger not set up",
"none": "Inverter connection" "none": "Inverter connection"
}, },
+42 -6
View File
@@ -4,7 +4,7 @@
"inverters": {"name": "Omvormers en batterijen", "description": "De omvormers die de add-on regelt, en uw zonnepanelen."}, "inverters": {"name": "Omvormers en batterijen", "description": "De omvormers die de add-on regelt, en uw zonnepanelen."},
"tariff": {"name": "Tarief en prijzen", "description": "Wat u per kWh betaalt en terugkrijgt."}, "tariff": {"name": "Tarief en prijzen", "description": "Wat u per kWh betaalt en terugkrijgt."},
"safety": {"name": "Veiligheidsgrenzen", "description": "De piekgrens, starten en stoppen, en de veiligheidsstops."}, "safety": {"name": "Veiligheidsgrenzen", "description": "De piekgrens, starten en stoppen, en de veiligheidsstops."},
"car": {"name": "Laadpaal", "description": "Welke laadpaal de add-on leest, en haar grenzen."}, "car": {"name": "Laadpaal", "description": "Welke laadpaal de add-on stuurt, haar grenzen en de standaardmodus."},
"maintenance": {"name": "Onderhoud", "description": "De maandelijkse batterijcyclus en het logboek."}, "maintenance": {"name": "Onderhoud", "description": "De maandelijkse batterijcyclus en het logboek."},
"tuning": {"name": "Afstelling van de regeling", "description": "Alleen voor support, want deze zijn gemeten op echte hardware."} "tuning": {"name": "Afstelling van de regeling", "description": "Alleen voor support, want deze zijn gemeten op echte hardware."}
}, },
@@ -36,6 +36,7 @@
"meter_source": {"off": "Eén entiteit voor netvermogen", "ha_dsmr": "Entiteiten voor afname en injectie", "mqtt_p1": "Meter via MQTT", "ha_signed": "Eén entiteit voor nettovermogen", "homewizard_local": "HomeWizard-meter op het netwerk"}, "meter_source": {"off": "Eén entiteit voor netvermogen", "ha_dsmr": "Entiteiten voor afname en injectie", "mqtt_p1": "Meter via MQTT", "ha_signed": "Eén entiteit voor nettovermogen", "homewizard_local": "HomeWizard-meter op het netwerk"},
"ev_charger": {"off": "Geen", "alfen_ha": "Alfen (Home Assistant-integratie)"}, "ev_charger": {"off": "Geen", "alfen_ha": "Alfen (Home Assistant-integratie)"},
"ev_phases": {"1": "1 fase", "3": "3 fasen", "auto": "1 en 3"}, "ev_phases": {"1": "1 fase", "3": "3 fasen", "auto": "1 en 3"},
"ev_mode_start": {"keep": "Laatste modus houden", "off": "Uit"},
"meter_phases": {"1": "1 fase", "3": "3 fasen"}, "meter_phases": {"1": "1 fase", "3": "3 fasen"},
"shadow_mode": {"auto": "Automatisch", "on": "Altijd aan", "off": "Uit"}, "shadow_mode": {"auto": "Automatisch", "on": "Altijd aan", "off": "Uit"},
"price_provider": {"generic_dayahead": "Day-aheadprijs van de markt", "custom_formula": "Uw eigen prijsformule", "manual_csv": "Een prijsbestand", "price_service": "Uw eigen prijsdienst"}, "price_provider": {"generic_dayahead": "Day-aheadprijs van de markt", "custom_formula": "Uw eigen prijsformule", "manual_csv": "Een prijsbestand", "price_service": "Uw eigen prijsdienst"},
@@ -87,7 +88,7 @@
"loading": "De prognose wordt geladen." "loading": "De prognose wordt geladen."
}, },
"peak": {"name": "Piekgrens", "this_month": "Piek van deze maand", "limit": "Grens", "none": "Nog niets gemeten", "unreadable": "Nu niet leesbaar"}, "peak": {"name": "Piekgrens", "this_month": "Piek van deze maand", "limit": "Grens", "none": "Nog niets gemeten", "unreadable": "Nu niet leesbaar"},
"car": {"name": "Auto", "mode": "Modus", "mode_off": "Uit", "help_off": {"description": "De add-on laat de laadpaal met rust."}, "why": "Waarom"}, "car": {"name": "Auto", "mode": "Modus", "mode_off": "Uit", "mode_manual": "Handmatig", "help_off": {"description": "De add-on laat de laadpaal met rust."}, "help_manual": {"description": "Laadt met de stroom die u instelt, wat de zon of de piekgrens ook doen."}, "current": "Stroom", "phases": "Fasen", "phases_1": "1 fase", "phases_3": "3 fasen", "why": "Waarom", "mode_solar": "Zon", "help_solar": {"description": "Laadt alleen met zonne-overschot en pauzeert als er te weinig is."}, "first": "Zonne-overschot gaat eerst naar", "first_batteries": "Batterijen", "first_car": "Auto", "first_help": {"description": "Batterijen: de auto krijgt pas zon als de batterijen op vol vermogen laden of vol zijn."}},
"attention": {"name": "Vraagt aandacht", "nothing": "Niets om na te kijken", "to_look": "na te kijken", "details": "Details", "alarm": "Alarm", "warning": "Waarschuwing", "info": "Info"}, "attention": {"name": "Vraagt aandacht", "nothing": "Niets om na te kijken", "to_look": "na te kijken", "details": "Details", "alarm": "Alarm", "warning": "Waarschuwing", "info": "Info"},
"control": {"name": "Regeling", "stop": "Regeling stoppen", "start": "Regeling starten", "maint_start": "Nu een batterijcyclus starten", "maint_abort": "Batterijcyclus stoppen", "docs": "Documentatie van de add-on", "more": "Meer acties"}, "control": {"name": "Regeling", "stop": "Regeling stoppen", "start": "Regeling starten", "maint_start": "Nu een batterijcyclus starten", "maint_abort": "Batterijcyclus stoppen", "docs": "Documentatie van de add-on", "more": "Meer acties"},
"details": {"name": "Details voor installateurs", "rows": "Statusregels", "checks": "Controles", "event": "Laatste gebeurtenis"}, "details": {"name": "Details voor installateurs", "rows": "Statusregels", "checks": "Controles", "event": "Laatste gebeurtenis"},
@@ -255,11 +256,11 @@
"pill": {"running": "Actief", "shadow": "Schaduwmodus", "stopped": "Gestopt", "alarm": "Heeft u nu nodig", "waiting": "Wacht op Home Assistant", "warning": "Actief, met een waarschuwing"}, "pill": {"running": "Actief", "shadow": "Schaduwmodus", "stopped": "Gestopt", "alarm": "Heeft u nu nodig", "waiting": "Wacht op Home Assistant", "warning": "Actief, met een waarschuwing"},
"banner_sub": {"running": "De batterijen volgen het plan hieronder.", "shadow": "De plannen hieronder tonen wat de add-on zou doen.", "stopped": "Start de regeling hieronder als u klaar bent.", "alarm": "Zie Vraagt aandacht hieronder voor wat u moet doen.", "waiting": "De regeling gaat vanzelf verder zodra Home Assistant antwoordt.", "warning": "Zie Vraagt aandacht hieronder."}, "banner_sub": {"running": "De batterijen volgen het plan hieronder.", "shadow": "De plannen hieronder tonen wat de add-on zou doen.", "stopped": "Start de regeling hieronder als u klaar bent.", "alarm": "Zie Vraagt aandacht hieronder voor wat u moet doen.", "waiting": "De regeling gaat vanzelf verder zodra Home Assistant antwoordt.", "warning": "Zie Vraagt aandacht hieronder."},
"car": { "car": {
"state": {"charging": "Laadt", "waiting": "Aangesloten, wacht", "none": "Geen auto aangesloten", "full": "Auto is vol", "unreach": "Laadpaal onbereikbaar", "setup": "Laadpaal niet ingesteld", "fault": "Laadpaalstoring", "wait": "Nog geen meting"}, "state": {"charging": "Laadt", "waiting": "Aangesloten, wacht", "none": "Geen auto aangesloten", "full": "Auto is vol", "unreach": "Laadpaal onbereikbaar", "setup": "Laadpaal niet ingesteld", "fault": "Laadpaalstoring", "wait": "Nog geen meting", "paused": "Wacht op zon"},
"big": {"waiting": "Aangesloten, laadt niet.", "none": "Niets te laden.", "full": "De auto is vol.", "seen": "Laatst gezien om {t}.", "no_reading": "Geen meting.", "setup": "Niet ingesteld.", "fault": "De laadpaal meldt een storing.", "wait": "Nog geen meting."}, "big": {"waiting": "Aangesloten, laadt niet.", "none": "Niets te laden.", "full": "De auto is vol.", "seen": "Laatst gezien om {t}.", "no_reading": "Geen meting.", "setup": "Niet ingesteld.", "fault": "De laadpaal meldt een storing.", "wait": "Nog geen meting.", "paused": "Wacht op zonne-overschot."},
"phase_one": "1 fase", "phase_one": "1 fase",
"phase_many": "{n} fasen", "phase_many": "{n} fasen",
"today": "Vandaag {kwh} geladen.", "today": "Vandaag {kwh} geladen.", "today_sun": "Vandaag {kwh} geladen, {sun} van de zon.", "and": "en",
"why": { "why": {
"charging": "De laadpaal laadt de auto. De add-on laat haar met rust.", "charging": "De laadpaal laadt de auto. De add-on laat haar met rust.",
"waiting": "De auto is aangesloten en laadt niet. De add-on laat de laadpaal met rust.", "waiting": "De auto is aangesloten en laadt niet. De add-on laat de laadpaal met rust.",
@@ -273,9 +274,38 @@
"limit": "De laadpaalgrens is hoger dan de laadpaal toestaat. Verlaag ze bij Instellingen.", "limit": "De laadpaalgrens is hoger dan de laadpaal toestaat. Verlaag ze bij Instellingen.",
"name": "De entiteit van de laadstroom past niet bij de laadpaal. Controleer ze bij Instellingen.", "name": "De entiteit van de laadstroom past niet bij de laadpaal. Controleer ze bij Instellingen.",
"fault": "De laadpaal meldt een storing. Controleer ze aan de laadpaal zelf.", "fault": "De laadpaal meldt een storing. Controleer ze aan de laadpaal zelf.",
"wait": "Wacht op de eerste meting." "wait": "Wacht op de eerste meting.",
"manual_set": "U stelde {a} A in, {phases}. De laadpaal houdt dit aan, wat de piekgrens ook doet.",
"manual_cover": "U stelde {a} A in. De batterijen leveren {kw} en helpen tot {pct}.",
"manual_over": "U stelde {a} A in. De batterijen staan op {pct}, dus deze lading bepaalt de piek.",
"manual_full": "U stelde {a} A in. De batterijen geven alles, dus deze lading bepaalt de piek.",
"manual_nocover": "U stelde {a} A in. De bewaking negeert de auto, dus deze lading kan de piek bepalen.",
"manual_wait": "U stelde {a} A in. Het wordt ingesteld zodra een auto is aangesloten.",
"manual_would": "Schaduwmodus: de add-on zou {a} A instellen, {phases}.",
"manual_stopped": "De regeling is gestopt. De laadpaal houdt haar laatste instelling.",
"manual_blocked": "De fasen wisselen hooguit eens per 10 minuten. Dit wacht.",
"solar_batt": "Eerst de batterijen: {a} op vol vermogen, {b} is vol. De auto krijgt de {kw} die overblijft, min {m} marge.",
"solar_batt_room": "Eerst de batterijen: {a} op vol vermogen. De auto krijgt de {kw} die overblijft, min {m} marge.",
"solar_batt_full": "Eerst de batterijen, en die zijn vol. De auto krijgt de {kw} die overblijft, min {m} marge.",
"solar_car": "Eerst de auto: die neemt {kw} op {phases}. De batterijen krijgen de rest van de zon.",
"solar_hold": "Te weinig zonne-overschot, dus de auto houdt nu 6 A. Na {s} minuten zo pauzeert ze.",
"solar_paused": "Te weinig zonne-overschot voor het minimum van de auto, 6 A. Ze start na {s} minuten genoeg zon.",
"solar_start": "Er is nu genoeg zonne-overschot. De auto start na {s} minuten daarvan.",
"solar_cut": "De auto werd eerst teruggeschroefd voor de piekgrens. Ze start weer na {s} minuten genoeg zon.",
"solar_unknown": "De add-on kan het zonne-overschot nu niet meten. De auto pauzeert als dit duurt.",
"solar_would": "Schaduwmodus: de add-on zou de auto gepauzeerd houden.",
"solar_stopped": "De regeling is gestopt, dus de add-on pauzeert de auto.",
"solar_error": "De laadpaal meldt een fout, dus de add-on pauzeert de auto.",
"solar_stuck": "De laadpaal meet mogelijk niet meer, dus de add-on pauzeert de auto.",
"solar_other": "Iets anders wijzigt de laadpaal, dus de add-on laat haar met rust.",
"solar_zeroing": "De laadpaal nam 0 A nog niet aan. De add-on probeert opnieuw.",
"solar_zero_failed": "De laadpaal nam 0 A niet aan. Controleer ze aan de laadpaal zelf."
} }
}, },
"peak": {
"car": "Dit kwartier gaat richting {kw}. De auto neemt {car} en de batterijen dekken {cov}.",
"set_by_car": "Bepaald door de autolading die u vroeg, om {t}."
},
"tile": {"not_set_up": "Niet ingesteld", "no_reading": "Geen meting", "producing": "Produceert", "not_producing": "Produceert niet", "needs_solar": "Zonnemeting nodig", "not_adding_up": "Metingen kloppen niet", "using": "Verbruikt", "taking": "Neemt af van het net", "feeding": "Injecteert", "balanced": "In evenwicht", "giving": "Levert stroom", "charging": "Laadt", "resting": "Rust"}, "tile": {"not_set_up": "Niet ingesteld", "no_reading": "Geen meting", "producing": "Produceert", "not_producing": "Produceert niet", "needs_solar": "Zonnemeting nodig", "not_adding_up": "Metingen kloppen niet", "using": "Verbruikt", "taking": "Neemt af van het net", "feeding": "Injecteert", "balanced": "In evenwicht", "giving": "Levert stroom", "charging": "Laadt", "resting": "Rust"},
"now": { "now": {
"no_reading": "Geen meting van deze batterij.", "no_reading": "Geen meting van deze batterij.",
@@ -448,6 +478,12 @@
"solar_forecast": "Zonneprognose", "solar_forecast": "Zonneprognose",
"charger": "Laadpaal onbereikbaar", "charger": "Laadpaal onbereikbaar",
"charger_writer": "Iets anders wijzigt de laadpaal", "charger_writer": "Iets anders wijzigt de laadpaal",
"charger_other": "Iets anders wijzigt de laadpaal",
"charger_phases": "Laadpaal nam fasen niet over",
"charger_stuck": "Laadpaalmeting staat mogelijk vast",
"charger_refused": "Laadpaal nam het niet over",
"charger_error": "De laadpaal meldt een fout",
"car_over": "Auto boven de piekgrens",
"charger_setup": "Laadpaal niet ingesteld", "charger_setup": "Laadpaal niet ingesteld",
"none": "Verbinding met de omvormer" "none": "Verbinding met de omvormer"
}, },
+7 -2
View File
@@ -223,8 +223,8 @@ GROUPS = (
Field("delivery_hold_s", LOCKED, "s", step=5, show=_SEVERAL), Field("delivery_hold_s", LOCKED, "s", step=5, show=_SEVERAL),
), collapsed=True), ), collapsed=True),
)), )),
# EV-03: the car charger, read only. Everything after the choice shows # EV-03: the car charger. Everything after the choice shows only while a
# only while a charger is switched on. # charger is switched on. EV-04 adds the battery switch and the restart mode.
Group("car", ( Group("car", (
Part("", ( Part("", (
Field("ev_charger", CHOICE, simple=True), Field("ev_charger", CHOICE, simple=True),
@@ -232,6 +232,11 @@ GROUPS = (
show=_CAR), show=_CAR),
Field("ev_max_a", SLIDER, "A", simple=True, show=_CAR), Field("ev_max_a", SLIDER, "A", simple=True, show=_CAR),
Field("ev_phases", SEGMENTED, simple=True, show=_CAR), Field("ev_phases", SEGMENTED, simple=True, show=_CAR),
Field("ev_batt_cover", TOGGLE, simple=True, show=_CAR),
Field("ev_mode_start", SEGMENTED, simple=True, show=_CAR),
Field("ev_margin_w", SLIDER, "W", step=10, show=_CAR),
Field("ev_start_min", SLIDER, "min", show=_CAR),
Field("ev_pause_min", SLIDER, "min", show=_CAR),
)), )),
)), )),
Group("maintenance", ( Group("maintenance", (
+11
View File
@@ -688,6 +688,17 @@ def _charger_problems(opts: dict, writers: dict) -> list[str]:
out.append(f"{S('ev_max_a')} is {messages.shown(opts.get('ev_max_a'))}" out.append(f"{S('ev_max_a')} is {messages.shown(opts.get('ev_max_a'))}"
f". Set it from {chargers.MIN_A:.0f} to " f". Set it from {chargers.MIN_A:.0f} to "
f"{chargers.ENTITY_MAX_A:.0f} A.") f"{chargers.ENTITY_MAX_A:.0f} A.")
# EV-05: Solar's sun kept back and its two dwells, each in its range.
for key, (lo, hi) in chargers.SOLAR_RANGES.items():
raw = opts.get(key, chargers.EV_OPTION_DEFAULTS[key])
try:
v = float(raw)
ok = not isinstance(raw, bool) and v == v and lo <= v <= hi
except (TypeError, ValueError):
ok = False
if not ok:
out.append(f"{S(key)} is {messages.shown(raw)}. Set it from {lo} "
f"to {hi}.")
entity = chargers.census_entity(opts) entity = chargers.census_entity(opts)
if entity and drivers.census_key(entity) in writers: if entity and drivers.census_key(entity) in writers:
out.append(f"{S('ev_current_entity')} is {entity}, which an inverter " out.append(f"{S('ev_current_entity')} is {entity}, which an inverter "
+10
View File
@@ -62,6 +62,7 @@ _LOG = logging.getLogger("goodwe.web")
# OPT-11: the per-battery actions, which name a battery and a value. # OPT-11: the per-battery actions, which name a battery and a value.
PACK_ACTIONS = ("pack_use", "pack_mode", "pack_sell") PACK_ACTIONS = ("pack_use", "pack_mode", "pack_sell")
CAR_ACTIONS = ("car_mode", "car_current", "car_phases", "car_sun_first")
# MAINT-11: start or stop one battery's maintenance cycle (the unit is optional). # MAINT-11: start or stop one battery's maintenance cycle (the unit is optional).
MAINT_ACTIONS = ("maint_start", "maint_abort") MAINT_ACTIONS = ("maint_start", "maint_abort")
@@ -176,6 +177,15 @@ def build_app(controller, selfcfg=None) -> web.Application:
return web.json_response({"ok": False, return web.json_response({"ok": False,
"error": result["error"]}, "error": result["error"]},
status=400) status=400)
elif what in CAR_ACTIONS:
# EV-04: the car's mode, current or phases. Store state, applied by
# the writer's next step; nothing is written to the charger here.
result = await controller.handle_action(
what, value=body.get("value"))
if isinstance(result, dict) and "error" in result:
return web.json_response({"ok": False,
"error": result["error"]},
status=400)
elif what in MAINT_ACTIONS and body.get("unit") is not None: elif what in MAINT_ACTIONS and body.get("unit") is not None:
# MAINT-11: one battery's cycle. No unit = the old bare call below. # MAINT-11: one battery's cycle. No unit = the old bare call below.
result = await controller.handle_action(what, unit=body["unit"]) result = await controller.handle_action(what, unit=body["unit"])
+19 -5
View File
@@ -1,5 +1,5 @@
name: GoodWe RS485 Controller name: GoodWe RS485 Controller
version: "0.22.0" version: "0.24.0"
slug: goodwe_controller slug: goodwe_controller
description: >- description: >-
Drives a GoodWe ES/BP battery inverter over its RS485 EMS port by sending it a Drives a GoodWe ES/BP battery inverter over its RS485 EMS port by sending it a
@@ -873,16 +873,25 @@ options:
shadow_mode: "auto" shadow_mode: "auto"
# ========================================================================== # ==========================================================================
# CAR CHARGER - read only (EV-03) # CAR CHARGER (EV-03 reads it, EV-04 adds Manual, EV-05 Solar)
# ========================================================================== # ==========================================================================
# `off` is the shipped value and means NO CHANGE AT ALL: nothing is read, # `off` is the shipped value and means NO CHANGE AT ALL: nothing is read,
# shown or announced, and the House tile and the house profile are as before. # shown or announced, and the House tile and the house profile are as before.
# `alfen_ha` reads the charger through its Home Assistant integration. THIS # `alfen_ha` drives the charger through its Home Assistant integration. The
# VERSION NEVER WRITES TO THE CHARGER; later cards add the modes. # mode (Off, Manual or Solar), the current, the phases and where spare sun
# goes first are runtime state in the store, not options. `ev_batt_cover`:
# the batteries help with the peak while the car charges. `ev_mode_start`:
# the mode after a restart. Solar: `ev_margin_w` sun kept back, and the car
# starts after `ev_start_min` of enough sun and pauses after `ev_pause_min`.
ev_charger: "off" ev_charger: "off"
ev_current_entity: "" ev_current_entity: ""
ev_max_a: 16 ev_max_a: 16
ev_phases: "auto" ev_phases: "auto"
ev_batt_cover: true
ev_mode_start: "keep"
ev_margin_w: 100
ev_start_min: 2
ev_pause_min: 5
# ========================================================================== # ==========================================================================
# ADVANCED - the control law and diagnostics # ADVANCED - the control law and diagnostics
@@ -1262,7 +1271,7 @@ schema:
shadow_mode: list(auto|on|off) shadow_mode: list(auto|on|off)
# ========================================================================== # ==========================================================================
# CAR CHARGER - read only (EV-03) # CAR CHARGER (EV-03 reads it, EV-04 adds Manual, EV-05 Solar)
# ========================================================================== # ==========================================================================
# `ev_current_entity` is the charger's current setpoint; the other entities # `ev_current_entity` is the charger's current setpoint; the other entities
# are found from its name. `ev_max_a` may not exceed the charger's own station # are found from its name. `ev_max_a` may not exceed the charger's own station
@@ -1271,6 +1280,11 @@ schema:
ev_current_entity: str? ev_current_entity: str?
ev_max_a: int(6,40) ev_max_a: int(6,40)
ev_phases: list(1|3|auto) ev_phases: list(1|3|auto)
ev_batt_cover: bool
ev_mode_start: list(keep|off)
ev_margin_w: int(0,1000)
ev_start_min: int(1,30)
ev_pause_min: int(1,30)
# ========================================================================== # ==========================================================================
# ADVANCED - the control law and diagnostics # ADVANCED - the control law and diagnostics
+273
View File
@@ -0,0 +1,273 @@
"""Runnable check for CI-18's selector. `python3 test_affected_tests.py`
`.gitea/ci/affected_tests.py` says which test_*.py files a diff affects, so a
developer's round can skip the rest. It is used ONLY for local rounds; the merge
gate (`checks / unit (pull_request)`) runs every file. So the properties graded
here are the ones whose failure would be a missed test:
1. A synthetic tree: transitive imports, a tool launched by path, a module
named in a string, and what must NOT be chosen.
2. FAIL OPEN: a non-Python file, a deletion, a .py nothing references, a
file that does not parse, a base that does not exist, all select ALL.
3. The real tree: the safety set names files that exist, config.yaml and
run-tests.sh select ALL, a changed test file is chosen.
4. THE MUTANT: break a real module in a private copy of the tree; the
selector must choose a test that goes red, and the unbroken copy is green.
5. The merge gate cannot be partial: checks.yml and the CI image never
mention CI_ONLY, and checks.yml still runs the unfiltered run-tests.sh line.
Read MUTATION.md before you report a survivor.
"""
import os
import shutil
import subprocess
import sys
import tempfile
HERE = os.path.dirname(os.path.abspath(__file__))
REPO = os.path.dirname(HERE)
SEL = os.path.join(REPO, ".gitea", "ci", "affected_tests.py")
sys.path.insert(0, os.path.dirname(SEL))
import affected_tests as sel # noqa: E402
fails = []
tmps = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
def mk(root, files):
for rel, text in files.items():
p = os.path.join(root, rel)
os.makedirs(os.path.dirname(p), exist_ok=True)
with open(p, "w", encoding="utf-8") as fh:
fh.write(text)
def tmp():
d = tempfile.mkdtemp(prefix="test_affected.")
tmps.append(d)
return d
def choose(root, paths, status="M"):
names, _r, why = sel.select(root, [(status, p) for p in paths])
return ([os.path.basename(n) for n in names] if names is not None else None,
why)
# ---------------------------------------------------------------- 1. synthetic
print("1. a synthetic tree")
R = tmp()
P = "goodwe_controller/"
mk(R, {
P + "app/__init__.py": "",
P + "app/low.py": "def f():\n return 1\n",
P + "app/mid.py": "from app import low\n\ndef g():\n return low.f()\n",
P + "app/top.py": "from app.mid import g\n",
P + "app/lonely.py": "X = 1\n",
P + "app/viastr.py": "Y = 2\n",
P + "tools/launched.py": "print('hi')\n",
P + "tools/reader.py": "print('r')\n",
P + "test_a.py": "from app import top\n",
P + "test_b.py": "from app import lonely\n",
P + "test_c.py": "import subprocess\nsubprocess.run(['python3', 'tools/launched.py'])\n",
P + "test_d.py": "import importlib\nm = importlib.import_module('app.viastr')\n",
# reads every test_*.py as text: affected by a changed test, but it is a
# reader, not a dependency of anything that imports a module
P + "test_reader.py": "import glob\nfor f in glob.glob('test_*.py'):\n open(f).read()\n",
P + "test_unrelated.py": "print('x')\n",
# a test imported by another test carries the change on (an import runs it)
P + "test_base.py": "from app import lonely\n",
P + "test_chain.py": "import test_base\n",
})
n, why = choose(R, [P + "app/low.py"])
check("a change two imports down chooses the test that imports the top (transitive)",
n is not None and "test_a.py" in n)
check("...and not tests that do not reach it",
n is not None and not {"test_b.py", "test_c.py", "test_unrelated.py"} & set(n))
n, why = choose(R, [P + "app/lonely.py"])
check("a direct importer is chosen", n is not None and "test_b.py" in n)
check("a test that imports another test is chosen with it, even though "
"test_reader (a pattern reader) also reaches test_base as text",
n is not None and "test_chain.py" in n and "test_base.py" in n)
n, why = choose(R, [P + "tools/launched.py"])
check("a tool launched by path in a string chooses the launching test",
n is not None and "test_c.py" in n)
n, why = choose(R, [P + "app/viastr.py"])
check("a module imported dynamically by name chooses its test",
n is not None and "test_d.py" in n)
n, why = choose(R, [P + "test_unrelated.py"])
check("a changed test file is chosen", n is not None and "test_unrelated.py" in n)
check("a test that only READS test files by pattern is chosen with it",
n is not None and "test_reader.py" in n)
check("...but a reader does not drag in the importers of an unrelated module",
n is not None and "test_a.py" not in n and "test_b.py" not in n)
n, why = choose(R, [P + "app/low.py", P + "tools/launched.py"])
check("two changes choose the union",
n is not None and {"test_a.py", "test_c.py"} <= set(n))
# the safety set is always in, whatever changed
R2 = tmp()
files = {P + "app/__init__.py": "", P + "app/m.py": "A = 1\n",
P + "test_m.py": "from app import m\n", P + "test_zzz.py": "print(1)\n"}
for name in sel.SAFETY_SET:
files[P + name] = "print('safety')\n"
mk(R2, files)
n, why = choose(R2, [P + "app/m.py"])
check("every safety-set file is chosen on a one-module change",
n is not None and set(sel.SAFETY_SET) <= set(n))
check("...with a reason printed for each", all(sel.SAFETY_SET.values()))
check("...and a test outside the set that does not reach it stays out",
n is not None and "test_zzz.py" not in n)
# ------------------------------------------------------------ 2. fails open
print("\n2. it fails open")
for label, paths, status in (
("config.yaml (not Python)", [P + "config.yaml"], "M"),
("a translation file", [P + "translations/en.yaml"], "M"),
("run-tests.sh itself", [".gitea/ci/run-tests.sh"], "M"),
("a Dockerfile", [P + "Dockerfile"], "M"),
("a markdown file", ["README.md"], "M"),
("a deleted module", [P + "app/low.py"], "D"),
("a renamed module", [P + "app/low.py"], "R"),
("a .py nothing references", [P + "app/never_imported.py"], "M")):
if label.startswith("a .py"):
mk(R, {P + "app/never_imported.py": "Z = 1\n"})
n, why = choose(R, paths, status)
check(f"{label}: SELECT ALL", n is None and why)
mk(R, {P + "app/broken.py": "def (:\n"})
n, why = choose(R, [P + "app/low.py"])
check("a file in the tree that does not parse: SELECT ALL", n is None and why)
os.remove(os.path.join(R, P + "app/broken.py"))
n, why = choose(tmp(), [P + "app/low.py"])
check("a tree with no test files: SELECT ALL", n is None and why)
# the CLI: --names prints every test on SELECT ALL, and a bad base is ALL
g = tmp()
mk(g, {P + "app/__init__.py": "", P + "app/m.py": "A = 1\n",
P + "test_m.py": "from app import m\n"})
env = {**os.environ, "GIT_AUTHOR_NAME": "t", "GIT_AUTHOR_EMAIL": "t@t",
"GIT_COMMITTER_NAME": "t", "GIT_COMMITTER_EMAIL": "t@t"}
def git(*a):
return subprocess.run(["git", "-C", g] + list(a), env=env,
capture_output=True, text=True)
git("init", "-q", "-b", "base")
git("add", "-A")
git("commit", "-q", "-m", "base")
git("checkout", "-q", "-b", "work")
mk(g, {P + "app/m.py": "A = 2\n"})
git("commit", "-q", "-am", "work")
r = subprocess.run([sys.executable, SEL, "--root", g, "--base", "base",
"--head", "work", "--names"], capture_output=True, text=True)
check("a committed range via git: the importer is chosen",
r.returncode == 0 and r.stdout.split() == ["test_m.py"])
r = subprocess.run([sys.executable, SEL, "--root", g, "--base", "nosuchref",
"--head", "work"], capture_output=True, text=True)
check("a base that does not exist: SELECT ALL, not an error and not nothing",
r.returncode == 0 and "SELECT ALL" in r.stdout)
mk(g, {P + "app/m.py": "A = 3\n"})
r = subprocess.run([sys.executable, SEL, "--root", g, "--base", "base",
"--names"], capture_output=True, text=True)
check("uncommitted work is part of the diff (no --head)",
r.returncode == 0 and r.stdout.split() == ["test_m.py"])
mk(g, {P + "app/newmod.py": "B = 1\n", P + "test_new.py": "from app import newmod\n"})
r = subprocess.run([sys.executable, SEL, "--root", g, "--base", "base",
"--names"], capture_output=True, text=True)
check("an untracked new module and its new test are in the diff",
r.returncode == 0 and set(r.stdout.split()) == {"test_m.py", "test_new.py"})
# ---------------------------------------------------------------- 3. real tree
print("\n3. the real tree")
tests = sorted(f for f in os.listdir(HERE)
if f.startswith("test_") and f.endswith(".py"))
check("every safety-set name is a test file that exists",
all(f in tests for f in sel.SAFETY_SET))
for p in ("goodwe_controller/config.yaml", ".gitea/ci/run-tests.sh",
".gitea/workflows/checks.yml", "goodwe_controller/DOCS.md",
"goodwe_controller/translations/en.yaml"):
n, why = choose(REPO, [p])
check(f"{p}: SELECT ALL", n is None and why)
n, why = choose(REPO, ["goodwe_controller/app/maintenance.py"])
check("app/maintenance.py chooses test_maint25.py (it imports it through main)",
n is not None and "test_maint25.py" in n)
n, why = choose(REPO, ["goodwe_controller/test_maint25.py"])
check("a changed test chooses itself and the safety set",
n is not None and "test_maint25.py" in n and set(sel.SAFETY_SET) <= set(n))
check("...and far fewer than all",
n is not None and len(n) < len(tests) // 2)
n, why = choose(REPO, [".gitea/ci/affected_tests.py"])
check("the selector's own file chooses this file",
n is not None and "test_affected_tests.py" in n)
# ------------------------------------------------------------------ 4. mutant
print("\n4. the mutant: break a module, the selector must choose a red test")
M = tmp()
ign = shutil.ignore_patterns(".git", "scenarios", "__pycache__", "*.pyc")
shutil.copytree(REPO, os.path.join(M, "repo"), ignore=ign, symlinks=True)
mroot = os.path.join(M, "repo")
cwd = os.path.join(mroot, "goodwe_controller")
env2 = {**os.environ, "PYTHONDONTWRITEBYTECODE": "1"}
def run_test(name):
r = subprocess.run([sys.executable, "-B", name], cwd=cwd, env=env2,
capture_output=True, text=True, timeout=600)
return r.returncode
check("control: test_maint25.py is green on the unbroken copy",
run_test("test_maint25.py") == 0)
path = os.path.join(cwd, "app", "maintenance.py")
with open(path, encoding="utf-8") as fh:
src = fh.read()
old = " return until if now < until else None\n"
check("the line to break is where this test expects it", src.count(old) == 1)
with open(path, "w", encoding="utf-8") as fh:
fh.write(src.replace(old, " return None\n"))
n, why = choose(mroot, ["goodwe_controller/app/maintenance.py"])
check("the selector chooses test_maint25.py for the broken module",
n is not None and "test_maint25.py" in n)
check("...and running the chosen file is RED", run_test("test_maint25.py") != 0)
with open(path, "w", encoding="utf-8") as fh:
fh.write(src)
check("put back: GREEN again", run_test("test_maint25.py") == 0)
# --------------------------------------------- 5. the gate cannot be partial
print("\n5. the merge gate runs everything")
with open(os.path.join(REPO, ".gitea", "workflows", "checks.yml"),
encoding="utf-8") as fh:
wf = fh.read()
check("checks.yml never mentions CI_ONLY", "CI_ONLY" not in wf)
check("checks.yml runs run-tests.sh with no file list",
"sh -eu /w/goodwe-addon/.gitea/ci/run-tests.sh\n" in wf)
check("checks.yml never calls the selector or the local wrapper",
"affected_tests" not in wf and "run-affected" not in wf)
with open(os.path.join(REPO, ".gitea", "ci", "run-tests.sh"),
encoding="utf-8") as fh:
rt = fh.read()
check("run-tests.sh takes CI_ONLY from the environment only and says PARTIAL",
"PARTIAL RUN" in rt and 'set -- test_*.py' in rt)
with open(os.path.join(REPO, ".gitea", "ci", "Dockerfile"),
encoding="utf-8") as fh:
df = fh.read()
check("the CI image (built from the merged tree) never sets CI_ONLY",
"CI_ONLY" not in df)
for d in tmps:
shutil.rmtree(d, ignore_errors=True)
print()
if fails:
print(f"{len(fails)} FAILED:")
for f in fails:
print(f" - {f}")
sys.exit(1)
print("all checks passed")
+17 -11
View File
@@ -185,7 +185,9 @@ def callers_of_writes():
out = [] out = []
for root, _d, files in os.walk(os.path.join(HERE, "app")): for root, _d, files in os.walk(os.path.join(HERE, "app")):
for f in files: for f in files:
if not f.endswith(".py") or f == "chargers.py": # EV-04: carmode.py is the one place that writes, and only in
# Manual (test_ev04.py grades it); chargers.py is the seam.
if not f.endswith(".py") or f in ("chargers.py", "carmode.py"):
continue continue
tree = ast.parse(io.open(os.path.join(root, f), tree = ast.parse(io.open(os.path.join(root, f),
encoding="utf-8").read()) encoding="utf-8").read())
@@ -199,15 +201,17 @@ def callers_of_writes():
return out return out
check(f"nothing in the add-on calls write_current, write_phases or the " check(f"nothing in the add-on but carmode.py calls write_current, "
f"charger's release ({callers_of_writes()})", not callers_of_writes()) f"write_phases or the charger's release ({callers_of_writes()})",
not callers_of_writes())
check("the seam does define them (the next cards use them)", check("the seam does define them (the next cards use them)",
all(hasattr(CH.ChargerDriver, m) for m in all(hasattr(CH.ChargerDriver, m) for m in
("write_current", "write_phases", "release"))) ("write_current", "write_phases", "release")))
_ha = FakeHa(SimCharger()) _ha = FakeHa(SimCharger())
asyncio.run(CH.AlfenHaDriver(SET, 16).bind(_ha).write_current(99)) _took99 = asyncio.run(CH.AlfenHaDriver(SET, 16).bind(_ha).write_current(99))
check("the Alfen driver's write (a later card's) is clamped to the charger " check("the Alfen driver never sends 99 A against a 16 A limit (EV-04: a value "
"limit, 16 A and not 99", _ha.sets == [(SET, 16.0)]) "above the clamp is a software fault, not sent)",
_ha.sets == [] and _took99 is False)
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
print("\n2. THE SEAM") print("\n2. THE SEAM")
@@ -901,16 +905,18 @@ check("it stays for an hour and then goes",
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
print("\n9. THE MQTT SENSORS") print("\n9. THE MQTT SENSORS")
# --------------------------------------------------------------------------- # # --------------------------------------------------------------------------- #
check("the three car sensors are announced only with a charger on", check("the car sensors (EV-05: four, with today's solar kWh) are announced "
"only with a charger on",
mqtt.optional_keys(CAR) == ("pv", "car_power", "car_state", mqtt.optional_keys(CAR) == ("pv", "car_power", "car_state",
"car_today_kwh") "car_today_kwh", "car_today_solar_kwh")
and mqtt.optional_keys(BASE) == ("pv",)) and mqtt.optional_keys(BASE) == ("pv",))
pl = dict(mqtt.discovery_payloads(include=mqtt.optional_keys(CAR))) pl = dict(mqtt.discovery_payloads(include=mqtt.optional_keys(CAR)))
names = sorted(k for k in pl if "_car_" in k) names = sorted(k for k in pl if "_car_" in k)
check(f"discovery announces three sensors, goodwe_car_power, " check(f"discovery announces the sensors goodwe_car_power, goodwe_car_state, "
f"goodwe_car_state and goodwe_car_today_kwh ({names})", f"goodwe_car_today_kwh and (EV-05) goodwe_car_today_solar_kwh ({names})",
[pl[k]["object_id"] for k in names] == [ [pl[k]["object_id"] for k in names] == [
"goodwe_car_power", "goodwe_car_state", "goodwe_car_today_kwh"] "goodwe_car_power", "goodwe_car_state", "goodwe_car_today_kwh",
"goodwe_car_today_solar_kwh"]
and all(k.startswith("homeassistant/sensor/") for k in names)) and all(k.startswith("homeassistant/sensor/") for k in names))
check("...and no command entity (no select, number or switch for the car)", check("...and no command entity (no select, number or switch for the car)",
not [k for k in pl if "car" in k and not k.startswith( not [k for k in pl if "car" in k and not k.startswith(
File diff suppressed because it is too large Load Diff
File diff suppressed because it is too large Load Diff
+474
View File
@@ -0,0 +1,474 @@
"""EV-05: the car's Solar mode, the long runs. `python3 -B test_ev05_long.py`
Split from test_ev05.py so CI's parallel batch stays short: the shadow-mode
twin (T39), the acceptance day (T44), the fuzz (T45), and the hour-long
"nothing else changes" comparisons (T50, T51). Same harness,
`tools/ev05_sun.py`; the rows are named by their test-plan id.
Mutating a module this file grades? Read MUTATION.md first (purge __pycache__).
"""
import logging
import math
import os
import random
import sys
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(HERE, "tools"))
import ev05_sun as S # noqa: E402
from chargersim import SimCharger # noqa: E402
logging.disable(logging.CRITICAL)
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
def const(w):
return lambda t: float(w)
def steps(*pairs):
def f(t):
v = pairs[0][1]
for at, w in pairs:
if t >= at:
v = w
return float(v)
return f
def cur(r):
return S.writes(r, "current")
def ph(r):
return S.writes(r, "phases")
FULL = {"a": 100.0, "b": 100.0}
ABLE = {"a": 60.0, "b": 60.0}
def quarters(r, aim):
"""(start, import average, car average) of each whole quarter."""
out = []
tr = r["trace"]
for q0 in range(0, int(tr[-1]["t"]) + 1 - 900, 900):
xs = [x for x in tr if q0 <= x["t"] < q0 + 900]
if len(xs) < 890:
continue
g = sum(max(0.0, x["grid"]) for x in xs) / len(xs)
car = sum(x["car"] for x in xs) / len(xs)
out.append((q0, g, car))
return out
def seq_ok(r):
"""Every select: a 0 A write before it, the car under 100 W or out of C or
20 s after the 0 A, then 10 s or more to the next current; no other write
in between."""
log = r["sim"].log
state = {x["t"]: x["st"] for x in r["trace"]}
bad = []
for i, x in enumerate(log):
if x[1] != "phases":
continue
prev = log[i - 1] if i else None
nxt = log[i + 1] if i + 1 < len(log) else None
if prev is None or prev[1] != "current" or prev[2] != 0.0:
bad.append(("no 0 A before", x))
continue
quiet = (x[3] < 100.0 or state.get(x[0] - 1) != "C"
or x[0] - prev[0] >= 20.0)
if not quiet or x[4] != 0.0:
bad.append(("select under load", x))
if nxt is not None and (nxt[1] != "current" or nxt[0] - x[0] < 10.0):
bad.append(("current too soon or not next", x, nxt))
return bad
def inv_sets(r):
return [x for x in r["plant"].sets if x[1].startswith("number.sp_")]
# =========================================================================== #
print("\nT39. SHADOW MODE: NOTHING WRITTEN, THE CARD SAYS WHAT IT WOULD SET (N10)")
# =========================================================================== #
def cloudy(t):
k = int(t) // 240
return 900.0 + (2600.0 if k % 3 else 400.0) + 300.0 * (k % 5)
twin = S.drive(house=const(500.0), sun=cloudy, first="car", socs=FULL,
opts={"ev_phases": "1"}, dur=3600)
for name, kw in (("on", dict(opts={"ev_phases": "1", "shadow_mode": "on"})),
("auto, control stopped",
dict(opts={"ev_phases": "1", "shadow_mode": "auto"},
events={0: lambda p, c: setattr(c, "auto", False)}))):
sh = S.drive(house=const(500.0), sun=cloudy, first="car", socs=FULL,
dur=3600, **kw)
diff = [(a["t"], a["a"], (b["would"] or (None,))[0])
for a, b in zip(twin["trace"], sh["trace"])
if b["would"] is not None and a["a"] != b["would"][0]]
check(f"T39 shadow {name}: the charger log is empty for a cloudy hour, and "
f"every second the card's 'would set' is the current of a twin run "
f"without shadow mode ({len(diff)} seconds differ: {diff[:3]})",
sh["sim"].log == [] and not diff
and len({a['a'] for a in twin['trace']}) >= 3)
# =========================================================================== #
print("\nT50, T51. NOTHING ELSE CHANGES FOR THE GUARD AND THE ZERO-GRID LOOP")
# =========================================================================== #
h50 = steps((0, 400.0), (600, 2600.0), (900, 800.0), (1800, 4200.0),
(2100, 300.0), (3000, 1500.0))
r50 = S.drive(house=h50, sun=const(0.0), plug=False, dur=3600)
r50o = S.drive(house=h50, sun=const(0.0), plug=False, dur=3600,
opts={"ev_charger": "off"})
check(f"T50: Solar with no car for an hour: the guard's floor and every battery "
f"command are identical to the run with no charger "
f"({len(inv_sets(r50))} commands)", inv_sets(r50) == inv_sets(r50o)
and [x["floor"] for x in r50["trace"]]
== [x["floor"] for x in r50o["trace"]] and cur(r50) == [])
sun51 = steps((0, 3000.0), (700, 5200.0), (1500, 2500.0))
r51 = S.drive(house=const(400.0), sun=sun51, first="car", socs=ABLE,
dur=2000)
carp = {int(x["t"]): x["car"] for x in r51["trace"]}
r51o = S.drive(house=lambda t: 400.0 + carp.get(math.ceil(t), 0.0),
sun=sun51, socs=ABLE, dur=2000, opts={"ev_charger": "off"})
check(f"T51: Car first, the zero-grid loop: the same meter series with the car "
f"as a Solar car and as house load gives the same battery commands "
f"({len(inv_sets(r51))} commands)", inv_sets(r51) == inv_sets(r51o)
and max(carp.values()) > 3000)
check("T51: the batteries charge with what the car leaves (Car first)",
-300 <= r51["plant"].batt(1999) <= 0)
# =========================================================================== #
print("\nT44. THE ACCEPTANCE DAY: 08:00-18:00, CLOUDS, HOUSE STEPS (A2)")
# =========================================================================== #
_rnd44 = random.Random(44)
CLOUDS44 = []
for _i in range(12):
a = _rnd44.randint(600, 34000)
CLOUDS44.append((a, a + _rnd44.randint(60, 480)))
STEPS44 = [(8000, 8300), (17000, 17300), (26000, 26300)]
def sun44(t):
base = max(0.0, 7500.0 * math.sin(math.pi * t / 36000.0))
return base * (0.15 if any(a <= t < b for a, b in CLOUDS44) else 1.0)
def house44(t):
w = 1450.0 + 1050.0 * math.sin(t / 1700.0)
return w + (3000.0 if any(a <= t < b for a, b in STEPS44) else 0.0)
long44 = sum(1 for a, b in CLOUDS44 if b - a > 300)
for first, race in (("batteries", False), ("car", True)):
# The batteries' levels move with their charge (A 15.36 kWh, B 20.48 kWh),
# so with Batteries first the car gets sun once they are full.
r44 = S.drive(house=house44, sun=sun44, first=first, socs={"a": 40.0,
"b": 60.0},
caps={"a": 15.36, "b": 20.48}, dur=36000, race=race,
opts={"slew_w": 0})
# `slew_w` 0 is the shipped default. With the harness's usual 400 W a
# cycle (the SAFETY-81 rig) this day also has no cut pause (dev report,
# round 2).
# On the harness clock, as the trace (the model's own clock runs ahead).
w44 = [(x[0], x[2]) for x in r44["plant"].wlog if x[1] == "current"]
p44 = [(x[0], x[2]) for x in r44["plant"].wlog if x[1] == "phases"]
# A phase change's own 0 A (a select follows within 25 s) is not a pause.
seq0 = {t for t, v in w44 if v == 0.0 and any(0 < pt - t <= 25
for pt, _n in p44)}
starts, pauses, paused, pause_t = 0, 0, True, []
for t, v in w44:
if v == 0.0 and t not in seq0:
paused = True
pauses += 1
pause_t.append(t)
elif v > 0 and paused:
starts += 1
paused = False
why_at = {x["t"]: x["why"] for x in r44["trace"]}
cut_t = [t for t in pause_t if why_at.get(t) == "cut"
or why_at.get(t - 1) == "cut"]
# Car first: no hold pause from a cloud under 300 s. Batteries first: a
# battery that gave power in the cloud is under 100 % again, so its
# rating is room and the car waits for it (the brief's room rule).
short_hit = [t for t in pause_t if t not in cut_t and first == "car"
and any(a <= t <= b + 2 for a, b in CLOUDS44 if b - a <= 300)]
print(f" pauses (second, why): {[(t, why_at.get(t)) for t in pause_t]}")
# N5 on the whole day: a start 120 s or more after its pause, a hold
# pause after 300 s of holding, non-zero writes 30 s apart.
nz = [t for t, v in w44 if v > 0]
n5 = [("30 s", b) for a, b in zip(nz, nz[1:]) if b - a < 30]
last_p = None
for t, v in w44:
if v == 0.0 and t not in seq0:
last_p = t
elif v > 0 and last_p is not None:
if t - last_p < 120:
n5.append(("start", t))
last_p = None
for t in pause_t:
if why_at.get(t) == "paused":
run = 0
while why_at.get(t - 1 - run) == "hold":
run += 1
if run < 298:
n5.append(("pause", t, run))
# The loop turns at most `slew_w` per cycle, so for some 15 s after each
# current step, cloud edge and house step the grid covers the change:
# counted apart (dev report). The rest is the car on grid power while
# the loop is settled, outside the holds.
edges = [t for t, v in w44] + [e for ab in CLOUDS44 + STEPS44 for e in ab]
edges.sort()
def settling(t):
return any(0 <= t - e < 15 for e in edges)
grid_wh = sum(min(x["car"], max(0.0, x["grid"])) for x in r44["trace"]
if x["why"] not in ("hold",) and not settling(x["t"])) / 3600.0
slew_wh = sum(min(x["car"], max(0.0, x["grid"])) for x in r44["trace"]
if settling(x["t"])) / 3600.0
steps44 = edges
over44 = [(q, round(g)) for q, g, car in quarters(r44, 3400.0)
if g > 3410.0 and g - car <= 3410.0]
gaps = [b[0] - a[0] for a, b in zip(p44, p44[1:])]
check(f"T44 {first} first ({'race' if race else 'step'}): starts {starts} "
f"(<= 1 + {long44} long clouds, Car first); peak-cut pauses "
f"{len(cut_t)} (round 2: none, the batteries catch the cloud edges)"
f"; pauses {pauses}; N5 dwells {n5[:3]}; selects {len(p44)} "
f"(gaps >= 600 s: {gaps[:4]}); no pause from a short cloud "
f"{short_hit[:3]}; the car's grid energy outside holds {grid_wh:.1f} "
f"Wh (and {slew_wh:.1f} Wh in the loop's 15 s after "
f"{len(steps44)} steps and edges); quarters over the aim by the car "
f"{over44}",
starts >= 1 and not n5 and all(g >= 600 for g in gaps)
and not cut_t and (first != "car" or starts <= 1 + long44)
and not seq_ok(r44) and not short_hit and grid_wh <= 10.0
and not over44)
# =========================================================================== #
print("\nT45. THE FUZZ: 14 SITES, 16800 STEPS (N1-N10)")
# The plan asks 14 x 400 steps; a busy site rarely has the 60 s calm a start
# needs, so each site runs 1200 steps to make enough writes to judge.
# =========================================================================== #
def fuzz(seed):
rnd = random.Random(seed)
stations = [10.0, 13.0, 16.0]
st = {"sun": rnd.uniform(0, 9000), "house": rnd.uniform(200, 3000),
"n": {}, "acts": [], "undo": [], "exits": []}
def exit_check(p, c, kind="off"):
"""N9: a way out of Solar (Off, Stop, shadow) with the charger above
0 A, reachable and not held by another writer. Round 3: also while
the charger refuses writes (judged after the refusal ends)."""
ch = p.ch
if c.car_mode == "solar" and c.car_writing() and not c.car_solar.hold \
and not ch.unavailable and ch.readback_a > 0.5 \
and not p.ha_down:
st["exits"].append((p.t, kind, ch.refuse))
def at(t, fn):
st["undo"].append((t, fn))
def later(p, fn):
st["undo"].append((p.t + rnd.randint(10, 40), fn))
def ev(p, c):
for due in [u for u in st["undo"] if u[0] <= p.t]:
st["undo"].remove(due)
due[1]()
if st.get("back") is not None and p.t >= st["back"]:
st["back"] = None # the user goes back to Solar
st["acts"].append(p.t)
return c.handle_action("car_mode", value="solar")
if st.get("press") is not None and p.t >= st["press"]:
st["press"] = None # the user presses the mode
st["acts"].append(p.t)
return c.handle_action("car_mode", value=c.car_mode)
r = rnd.random()
ch = p.ch
if r < 0.012:
st["sun"] = rnd.choice([0.0, 1000.0, 2500.0, 5000.0, 8000.0,
8000.0, 6500.0])
elif r < 0.02:
st["house"] = rnd.uniform(200, 4000)
elif r < 0.08:
st["sun"] = max(0.0, st["sun"] + rnd.uniform(-600, 600))
elif r < 0.082:
if ch.state != "A":
ch.unplug()
later(p, ch.plug_in)
st["n"]["plug"] = st["n"].get("plug", 0) + 1
elif r < 0.084:
ch.go_unavailable(True)
later(p, lambda: ch.go_unavailable(False))
st["n"]["down"] = st["n"].get("down", 0) + 1
elif r < 0.087:
ch.set_current(rnd.randint(0, 16))
st["n"]["other"] = st["n"].get("other", 0) + 1
st["press"] = p.t + rnd.randint(20, 90)
elif r < 0.089:
ch.refuse = rnd.choice(["ignore", "error"])
later(p, lambda: setattr(ch, "refuse", None))
elif r < 0.091:
p.meter_on = False
later(p, lambda: setattr(p, "meter_on", True))
st["n"]["meter"] = st["n"].get("meter", 0) + 1
elif r < 0.093:
exit_check(p, c, "out")
c.o["shadow_mode"] = "on"
later(p, lambda: c.o.__setitem__("shadow_mode", "off"))
st["n"]["shadow"] = st["n"].get("shadow", 0) + 1
elif r < 0.095:
exit_check(p, c, "out")
c.auto = False
later(p, lambda: setattr(c, "auto", True))
st["n"]["stop"] = st["n"].get("stop", 0) + 1
elif r < 0.098:
m = rnd.choice(["solar", "solar", "solar", "off", "manual"])
st["n"]["mode"] = st["n"].get("mode", 0) + 1
st["acts"].append(p.t)
if m == "off":
exit_check(p, c)
return c.handle_action("car_mode", value=m)
elif r < 0.1:
ch.station_a = rnd.choice(stations)
elif r < 0.1015 and c.car_mode == "solar" and c.car_writing() \
and p.ch.readback_a > 0.5 and st.get("back") is None \
and not p.ch.unavailable and p.ch.refuse is None:
# Round 3: the charger refuses for 5 s, and a way out comes now
# and stands 100-150 s.
kind = rnd.choice(["off", "stop", "shadow"])
p.ch.refuse = rnd.choice(["error", "ignore"])
at(p.t + 5, lambda: setattr(p.ch, "refuse", None))
exit_check(p, c, "off" if kind == "off" else "out")
stay = rnd.randint(100, 150)
st["n"]["refused_exit_made"] = \
st["n"].get("refused_exit_made", 0) + 1
if kind == "stop":
c.auto = False
at(p.t + stay, lambda: setattr(c, "auto", True))
elif kind == "shadow":
c.o["shadow_mode"] = "on"
at(p.t + stay, lambda: c.o.__setitem__("shadow_mode", "off"))
else:
st["acts"].append(p.t)
st["back"] = p.t + stay
return c.handle_action("car_mode", value="off")
elif r < 0.103 and c.car_mode == "solar" and p.ch.readback_a > 0.5 \
and st.get("back") is None:
exit_check(p, c) # leave Solar while it charges
st["acts"].append(p.t)
st["back"] = p.t + rnd.randint(30, 120)
return c.handle_action("car_mode", value="off")
elif r < 0.2 and c.car_solar.seq is not None:
st["n"]["mid"] = st["n"].get("mid", 0) + 1
exit_check(p, c)
return c.handle_action("car_mode", value="off")
ctx = []
def note(p, c, t):
ctx.append((t, c.car_mode, c.car_writing(), c.car_solar.single,
p.ch.refuse, p.ch.unavailable, p.ch.setpoint_a,
c.car_solar.hold, p.ch.station_a))
r = S.drive(house=lambda t: st["house"], sun=lambda t: st["sun"],
first="car", opts={"ev_margin_w": 0, "ev_start_min": 1,
"ev_pause_min": 1}, socs=FULL, dur=1200,
events={t: ev for t in range(1, 1200)}, on_cycle=note,
race=seed % 2 == 1, sim=SimCharger(setpoint_a=rnd.choice(
[0, 10, 16])))
bad = []
by_t = {x[0]: x for x in ctx}
log = r["plant"].wlog # on the harness clock
last_sel, last_nz = None, None
for t, what, v, power, sp in log:
# A write logged at second t comes after that second's actions.
x = by_t.get(t) or by_t.get(t - 1)
mode = x[1] if x else "?"
if what == "current" and v > min(16.0, x[8] if x else 16.0) + 1e-9:
bad.append(("N1 over the clamp", t, v))
if what == "phases":
if sp != 0.0:
bad.append(("N2 select with the setpoint up", t))
if last_sel is not None and t - last_sel < 600:
bad.append(("N2 two selects in 600 s", t))
last_sel = t
if what == "current" and mode == "off" and v > 0:
bad.append(("N10 a non-zero write in Off", t, v))
if what == "current" and x is not None and not x[2] and v > 0 \
and mode == "solar":
bad.append(("N10 a non-zero Solar write while not writing", t, v))
if what == "current" and v > 0 and mode == "solar":
near_act = any(abs(t - a) <= 3 for a in st["acts"])
if last_nz is not None and t - last_nz < 30 and not near_act:
bad.append(("N5 two non-zero writes under 30 s", t, v))
last_nz = t
for te, kind, ref in st["exits"]:
if ref is None:
if not any(x[1] == "current" and x[2] == 0.0
and te <= x[0] <= te + 3 for x in log):
bad.append(("N9 a way out left the current up", te, kind))
continue
# Round 3: the charger refused when the way out came. Judged when the
# refusal ended within 60 s and the way out still stands 80 s on (the
# 0 A is tried again 60 s after the first try, +10 s read-back).
span = [x for x in ctx if te <= x[0] <= te + 80]
ends = next((x[0] for x in span if x[4] is None), None)
still = len(span) >= 80 and all(
(x[1] == "off" if kind == "off" else
(x[1] == "solar" and not x[2])) and not x[5] and not x[7]
for x in span)
if ends is None or ends > te + 60 or not still:
continue
st["n"]["refused_exits"] = st["n"].get("refused_exits", 0) + 1
if not any(x[6] <= 0.5 for x in span): # reached 0 A in it
bad.append(("N9 a refused way-out 0 A was not tried again", te,
kind))
if r["c"].charger.clamp_faults:
bad.append(("N1 clamp fault", r["c"].charger.clamp_faults))
st["n"]["exits"] = len(st["exits"])
return bad, len(log), st["n"]
fz_bad, fz_n, fz_counts = [], 0, {}
for _seed in range(14):
_b, _n, _c = fuzz(_seed)
fz_bad += _b
fz_n += _n
for k, v in _c.items():
fz_counts[k] = fz_counts.get(k, 0) + v
check(f"T45: {fz_n} charger writes over 14 random Solar sites and 16800 steps "
f"(outages, unplugs, refusals, other writers, a silent meter, shadow and "
f"Stop, mode changes, half racing): none over the clamp, no select with "
f"the setpoint up or two in 600 s, every Solar to Off at 0 A (N9), no "
f"non-zero write in Off, in shadow "
f"or stopped, none under 30 s apart ({fz_bad[:3]})",
not fz_bad and fz_n > 100)
check(f"T45: each disturbance happened, and exits while the charger refused "
f"were judged ({fz_counts})",
all(fz_counts.get(k, 0) > 2 for k in ("plug", "down", "other", "meter",
"shadow", "stop", "mode",
"exits"))
and fz_counts.get("refused_exits", 0) >= 1)
print()
if fails:
print(f"{len(fails)} FAILED")
for f in fails:
print(" -", f)
sys.exit(1)
print("all passed")
+562
View File
@@ -0,0 +1,562 @@
"""EV-10, EV-11, EV-12: three rig findings of EV-04's test (F-1, F-2, F-3).
`python3 -B test_ev10.py`
1. EV-10: the car alone takes the batteries to the peak reserve while the period
is still projected UNDER the aim: no alarm, one grey notice. A stuck car
figure with a house overload, and a house-only drain, still alarm. Mutant:
an uncorroborated car figure in the "period without the car" test.
2. EV-11: the grey row and the Car Why do not flicker while the car keeps the
period over the limit; a real end clears them after OVER_OFF_HOLD_S. The
alarm decision (`car_explains`) has no hold.
3. EV-12: the add-on's own write, and Off within 15 s of it, is never "another
writer"; a real outside change afterwards still shows the row.
Mutating a module this file grades? Read MUTATION.md first (purge __pycache__).
"""
import asyncio
import dataclasses
import logging
import os
import sys
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(HERE, "tools"))
from app import ctl_car, homeview, chargers as CH # noqa: E402
from app.main import Controller # noqa: E402
from app import freshness # noqa: E402
from chargersim import FakeHa, SimCharger # noqa: E402
import ev04_peak as P # noqa: E402
import safety81_sim as s81 # noqa: E402
import opt11_identity as rig # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
class _Log(logging.Handler):
def __init__(self):
super().__init__(logging.DEBUG)
self.rec = []
def emit(self, r):
self.rec.append((r.levelname, r.getMessage()))
LOG = _Log()
_lg = logging.getLogger("goodwe")
_lg.addHandler(LOG)
_lg.setLevel(logging.DEBUG)
_lg.propagate = False
# =========================================================================== #
print("1. EV-10: THE CAR ALONE TAKES THE BATTERIES TO THE RESERVE (F-1)")
# =========================================================================== #
CAP = 4500.0 # the aim is 4450 W (50 W margin)
HOUSE = 1100.0
def at_reserve(plant, c):
"""The batteries reach the peak reserve late in the period, and the house
eases a little: the period is still projected UNDER the aim."""
plant.soc = 19.0
plant.load = lambda at: 780.0 + plant.ch.power_w
def alarms(r):
return P.ids(r, *P.ALARMS)
UNDER = [] # (second, projected W, aim W) while floor-limited
def watch(first, fn):
"""Events for seconds 840 to 894: `fn` at `first`, and a note of every
cycle in which the guard is floor-limited."""
def note(plant, c):
g = c.peak_guard
if g is not None and g.floor_limited:
UNDER.append((plant.t, g.projected_w, g.target_w))
ev = {t: note for t in range(first - 10, 895)}
ev[first] = lambda plant, c: (fn(plant, c), note(plant, c))
return ev
LOG.rec.clear()
r10 = P.drive(s81.constant(HOUSE), dur=895, rating=12000.0, soc=60.0,
cap=CAP, phases=1, events=watch(850, at_reserve))
ERR10 = [m for lv, m in LOG.rec if lv in ("ERROR", "WARNING")]
check("PRECONDITION: the guard was floor-limited with the projection UNDER "
"the aim (the rig's 5888 W against 6000 W)",
any(p < a for _t, p, a in UNDER))
check("the car alone: no 'Load too high', no 'Battery stopped limiting the "
"peak'", alarms(r10) == [])
rows10 = {x["id"]: x for x in r10["c"].checks()}
check("...no red row; the grey 'Car over the peak limit' row says it",
rows10["peak_guard"]["ok"] is True
and not [x for x in r10["c"].checks()
if x["ok"] is False and not x["warn"]]
and rows10.get("car_over", {}).get("ok") is True)
check("...one grey notice for the session", len(P.ids(r10, P.OVER)) == 1)
check("...no ERROR (or WARNING) line was logged for it", ERR10 == [])
def house_stuck(plant, c):
at_reserve(plant, c)
plant.ch.freeze() # the reading stops moving
plant.ch.unplug() # the car really goes
plant.load = lambda at: 9000.0 + plant.ch.power_w
asyncio.get_event_loop().create_task(c.handle_action("car_current",
value=10))
r10s = P.drive(s81.constant(HOUSE), dur=895, rating=12000.0, soc=60.0,
cap=CAP, phases=1, events=watch(850, house_stuck))
check("a stuck car figure and a house overload at the reserve: the normal "
"alarm still fires",
[n for _t, n in alarms(r10s)]
and all(n in P.ALARMS for _t, n in alarms(r10s)))
def house_drain(plant, c):
plant.soc = 19.0
plant.load = lambda at: 12000.0 + plant.ch.power_w
r10h = P.drive(s81.constant(HOUSE), dur=895, rating=12000.0, soc=60.0,
cap=CAP, phases=1, user_a=6, setpoint=6,
events=watch(600, house_drain))
check("a house-only drain to the reserve with the car charging little: the "
"normal alarm still fires",
alarms(r10h) != [] and not r10h["c"].car_explains)
def plug_late(plant, c):
plant.ch.plug_in()
def house_reserve(plant, c):
plant.soc = 19.0
plant.load = lambda at: 3075.0 + plant.ch.power_w
def swapped_events():
ev = watch(850, house_reserve)
ev[800] = plug_late
return ev
def swapped(mode):
return P.drive(s81.constant(6000.0), dur=895, rating=12000.0, soc=60.0,
cap=CAP, phases=1, user_a=6, setpoint=6, mode=mode,
plug=False, events=swapped_events())
r10x = swapped("manual")
r10xo = swapped("off")
check("PRECONDITION (review): a 6 kW HOUSE drains the batteries, the car "
"plugs in late (a small share); the projection is under the aim at the "
"reserve, and Off raises the alarm", alarms(r10xo) != []
and any(p < a for _t, p, a in UNDER))
check("the house drains the batteries and a small car is plugged in: the "
"normal alarm still fires in Manual", alarms(r10x) != [])
r10off = P.drive(s81.constant(HOUSE), dur=895, rating=12000.0, soc=60.0,
cap=CAP, phases=1, mode="off", events=watch(850, at_reserve))
check("PRECONDITION: Off, the same case raises the normal alarm (the false "
"alarm Manual must not make)", alarms(r10off) != [])
# a direct unit of the rule: the car's average, the period without it
class _Car(ctl_car.CarMixin):
def __init__(self, cover=True, w=3700.0):
self.o = {"ev_batt_cover": cover}
self.w = w
self._now = 0.0
self.site_batt_w, self.site_rating_w = 300.0, 5000.0
self.car_init({}, type("S", (), {"data": {}, "set": lambda s, k, v: 0})())
def car_now(self):
return self._now
def car_alarm_w(self):
return self.w
class car: # noqa: N801
@staticmethod
def status(*_a):
return "charging"
@dataclasses.dataclass
class _Proj:
projected_w: float
elapsed_s: float = 850.0
held_w: float = 0.0
block_start: object = datetime(2026, 11, 16, 20, 0, tzinfo=timezone.utc)
def __post_init__(self):
self.held_w = self.projected_w
class _G:
def __init__(self, floor=True, sat=False, within_aim=False):
self.floor_limited, self.saturated = floor, sat
self.floor_w, self.able_w, self.ceiling_w = 0.0, None, 4500.0
self.engaged, self.blind, self.wanted_w = True, None, 300.0
self.within_aim = within_aim
def explains(proj_w, car_w, *, floor=True, cover=True, car_so_far_w=None,
within_aim=False, earlier=(), block=0, c=None, at=0.0):
"""One cycle of `car_cycle` on a stub; `earlier` are projections of
cycles before it in the same quarter (they latch SAFETY-126's test)."""
c = c or _Car(cover, car_w)
c.w = car_w
for k, e in enumerate(tuple(earlier) + (proj_w,)):
p = _Proj(e)
p.block_start = p.block_start + timedelta(minutes=15 * block)
c._now = at - len(earlier) + k
c._carq = {"key": p.block_start,
"ws": ((car_w or 0.0) if car_so_far_w is None else car_so_far_w)
* p.elapsed_s, "mono": c._now}
c.car_cycle(p, _G(floor, within_aim=within_aim), 4450.0, None)
return c.car_explains
check("rule: the alarm's test is true with the car (4468 W, the batteries "
"at 0 W land 4485 W) and false without it (768 W): the car explains it, "
"with the projection under the aim", explains(4468.0, 3700.0))
check("rule: under the aim, the quarter's test latched by the car's share "
"(4600 W earlier), the car explains the alarm (the positive under-aim "
"case; a single 4300 W cycle has no landing miss to explain, so it "
"needs the earlier cycle)", explains(4300.0, 3700.0, earlier=(4600.0,)))
check("rule: where the alarm would not fire anyway nothing is explained",
not explains(4300.0, 3700.0, within_aim=True))
check("rule: without the car it is still over the aim: the car does not "
"explain it", not explains(9000.0, 3700.0))
check("rule: no car power, no explanation", not explains(4300.0, 0.0))
check("rule: ...also when the test was latched earlier in the quarter",
not explains(4300.0, 0.0, earlier=(4600.0,))
and not explains(9000.0, 0.0))
check("rule: an untrusted car figure (None) explains nothing",
not explains(4300.0, None, earlier=(4600.0,)))
# the latches: per quarter, and independent of the cover option
c4 = _Car(True, 3700.0)
explains(9000.0, 3700.0, c=c4, block=0) # the house needs it: latched
check("latch: in the same quarter the house need stays latched, so the car "
"does not explain", not explains(4300.0, 3700.0, c=c4, block=0, at=10.0))
check("latch: a new quarter starts clean: the car alone explains it again",
explains(4300.0, 3700.0, c=c4, block=1, at=1000.0,
earlier=(4600.0,)))
c5 = _Car(False, 3700.0) # cover OFF
explains(9000.0, 3700.0, c=c5, block=0) # the house needs it
c5.o["ev_batt_cover"] = True # ... and the option flips
check("latch: the option flipping to ON does not lose a house need seen "
"while it was off", not explains(4300.0, 3700.0, c=c5, block=0, at=10.0))
c6 = _Car(True, 3700.0)
explains(9000.0, 3700.0, c=c6, block=0)
c6.o["ev_batt_cover"] = False
explains(4300.0, 3700.0, c=c6, block=0, at=10.0)
c6.o["ev_batt_cover"] = True
check("latch: ... nor does flipping it off and on again",
not explains(4300.0, 3700.0, c=c6, block=0, at=20.0))
check("rule: the guard is not floor-limited or saturated: nothing to explain",
not explains(4300.0, 3700.0, floor=False))
# =========================================================================== #
print("\n2. EV-11: THE 'CAR OVER THE PEAK LIMIT' ROW DOES NOT FLICKER (F-2)")
# =========================================================================== #
# The cause (rig p7off 21:18 to 21:45, plant.csv): after 21:15 the car's own
# quarter (14.0 kW) was the month peak, so the aim was that quarter's average
# and the grid of the next ones (14.04 kW, +-40 W of noise) sat ON it. The
# projection crossed the aim every few seconds, `ex > 0` came and went, and
# `car_over` followed it with no hold on the way off.
def over_run(c, secs, proj_of, w_of=lambda t: 11000.0, t0=0.0, target=14000.0,
cover=False):
"""Run `car_cycle` once a second; returns (car_over, car_explains) per second."""
out = []
for k in range(secs):
t = t0 + k
c._now = t
c.w = w_of(t)
p = _Proj(proj_of(t), elapsed_s=300.0 + (t % 400))
c._carq = {"key": p.block_start, "ws": 11000.0 * p.elapsed_s,
"mono": t}
c.car_cycle(p, _G(True), target, None)
out.append((c.car_over, c.car_explains))
return out
def noisy(t):
"""The projection straddles the aim: +-40 W, a new value every 7 s."""
return 14000.0 + (40.0 if int(t // 7) % 2 else -40.0) * (1 + (int(t) % 3))
c11 = _Car(cover=False)
o11 = over_run(c11, 1200, noisy)
flips = sum(1 for a, b in zip(o11, o11[1:]) if a[0] != b[0])
check("while the car keeps the period at the limit the row stays on: one "
"switch on in 20 minutes, none off", flips == 1 and len(o11) == 1200 and o11[-1][0] is True)
check("it turns on after the existing 10 s hold, not later than the first "
"10 s the condition has stood (a gap does not restart the count)",
next((i for i, x in enumerate(o11) if x[0]), 10**6) <= 25)
# the condition on its own, for the PRECONDITION: the same input flips
c11o = _Car(cover=False)
raw = []
for k in range(1200):
c11o._now = float(k)
p = _Proj(noisy(k), elapsed_s=300.0 + (k % 400))
c11o._carq = {"key": p.block_start, "ws": 11000.0 * p.elapsed_s, "mono": k}
ex = p.projected_w - 14000.0
raw.append(ex > 0.0 and c11o.car_avg_w(p, 11000.0) >= ex)
raw_flips = sum(1 for a, b in zip(raw, raw[1:]) if a != b)
check("PRECONDITION: the condition itself flips many times in those 20 "
"minutes", raw_flips > 20)
# a real end: the car stops (no trusted power) after 600 s
c11e = _Car(cover=False)
o11e = over_run(c11e, 1000, lambda t: 14500.0,
w_of=lambda t: 11000.0 if t < 600 else None)
off_at = next((i for i, x in enumerate(o11e) if i > 600 and not x[0]), -1)
check("a real end: the row stays for OVER_OFF_HOLD_S (180 s) and then goes",
off_at == 600 + int(ctl_car.OVER_OFF_HOLD_S)
and not any(x[0] for x in o11e[off_at:]))
o11r = over_run(c11e, 100, lambda t: 14500.0, t0=1000.0)
check("it comes back after the usual 10 s if the condition returns after "
"it went", len(o11r) == 100 and o11r[9][0] is False and o11r[10][0] is True)
# the alarm decision has no hold: a real house overload is never delayed
c11a = _Car(cover=True)
o11a = over_run(c11a, 60, lambda t: 4300.0, target=4450.0)
check("decision 1 on: the car explains it at once (no hold)",
len(o11a) == 60 and o11a[0][1] is True)
c11a.w = None # the figure is not trusted
c11a._now = 61.0
c11a.car_cycle(_Proj(4300.0), _G(True), 4450.0, None)
check("...and the moment the car figure is not trusted it explains nothing, "
"so the normal alarms stand at once (the grey row may stay)",
c11a.car_explains is False)
# the whole thing on the real controller: the Why does not flicker either
def p7_like(plant, c):
plant.load = lambda at: 3000.0 + plant.ch.power_w
r11 = P.drive(s81.constant(HOUSE), dur=700, rating=2000.0, soc=60.0, cap=CAP,
phases=3, opts={"ev_batt_cover": False})
ov = [s[2] for s in r11["snaps"]]
check("real controller, cover off, an 11 kW car: the flag is steady once on",
sum(1 for a, b in zip(ov, ov[1:]) if a != b) <= 1 and ov[-1] is True)
# =========================================================================== #
print("\n3. EV-12: OUR OWN WRITE IS NOT ANOTHER WRITER (F-3)")
# =========================================================================== #
CLOCK = [1000.0]
freshness.monotonic = lambda: CLOCK[0]
SET = "number.wallbox_power_connector_max_current_socket_1"
BASE = {"setpoint_entity": "number.sp", "meter_entity": "sensor.grid",
"soc_entity": "sensor.soc", "batt_entity": "sensor.batt",
"meter_source": "off", "max_w": 5000, "gain": 0.6, "slew_w": 500,
"deadband_w": 15, "target_grid_w": 0, "step_w": 10, "heartbeat_s": 10,
"stale_input_s": 15, "shadow_mode": "off", "peak_cap_w": 3500,
"pv_entities": ["sensor.pv"], "ev_charger": "alfen_ha", "ev_max_a": 16,
"ev_phases": "auto", "ev_current_entity": SET}
class _Store:
def __init__(self):
self.data = {}
def set(self, k, v):
self.data[k] = v
def get(self, k, d=None):
return self.data.get(k, d)
def set_time(self, k, v):
self.data[k] = v.isoformat()
def get_time(self, k):
v = self.data.get(k)
return None if v is None else datetime.fromisoformat(v)
class _Pub:
enabled = False
def publish(self, v):
pass
def close(self):
pass
class Site(FakeHa):
def __init__(self, charger):
super().__init__(charger, None)
async def limits(self, _e):
return (-5000.0, 5000.0, 1.0)
def _all(self):
out = super()._all()
for eid, val, unit in (("sensor.grid", 800.0, "W"),
("sensor.soc", 50.0, "%"),
("sensor.batt", 0.0, "W"),
("sensor.pv", 2000.0, "W")):
out[eid] = {"entity_id": eid, "state": str(val),
"attributes": {"unit_of_measurement": unit}}
return out
async def number(self, entity_id, invert=False):
s = self._all().get(entity_id)
try:
v = float(s["state"])
except (TypeError, ValueError, KeyError):
return None
return -v if invert else v
async def set_number(self, entity_id, value):
return await super().set_number(entity_id, float(value))
class World:
"""A real Controller on the charger model. While a write waits for its
read-back, the controller's own reading goes on (as in production, where
the cycle runs while the writer task waits): that is how the read-back of
our own write reaches the tracker BEFORE the write returns."""
def __init__(self, setpoint=10):
self.sim = SimCharger(setpoint_a=setpoint)
self.sim.plug_in()
self.sim.lag_s = 2.0 # the rig's read-back lag
self.sim.phases_allowed = 1
self.t = 1000.0
CLOCK[0] = self.t
self.c = Controller(dict(BASE), Site(self.sim), _Store(), _Pub(),
stop=asyncio.Event())
self.c.auto = True
self.c.dev_min, self.c.dev_max = -5000.0, 5000.0
self.drv = self.c.charger
self.drv._sleep = self.sleep
self.drv._clock = lambda: CLOCK[0]
async def sleep(self, s):
self.sim.tick(s)
self.t += s
CLOCK[0] = self.t
await self.c.read_inputs(now_mono=self.t) # the cycle reads on
async def step(self, n=1):
for _ in range(n):
self.sim.tick(1.0)
self.t += 1.0
CLOCK[0] = self.t
await self.c.read_inputs(now_mono=self.t)
await self.c.cycle()
await self.c.car_settle()
def rows(self):
return {r["id"]: r for r in self.c.checks()}
async def own_then_off(wait):
w = World()
await w.step(3)
await w.c.handle_action("car_mode", value="manual")
await w.c.handle_action("car_current", value=12)
await w.step(wait)
await w.c.handle_action("car_mode", value="off")
await w.step(40)
return w
w12 = asyncio.run(own_then_off(2))
check("PRECONDITION: the add-on wrote 12 A and the charger took it",
w12.sim.readback_a == 12 and len(w12.sim.writes("current")) == 1)
check("our own write, then Off 2 s later: no 'Something else changes the "
"charger'", "charger_writer" not in w12.rows()
and w12.c.car.writer_at_utc is None)
w12b = asyncio.run(own_then_off(14))
check("...and 14 s later (inside the 15 s)", "charger_writer" not in
w12b.rows() and w12b.c.car.writer_at_utc is None)
async def own_then_outside():
w = await own_then_off(2)
w.sim.set_current(7) # somebody else, afterwards
await w.step(3)
early = "charger_writer" in w.rows()
await w.step(30)
return early, "charger_writer" in w.rows()
early12, late12 = asyncio.run(own_then_outside())
check("an outside change after that still shows the row (within 30 s)",
late12 is True)
async def manual_own():
w = World()
await w.step(3)
await w.c.handle_action("car_mode", value="manual")
await w.c.handle_action("car_current", value=12)
await w.step(60)
await w.c.handle_action("car_current", value=8)
await w.step(20)
return w
wm = asyncio.run(manual_own())
check("Manual: two writes of ours, never 'another writer' in the tracker",
wm.c.car.writer_at_utc is None and "charger_other" not in wm.rows())
async def failed_write_then_outside(how):
"""A write that RAISES or returns FAILURE must still close the self-mute:
it ends 15 s after the write returned, and a later outside change shows
the row."""
w = World()
await w.step(3)
await w.c.handle_action("car_mode", value="manual")
ret = []
async def bad(a):
await w.sleep(1.0)
ret.append(w.t) # when the write came back
if how == "raise":
raise RuntimeError("the charger link broke")
return False
w.drv.write_current = bad
await w.c.handle_action("car_current", value=12)
await w.step(3) # the write is tried
closed = (bool(ret) and w.c.car.mute_until <= ret[-1] + 15.0 + 1e-6)
await w.c.handle_action("car_mode", value="off")
await w.step(20) # past the 15 s mute
w.sim.set_current(7) # somebody else
await w.step(3)
return w, closed
for how in ("raise", "fail"):
wf, closed = asyncio.run(failed_write_then_outside(how))
check(f"a write that {'raises' if how == 'raise' else 'returns failure'}"
": the mute ends within 15 s of the write's return, and a later "
"outside change shows the row",
closed and "charger_writer" in wf.rows())
print()
print("FAIL: " + ", ".join(fails) if fails else "PASS: every check passed")
sys.exit(1 if fails else 0)
+176
View File
@@ -0,0 +1,176 @@
"""EV-10b: the period without the car is not clipped at 0 W (rig F-1 again).
`python3 -B test_ev10b.py`
The rig shape: house 3 kW, car 11 kW, batteries 8.1 kW, aim 6 kW. The batteries
give more than the house uses, so the house alone is an export; clipping it at
0 W charged the car's battery share to the house, latched "the house needs the
batteries" for the quarter, and the floor alarm fired once both batteries
reached the reserve. Mutating a module this file grades? Read MUTATION.md first.
"""
import asyncio
import dataclasses
import os
import sys
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(HERE, "tools"))
from app import ctl_car, peakguard, tariff # noqa: E402
import ev04_peak as P # noqa: E402
import safety81_sim as s81 # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
CAP = 6050.0 # aim 6000 W
OPTS = {"inverters": [
{"name": f"inverter-{u}", "setpoint_entity": f"number.sp_{u}",
"soc_entity": f"sensor.soc_{u}", "batt_entity": f"sensor.batt_{u}",
"max_w": 4050, "bms_soc_floor": 10} for u in "ab"]}
def rig_run(house_w, soc_events, dur=895):
"""A whole quarter from its start, N=2 (4.05 kW each = 8.1 kW), the car at
11 kW; `soc_events` is {second: {"a": soc, "b": soc}}."""
def setter(socs):
return lambda plant, c: plant.socs.update(socs)
return P.drive(s81.constant(house_w), dur=dur, rating=4050.0,
soc={"a": 60.0, "b": 60.0}, cap=CAP, phases=3, n=2,
plant_cls=P.CarPlantN, opts=OPTS, dev_w=4050.0,
events={t: setter(s) for t, s in soc_events.items()})
def summary(r):
rows = r["c"].checks()
red = [x["id"] for x in rows if x["ok"] is False and not x["warn"]]
return (P.ids(r, *P.ALARMS), red, P.ids(r, P.OVER),
max(abs(r["plant"].batt(t)) for t in range(0, 30)) if r else 0)
print("1. THE RIG SHAPE, A WHOLE QUARTER (house 3 kW, car 11 kW, batteries 8.1 kW)")
r = rig_run(3000.0, {30: {"a": 19.0, "b": 19.0}})
al, red, over, _ = summary(r)
peak_batt = max(r["plant"].batt(t) for t in range(5, 30))
check("PRECONDITION: the batteries gave more than the house uses (8.1 kW "
"against 3 kW) before the reserve", peak_batt > 7500.0)
check("both batteries reach the reserve early in the quarter: no 'Battery "
"stopped limiting the peak', no 'Load too high'", al == [])
check("...no red row, and no goodwe_peak_soc_floor", red == [])
check("...one car-over notice", len(over) == 1)
check("...the car-over row is on at the end", any(
x["id"] == "car_over" and x["ok"] is True for x in r["c"].checks()))
r2 = rig_run(3000.0, {30: {"a": 19.0}, 200: {"b": 19.0}})
al2, red2, over2, _ = summary(r2)
check("N=2, one battery reaches the reserve first, the other later: no "
"alarm, no red row, one car-over notice",
al2 == [] and red2 == [] and len(over2) == 1)
print("\n2. BATTERIES ABOVE THE HOUSE AND THE HOUSE ALONE OVER THE AIM")
r3 = rig_run(7000.0, {30: {"a": 19.0, "b": 19.0}})
check("house 7 kW, car 11 kW, aim 6 kW, batteries to the reserve: the alarm "
"fires (the house alone misses the aim)", summary(r3)[0] != []
and not r3["c"].car_explains)
print("\n3. THE COUNTERFACTUAL ITSELF")
BS = datetime(2026, 11, 16, 20, 0, tzinfo=timezone.utc)
class _Car(ctl_car.CarMixin):
def __init__(self, cover=True):
self.o = {"ev_batt_cover": cover}
self._carq = {"key": BS, "ws": 0.0, "mono": 0.0}
def proj(grid, elapsed, held=None):
return tariff.Projection(
projected_w=grid, elapsed_w=grid, elapsed_s=elapsed,
covered_frac=1.0, complete=False, block_start=BS,
held_w=grid if held is None else held)
def lands(p, batt, aim=5950.0):
return peakguard.misses_aim(p, batt_w=batt, target_w=aim)
c = _Car()
for el in (10.0, 30.0, 120.0, 300.0, 600.0):
c._carq["ws"] = 11040.0 * el
p = proj(3000 + 11040 - 8100, el)
x = c.car_exclude_alarm(p, 11040.0)
check(f"rig numbers at {el:.0f} s: the house alone does not miss the aim "
"(no 0 W clip)", not lands(x, 8100.0))
check(f"...and the guard-side `car_exclude` is unchanged (still clipped)",
c.car_exclude(p, 11040.0).held_w == 0.0)
c._carq["ws"] = 11040.0 * 30
x = c.car_exclude_alarm(proj(5940.0, 30.0), 11040.0)
check("the rest of the period keeps its sign: held = grid - car = -5100 W",
abs(x.held_w - (5940.0 - 11040.0)) < 1e-6)
check("a fresh car reading is needed: None gives the period back as it is",
c.car_exclude_alarm(proj(5940.0, 30.0), None).held_w == 5940.0)
# the house alone over the aim still misses
c._carq["ws"] = 11040.0 * 30
check("house 7 kW alone (batteries 8.1 kW, car 11 kW): the house misses the aim",
lands(c.car_exclude_alarm(proj(7000 + 11040 - 8100, 30.0), 11040.0),
8100.0))
# review: the done part is clipped at 0 Ws. Rig shape for 400 s (grid 5940 W),
# then the batteries at the reserve and the house at 12 kW: the house alone
# lands 6667 W. Crediting the car-made export (-5100 W x 400 s) would hide it.
c._carq["ws"] = 11040.0 * 400
held = 12000.0 + 11040.0
check("the car's battery share earlier is not credited against a later house "
"overload (done part clipped at 0 Ws)",
lands(c.car_exclude_alarm(
proj((5940.0 * 400 + held * 500) / 900, 400.0, held), 11040.0), 0.0))
# review: the rest of the period takes off the car's power NOW, not its
# quarter average. Car 11 kW for 500 s, then 1.4 kW; house 7 kW, no batteries.
c._carq["ws"] = 11040.0 * 500 + 1380.0 * 100
held = 7000.0 + 1380.0
check("a car turned down mid-quarter: the rest takes off its power now, so "
"the house alone (7 kW) still misses the aim",
lands(c.car_exclude_alarm(
proj(((7000 + 11040) * 500 + held * 100 + held * 300) / 900, 600.0,
held), 1380.0), 0.0))
# with the batteries giving less than the house the two agree where the old
# clip did not bite
p = proj(3000 + 3700 - 300, 300.0)
c._carq["ws"] = 3700.0 * 300.0
old, new = c.car_exclude(p, 3700.0), c.car_exclude_alarm(p, 3700.0)
check("batteries under the house: the same landing as before (no clip bit)",
abs(old.projected_w - new.projected_w) < 1e-6
and abs(old.held_w - new.held_w) < 1e-6)
# cover OFF: the projection the guard sees is `car_exclude`, bit for bit what
# b86c015 built (a frozen copy of its formula), over a grid of periods
def frozen(c, p, w):
avg = c.car_avg_w(p, w)
return (max(0.0, float(p.projected_w) - avg),
max(0.0, float(p.held_w) - float(w)))
same = True
for grid in (-3000.0, 0.0, 800.0, 5900.0, 14000.0):
for held in (-4000.0, 0.0, 6000.0, 15000.0):
for el in (0.0, 30.0, 450.0, 899.0):
for w in (1380.0, 3700.0, 11040.0):
c._carq["ws"] = w * el * 0.9
p = proj(grid, el, held)
x = c.car_exclude(p, w)
same = same and (x.projected_w, x.held_w) == frozen(c, p, w)
check("cover off: the projection the guard sees (`car_exclude`) is bit for "
"bit the old formula over 240 periods", same)
check("...and `car_exclude` still hands back the period when the car figure "
"is None", c.car_exclude(proj(5000.0, 30.0), None).projected_w == 5000.0)
print()
print("FAIL: " + ", ".join(fails) if fails else "PASS: every check passed")
sys.exit(1 if fails else 0)
+344
View File
@@ -0,0 +1,344 @@
"""EV-15: the add-on's own phase change at the peak reserve raises no alarm.
`python3 -B test_ev15.py`
The rig (EV-10 and EV-10b, F-2): cover on, the batteries at the reserve, the car
charging and explaining the excess. The add-on's own 3 -> 1 phase switch sets
the car to 0 A; with the car not charging its figure is no longer corroborated
(`CarTracker.corroborated`), so `car_alarm_w()` is None, nothing is explained,
and PEAK_GUARD_FLOOR_LIMITED plus `goodwe_peak_soc_floor` fire. The rule: for
the add-on's own sequence only (`ctl_car._car_own_pause`, bounded) the car's
fresh, not stuck figure stands in for grading.
1. The rig shapes end to end through the car cycle: 3 -> 1 and 1 -> 3.
2. A house overload that starts during the sequence still alarms, as on Off.
3. Aborted (Off, Stop, unplug), refused, an outside writer: no grace.
4. The bounds, and the figure that stands in (stale, stuck: nothing).
Mutating a module this file grades? Read MUTATION.md first (purge __pycache__).
"""
import asyncio
import logging
import os
import sys
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, os.path.join(HERE, "tools"))
from app import ctl_car, carmode, chargers as CH # noqa: E402
import ev04_peak as P # noqa: E402
import safety81_sim as s81 # noqa: E402
logging.disable(logging.CRITICAL)
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
def at(t, fn):
return {"t": t, "fn": fn}
def beside(plant, c):
"""The writer runs BESIDE the cycle, as in production (`car_kick`): its 1 s
poll for the read-back lands after the cycle's own read, and the cycle does
not wait for the writer (`ev04_peak.drive` does)."""
gate = asyncio.Event()
async def sleep(_s):
gate.clear()
await gate.wait()
async def settle():
gate.set()
for _ in range(5):
await asyncio.sleep(0)
c.charger._sleep = sleep
c.car_settle = settle
def run(house, cap, t_res, t_sw, new, *, extra=None, mode="manual",
sim_fn=None, dur=895, plug=True, side=False):
"""Reserve at `t_res`, our phase change to `new` at `t_sw`. Returns the
run, a per-second trace (second, own-pause, explains, red rows) and the
alarms."""
tr = []
def note(plant, c):
red = [x["id"] for x in c.checks()
if x["ok"] is False and not x["warn"]] \
if t_sw - 5 <= plant.t <= t_sw + 90 else []
g = c.peak_guard
lim = bool(g is not None and (g.floor_limited or g.saturated))
tr.append((plant.t, getattr(c, "_car_own_pause", lambda _t: False)(c.car_now()), c.car_explains,
red, plant.ch.power_w, plant.ch.state, lim))
def reserve(plant, c):
plant.soc = 19.0
plant.load = lambda t: house + plant.ch.power_w
def switch(plant, c):
asyncio.get_event_loop().create_task(
c.handle_action("car_phases", value=new))
ev = {t: note for t in range(0, dur)}
ev[t_res] = lambda p, c: (reserve(p, c), note(p, c))
ev[t_sw] = lambda p, c: (switch(p, c), note(p, c))
if side:
ev[t_sw - 2] = lambda p, c: (beside(p, c), note(p, c))
for t, fn in (extra or {}).items():
prev = ev.get(t, note)
ev[t] = (lambda p, c, prev=prev, fn=fn: (fn(p, c), prev(p, c)))
sim = None
if sim_fn is not None or side:
from chargersim import SimCharger
sim = SimCharger(setpoint_a=16)
sim_fn = sim_fn or (lambda s: None)
sim_fn(sim)
r = P.drive(s81.constant(house), dur=dur, rating=12000.0, soc=60.0,
cap=cap, phases=(3 if new == 1 else 1), user_a=16, setpoint=16,
mode=mode, events=ev, sim=sim, plug=plug)
return r, tr, P.ids(r, *P.ALARMS)
def reds(tr):
return [x for x in tr if x[3]]
# =========================================================================== #
print("1. THE RIG SHAPES THROUGH THE CAR CYCLE")
# =========================================================================== #
SHAPES = (
("EV-10 shape: house 3 kW, car 11 kW, aim 6 kW, 3 -> 1",
3000.0, 6050.0, 300, 600, 1),
("EV-10b shape: a 9411 W limit, 3 -> 1", 2000.0, 9461.0, 300, 600, 1),
("1 -> 3 (the car 3.7 kW, then 11 kW), aim 5 kW", 2500.0, 5050.0,
100, 600, 3),
)
for name, house, cap, t_res, t_sw, new in SHAPES:
r, tr, al = run(house, cap, t_res, t_sw, new)
c, sim = r["c"], r["sim"]
sw = [x for x in sim.writes() if x[1] == "phases"]
check(f"{name}: the car at the reserve covers, and the add-on's own "
f"sequence ran (0 A, select, the current back)",
len(sw) == 1 and [x[2] for x in sim.writes("current")][-2:]
== [0.0, 16.0] and sim.phases_allowed == new)
pause = [x for x in tr if x[1]]
check(f"{name}: the own-pause grace was on during it, and ended",
len(pause) >= 10 and not any(x[1] for x in tr[-1:])
and (pause[-1][0] - pause[0][0])
<= getattr(ctl_car, "OWN_PAUSE_MAX_S", 0)
+ getattr(ctl_car, "OWN_PAUSE_TAIL_S", 0))
check(f"{name}: no PEAK_GUARD_FLOOR_LIMITED / saturated, no "
f"goodwe_peak_soc_floor notification", al == [])
check(f"{name}: no red row in any sample around the switch",
reds(tr) == [])
limited = [x for x in tr if x[1] and x[6]]
check(f"{name}: in every cycle of the sequence in which the guard is "
f"limited (the cycle of the rig's alarm among them) the car "
f"explains it", len(limited) >= 1 and all(x[2] for x in limited)
and any(x[2] for x in tr if x[0] == t_sw + 1))
check(f"{name}: and in every limited cycle after it, to the quarter's end",
all(x[2] for x in tr if x[0] >= t_sw and x[6]))
# =========================================================================== #
print("\n2. A HOUSE OVERLOAD DURING THE SEQUENCE STILL ALARMS")
# =========================================================================== #
def overload(plant, c):
plant.load = lambda t: 25000.0 + plant.ch.power_w
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, extra={606: overload})
ro, tro, alo = run(3000.0, 6050.0, 300, 600, 1, extra={606: overload},
mode="off", plug=False)
rn, trn, aln = run(3000.0, 6050.0, 300, 900, 1, extra={606: overload})
check("PRECONDITION: on Off (no car) the same load alarms, and in Manual "
"with no phase change", alo != [] and aln != [])
check("a 25 kW house overload that starts 6 s into the sequence (the car "
"paused): the alarm fires", al != [])
print(f" alarm seconds: in the sequence {[t for t, _ in al]}, Off without "
f"the car {[t for t, _ in alo]}, Manual with no phase change "
f"{[t for t, _ in aln]}")
check("...at the same second as on Off and as in Manual with no phase change",
bool(al) and bool(alo) and bool(aln)
and al[0][0] == alo[0][0] == aln[0][0])
check("...and the car does not explain it (during the sequence too)",
not any(x[2] for x in tr if 640 <= x[0] <= 660))
# =========================================================================== #
print("\n3. ABORTED, REFUSED, OUTSIDE: NO GRACE AFTER IT")
# =========================================================================== #
def hit(res, t0, secs):
return [x for x in res if t0 <= x[0] <= t0 + secs and x[1]]
def off_now(plant, c):
asyncio.get_event_loop().create_task(c.handle_action("car_mode",
value="off"))
def stop_now(plant, c):
c.auto = False
def unplug(plant, c):
plant.ch.unplug()
slow = lambda s: setattr(s, "stop_delay_s", 8.0) # noqa: E731
for what, fn in (("Off", off_now), ("Stop", stop_now), ("unplug", unplug)):
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, extra={602: fn},
sim_fn=slow)
check(f"{what} 2 s into the sequence: the grace is off from the next "
f"cycle on", not hit(tr, 604, 200)
and any(x[1] for x in tr if 600 <= x[0] <= 602))
def refuse_phases(sim):
sim.request_phases = lambda n: False
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, sim_fn=refuse_phases)
check("the select is refused: the grace ends at once (no cycle of it after "
"the refusal), the current comes back",
len([x for x in r["sim"].writes("current")]) >= 2
and not hit(tr, 606, 200))
def outside_zero(plant, c):
plant.ch.set_current(0.0)
r2, tr2, al2 = run(3000.0, 6050.0, 300, 900, 1, extra={602: outside_zero})
check("an outside writer's 0 A: no grace, and the normal grading (no car "
"power: nothing explained) raises the alarm as before",
not any(x[1] for x in tr2) and not any(x[2] for x in tr2
if 610 <= x[0] <= 700)
and al2 != [])
# =========================================================================== #
print("\n4. THE BOUNDS AND THE FIGURE THAT STANDS IN")
# =========================================================================== #
class _C(ctl_car.CarMixin):
"""The mixin with just what `_car_own_pause` reads."""
def __init__(self):
self.o = {}
self.car_init({}, type("S", (), {"data": {}, "set": lambda s, k, v: 0})())
self.car_mode = carmode.MANUAL
self.auto, self.shadow = True, False
self.inverters, self.site_sign_wd = [], type("W", (), {"tripped": False})()
self.circ_wd = type("W", (), {"tripped": False})()
self.charger = type("H", (), {"configured": lambda s: True})()
self.car = CH.CarTracker()
self.car.reading = CH.ChargerReading(available=True, state="B")
c = _C()
c.car_writer.seq = {"stage": "settle", "t0": 100.0, "n": 1, "tries": 0,
"prev": 16.0}
M = ctl_car.OWN_PAUSE_MAX_S
check("bound: the sequence's own maximum is its waits (0 A wait, settle, "
"three tries at 15 s, the select) and no more",
M == carmode.ZERO_WAIT_S + carmode.SETTLE_S + carmode.MAX_TRIES * 15.0
+ 10.0 and ctl_car.OWN_PAUSE_TAIL_S == CH.CORR_WINDOW_S)
check("bound: on at the 0 A write and up to the maximum",
c._car_own_pause(100.0) and c._car_own_pause(100.0 + M))
check("bound: off one second past it", not c._car_own_pause(101.0 + M))
c.car_writer.seq = None
c.car_writer.phase_done_at = 200.0
T = ctl_car.OWN_PAUSE_TAIL_S
check("bound: after the current is set again it lasts one corroboration "
"window", c._car_own_pause(200.0 + T) and not c._car_own_pause(201.0 + T))
c.car_writer.phase_done_at = None
check("no sequence and none just done: no grace", not c._car_own_pause(100.0))
c.car_writer.seq = {"stage": "settle", "t0": 100.0, "failed": True}
check("a refused write marks the sequence: no grace", not c._car_own_pause(110.0))
c.car_writer.seq = {"stage": "settle", "t0": 100.0}
c.car_mode = carmode.OFF
check("Off: no grace", not c._car_own_pause(110.0))
c.car_mode, c.shadow = carmode.MANUAL, True
check("shadow mode: no grace", not c._car_own_pause(110.0))
c.shadow, c.auto = False, False
check("control stopped: no grace", not c._car_own_pause(110.0))
c.auto = True
c.car_writer.hold = True
check("another writer (hold): no grace", not c._car_own_pause(110.0))
c.car_writer.hold = False
c.car_writer.seq, c.car_writer.zero_sent_at = None, 100.0
check("0 A sent, not yet back: grace from the send, to the maximum, no more",
c._car_own_pause(100.0) and c._car_own_pause(100.0 + M)
and not c._car_own_pause(101.0 + M))
c.car_writer.zero_sent_at = None
c.car_writer.phase_done_at = 200.0
c.car_writer.hold = True
check("another writer in the 60 s after the current is set: no grace",
not c._car_own_pause(210.0))
c.car_writer.hold, c.car_writer.phase_done_at = False, None
c.car_writer.seq = {"stage": "settle", "t0": 100.0}
c.car.reading = CH.ChargerReading(available=True, state="A")
check("unplugged: no grace", not c._car_own_pause(110.0))
c.car.reading = CH.ChargerReading(available=True, state="B")
check("PRECONDITION: the same state is on", c._car_own_pause(110.0))
tk = CH.CarTracker()
tk.reading = CH.ChargerReading(available=True, state="B", power_w=500.0,
allowed_a=16.0, phases_allowed=1)
tk.last_ok = 0.0
check("the stand-in figure is the fresh reading, capped by the read-back",
tk.car_w_paused(5.0) == 500.0 and tk.car_w_trusted(5.0) is None)
check("a stale reading stands in for nothing", tk.car_w_paused(100.0) is None)
tk.stuck_now = True
check("a stuck reading stands in for nothing", tk.car_w_paused(5.0) is None)
# =========================================================================== #
print("\n5. THE WRITER RUNS BESIDE THE CYCLE (review F-1)")
# =========================================================================== #
# The car stops (state B) in the same Home Assistant update as the 0 A
# read-back; the write has not returned yet, so no sequence exists. The window
# opens when the write is SENT (`ManualWriter.zero_sent_at`).
def lagged(lag, delay):
def f(s):
s.lag_s, s.stop_delay_s = lag, delay
return f
for lag, delay in ((2, 0), (0, 0), (2, 3), (5, 2)):
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, side=True,
sim_fn=lagged(lag, delay))
nm = f"beside the cycle, lag {lag} s, stop delay {delay} s"
limited = [x for x in tr if x[0] >= 600 and x[6]]
check(f"{nm}: our sequence ran (select once, then 16 A again)",
len([x for x in r["sim"].writes("phases")]) == 1
and r["sim"].phases_allowed == 1
and [x[2] for x in r["sim"].writes("current")][-2:] == [0.0, 16.0])
check(f"{nm}: no PEAK_GUARD_FLOOR_LIMITED, no goodwe_peak_soc_floor",
al == [])
check(f"{nm}: no red row, and the car explains every limited cycle",
reds(tr) == [] and all(x[2] for x in limited))
def not_taken(plant, c):
plant.ch.refuse = "ignore" # HA accepts, the charger does nothing
r, tr, al = run(3000.0, 6050.0, 300, 600, 1, side=True,
sim_fn=lagged(0, 0), extra={600: not_taken})
check("the 0 A write is not taken (read-back never follows): the window was "
"open while it waited", any(x[1] for x in tr if 600 <= x[0] <= 606))
own = [x[0] for x in tr if x[1]]
runs = 1 + len([1 for a, b in zip(own, own[1:]) if b - a > 1])
check("...and no grace after the refusal (the retry, RETRY_S later, opens it "
"again only while that write waits: at most 3 runs of 11 s), no "
"sequence made", not hit(tr, 613, 40) and r["c"].car_writer.seq is None
and 1 <= runs <= 3 and len(own) <= 3 * 11)
check("...the car went on charging and nothing was written but the 0 A",
r["sim"].power_w > 5000.0 and not r["sim"].writes("phases"))
print()
if fails:
print(f"FAIL: {len(fails)} check(s)")
for f in fails:
print(" -", f)
sys.exit(1)
print("ok: EV-15")
+5 -335
View File
@@ -22,7 +22,11 @@ record.
8. Options: validation of the trust and the entities. 8. Options: validation of the trust and the entities.
Mutations (MUTATION.md, purged copies) are listed in the pull request. Mutations (MUTATION.md, purged copies) are listed in the pull request.
"""
This file is parts 1-5 and 8. Part 6 (the real controller over a night and a day,
the slow one) and part 7 are in test_modes_p4b.py, test_modes_p4c.py and
test_modes_p4d.py, one group of scenarios each, so CI can run them side by side
(CI-18). Every check is in exactly one of the four files."""
import asyncio import asyncio
import logging import logging
@@ -549,340 +553,6 @@ e = modetrade.energy([pk(B, packmode.LEFTOVER_SOLAR, 30.0)], 20.0, 95.0,
check("the cheap run is sized by the shortfall (1.5 kWh), not the room to " check("the cheap run is sized by the shortfall (1.5 kWh), not the room to "
"95 % (6.5 kWh)", abs(e[0] - 1.5) < 1e-9) "95 % (6.5 kWh)", abs(e[0] - 1.5) < 1e-9)
# ============================================================================ #
print("6. the real controller over a night and a day")
AIM = rp.PEAK_CAP - 50
FC_KWH = [None] # today's forecast in the fake sensor (None: down)
async def _sensor(self, e):
now = rp_start[0] + timedelta(seconds=self.t)
kwh = FC_KWH[0](now) if callable(FC_KWH[0]) else FC_KWH[0]
if kwh is None:
return {"state": "unavailable", "attributes": {},
"last_updated": now.isoformat()}
if e.endswith("tomorrow"):
return None
loc = now.astimezone(L)
d0 = loc.replace(hour=0, minute=0, second=0, microsecond=0)
wh = {(d0 + timedelta(hours=h)).astimezone(timezone.utc).isoformat():
(kwh * 100.0 if 8 <= h < 18 else 0.0) for h in range(24)}
left = sum(v for k, v in wh.items()
if datetime.fromisoformat(k) >= now) / 1000.0
return {"state": f"{left:.3f}",
"attributes": {"unit_of_measurement": "kWh", "wh_period": wh},
"last_updated": now.isoformat(), "last_reported": now.isoformat()}
rp.Hass.state = _sensor
rp_start = [UTC0]
FC_OPTS = {"pv_forecast_entity": "sensor.energy_production_today_remaining",
"cycle_cost_threshold_eur": 0.20}
# TARIFF-24 round 2: with a forecast read, a price mode needs the cycle cost
# itself (0.20 here), no longer 1.5 times it (0.30). These scenarios were
# written for a 0.30 gap, and a midday 0.21 gap now plans a grid top-up they
# are not about, so they ask for 0.30 with the forecast; the no-forecast leg
# (`rows_nf`) keeps 0.20, which is 0.30 widened: the same gate on both sides.
GATE_030 = {"cycle_cost_threshold_eur": 0.30}
def seed_profile(c):
if c.house_profile is not None:
c.house_profile = profile(day_w=600.0, evening=3000.0)
def house_flat(w):
return [(UTC0.timestamp() - 10, float(w))]
def run_day(choice, *, fc, soc0, hours=21.0, start_h=0.75, house_w=800.0,
refuse=(), extra=None, patch=seed_profile):
FC_KWH[0] = fc
start = UTC0 + timedelta(hours=start_h)
rp_start[0] = start
rows = []
def cb(c, h, now, pr):
sh = dict(c.allocation.shares) if c.allocation is not None and \
c.allocation.shares else {}
rows.append(dict(
now=now, grid=h.grid(), shares=sh,
action=getattr(c.arb, "action", None),
roles=dict(c.mode_tick.roles) if c.mode_tick else {},
soc={u: p.soc for u, p in h.plants.items()},
targets=c.plan_targets(), plan=c.day_plan, runs=c.mode_runs))
st_, c = rp.run("p3_ls", house_flat(house_w), WPTS, start, 3600 * hours,
check=cb, soc0=soc0, choice=choice, refuse=refuse,
extra=dict(FC_OPTS, **(extra or {})), patch=patch)
return rows, st_, c
SF_LS = {"a": (True, "solar_first", False), "b": (True, "leftover_solar",
False)}
SF_CH = {"a": (True, "solar_first", False), "b": (True, "cheap_hours",
False)}
def invariants(tag, rows, c):
charge = [r for r in rows if r["action"] == arbitrage.CHARGE]
mixed = [r for r in rows if any(v > 0 for v in r["shares"].values())
and any(v < 0 for v in r["shares"].values())]
check(f"{tag}: no opposite-direction split on any cycle", not mixed)
check(f"{tag}: Solar first never charges from the grid (A's share >= 0 "
"while the site charges)",
all(r["shares"].get(A, 0) >= 0 for r in charge))
q = {int(r["now"].timestamp() // 900) for r in charge}
banked = [b.offtake_avg_w for b in c.p1.blocks
if int(b.start.timestamp() // 900) in q]
check(f"{tag}: every banked quarter with a grid charge <= cap - margin "
f"(max {max(banked, default=0):.1f} W, aim {AIM})",
not banked or max(banked) <= AIM + 0.5)
return charge
# Sunny: 40 kWh forecast. B (Leftover solar) at 30 % needs nothing.
rows, st_, c = run_day(SF_LS, fc=40.0, soc0={"a": 60.0, "b": 30.0},
extra=GATE_030)
charge = invariants("sunny", rows, c)
_last = nth(rows, -1, "a cycle")
print(f" sunny: verdict {present(_last) and _last['plan'] and _last['plan'].verdict}, "
f"{len(charge)} charge cycles")
check("sunny: a day plan is made, and says sunny",
any(r["plan"] is not None and r["plan"].verdict == dayplan.SUNNY
for r in rows))
check("sunny: no grid charge at all", not charge)
# TARIFF-24 round 2: the same day at the cycle cost 0.20 itself. With the
# forecast read the gap needed is 0.20 (not 1.5 x = 0.30), so the midday
# quarter 0.339 against the evening 0.551 (gap 0.21, between 1x and 1.5x) is
# a planned top-up for B (Leftover solar) up to its planned level.
rows_g, st_, c_g = run_day(SF_LS, fc=40.0, soc0={"a": 60.0, "b": 30.0})
charge_g = invariants("gap between 1x and 1.5x", rows_g, c_g)
_first_g = nth(charge_g, 0, "a charge cycle")
_gaps = [min(g.mean_eur_kwh for g in r["runs"].give)
- r["runs"].cheap.mean_eur_kwh for r in charge_g
if r["runs"] is not None and r["runs"].give]
print(f" gap 0.20 <= gap < 0.30: {len(charge_g)} charge cycles, run gap "
f"{min(_gaps, default=0):.3f}, B to "
f"{max((r['soc']['b'] for r in rows_g), default=0):.1f} %")
check("a forecast day whose price gap lies between 1x and 1.5x the cycle "
"cost (0.20 < 0.21 < 0.30) plans a cheap run: B charges from the grid "
"inside it, only B, and only up to its planned level",
present(_first_g) and len(_gaps) == len(charge_g)
and all(0.20 <= g < 0.30 for g in _gaps)
and all(r["runs"].cheap.holds(r["now"]) for r in charge_g)
and all(r["roles"][B] == modetrade.CHARGE for r in charge_g)
and all(r["roles"][A] != modetrade.CHARGE for r in charge_g)
and max(r["soc"]["b"] for r in rows_g) <= 45.64 + 2.0)
check("...and the same day with no forecast read does not (it needs 0.30): "
"the old gate, kept for a day without a forecast",
not [r for r in run_day(SF_LS, fc=None,
soc0={"a": 60.0, "b": 30.0})[0]
if r["action"] == arbitrage.CHARGE
and r["now"].astimezone(L).hour == 12])
# Dark: 1 kWh. B buys the evening's shortfall only, in the cheap run.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0})
charge = invariants("dark", rows, c)
tgt = nth([r["targets"][B] for r in rows if r["targets"]], 0, "a level")
top = max(r["soc"]["b"] for r in rows)
print(f" dark: B level {tgt:.1f} %, B reached {top:.1f} %, "
f"{len(charge)} charge cycles")
check("dark: Leftover solar charges from the grid in the cheap run",
charge and all(r["runs"].cheap.holds(r["now"]) for r in charge)
and all(r["roles"][B] == modetrade.CHARGE for r in charge))
check("dark: ...only up to its level (the shortfall), not 95 %",
present(tgt) and tgt < 60.0 and top <= tgt + 2.0)
check("dark: A rests while B charges", all(r["roles"][A] == modetrade.REST
for r in charge))
# Cheap hours on a partly sunny day: ignores the plan, fills as in P3.
rows, st_, c = run_day(SF_CH, fc=14.0, soc0={"a": 60.0, "b": 30.0},
extra=GATE_030)
charge = invariants("cheap hours, partly", rows, c)
top = max(r["soc"]["b"] for r in rows)
print(f" cheap hours partly: B reached {top:.1f} %")
check("Cheap hours gets no planned level",
not any(r["targets"] and B in r["targets"] for r in rows))
rows_nf, _s, c_nf = run_day(SF_CH, fc=None, soc0={"a": 60.0, "b": 30.0})
check("Cheap hours with a sun forecast charges as with none (P3)",
charge and abs(max(r["soc"]["b"] for r in rows_nf) - top) < 1.0
and top > 80.0)
# The forecast goes away mid-run: a charge under way goes on to its level
# (OPT-34; it stopped at once, P3 option A, before). With no charge under way
# the levels go with the forecast (below, and test_opt27.py).
# OPT-27: a sensor that is unavailable is covered by its last fresh reading
# for up to 3 h (`solarfc.Hold`), so "lost" here is a hold that never covers;
# the next scenario is the same loss with the hold (test_opt27.py).
DROP = UTC0 + timedelta(hours=1, minutes=30)
class _NoHold(solarfc.Hold):
def stand_in(self, *a, **k):
return None
def seed_profile_no_hold(c):
seed_profile(c)
c.fc_hold = _NoHold()
rows, st_, c = run_day(SF_LS, fc=lambda now: 1.0 if now < DROP else None,
soc0={"a": 60.0, "b": 10.0}, patch=seed_profile_no_hold)
invariants("forecast lost mid-run", rows, c)
before = [r for r in rows if r["now"] < DROP and r["action"]
== arbitrage.CHARGE]
late = [r for r in rows if r["now"] > DROP + timedelta(
seconds=2 * 60 + 10) and r["action"] == arbitrage.CHARGE]
check("forecast lost mid-run (OPT-34): Leftover solar was charging, and goes "
"on charging past a forecast read (60 s) and a cycle, to its level",
before and late)
rows, st_, c = run_day(SF_LS, fc=lambda now: 1.0 if now < DROP else None,
soc0={"a": 60.0, "b": 10.0})
invariants("forecast unavailable mid-run, covered", rows, c)
check("forecast unavailable mid-run (OPT-27): the last reading covers it, so "
"Leftover solar goes on charging past the point where it was lost",
[r for r in rows if r["now"] < DROP and r["action"]
== arbitrage.CHARGE]
and [r for r in rows if r["now"] > DROP + timedelta(
seconds=2 * 60 + 10) and r["action"] == arbitrage.CHARGE])
# The forecast is far too high (40 kWh, and there is no sun at all): no grid
# charge, so B covers less of the evening - a money risk, never a safety one.
rows, st_, c = run_day(SF_LS, fc=40.0, soc0={"a": 30.0, "b": 30.0},
extra=GATE_030)
invariants("forecast too high", rows, c)
check("forecast too high: no grid charge, and B still keeps its power for "
"the dear run", not [r for r in rows if r["action"]
== arbitrage.CHARGE]
and all(r["roles"].get(B) != modetrade.GIVE for r in rows
if r["now"].astimezone(L).hour not in (19,)))
# A refusal wins over the plan.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
refuse=("b",), extra=GATE_030)
invariants("refusal", rows, c)
check("refusal: B refuses to charge, so the plan's charge ends and B is "
"never a charger after it", rows and not [
r for r in rows[len(rows) // 3:]
if r["roles"].get(B) == modetrade.CHARGE])
# Off wins over the plan.
rows, st_, c = run_day({"a": (True, "solar_first", False),
"b": (False, "leftover_solar", False)},
fc=1.0, soc0={"a": 60.0, "b": 30.0})
check("Off: an Off battery never charges from the grid, whatever the plan",
not [r for r in rows if r["action"] == arbitrage.CHARGE]
and all(abs(r["shares"].get(B, 0)) < 1e-6 for r in rows))
# No house profile yet (first day): no plan, P3 option A.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
patch=None)
check("no house profile yet: no plan, and Leftover solar takes solar only",
all(r["plan"] is None for r in rows)
and not [r for r in rows if r["action"] == arbitrage.CHARGE])
check("...while the profile learns and the store keeps each closed hour",
c.house_profile is not None and len(
c.store.data.get("house_profile") or {}) >= 1)
check("selling stays off (option A)", packmode.SELLING_ENABLED is False)
# A forecast arriving mid-period makes the plan at once, not at the next
# 15-minute period.
COME = datetime(2026, 9, 21, 1, 3, tzinfo=L).astimezone(timezone.utc)
rows, st_, c = run_day(SF_LS, fc=lambda now: None if now < COME else 1.0,
soc0={"a": 60.0, "b": 30.0}, hours=0.5)
first = next((r["now"] for r in rows if r["targets"]), None)
check("a forecast that arrives at 01:03 makes the plan before 01:15",
first is not None and first < COME + timedelta(minutes=3))
# Battery modes off: the forecast is never read.
READS = [0]
_real_sensor = rp.Hass.state
async def _counted(self, e):
READS[0] += 1
return await _real_sensor(self, e)
rp.Hass.state = _counted
FC_KWH[0] = 1.0
rp.run("modes_off", house_flat(800.0), WPTS, UTC0 + timedelta(hours=1),
600.0, extra=dict(FC_OPTS))
rp.Hass.state = _real_sensor
check("battery modes off: the forecast sensor is never read", READS[0] == 0)
# ============================================================================ #
print("7. the Batteries screen and the Simple view")
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
hours=0.6)
main_files.live.datetime = datetime
sb = homeview.solar_block(c, c.solar_fc.at)
check("the forecast line names the forecast, what is counted and when",
sb["line"].startswith("Solar still to come today:")
and "we count on" in sb["line"] and sb["state"] == "plan")
why = homeview.day_key(c, B)
check("B's Why key (plan, dark) is tops_up", why == "tops_up")
check("...and says so in plain words, with the level and what it covers "
"(OPT-28)", homeview.why_words(why, pct="82 %", kwh="9.4 kWh")
== "It charges from the grid to 82 %. That covers 9.4 kWh of "
"expensive hours the sun will not.")
_d0, _d1 = homeview.local_day(c.solar_fc.at)
_blocks, _ = homeview.mode_runs(c, _d0, _d1, c.solar_fc.at, False)
_grid = [b for b in _blocks if b["kind"] == "grid" and b["battery"] == 1]
_need = homeview.plan_need(c, B)
check(f"Today: B's grid block is the planned shortfall ({_need:.2f} kWh), "
"not its room to 95 %", _grid and abs(_grid[0]["kwh"] - _need) < 0.01
and _need < 3.0)
_run = c.mode_runs.cheap
_packs = c._mode_packs()
_m1 = c._run_mark("charge", _run, _packs, lambda p: True, ((B, 40.0),))
_m2 = c._run_mark("charge", _run, _packs, lambda p: False, ((B, 50.0),))
check("a level the hysteresis moved opens the run to that battery again",
_m1 and not _m2)
latch, c._charge_latch = c._charge_latch, None
c.solar_fc = None
check("with no charge under way, the levels are dropped as soon as the "
"forecast goes, even before the plan is rebuilt",
c._plan_targets and c.plan_targets() is None)
check("a lost forecast says so: no forecast, Leftover solar solar only",
homeview.solar_block(c, datetime.now(timezone.utc))["state"]
== "no_forecast" and homeview.day_key(c, B) == "no_forecast")
c._charge_latch = latch
# the latch ends at its end time; this replay ran in September, so ask at a
# moment inside it
_real_dt = main_files.live.datetime
main_files.live.datetime = type("_DT", (datetime,), {"now": classmethod(
lambda cls, tz=None: latch[0] - timedelta(hours=1))})
check("OPT-34: with a charge under way (B charged in this run), the level "
"stays: plan_targets() gives it (the line: test_opt34.py)",
latch is not None and c.plan_targets() is not None
and B in c.plan_targets() and c.plan_targets()[B] == c._plan_targets[B])
main_files.live.datetime = _real_dt
check("the Why line wins over 'saves its power' only while holding",
homeview.battery_why(modes_on=True, mode="leftover_solar", off=False,
reading=True, phase="idle", shadow=False,
running=True, held=False, refused=0, peak=False,
sf_ahead=True, role="hold", has_at=True,
day="sun_fills") == "sun_fills"
and homeview.battery_why(modes_on=True, mode="leftover_solar",
off=False, reading=True, phase="idle",
shadow=False, running=True, held=False,
refused=0, peak=False, sf_ahead=True,
role="charge", has_at=True, day="tops_up")
== "grid_charge")
for lang in ("en", "nl"):
homeview._LANG[0] = lang
t = [homeview.why_words(k, pct="82 %", kwh="9.4 kWh")
for k in ("sun_fills", "tops_up", "no_forecast")]
t += [homeview._t("solar.no_forecast"), homeview._t("solar.learning"),
homeview.line_solar(9.2, 6.4, "10:15")]
check(f"{lang}: every P4 sentence is there and short (<= 2 x 12 words)",
all(t) and all(len(s.split()) <= 24 for s in t))
homeview._LANG[0] = "en"
from app import uilayout # noqa: E402
simple = [f.key for _g, _p, f in uilayout.fields() if f.simple]
check("the Simple view has the solar forecast card",
"pv_forecast_entity" in simple)
# ============================================================================ # # ============================================================================ #
print("8. options") print("8. options")
+225
View File
@@ -0,0 +1,225 @@
"""Runnable check for OPT-11 P4, part 6a: the sunny day, the 0.20 gap between 1x and 1.5x, the dark day.
`python3 test_modes_p4b.py`
Split out of test_modes_p4.py by CI-18 so the slow part 6 runs in pieces (CI
runs files side by side; the one file took ~13 min). The docstring there describes
the whole. Same fake Home Assistant, same engine (tools/opt11p3_replay.py), same
checks, none dropped: the four files print exactly the check lines the one file did.
Read MUTATION.md before you report a survivor."""
import asyncio
import logging
import os
import random
import sys
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
sys.path.insert(0, os.path.join(HERE, "tools"))
logging.disable(logging.WARNING)
from named_absence import nth, present # noqa: E402
import main_files # noqa: E402
import opt11p3_replay as rp # noqa: E402
from app import arbitrage, dayplan, homeview, modetrade, packmode # noqa
from app import priceruns, solarfc, validate # noqa: E402
from app.tariff import BILLING_TZ # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
L = timezone(timedelta(hours=2))
A, B = "inverter-a", "inverter-b"
D0 = datetime(2026, 9, 21, tzinfo=L)
UTC0 = D0.astimezone(timezone.utc)
# ============================================================================ #
def profile(day_w=None, days=1, evening=None, start=UTC0 - timedelta(days=1)):
hp = dayplan.HouseProfile()
t = start
end = start + timedelta(days=days)
while t < end:
h = t.astimezone(L).hour
w = (evening if evening is not None and 17 <= h < 22 else
day_w if day_w is not None else 600.0)
hp.add(t, w)
t += timedelta(seconds=5)
hp.add(t, None)
return hp
P = modetrade.Pack
def pk(name, mode, soc, cap=10.0, **kw):
return P(name, True, mode, False, 2500.0, soc, cap, **kw)
# Prices: cheap 01:00-03:00, dear 19:00-20:00 local (as in test_modes_p3).
DAYW = [0.20] * 96 * 2
for i in list(range(4, 12)) + list(range(100, 108)):
DAYW[i] = 0.02
for i in list(range(76, 80)) + list(range(172, 176)):
DAYW[i] = 0.40
WPTS = [(UTC0 + timedelta(minutes=15 * i), 900, p) for i, p in enumerate(DAYW)]
from app.price import PricePoint # noqa: E402
# ============================================================================ #
print("6. the real controller over a night and a day")
AIM = rp.PEAK_CAP - 50
FC_KWH = [None] # today's forecast in the fake sensor (None: down)
async def _sensor(self, e):
now = rp_start[0] + timedelta(seconds=self.t)
kwh = FC_KWH[0](now) if callable(FC_KWH[0]) else FC_KWH[0]
if kwh is None:
return {"state": "unavailable", "attributes": {},
"last_updated": now.isoformat()}
if e.endswith("tomorrow"):
return None
loc = now.astimezone(L)
d0 = loc.replace(hour=0, minute=0, second=0, microsecond=0)
wh = {(d0 + timedelta(hours=h)).astimezone(timezone.utc).isoformat():
(kwh * 100.0 if 8 <= h < 18 else 0.0) for h in range(24)}
left = sum(v for k, v in wh.items()
if datetime.fromisoformat(k) >= now) / 1000.0
return {"state": f"{left:.3f}",
"attributes": {"unit_of_measurement": "kWh", "wh_period": wh},
"last_updated": now.isoformat(), "last_reported": now.isoformat()}
rp.Hass.state = _sensor
rp_start = [UTC0]
FC_OPTS = {"pv_forecast_entity": "sensor.energy_production_today_remaining",
"cycle_cost_threshold_eur": 0.20}
# TARIFF-24 round 2: with a forecast read, a price mode needs the cycle cost
# itself (0.20 here), no longer 1.5 times it (0.30). These scenarios were
# written for a 0.30 gap, and a midday 0.21 gap now plans a grid top-up they
# are not about, so they ask for 0.30 with the forecast; the no-forecast leg
# (`rows_nf`) keeps 0.20, which is 0.30 widened: the same gate on both sides.
GATE_030 = {"cycle_cost_threshold_eur": 0.30}
def seed_profile(c):
if c.house_profile is not None:
c.house_profile = profile(day_w=600.0, evening=3000.0)
def house_flat(w):
return [(UTC0.timestamp() - 10, float(w))]
def run_day(choice, *, fc, soc0, hours=21.0, start_h=0.75, house_w=800.0,
refuse=(), extra=None, patch=seed_profile):
FC_KWH[0] = fc
start = UTC0 + timedelta(hours=start_h)
rp_start[0] = start
rows = []
def cb(c, h, now, pr):
sh = dict(c.allocation.shares) if c.allocation is not None and \
c.allocation.shares else {}
rows.append(dict(
now=now, grid=h.grid(), shares=sh,
action=getattr(c.arb, "action", None),
roles=dict(c.mode_tick.roles) if c.mode_tick else {},
soc={u: p.soc for u, p in h.plants.items()},
targets=c.plan_targets(), plan=c.day_plan, runs=c.mode_runs))
st_, c = rp.run("p3_ls", house_flat(house_w), WPTS, start, 3600 * hours,
check=cb, soc0=soc0, choice=choice, refuse=refuse,
extra=dict(FC_OPTS, **(extra or {})), patch=patch)
return rows, st_, c
SF_LS = {"a": (True, "solar_first", False), "b": (True, "leftover_solar",
False)}
SF_CH = {"a": (True, "solar_first", False), "b": (True, "cheap_hours",
False)}
def invariants(tag, rows, c):
charge = [r for r in rows if r["action"] == arbitrage.CHARGE]
mixed = [r for r in rows if any(v > 0 for v in r["shares"].values())
and any(v < 0 for v in r["shares"].values())]
check(f"{tag}: no opposite-direction split on any cycle", not mixed)
check(f"{tag}: Solar first never charges from the grid (A's share >= 0 "
"while the site charges)",
all(r["shares"].get(A, 0) >= 0 for r in charge))
q = {int(r["now"].timestamp() // 900) for r in charge}
banked = [b.offtake_avg_w for b in c.p1.blocks
if int(b.start.timestamp() // 900) in q]
check(f"{tag}: every banked quarter with a grid charge <= cap - margin "
f"(max {max(banked, default=0):.1f} W, aim {AIM})",
not banked or max(banked) <= AIM + 0.5)
return charge
# Sunny: 40 kWh forecast. B (Leftover solar) at 30 % needs nothing.
rows, st_, c = run_day(SF_LS, fc=40.0, soc0={"a": 60.0, "b": 30.0},
extra=GATE_030)
charge = invariants("sunny", rows, c)
_last = nth(rows, -1, "a cycle")
print(f" sunny: verdict {present(_last) and _last['plan'] and _last['plan'].verdict}, "
f"{len(charge)} charge cycles")
check("sunny: a day plan is made, and says sunny",
any(r["plan"] is not None and r["plan"].verdict == dayplan.SUNNY
for r in rows))
check("sunny: no grid charge at all", not charge)
# TARIFF-24 round 2: the same day at the cycle cost 0.20 itself. With the
# forecast read the gap needed is 0.20 (not 1.5 x = 0.30), so the midday
# quarter 0.339 against the evening 0.551 (gap 0.21, between 1x and 1.5x) is
# a planned top-up for B (Leftover solar) up to its planned level.
rows_g, st_, c_g = run_day(SF_LS, fc=40.0, soc0={"a": 60.0, "b": 30.0})
charge_g = invariants("gap between 1x and 1.5x", rows_g, c_g)
_first_g = nth(charge_g, 0, "a charge cycle")
_gaps = [min(g.mean_eur_kwh for g in r["runs"].give)
- r["runs"].cheap.mean_eur_kwh for r in charge_g
if r["runs"] is not None and r["runs"].give]
print(f" gap 0.20 <= gap < 0.30: {len(charge_g)} charge cycles, run gap "
f"{min(_gaps, default=0):.3f}, B to "
f"{max((r['soc']['b'] for r in rows_g), default=0):.1f} %")
check("a forecast day whose price gap lies between 1x and 1.5x the cycle "
"cost (0.20 < 0.21 < 0.30) plans a cheap run: B charges from the grid "
"inside it, only B, and only up to its planned level",
present(_first_g) and len(_gaps) == len(charge_g)
and all(0.20 <= g < 0.30 for g in _gaps)
and all(r["runs"].cheap.holds(r["now"]) for r in charge_g)
and all(r["roles"][B] == modetrade.CHARGE for r in charge_g)
and all(r["roles"][A] != modetrade.CHARGE for r in charge_g)
and max(r["soc"]["b"] for r in rows_g) <= 45.64 + 2.0)
check("...and the same day with no forecast read does not (it needs 0.30): "
"the old gate, kept for a day without a forecast",
not [r for r in run_day(SF_LS, fc=None,
soc0={"a": 60.0, "b": 30.0})[0]
if r["action"] == arbitrage.CHARGE
and r["now"].astimezone(L).hour == 12])
# Dark: 1 kWh. B buys the evening's shortfall only, in the cheap run.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0})
charge = invariants("dark", rows, c)
tgt = nth([r["targets"][B] for r in rows if r["targets"]], 0, "a level")
top = max(r["soc"]["b"] for r in rows)
print(f" dark: B level {tgt:.1f} %, B reached {top:.1f} %, "
f"{len(charge)} charge cycles")
check("dark: Leftover solar charges from the grid in the cheap run",
charge and all(r["runs"].cheap.holds(r["now"]) for r in charge)
and all(r["roles"][B] == modetrade.CHARGE for r in charge))
check("dark: ...only up to its level (the shortfall), not 95 %",
present(tgt) and tgt < 60.0 and top <= tgt + 2.0)
check("dark: A rests while B charges", all(r["roles"][A] == modetrade.REST
for r in charge))
print()
if fails:
print(f"FAILED: {len(fails)}")
for f in fails:
print(" -", f)
sys.exit(1)
print("all checks passed")
+232
View File
@@ -0,0 +1,232 @@
"""Runnable check for OPT-11 P4, part 6b: cheap hours on a partly sunny day, the forecast lost mid-run, a forecast far too high.
`python3 test_modes_p4c.py`
Split out of test_modes_p4.py by CI-18 so the slow part 6 runs in pieces (CI
runs files side by side; the one file took ~13 min). The docstring there describes
the whole. Same fake Home Assistant, same engine (tools/opt11p3_replay.py), same
checks, none dropped: the four files print exactly the check lines the one file did.
Read MUTATION.md before you report a survivor."""
import asyncio
import logging
import os
import random
import sys
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
sys.path.insert(0, os.path.join(HERE, "tools"))
logging.disable(logging.WARNING)
from named_absence import nth, present # noqa: E402
import main_files # noqa: E402
import opt11p3_replay as rp # noqa: E402
from app import arbitrage, dayplan, homeview, modetrade, packmode # noqa
from app import priceruns, solarfc, validate # noqa: E402
from app.tariff import BILLING_TZ # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
L = timezone(timedelta(hours=2))
A, B = "inverter-a", "inverter-b"
D0 = datetime(2026, 9, 21, tzinfo=L)
UTC0 = D0.astimezone(timezone.utc)
# ============================================================================ #
def profile(day_w=None, days=1, evening=None, start=UTC0 - timedelta(days=1)):
hp = dayplan.HouseProfile()
t = start
end = start + timedelta(days=days)
while t < end:
h = t.astimezone(L).hour
w = (evening if evening is not None and 17 <= h < 22 else
day_w if day_w is not None else 600.0)
hp.add(t, w)
t += timedelta(seconds=5)
hp.add(t, None)
return hp
P = modetrade.Pack
def pk(name, mode, soc, cap=10.0, **kw):
return P(name, True, mode, False, 2500.0, soc, cap, **kw)
# Prices: cheap 01:00-03:00, dear 19:00-20:00 local (as in test_modes_p3).
DAYW = [0.20] * 96 * 2
for i in list(range(4, 12)) + list(range(100, 108)):
DAYW[i] = 0.02
for i in list(range(76, 80)) + list(range(172, 176)):
DAYW[i] = 0.40
WPTS = [(UTC0 + timedelta(minutes=15 * i), 900, p) for i, p in enumerate(DAYW)]
from app.price import PricePoint # noqa: E402
# ============================================================================ #
print("6. the real controller over a night and a day")
AIM = rp.PEAK_CAP - 50
FC_KWH = [None] # today's forecast in the fake sensor (None: down)
async def _sensor(self, e):
now = rp_start[0] + timedelta(seconds=self.t)
kwh = FC_KWH[0](now) if callable(FC_KWH[0]) else FC_KWH[0]
if kwh is None:
return {"state": "unavailable", "attributes": {},
"last_updated": now.isoformat()}
if e.endswith("tomorrow"):
return None
loc = now.astimezone(L)
d0 = loc.replace(hour=0, minute=0, second=0, microsecond=0)
wh = {(d0 + timedelta(hours=h)).astimezone(timezone.utc).isoformat():
(kwh * 100.0 if 8 <= h < 18 else 0.0) for h in range(24)}
left = sum(v for k, v in wh.items()
if datetime.fromisoformat(k) >= now) / 1000.0
return {"state": f"{left:.3f}",
"attributes": {"unit_of_measurement": "kWh", "wh_period": wh},
"last_updated": now.isoformat(), "last_reported": now.isoformat()}
rp.Hass.state = _sensor
rp_start = [UTC0]
FC_OPTS = {"pv_forecast_entity": "sensor.energy_production_today_remaining",
"cycle_cost_threshold_eur": 0.20}
# TARIFF-24 round 2: with a forecast read, a price mode needs the cycle cost
# itself (0.20 here), no longer 1.5 times it (0.30). These scenarios were
# written for a 0.30 gap, and a midday 0.21 gap now plans a grid top-up they
# are not about, so they ask for 0.30 with the forecast; the no-forecast leg
# (`rows_nf`) keeps 0.20, which is 0.30 widened: the same gate on both sides.
GATE_030 = {"cycle_cost_threshold_eur": 0.30}
def seed_profile(c):
if c.house_profile is not None:
c.house_profile = profile(day_w=600.0, evening=3000.0)
def house_flat(w):
return [(UTC0.timestamp() - 10, float(w))]
def run_day(choice, *, fc, soc0, hours=21.0, start_h=0.75, house_w=800.0,
refuse=(), extra=None, patch=seed_profile):
FC_KWH[0] = fc
start = UTC0 + timedelta(hours=start_h)
rp_start[0] = start
rows = []
def cb(c, h, now, pr):
sh = dict(c.allocation.shares) if c.allocation is not None and \
c.allocation.shares else {}
rows.append(dict(
now=now, grid=h.grid(), shares=sh,
action=getattr(c.arb, "action", None),
roles=dict(c.mode_tick.roles) if c.mode_tick else {},
soc={u: p.soc for u, p in h.plants.items()},
targets=c.plan_targets(), plan=c.day_plan, runs=c.mode_runs))
st_, c = rp.run("p3_ls", house_flat(house_w), WPTS, start, 3600 * hours,
check=cb, soc0=soc0, choice=choice, refuse=refuse,
extra=dict(FC_OPTS, **(extra or {})), patch=patch)
return rows, st_, c
SF_LS = {"a": (True, "solar_first", False), "b": (True, "leftover_solar",
False)}
SF_CH = {"a": (True, "solar_first", False), "b": (True, "cheap_hours",
False)}
def invariants(tag, rows, c):
charge = [r for r in rows if r["action"] == arbitrage.CHARGE]
mixed = [r for r in rows if any(v > 0 for v in r["shares"].values())
and any(v < 0 for v in r["shares"].values())]
check(f"{tag}: no opposite-direction split on any cycle", not mixed)
check(f"{tag}: Solar first never charges from the grid (A's share >= 0 "
"while the site charges)",
all(r["shares"].get(A, 0) >= 0 for r in charge))
q = {int(r["now"].timestamp() // 900) for r in charge}
banked = [b.offtake_avg_w for b in c.p1.blocks
if int(b.start.timestamp() // 900) in q]
check(f"{tag}: every banked quarter with a grid charge <= cap - margin "
f"(max {max(banked, default=0):.1f} W, aim {AIM})",
not banked or max(banked) <= AIM + 0.5)
return charge
# Cheap hours on a partly sunny day: ignores the plan, fills as in P3.
rows, st_, c = run_day(SF_CH, fc=14.0, soc0={"a": 60.0, "b": 30.0},
extra=GATE_030)
charge = invariants("cheap hours, partly", rows, c)
top = max(r["soc"]["b"] for r in rows)
print(f" cheap hours partly: B reached {top:.1f} %")
check("Cheap hours gets no planned level",
not any(r["targets"] and B in r["targets"] for r in rows))
rows_nf, _s, c_nf = run_day(SF_CH, fc=None, soc0={"a": 60.0, "b": 30.0})
check("Cheap hours with a sun forecast charges as with none (P3)",
charge and abs(max(r["soc"]["b"] for r in rows_nf) - top) < 1.0
and top > 80.0)
# The forecast goes away mid-run: a charge under way goes on to its level
# (OPT-34; it stopped at once, P3 option A, before). With no charge under way
# the levels go with the forecast (below, and test_opt27.py).
# OPT-27: a sensor that is unavailable is covered by its last fresh reading
# for up to 3 h (`solarfc.Hold`), so "lost" here is a hold that never covers;
# the next scenario is the same loss with the hold (test_opt27.py).
DROP = UTC0 + timedelta(hours=1, minutes=30)
class _NoHold(solarfc.Hold):
def stand_in(self, *a, **k):
return None
def seed_profile_no_hold(c):
seed_profile(c)
c.fc_hold = _NoHold()
rows, st_, c = run_day(SF_LS, fc=lambda now: 1.0 if now < DROP else None,
soc0={"a": 60.0, "b": 10.0}, patch=seed_profile_no_hold)
invariants("forecast lost mid-run", rows, c)
before = [r for r in rows if r["now"] < DROP and r["action"]
== arbitrage.CHARGE]
late = [r for r in rows if r["now"] > DROP + timedelta(
seconds=2 * 60 + 10) and r["action"] == arbitrage.CHARGE]
check("forecast lost mid-run (OPT-34): Leftover solar was charging, and goes "
"on charging past a forecast read (60 s) and a cycle, to its level",
before and late)
rows, st_, c = run_day(SF_LS, fc=lambda now: 1.0 if now < DROP else None,
soc0={"a": 60.0, "b": 10.0})
invariants("forecast unavailable mid-run, covered", rows, c)
check("forecast unavailable mid-run (OPT-27): the last reading covers it, so "
"Leftover solar goes on charging past the point where it was lost",
[r for r in rows if r["now"] < DROP and r["action"]
== arbitrage.CHARGE]
and [r for r in rows if r["now"] > DROP + timedelta(
seconds=2 * 60 + 10) and r["action"] == arbitrage.CHARGE])
# The forecast is far too high (40 kWh, and there is no sun at all): no grid
# charge, so B covers less of the evening - a money risk, never a safety one.
rows, st_, c = run_day(SF_LS, fc=40.0, soc0={"a": 30.0, "b": 30.0},
extra=GATE_030)
invariants("forecast too high", rows, c)
check("forecast too high: no grid charge, and B still keeps its power for "
"the dear run", not [r for r in rows if r["action"]
== arbitrage.CHARGE]
and all(r["roles"].get(B) != modetrade.GIVE for r in rows
if r["now"].astimezone(L).hour not in (19,)))
print()
if fails:
print(f"FAILED: {len(fails)}")
for f in fails:
print(" -", f)
sys.exit(1)
print("all checks passed")
+294
View File
@@ -0,0 +1,294 @@
"""Runnable check for OPT-11 P4, part 6c and 7: a refusal, Off, no house profile, a forecast arriving mid-period, battery modes off; then the Batteries screen and the Simple view.
`python3 test_modes_p4d.py`
Split out of test_modes_p4.py by CI-18 so the slow part 6 runs in pieces (CI
runs files side by side; the one file took ~13 min). The docstring there describes
the whole. Same fake Home Assistant, same engine (tools/opt11p3_replay.py), same
checks, none dropped: the four files print exactly the check lines the one file did.
Read MUTATION.md before you report a survivor."""
import asyncio
import logging
import os
import random
import sys
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
sys.path.insert(0, os.path.join(HERE, "tools"))
logging.disable(logging.WARNING)
from named_absence import nth, present # noqa: E402
import main_files # noqa: E402
import opt11p3_replay as rp # noqa: E402
from app import arbitrage, dayplan, homeview, modetrade, packmode # noqa
from app import priceruns, solarfc, validate # noqa: E402
from app.tariff import BILLING_TZ # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
L = timezone(timedelta(hours=2))
A, B = "inverter-a", "inverter-b"
D0 = datetime(2026, 9, 21, tzinfo=L)
UTC0 = D0.astimezone(timezone.utc)
# ============================================================================ #
def profile(day_w=None, days=1, evening=None, start=UTC0 - timedelta(days=1)):
hp = dayplan.HouseProfile()
t = start
end = start + timedelta(days=days)
while t < end:
h = t.astimezone(L).hour
w = (evening if evening is not None and 17 <= h < 22 else
day_w if day_w is not None else 600.0)
hp.add(t, w)
t += timedelta(seconds=5)
hp.add(t, None)
return hp
P = modetrade.Pack
def pk(name, mode, soc, cap=10.0, **kw):
return P(name, True, mode, False, 2500.0, soc, cap, **kw)
# Prices: cheap 01:00-03:00, dear 19:00-20:00 local (as in test_modes_p3).
DAYW = [0.20] * 96 * 2
for i in list(range(4, 12)) + list(range(100, 108)):
DAYW[i] = 0.02
for i in list(range(76, 80)) + list(range(172, 176)):
DAYW[i] = 0.40
WPTS = [(UTC0 + timedelta(minutes=15 * i), 900, p) for i, p in enumerate(DAYW)]
from app.price import PricePoint # noqa: E402
# ============================================================================ #
print("6. the real controller over a night and a day")
AIM = rp.PEAK_CAP - 50
FC_KWH = [None] # today's forecast in the fake sensor (None: down)
async def _sensor(self, e):
now = rp_start[0] + timedelta(seconds=self.t)
kwh = FC_KWH[0](now) if callable(FC_KWH[0]) else FC_KWH[0]
if kwh is None:
return {"state": "unavailable", "attributes": {},
"last_updated": now.isoformat()}
if e.endswith("tomorrow"):
return None
loc = now.astimezone(L)
d0 = loc.replace(hour=0, minute=0, second=0, microsecond=0)
wh = {(d0 + timedelta(hours=h)).astimezone(timezone.utc).isoformat():
(kwh * 100.0 if 8 <= h < 18 else 0.0) for h in range(24)}
left = sum(v for k, v in wh.items()
if datetime.fromisoformat(k) >= now) / 1000.0
return {"state": f"{left:.3f}",
"attributes": {"unit_of_measurement": "kWh", "wh_period": wh},
"last_updated": now.isoformat(), "last_reported": now.isoformat()}
rp.Hass.state = _sensor
rp_start = [UTC0]
FC_OPTS = {"pv_forecast_entity": "sensor.energy_production_today_remaining",
"cycle_cost_threshold_eur": 0.20}
# TARIFF-24 round 2: with a forecast read, a price mode needs the cycle cost
# itself (0.20 here), no longer 1.5 times it (0.30). These scenarios were
# written for a 0.30 gap, and a midday 0.21 gap now plans a grid top-up they
# are not about, so they ask for 0.30 with the forecast; the no-forecast leg
# (`rows_nf`) keeps 0.20, which is 0.30 widened: the same gate on both sides.
GATE_030 = {"cycle_cost_threshold_eur": 0.30}
def seed_profile(c):
if c.house_profile is not None:
c.house_profile = profile(day_w=600.0, evening=3000.0)
def house_flat(w):
return [(UTC0.timestamp() - 10, float(w))]
def run_day(choice, *, fc, soc0, hours=21.0, start_h=0.75, house_w=800.0,
refuse=(), extra=None, patch=seed_profile):
FC_KWH[0] = fc
start = UTC0 + timedelta(hours=start_h)
rp_start[0] = start
rows = []
def cb(c, h, now, pr):
sh = dict(c.allocation.shares) if c.allocation is not None and \
c.allocation.shares else {}
rows.append(dict(
now=now, grid=h.grid(), shares=sh,
action=getattr(c.arb, "action", None),
roles=dict(c.mode_tick.roles) if c.mode_tick else {},
soc={u: p.soc for u, p in h.plants.items()},
targets=c.plan_targets(), plan=c.day_plan, runs=c.mode_runs))
st_, c = rp.run("p3_ls", house_flat(house_w), WPTS, start, 3600 * hours,
check=cb, soc0=soc0, choice=choice, refuse=refuse,
extra=dict(FC_OPTS, **(extra or {})), patch=patch)
return rows, st_, c
SF_LS = {"a": (True, "solar_first", False), "b": (True, "leftover_solar",
False)}
SF_CH = {"a": (True, "solar_first", False), "b": (True, "cheap_hours",
False)}
def invariants(tag, rows, c):
charge = [r for r in rows if r["action"] == arbitrage.CHARGE]
mixed = [r for r in rows if any(v > 0 for v in r["shares"].values())
and any(v < 0 for v in r["shares"].values())]
check(f"{tag}: no opposite-direction split on any cycle", not mixed)
check(f"{tag}: Solar first never charges from the grid (A's share >= 0 "
"while the site charges)",
all(r["shares"].get(A, 0) >= 0 for r in charge))
q = {int(r["now"].timestamp() // 900) for r in charge}
banked = [b.offtake_avg_w for b in c.p1.blocks
if int(b.start.timestamp() // 900) in q]
check(f"{tag}: every banked quarter with a grid charge <= cap - margin "
f"(max {max(banked, default=0):.1f} W, aim {AIM})",
not banked or max(banked) <= AIM + 0.5)
return charge
# A refusal wins over the plan.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
refuse=("b",), extra=GATE_030)
invariants("refusal", rows, c)
check("refusal: B refuses to charge, so the plan's charge ends and B is "
"never a charger after it", rows and not [
r for r in rows[len(rows) // 3:]
if r["roles"].get(B) == modetrade.CHARGE])
# Off wins over the plan.
rows, st_, c = run_day({"a": (True, "solar_first", False),
"b": (False, "leftover_solar", False)},
fc=1.0, soc0={"a": 60.0, "b": 30.0})
check("Off: an Off battery never charges from the grid, whatever the plan",
not [r for r in rows if r["action"] == arbitrage.CHARGE]
and all(abs(r["shares"].get(B, 0)) < 1e-6 for r in rows))
# No house profile yet (first day): no plan, P3 option A.
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
patch=None)
check("no house profile yet: no plan, and Leftover solar takes solar only",
all(r["plan"] is None for r in rows)
and not [r for r in rows if r["action"] == arbitrage.CHARGE])
check("...while the profile learns and the store keeps each closed hour",
c.house_profile is not None and len(
c.store.data.get("house_profile") or {}) >= 1)
check("selling stays off (option A)", packmode.SELLING_ENABLED is False)
# A forecast arriving mid-period makes the plan at once, not at the next
# 15-minute period.
COME = datetime(2026, 9, 21, 1, 3, tzinfo=L).astimezone(timezone.utc)
rows, st_, c = run_day(SF_LS, fc=lambda now: None if now < COME else 1.0,
soc0={"a": 60.0, "b": 30.0}, hours=0.5)
first = next((r["now"] for r in rows if r["targets"]), None)
check("a forecast that arrives at 01:03 makes the plan before 01:15",
first is not None and first < COME + timedelta(minutes=3))
# Battery modes off: the forecast is never read.
READS = [0]
_real_sensor = rp.Hass.state
async def _counted(self, e):
READS[0] += 1
return await _real_sensor(self, e)
rp.Hass.state = _counted
FC_KWH[0] = 1.0
rp.run("modes_off", house_flat(800.0), WPTS, UTC0 + timedelta(hours=1),
600.0, extra=dict(FC_OPTS))
rp.Hass.state = _real_sensor
check("battery modes off: the forecast sensor is never read", READS[0] == 0)
# ============================================================================ #
print("7. the Batteries screen and the Simple view")
rows, st_, c = run_day(SF_LS, fc=1.0, soc0={"a": 60.0, "b": 30.0},
hours=0.6)
main_files.live.datetime = datetime
sb = homeview.solar_block(c, c.solar_fc.at)
check("the forecast line names the forecast, what is counted and when",
sb["line"].startswith("Solar still to come today:")
and "we count on" in sb["line"] and sb["state"] == "plan")
why = homeview.day_key(c, B)
check("B's Why key (plan, dark) is tops_up", why == "tops_up")
check("...and says so in plain words, with the level and what it covers "
"(OPT-28)", homeview.why_words(why, pct="82 %", kwh="9.4 kWh")
== "It charges from the grid to 82 %. That covers 9.4 kWh of "
"expensive hours the sun will not.")
_d0, _d1 = homeview.local_day(c.solar_fc.at)
_blocks, _ = homeview.mode_runs(c, _d0, _d1, c.solar_fc.at, False)
_grid = [b for b in _blocks if b["kind"] == "grid" and b["battery"] == 1]
_need = homeview.plan_need(c, B)
check(f"Today: B's grid block is the planned shortfall ({_need:.2f} kWh), "
"not its room to 95 %", _grid and abs(_grid[0]["kwh"] - _need) < 0.01
and _need < 3.0)
_run = c.mode_runs.cheap
_packs = c._mode_packs()
_m1 = c._run_mark("charge", _run, _packs, lambda p: True, ((B, 40.0),))
_m2 = c._run_mark("charge", _run, _packs, lambda p: False, ((B, 50.0),))
check("a level the hysteresis moved opens the run to that battery again",
_m1 and not _m2)
latch, c._charge_latch = c._charge_latch, None
c.solar_fc = None
check("with no charge under way, the levels are dropped as soon as the "
"forecast goes, even before the plan is rebuilt",
c._plan_targets and c.plan_targets() is None)
check("a lost forecast says so: no forecast, Leftover solar solar only",
homeview.solar_block(c, datetime.now(timezone.utc))["state"]
== "no_forecast" and homeview.day_key(c, B) == "no_forecast")
c._charge_latch = latch
# the latch ends at its end time; this replay ran in September, so ask at a
# moment inside it
_real_dt = main_files.live.datetime
main_files.live.datetime = type("_DT", (datetime,), {"now": classmethod(
lambda cls, tz=None: latch[0] - timedelta(hours=1))})
check("OPT-34: with a charge under way (B charged in this run), the level "
"stays: plan_targets() gives it (the line: test_opt34.py)",
latch is not None and c.plan_targets() is not None
and B in c.plan_targets() and c.plan_targets()[B] == c._plan_targets[B])
main_files.live.datetime = _real_dt
check("the Why line wins over 'saves its power' only while holding",
homeview.battery_why(modes_on=True, mode="leftover_solar", off=False,
reading=True, phase="idle", shadow=False,
running=True, held=False, refused=0, peak=False,
sf_ahead=True, role="hold", has_at=True,
day="sun_fills") == "sun_fills"
and homeview.battery_why(modes_on=True, mode="leftover_solar",
off=False, reading=True, phase="idle",
shadow=False, running=True, held=False,
refused=0, peak=False, sf_ahead=True,
role="charge", has_at=True, day="tops_up")
== "grid_charge")
for lang in ("en", "nl"):
homeview._LANG[0] = lang
t = [homeview.why_words(k, pct="82 %", kwh="9.4 kWh")
for k in ("sun_fills", "tops_up", "no_forecast")]
t += [homeview._t("solar.no_forecast"), homeview._t("solar.learning"),
homeview.line_solar(9.2, 6.4, "10:15")]
check(f"{lang}: every P4 sentence is there and short (<= 2 x 12 words)",
all(t) and all(len(s.split()) <= 24 for s in t))
homeview._LANG[0] = "en"
from app import uilayout # noqa: E402
simple = [f.key for _g, _p, f in uilayout.fields() if f.simple]
check("the Simple view has the solar forecast card",
"pv_forecast_entity" in simple)
print()
if fails:
print(f"FAILED: {len(fails)}")
for f in fails:
print(" -", f)
sys.exit(1)
print("all checks passed")
+6 -195
View File
@@ -30,7 +30,12 @@ live), inverter-b Solar first, a house of 1 kW, cap 3500 W, margin 50 W.
quarter's last second. quarter's last second.
Mutations (MUTATION.md, purged copies) are listed in the pull request. Mutations (MUTATION.md, purged copies) are listed in the pull request.
"""
CI-18: this file holds parts 1, 2 and 8 (part 8 grades part 2's runs). Parts 3-7 are in
test_safety125b.py, split out so CI can run the pieces side by side (the one
file took ~10 min). Every check is in exactly one file; the two print exactly the
check lines the one file did."""
import asyncio import asyncio
import logging import logging
@@ -319,201 +324,7 @@ check("the forecast entity is read, in kW, as the live template (SAFETY-118), "
"month peak 5413 W banked, P1 projection"][1]]) "month peak 5413 W banked, P1 projection"][1]])
# ============================================================================ #
print("\n3. the same for a price trade (modes off) and a maintenance charge")
_ca, _ra, _fa = drive(opts(modes=False, arb=True), peak=PEAK, late=30.0)[:3]
check("modes off, price trading on, a reading 30 s late: every quarter at "
"or under the aim", graded("trade", _fa, AIM_PEAK)
and any(r[3] == "ARBITRAGE_CHARGE" for r in _ra))
def late_feed(gap, every=0.0, look=None):
"""safety84's cheap-window feed, no telegram in each quarter's last
`gap` s, and one only every `every` s (0: every cycle). `look(c, t)`
runs first, on the state the previous cycle left."""
feed = s84.feed(True)
def before(c, t):
if look is not None:
look(c, t)
if ((rig.BASE.timestamp() + t) % QUARTER_S < QUARTER_S - gap
and (not every or t % every < 1e-9)) \
or not getattr(c.hass, "_s84", False):
feed(c, t)
return before
def rig_quarters(rows, load):
"""The safety84 rig's whole quarters: the true average import (W)."""
qs = {}
for r in rows:
q = int((rig.BASE.timestamp() + r[0]) // QUARTER_S)
a = qs.setdefault(q, [0.0, 0])
a[0] += max(0.0, load(r[0]) - sum(v for _u, v in r[2]))
a[1] += 1
return {datetime.fromtimestamp(q * QUARTER_S, L).strftime("%H:%M"):
s / k for q, (s, k) in sorted(qs.items())
if k * rig.TICK >= QUARTER_S}
for peak, house, aim in ((5413.0, 4000.0, 5363.0), (None, 2500.0, AIM_CAP)):
_mr, _mc = s84.run(2, load=lambda t, h=house: h, dur=2700.0,
month_peak=peak, before=late_feed(30.0))
_mf = rig_quarters(_mr, lambda t, h=house: h)
check(f"N=2 maintenance charge, house {house:.0f} W, "
f"{'peak banked' if peak else 'no peak banked'}, a reading 30 s "
f"late: every quarter at or under the aim",
graded("maintenance", _mf, aim)
and any(mm.phase == "charge" for mm in _mc.maints))
# ============================================================================ #
print("\n4. a healthy meter: the quarters, and the words")
for name, kw, aim, kw_text in (("month peak banked", dict(peak=PEAK),
AIM_PEAK, "5.4 kW"),
("no peak banked", dict(), AIM_CAP, "3.5 kW")):
_c, _rows, _full, _s = drive(opts(), every=10, **kw)
check(f"{name}: every quarter at or under the aim",
graded(name, _full, aim))
over = [s for s in _s if not s[2] and s[0] > s[1]]
under = [s for s in _s if not s[2] and s[0] <= s[1]]
_o, _u = first(iter(over), "an over sample"), \
first(iter(under), "an under sample")
print(f" over the limit at this rate ({len(over)} samples): "
f"{_o[3] if present(_o) else _o!s} / "
f"{_o[4] if present(_o) else _o!s}")
print(f" under it ({len(under)}): "
f"{_u[3] if present(_u) else _u!s} / "
f"{_u[4] if present(_u) else _u!s}")
check(f"{name}: over the limit at this rate the guard row never says "
f"'under'; it says the grid charge is limited",
present(_o) and all(
"under" not in s[3] and "Peak guard: grid charge limited, "
"at this rate" in s[3] and " over " in s[3] for s in over))
check(f"{name}: ...and the month-peak line says the rate, and that the "
f"grid charge is cut back to stay under {kw_text}",
present(_o) and all(
s[4].startswith("At this rate this 15-minute period reaches")
and s[4].endswith("The grid charge is cut back to stay "
f"under {kw_text}.") for s in over))
check(f"{name}: under the limit both read as before",
present(_u) and all(
s[3].startswith("Peak guard: idle, heading for")
and " under " in s[3]
and s[4].startswith("This 15-minute period is heading for")
and s[4].endswith(f"The batteries step in above {kw_text}.")
for s in under))
# ============================================================================ #
print("\n5. the words on their own")
_en = messages.row_peak_guard_idle(5814.0, 5413.0, month_peak=True)
_cut = messages.row_peak_guard_idle(5814.0, 5413.0, month_peak=True,
cut=True)
_ok = messages.row_peak_guard_idle(5200.0, 5413.0, month_peak=True)
print(f" {_en}\n {_cut}\n {_ok}")
check("over, nothing cut: 'idle, at this rate ..., over ...'",
_en == "Peak guard: idle, at this rate 5 814 W, over 5 413 W")
check("over, a grid charge cut",
_cut == "Peak guard: grid charge limited, at this rate 5 814 W, "
"over 5 413 W")
check("under: the 0.19.1 sentence, unchanged",
_ok == "Peak guard: idle, heading for 5 200 W, under this month's "
"5 413 W peak")
check("the Dutch forms say the same",
_cut.nl == "Piekbewaking: laden beperkt, aan dit tempo 5 814 W, "
"boven 5 413 W"
and _en.nl.startswith("Piekbewaking: in rust, aan dit tempo"))
check("the month-peak line in shadow mode says 'would'",
homeview.line_period(5814.0, 5413.0, True, cut=True).endswith(
"The grid charge would be cut back to stay under 5.4 kW.")
and homeview.line_period(5814.0, 5413.0, False).endswith(
"The batteries step in above 5.4 kW."))
# ============================================================================ #
print("\n6. one inverter: the maintenance charge is sized to the room too")
# The start-up quarter on a 10 s meter: the charge's first step is not seen
# until the second reading, so it may land up to START_TOL over the aim; the
# same at N=2 and before this fix. Every later quarter is graded at TOL.
START_TOL = 15.0 START_TOL = 15.0
N1 = {}
for peak, house, aim in ((5413.0, 4000.0, 5363.0), (None, 2500.0, AIM_CAP)):
for late, every in ((0.0, 0.0), (30.0, 0.0), (20.0, 10.0)):
_r, _c = s84.run(1, load=lambda t, h=house: h, dur=2700.0,
month_peak=peak, before=late_feed(late, every))
_q = rig_quarters(_r, lambda t, h=house: h)
N1[peak, late, every] = (_r, _c)
_vals = list(_q.values())
_tag = (f"N=1, {'peak banked' if peak else 'no peak banked'}, "
f"{'10 s' if every else '5 s'} meter, "
f"{'late ' + format(late, '.0f') + ' s' if late else 'healthy'}")
print(f" {_tag}: quarters "
f"{ {k: round(v, 1) for k, v in _q.items()} } W, aim {aim:.0f}")
check(f"{_tag}: every quarter at or under the aim",
len(_vals) == 3
and all(v <= aim + TOL for v in _vals[1:])
and nth(_vals, 0, "a first quarter")
<= aim + (START_TOL if every else TOL)
and any(mm.phase == "charge" for mm in _c.maints))
_hr, _hc = N1[5413.0, 0.0, 0.0]
_eng = sum(1 for r in _hr if r[-1][1] and r[-1][1][0])
print(f" healthy, peak banked: guard engaged on {_eng} of {len(_hr)} "
f"cycles; A charges on "
f"{sum(1 for r in _hr if dict(r[2])['a'] < -1.0)} cycles")
check("N=1: the guard no longer steps in during the charge (no hand-back), "
"and the battery charges on every cycle, at no more than its rate",
_eng == 0 and all(-2000.0 <= dict(r[2])["a"] < -1.0 for r in _hr)
and not any("suspended" in e for e in _hc.events))
# ============================================================================ #
print("\n7. the row during an N=2 maintenance charge and in shadow mode")
_rows7 = []
def _look(c, t):
pg = c.peak_guard
if t >= QUARTER_S and pg is not None and pg.projected_w is not None \
and not pg.engaged and pg.projected_w > pg.ceiling_w:
_rows7.append(first((r["text"] for r in c.checks()
if r["id"] == "peak_guard"), "guard row"))
def _steps(t):
"""4000 W, 800 W more for the first 30 s of every minute."""
return 4000.0 + (800.0 if t % 60.0 < 30.0 else 0.0)
_m2r, _m2c = s84.run(2, load=_steps, dur=1800.0, month_peak=5413.0,
before=late_feed(0.0, look=_look))
_m2q = rig_quarters(_m2r, _steps)
print(f" N=2 maintenance charge, house steps 4000/4800 W: "
f"{len(_rows7)} over-the-limit rows, e.g. "
f"{first(iter(_rows7), 'a row')}; quarters "
f"{ {k: round(v, 1) for k, v in _m2q.items()} } W")
check("N=2 maintenance charge, over the limit at this rate: the row says the "
"grid charge is limited",
present(first(iter(_rows7), "a row")) and all(
r.startswith("Peak guard: grid charge limited, at this rate")
for r in _rows7)
and all(v <= 5363.0 + TOL for v in _m2q.values()))
_sh_o = dict(opts(), shadow_mode="on")
_csh, _rsh, _fsh, _ssh = drive(_sh_o, peak=PEAK, minutes=17, every=10,
plant=OnItsOwn)
_sh_over = [s for s in _ssh if not s[2] and s[0] > s[1]]
_sh1 = first(iter(_sh_over), "an over sample")
print(f" shadow mode, the inverter charging 5000 W on its own: "
f"{len(_sh_over)} over samples, e.g. "
f"{_sh1[3] if present(_sh1) else _sh1!s} / "
f"{_sh1[4] if present(_sh1) else _sh1!s}")
check("shadow mode: nothing is cut on the wire, so the row says 'idle', "
"never 'grid charge limited', and the line says 'would'",
_csh.shadow and present(_sh1) and all(
s[3].startswith("Peak guard: idle, at this rate")
and "would" in s[4] for s in _sh_over))
# ============================================================================ # # ============================================================================ #
print("\n8. edge cases") print("\n8. edge cases")
_e45 = drive(opts(), peak=PEAK, late=45.0) _e45 = drive(opts(), peak=PEAK, late=45.0)
+436
View File
@@ -0,0 +1,436 @@
"""Runnable check for SAFETY-125, a part. `python3 test_safety125b.py`
Split out of test_safety125.py by CI-18 so CI can run the pieces side by side (the one file
took ~10 min). The docstring there describes the whole. It holds parts 3-7 (a price trade and a maintenance charge, a healthy meter, the words, one inverter, N=2 and shadow). Same helpers,
same checks, none dropped: the pieces print exactly the check lines the one file did.
Read MUTATION.md before you report a survivor."""
import asyncio
import logging
import os
import sys
import tempfile
import types
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
sys.path.insert(0, os.path.join(HERE, "tools"))
logging.disable(logging.WARNING)
import opt11_identity as rig # noqa: E402
import opt11p3_replay as rp # noqa: E402
import safety84_identity as s84 # noqa: E402
import main_files # noqa: E402
import app.main as m # noqa: E402
import app.p1 as p1mod # noqa: E402
from named_absence import first, nth, present # noqa: E402
from app import homeview, messages, peakguard, tariff # noqa: E402
from app import price as _price, static_tariff as _st # noqa: E402
from app.main import Controller # noqa: E402
from app.p1 import make_sample, split_signed # noqa: E402
from app.store import unit_key # noqa: E402
from app.tariff import QUARTER_S, Projection # noqa: E402
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
PEAK = 5413.17 # October's banked peak on the live site
AIM_PEAK = PEAK - 50.0
AIM_CAP = 3500.0 - 50.0
TOL = 10.0 # W over the aim a quarter may land (SAFETY-81)
FC = "sensor.piek_prognose_kwartier"
L = timezone(timedelta(hours=1))
START = datetime(2026, 10, 29, 0, 0, tzinfo=L).astimezone(timezone.utc)
PROFILE = ('{"periods": ['
'{"name": "night", "days": "all", "from": "22:00", "to": "07:00",'
' "eur_per_kwh": 0.2333},'
'{"name": "day", "days": "all", "from": "07:00", "to": "22:00",'
' "eur_per_kwh": 0.2801}]}')
def opts(*, fc=False, modes=True, arb=False):
o = dict(rp.options(modes, arb, 2))
o.update(cycle_cost_threshold_eur=0.03, static_profile=PROFILE,
peak_cap_w=3500, peak_margin_w=50)
o["inverters"][0].update(max_w=5000, capacity_kwh=15.36)
o["inverters"][1].update(max_w=4600, capacity_kwh=20.48)
if fc:
o["peak_forecast_entity"] = FC
return o
class Harder(rp.Plant):
"""Charges harder than asked, as inverter-a did live (asked -4271 W,
measured about -4750 W; asked -5000 W, about -5210 W)."""
def step(self, dt, floor):
c = self.cmd
if c < 0:
self.cmd = max(c * 1.11, -5216.0)
try:
super().step(dt, floor)
finally:
self.cmd = c
async def _no_fetch(*a, **k):
raise AssertionError("the tariff task reached for a price feed")
class OnItsOwn(rp.Plant):
"""Charges 5000 W whatever it is asked (shadow mode: nothing is
written, the inverter charges on its own)."""
def step(self, dt, floor):
self.cmd = -5000.0
super().step(dt, floor)
def drive(o, *, peak=None, late=0.0, minutes=31, every=0, start=None,
period=0.0, fc_unit="kW", plant=Harder):
"""The real Controller from `start` (00:00 local) for `minutes` at a 1 s
cycle (OPT-15's lag). `late`: no P1 telegram in each quarter's last
`late` s; `period`: one telegram every `period` s (0: every cycle).
-> (controller, rows, {quarter start: true grid average}, samples), the
samples taken every `every` cycles from the second quarter (the first
starts before the first reading): (projection, ceiling, engaged,
peak_guard row, month-peak line)."""
store = rp._Store()
for u, mode in (("a", "cheap_hours"), ("b", "solar_first")):
store.data[unit_key(f"inverter-{u}", "pack_use")] = True
store.data[unit_key(f"inverter-{u}", "pack_mode")] = mode
store.data[unit_key(f"inverter-{u}", "pack_sell")] = False
rows, samples, sums = [], [], {}
t0 = start or START
async def go():
lag = rp.Lag()
hass = rp.Hass(("a", "b"), lambda t: 1000.0, {"a": 11.0, "b": 10.0},
limits={"a": (-5000.0, 5000.0),
"b": (-4600.0, 4600.0)}, lag=lag)
hass.plants["a"].__class__ = plant
fc_kw = [0.0]
async def state(e):
# The HA quarter projection, in kW like the live template.
return None if e != FC else {
"state": (f"{fc_kw[0]:.3f}" if fc_unit == "kW"
else f"{fc_kw[0] * 1000.0:.0f}"),
"attributes": {"unit_of_measurement": fc_unit}}
hass.state = state
tmp = tempfile.mkdtemp(prefix="s125-")
db = os.path.join(tmp, "tariff.db")
if peak is not None:
tariff.PeakStore(db)._db.execute(
"INSERT INTO monthly_peak VALUES (?, ?, ?, NULL)",
(tariff.month_key(t0), peak,
"2026-10-21T20:15:00+00:00")).connection.commit()
c = Controller(dict(o), hass, store, rp._Pub(), stop=asyncio.Event(),
peak_db_path=db,
price_history_path=os.path.join(tmp, "ph.json"))
c.inverters[0].dev_min, c.inverters[0].dev_max = -5000.0, 5000.0
c.inverters[1].dev_min, c.inverters[1].dev_max = -4600.0, 4600.0
c.auto = True
real = main_files.live.datetime, homeview.datetime, p1mod.time
clock, simt = [t0], [0.0]
class _DT(real[0]):
@classmethod
def now(cls, tz=None):
return clock[0] if tz is None else clock[0].astimezone(tz)
main_files.live.datetime = homeview.datetime = _DT
p1mod.time = types.SimpleNamespace(monotonic=lambda: 1e6 + simt[0])
real_load = _price.load_prices, _st.load_prices
_price.load_prices = _st.load_prices = _no_fetch
task = asyncio.create_task(c.run_tariff_refresh())
try:
hass.advance(0.0, 10.0)
t, n = 0.0, 0
while t < minutes * 60:
now = t0 + timedelta(seconds=t)
hass.t, simt[0], clock[0] = t, t, now
if t == 0.0:
for _ in range(500):
if c.tariff_plan is not None:
break
await asyncio.sleep(0)
q = int(now.timestamp() // QUARTER_S)
acc = sums.setdefault(q, [0.0, 0])
g_now = hass.grid()
fc_kw[0] = (acc[0] + g_now * (QUARTER_S - acc[1])) \
/ QUARTER_S / 1000.0
if now.timestamp() % QUARTER_S < QUARTER_S - late \
and t >= lag.p1_s \
and (not period or t % period < 1e-9):
imp, exp = split_signed(hass._past(lag.meter_s
+ lag.p1_s)[0])
c.p1.submit(make_sample(
"ha_signed", imp, exp, phases=1,
ingest_ts=now - timedelta(seconds=lag.p1_s),
ingest_mono=1e6 + t))
await c.read_inputs(now_mono=t)
await c.cycle()
hass.advance(lag.tick, 10.0)
acc[0] += max(0.0, hass.grid())
acc[1] += 1
rows.append((now, c.target, hass.plants["a"].p,
getattr(c.arb, "action", None)))
pg = c.peak_guard
if every and n % every == 0 and t >= QUARTER_S \
and pg is not None and pg.projected_w is not None:
row = first((r["text"] for r in c.checks(now)
if r["id"] == "peak_guard"), "guard row")
samples.append((pg.projected_w, pg.ceiling_w, pg.engaged,
row, homeview.month_peak(c, now)["line"]))
t += lag.tick
n += 1
finally:
task.cancel()
try:
await task
except asyncio.CancelledError:
pass
main_files.live.datetime, homeview.datetime, p1mod.time = real
_price.load_prices, _st.load_prices = real_load
return c
c = asyncio.run(go())
full = {datetime.fromtimestamp(q * QUARTER_S, L).strftime("%H:%M"):
s / k for q, (s, k) in sorted(sums.items()) if k >= QUARTER_S}
return c, rows, full, samples
def into(now):
return now.timestamp() % QUARTER_S
# ============================================================================ #
def graded(label, full, aim):
print(f" {label}: quarters "
f"{ {k: round(v, 1) for k, v in full.items()} } W, aim {aim:.0f}")
return len(full) >= 2 and all(v <= aim + TOL for v in full.values())
def cut_and_back(rows):
"""The charge is off in each quarter's last 5 s, and back (A charging
over 2 kW) within the next quarter's first minute."""
ends = [r for r in rows if into(r[0]) >= QUARTER_S - 5]
starts = {}
for r in rows:
if into(r[0]) < 60:
q = int(r[0].timestamp() // QUARTER_S)
starts[q] = starts.get(q, False) or r[2] < -2000.0
return (present(first(iter(ends), "a quarter end"))
and all(r[1] > -1.0 for r in ends)
and len(starts) >= 2 and all(starts.values()))
# ============================================================================ #
print("\n3. the same for a price trade (modes off) and a maintenance charge")
_ca, _ra, _fa = drive(opts(modes=False, arb=True), peak=PEAK, late=30.0)[:3]
check("modes off, price trading on, a reading 30 s late: every quarter at "
"or under the aim", graded("trade", _fa, AIM_PEAK)
and any(r[3] == "ARBITRAGE_CHARGE" for r in _ra))
def late_feed(gap, every=0.0, look=None):
"""safety84's cheap-window feed, no telegram in each quarter's last
`gap` s, and one only every `every` s (0: every cycle). `look(c, t)`
runs first, on the state the previous cycle left."""
feed = s84.feed(True)
def before(c, t):
if look is not None:
look(c, t)
if ((rig.BASE.timestamp() + t) % QUARTER_S < QUARTER_S - gap
and (not every or t % every < 1e-9)) \
or not getattr(c.hass, "_s84", False):
feed(c, t)
return before
def rig_quarters(rows, load):
"""The safety84 rig's whole quarters: the true average import (W)."""
qs = {}
for r in rows:
q = int((rig.BASE.timestamp() + r[0]) // QUARTER_S)
a = qs.setdefault(q, [0.0, 0])
a[0] += max(0.0, load(r[0]) - sum(v for _u, v in r[2]))
a[1] += 1
return {datetime.fromtimestamp(q * QUARTER_S, L).strftime("%H:%M"):
s / k for q, (s, k) in sorted(qs.items())
if k * rig.TICK >= QUARTER_S}
for peak, house, aim in ((5413.0, 4000.0, 5363.0), (None, 2500.0, AIM_CAP)):
_mr, _mc = s84.run(2, load=lambda t, h=house: h, dur=2700.0,
month_peak=peak, before=late_feed(30.0))
_mf = rig_quarters(_mr, lambda t, h=house: h)
check(f"N=2 maintenance charge, house {house:.0f} W, "
f"{'peak banked' if peak else 'no peak banked'}, a reading 30 s "
f"late: every quarter at or under the aim",
graded("maintenance", _mf, aim)
and any(mm.phase == "charge" for mm in _mc.maints))
# ============================================================================ #
print("\n4. a healthy meter: the quarters, and the words")
for name, kw, aim, kw_text in (("month peak banked", dict(peak=PEAK),
AIM_PEAK, "5.4 kW"),
("no peak banked", dict(), AIM_CAP, "3.5 kW")):
_c, _rows, _full, _s = drive(opts(), every=10, **kw)
check(f"{name}: every quarter at or under the aim",
graded(name, _full, aim))
over = [s for s in _s if not s[2] and s[0] > s[1]]
under = [s for s in _s if not s[2] and s[0] <= s[1]]
_o, _u = first(iter(over), "an over sample"), \
first(iter(under), "an under sample")
print(f" over the limit at this rate ({len(over)} samples): "
f"{_o[3] if present(_o) else _o!s} / "
f"{_o[4] if present(_o) else _o!s}")
print(f" under it ({len(under)}): "
f"{_u[3] if present(_u) else _u!s} / "
f"{_u[4] if present(_u) else _u!s}")
check(f"{name}: over the limit at this rate the guard row never says "
f"'under'; it says the grid charge is limited",
present(_o) and all(
"under" not in s[3] and "Peak guard: grid charge limited, "
"at this rate" in s[3] and " over " in s[3] for s in over))
check(f"{name}: ...and the month-peak line says the rate, and that the "
f"grid charge is cut back to stay under {kw_text}",
present(_o) and all(
s[4].startswith("At this rate this 15-minute period reaches")
and s[4].endswith("The grid charge is cut back to stay "
f"under {kw_text}.") for s in over))
check(f"{name}: under the limit both read as before",
present(_u) and all(
s[3].startswith("Peak guard: idle, heading for")
and " under " in s[3]
and s[4].startswith("This 15-minute period is heading for")
and s[4].endswith(f"The batteries step in above {kw_text}.")
for s in under))
# ============================================================================ #
print("\n5. the words on their own")
_en = messages.row_peak_guard_idle(5814.0, 5413.0, month_peak=True)
_cut = messages.row_peak_guard_idle(5814.0, 5413.0, month_peak=True,
cut=True)
_ok = messages.row_peak_guard_idle(5200.0, 5413.0, month_peak=True)
print(f" {_en}\n {_cut}\n {_ok}")
check("over, nothing cut: 'idle, at this rate ..., over ...'",
_en == "Peak guard: idle, at this rate 5 814 W, over 5 413 W")
check("over, a grid charge cut",
_cut == "Peak guard: grid charge limited, at this rate 5 814 W, "
"over 5 413 W")
check("under: the 0.19.1 sentence, unchanged",
_ok == "Peak guard: idle, heading for 5 200 W, under this month's "
"5 413 W peak")
check("the Dutch forms say the same",
_cut.nl == "Piekbewaking: laden beperkt, aan dit tempo 5 814 W, "
"boven 5 413 W"
and _en.nl.startswith("Piekbewaking: in rust, aan dit tempo"))
check("the month-peak line in shadow mode says 'would'",
homeview.line_period(5814.0, 5413.0, True, cut=True).endswith(
"The grid charge would be cut back to stay under 5.4 kW.")
and homeview.line_period(5814.0, 5413.0, False).endswith(
"The batteries step in above 5.4 kW."))
# ============================================================================ #
print("\n6. one inverter: the maintenance charge is sized to the room too")
# The start-up quarter on a 10 s meter: the charge's first step is not seen
# until the second reading, so it may land up to START_TOL over the aim; the
# same at N=2 and before this fix. Every later quarter is graded at TOL.
START_TOL = 15.0
N1 = {}
for peak, house, aim in ((5413.0, 4000.0, 5363.0), (None, 2500.0, AIM_CAP)):
for late, every in ((0.0, 0.0), (30.0, 0.0), (20.0, 10.0)):
_r, _c = s84.run(1, load=lambda t, h=house: h, dur=2700.0,
month_peak=peak, before=late_feed(late, every))
_q = rig_quarters(_r, lambda t, h=house: h)
N1[peak, late, every] = (_r, _c)
_vals = list(_q.values())
_tag = (f"N=1, {'peak banked' if peak else 'no peak banked'}, "
f"{'10 s' if every else '5 s'} meter, "
f"{'late ' + format(late, '.0f') + ' s' if late else 'healthy'}")
print(f" {_tag}: quarters "
f"{ {k: round(v, 1) for k, v in _q.items()} } W, aim {aim:.0f}")
check(f"{_tag}: every quarter at or under the aim",
len(_vals) == 3
and all(v <= aim + TOL for v in _vals[1:])
and nth(_vals, 0, "a first quarter")
<= aim + (START_TOL if every else TOL)
and any(mm.phase == "charge" for mm in _c.maints))
_hr, _hc = N1[5413.0, 0.0, 0.0]
_eng = sum(1 for r in _hr if r[-1][1] and r[-1][1][0])
print(f" healthy, peak banked: guard engaged on {_eng} of {len(_hr)} "
f"cycles; A charges on "
f"{sum(1 for r in _hr if dict(r[2])['a'] < -1.0)} cycles")
check("N=1: the guard no longer steps in during the charge (no hand-back), "
"and the battery charges on every cycle, at no more than its rate",
_eng == 0 and all(-2000.0 <= dict(r[2])["a"] < -1.0 for r in _hr)
and not any("suspended" in e for e in _hc.events))
# ============================================================================ #
print("\n7. the row during an N=2 maintenance charge and in shadow mode")
_rows7 = []
def _look(c, t):
pg = c.peak_guard
if t >= QUARTER_S and pg is not None and pg.projected_w is not None \
and not pg.engaged and pg.projected_w > pg.ceiling_w:
_rows7.append(first((r["text"] for r in c.checks()
if r["id"] == "peak_guard"), "guard row"))
def _steps(t):
"""4000 W, 800 W more for the first 30 s of every minute."""
return 4000.0 + (800.0 if t % 60.0 < 30.0 else 0.0)
_m2r, _m2c = s84.run(2, load=_steps, dur=1800.0, month_peak=5413.0,
before=late_feed(0.0, look=_look))
_m2q = rig_quarters(_m2r, _steps)
print(f" N=2 maintenance charge, house steps 4000/4800 W: "
f"{len(_rows7)} over-the-limit rows, e.g. "
f"{first(iter(_rows7), 'a row')}; quarters "
f"{ {k: round(v, 1) for k, v in _m2q.items()} } W")
check("N=2 maintenance charge, over the limit at this rate: the row says the "
"grid charge is limited",
present(first(iter(_rows7), "a row")) and all(
r.startswith("Peak guard: grid charge limited, at this rate")
for r in _rows7)
and all(v <= 5363.0 + TOL for v in _m2q.values()))
_sh_o = dict(opts(), shadow_mode="on")
_csh, _rsh, _fsh, _ssh = drive(_sh_o, peak=PEAK, minutes=17, every=10,
plant=OnItsOwn)
_sh_over = [s for s in _ssh if not s[2] and s[0] > s[1]]
_sh1 = first(iter(_sh_over), "an over sample")
print(f" shadow mode, the inverter charging 5000 W on its own: "
f"{len(_sh_over)} over samples, e.g. "
f"{_sh1[3] if present(_sh1) else _sh1!s} / "
f"{_sh1[4] if present(_sh1) else _sh1!s}")
check("shadow mode: nothing is cut on the wire, so the row says 'idle', "
"never 'grid charge limited', and the line says 'would'",
_csh.shadow and present(_sh1) and all(
s[3].startswith("Peak guard: idle, at this rate")
and "would" in s[4] for s in _sh_over))
print()
if fails:
print(f"{len(fails)} FAILED:")
for f in fails:
print(f" - {f}")
sys.exit(1)
print("all checks passed")
+5 -122
View File
@@ -25,7 +25,11 @@ quarter's edge as on the rig.
4. The page and the "Why" on a decision within the aim. 4. The page and the "Why" on a decision within the aim.
Mutations (MUTATION.md, purged copies) are listed in the pull request. Mutations (MUTATION.md, purged copies) are listed in the pull request.
"""
CI-18: this file holds parts 1 and 4 (part 4 grades part 1's nights). Parts 2 and 3 are in test_safety126b.py, split out so
CI can run the pieces side by side (the one file took ~13 min). Every check is in
exactly one file; the two print exactly the check lines the one file did."""
import asyncio import asyncio
import dataclasses import dataclasses
@@ -307,127 +311,6 @@ check("fix reverted, at 0.01 s: the ERROR, the notification and the "
_b["errors"] and _b["notes"] and any(s[3] for s in _b["seen"])) _b["errors"] and _b["notes"] and any(s[3] for s in _b["seen"]))
# ============================================================================ #
print("\n2. a real overrun under the reserve still alarms")
def evening(t):
"""600 W, then an oven and a car charger from 20 minutes on."""
return 600.0 if t < 1200 else 6500.0
for tag, onset, kw in (
("night grid charge, then 6500 W", 1200.0, dict(house=evening)),
("modes off, 5500 W all along", 0.0,
dict(house=5500.0, modes=None, socs=(15.0, 12.0)))):
o = opts(modes=kw.get("modes", OWNER) is not None)
head = drive(o, minutes=35, **kw)
base = without_fix(lambda: drive(o, minutes=35, **kw))
show("head " + tag, head)
show("fix reverted", base)
# From the load's onset: before it, the fix reverted shows the night's
# false alarm (part 1).
first_h = next((s[0] for s in head["seen"] if s[6] and s[0] >= onset),
None)
first_b = next((s[0] for s in base["seen"] if s[6] and s[0] >= onset),
None)
check(f"⭐ {tag}: the ERROR and the notification, naming both "
f"batteries",
head["errors"] and head["notes"]
and all("inverter-a and inverter-b" in n for _t, n in head["notes"]))
_th = [t for t, _n in head["notes"]]
_tb = [t for t, _n in base["notes"] if t >= onset]
print(f" notifications at {_th} s; with the fix reverted {_tb} s")
check(f"{tag}: the first at the same cycle as before the fix "
f"({first_h} s, {first_b} s), and none that was not raised before",
first_h is not None and first_h == first_b
and present(nth(_th, 0)) and nth(_th, 0) == nth(_tb, 0)
and set(_th) <= set(_tb))
check(f"{tag}: the red peak row and its banner while it stands",
any(s[4] for s in head["seen"]))
def burst(t):
"""600 W, a 6 500 W load from 20 to 25 minutes, then 600 W again while
the night charge goes on."""
return 6500.0 if 1200 <= t < 1500 else 600.0
# F3 (review): `_peak_landing()` resets its latch when the guard lets go, so
# a real overrun does not keep the later landing errors alarming.
_bh = drive(opts(), house=burst, off=0.99, minutes=61)
_bb = without_fix(lambda: drive(opts(), house=burst, off=0.99,
minutes=61))
show("head real overrun, then the night again", _bh)
show("fix reverted", _bb)
# The burst banked a new month peak, which the later quarters stay under.
_new_peak = _bh["c"].peak_guard.ceiling_w
def _late(r):
"""From the next quarter on: the overrun's own quarter ends over."""
return [x for x in r["seen"] if x[0] >= 1800]
print(f" notifications at {[t for t, _n in _bh['notes']]} s; with the fix "
f"reverted {[t for t, _n in _bb['notes']]} s; limit after the burst "
f"{_new_peak:.0f} W")
check("⭐ after a real overrun ends, the latch is reset: the alarm came "
"during the overrun, and the later quarters' landings are quiet "
"(no notification, no 'Why' peak, no red row) and under the new peak",
any(1200 <= t < 1500 for t, _n in _bh["notes"])
and not [t for t, _n in _bh["notes"] if t >= 1800]
and not any(x[3] or x[4] or x[5] for x in _late(_bh))
and present(nth([v for k, v in _bh["quarters"].items()
if k >= "22:30"], 0))
and all(v <= _new_peak for k, v in _bh["quarters"].items()
if k >= "22:30"))
check("...not vacuous: the guard wanted power at those landings, and with "
"the fix reverted they show the 'Why' peak or an alarm",
any(x[2] for x in _late(_bh))
and (any(x[3] or x[4] or x[5] for x in _late(_bb))
or bool([t for t, _n in _bb["notes"] if t >= 1800])))
# ============================================================================ #
print("\n3. misses_aim() on its own")
START = datetime(2026, 10, 30, 21, 15, tzinfo=timezone.utc)
def proj(projected, elapsed, held):
return Projection(projected, projected, elapsed, 1.0, True, START, held)
check("the rig's case: 3452 W against 3450 W, 0.3 s left, charging "
"1250 W from the grid: not a miss",
not peakguard.misses_aim(proj(3452.0, 899.7, 3452.0), batt_w=-1250.0,
target_w=AIM_CAP))
check("...although decide() wants power there (its gain, 900 / 0.3 s)",
(peakguard.decide(proj(3452.0, 899.7, 3452.0), batt_w=-1250.0,
cap_w=3500, margin_w=50, reading=None,
achievable_w=0.0, soc=10.0, soc_floor=20.0)
.wanted_w or 0.0) > 1000.0)
check("a quarter heading 11 W over the aim with the batteries at 0 W is a "
"miss", peakguard.misses_aim(proj(3461.0, 899.7, 3461.0), batt_w=0.0,
target_w=AIM_CAP))
check("...and 10 W is not (ALARM_MISS_W, as for 'Load too high')",
not peakguard.misses_aim(proj(3460.0, 899.7, 3460.0), batt_w=0.0,
target_w=AIM_CAP))
check("the add-on's own grid charge counts as stoppable: 4000 W on the "
"meter mid-quarter, 3000 W of it charging, is not a miss",
not peakguard.misses_aim(proj(2500.0, 450.0, 4000.0), batt_w=-3000.0,
target_w=AIM_CAP))
check("...and a house of 6000 W the batteries are covering is one",
peakguard.misses_aim(proj(1000.0, 450.0, 0.0), batt_w=6000.0,
target_w=AIM_CAP))
check("no battery reading, or no seconds left: not a miss (decide() files "
"nothing there)",
not peakguard.misses_aim(proj(9000.0, 450.0, 9000.0), batt_w=None,
target_w=AIM_CAP)
and not peakguard.misses_aim(proj(9000.0, 900.0, 9000.0), batt_w=0.0,
target_w=AIM_CAP))
# ============================================================================ # # ============================================================================ #
print("\n4. the page and the 'Why' on a decision within the aim") print("\n4. the page and the 'Why' on a decision within the aim")
_c = NIGHTS["aim 3450, cycle 0.01 s before the edge"][0]["c"] _c = NIGHTS["aim 3450, cycle 0.01 s before the edge"][0]["c"]
+382
View File
@@ -0,0 +1,382 @@
"""Runnable check for SAFETY-126, a part. `python3 test_safety126b.py`
Split out of test_safety126.py by CI-18 so CI can run the pieces side by side (the one file
took ~13 min). The docstring there describes the whole. It holds parts 2 and 3 (a real overrun still alarms, misses_aim()). Same helpers,
same checks, none dropped: the pieces print exactly the check lines the one file did.
Read MUTATION.md before you report a survivor."""
import asyncio
import dataclasses
import io
import logging
import os
import sys
import tempfile
import types
from datetime import datetime, timedelta, timezone
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
sys.path.insert(0, os.path.join(HERE, "tools"))
import opt11p3_replay as rp # noqa: E402
from named_absence import first, nth, present # noqa: E402
import main_files # noqa: E402
import app.main as m # noqa: E402
import app.p1 as p1mod # noqa: E402
from app import homeview, messages, peakguard, tariff # noqa: E402
from app import price as _price, static_tariff as _st # noqa: E402
from app.main import Controller # noqa: E402
from app.p1 import make_sample, split_signed # noqa: E402
from app.store import unit_key # noqa: E402
from app.tariff import QUARTER_S, Projection # noqa: E402
logging.disable(logging.NOTSET)
logging.getLogger().setLevel(logging.CRITICAL)
_ERRORS = io.StringIO()
_h = logging.StreamHandler(_ERRORS)
_h.setLevel(logging.ERROR)
logging.getLogger("goodwe").addHandler(_h)
logging.getLogger("goodwe").setLevel(logging.ERROR)
logging.getLogger("goodwe").propagate = False
fails = []
def check(name, cond):
print(f" {'ok ' if cond else 'FAIL'} {name}")
if not cond:
fails.append(name)
PEAK = 5413.17 # October's banked peak on the live site
AIM_CAP = 3500.0 - 50.0
AIM_PEAK = PEAK - 50.0
TOL = 10.0 # W over the aim a quarter may land (SAFETY-81)
L = timezone(timedelta(hours=1))
NIGHT = datetime(2026, 10, 30, 22, 0, tzinfo=L).astimezone(timezone.utc)
PROFILE = ('{"periods": ['
'{"name": "night", "days": "all", "from": "22:00", "to": "07:00",'
' "eur_per_kwh": 0.2333},'
'{"name": "day", "days": "all", "from": "07:00", "to": "22:00",'
' "eur_per_kwh": 0.2801}]}')
OWNER = {"a": "leftover_solar", "b": "cheap_hours"}
def opts(*, modes=True, arb=False):
o = dict(rp.options(modes, arb, 2))
o.update(cycle_cost_threshold_eur=0.03, static_profile=PROFILE,
peak_cap_w=3500, peak_margin_w=50)
o["inverters"][0].update(max_w=5000, capacity_kwh=15.36)
o["inverters"][1].update(max_w=4600, capacity_kwh=20.48)
return o
class Harder(rp.Plant):
"""Charges harder than asked, as inverter-a did live (test_safety125.py:
asked -4271 W, measured about -4750 W; asked -5000 W, about -5210 W), up
to `cap` W. So a charge sized to the aim lands a few W over it, as on the
rig (worst +7 W)."""
cap = -5216.0
def step(self, dt, floor):
c = self.cmd
if c < 0:
self.cmd = max(c * 1.11, self.cap)
try:
super().step(dt, floor)
finally:
self.cmd = c
async def _no_fetch(*a, **k):
raise AssertionError("the tariff task reached for a price feed")
def without_fix(fn):
"""release/1.0 cc9bbeb: no decision is ever within the aim."""
real = getattr(Controller, "_peak_landing", None)
if real is None:
return fn()
Controller._peak_landing = lambda self, decision: decision
try:
return fn()
finally:
Controller._peak_landing = real
def drive(o, *, modes=OWNER, socs=(10.0, 10.0), house=600.0, minutes=46,
start=NIGHT, off=0.7, peak=None):
"""The real Controller from `start` + `off` s for `minutes` at a 1 s
cycle with OPT-15's lag, so a cycle lands `1 - off` s before each
quarter's end. `house` is W or a function of t. Returns a dict: the
quarters' true grid averages, the commands, the reserve notifications,
the ERROR lines, and per cycle where the guard engaged: (t, floor
limited, within the aim, battery "Why" peak, red reserve row, red
saturated row, alarm latched)."""
store = rp._Store()
for u, mode in (modes or {}).items():
store.data[unit_key(f"inverter-{u}", "pack_use")] = True
store.data[unit_key(f"inverter-{u}", "pack_mode")] = mode
store.data[unit_key(f"inverter-{u}", "pack_sell")] = False
load = house if callable(house) else (lambda t: float(house))
t0 = start + timedelta(seconds=off)
out = {"cmds": [], "notes": [], "seen": [], "sums": {}}
_ERRORS.seek(0)
_ERRORS.truncate()
async def go():
lag = rp.Lag()
hass = rp.Hass(("a", "b"), load, {"a": socs[0], "b": socs[1]},
limits={"a": (-5000.0, 5000.0),
"b": (-4600.0, 4600.0)}, lag=lag)
for u, cap in (("a", -5216.0), ("b", -4800.0)):
hass.plants[u].__class__ = Harder
hass.plants[u].cap = cap
real_set = hass.set_number
async def set_number(e, v):
out["cmds"].append((round(hass.t, 3), e, float(v)))
return await real_set(e, v)
async def call(*a):
if a[:2] == ("persistent_notification", "create") \
and a[2]["notification_id"] == messages.ID_PEAK_RESERVE:
out["notes"].append((hass.t, a[2]["message"]))
return True
hass.set_number, hass.call = set_number, call
tmp = tempfile.mkdtemp(prefix="s126-")
db = os.path.join(tmp, "tariff.db")
if peak is not None:
tariff.PeakStore(db)._db.execute(
"INSERT INTO monthly_peak VALUES (?, ?, ?, NULL)",
(tariff.month_key(t0), peak,
"2026-10-21T20:15:00+00:00")).connection.commit()
c = Controller(dict(o), hass, store, rp._Pub(), stop=asyncio.Event(),
peak_db_path=db,
price_history_path=os.path.join(tmp, "ph.json"))
c.inverters[0].dev_min, c.inverters[0].dev_max = -5000.0, 5000.0
c.inverters[1].dev_min, c.inverters[1].dev_max = -4600.0, 4600.0
c.auto = True
real = main_files.live.datetime, homeview.datetime, p1mod.time
clock, simt = [t0], [0.0]
class _DT(real[0]):
@classmethod
def now(cls, tz=None):
return clock[0] if tz is None else clock[0].astimezone(tz)
main_files.live.datetime = homeview.datetime = _DT
p1mod.time = types.SimpleNamespace(monotonic=lambda: 1e6 + simt[0])
real_load = _price.load_prices, _st.load_prices
_price.load_prices = _st.load_prices = _no_fetch
task = (asyncio.create_task(c.run_tariff_refresh())
if o.get("battery_modes_enabled") or o.get("arbitrage_enabled")
else None)
try:
hass.advance(0.0, 10.0)
t = 0.0
while t < minutes * 60:
now = t0 + timedelta(seconds=t)
hass.t, simt[0], clock[0] = t, t, now
if t == 0.0 and task is not None:
for _ in range(500):
if c.tariff_plan is not None:
break
await asyncio.sleep(0)
q = int(now.timestamp() // QUARTER_S)
acc = out["sums"].setdefault(q, [0.0, 0])
if t >= lag.p1_s:
imp, exp = split_signed(hass._past(lag.meter_s
+ lag.p1_s)[0])
c.p1.submit(make_sample(
"ha_signed", imp, exp, phases=1,
ingest_ts=now - timedelta(seconds=lag.p1_s),
ingest_mono=1e6 + t))
await c.read_inputs(now_mono=t)
await c.cycle()
hass.advance(lag.tick, 10.0)
acc[0] += max(0.0, hass.grid())
acc[1] += 1
g = c.peak_guard
if g is not None and g.engaged and g.blind is None:
rows = {r["id"]: r for r in c.checks(now)}
row = rows.get("peak_guard", {})
red = row.get("ok") is False and not row.get("warn")
out["seen"].append((
t, g.floor_limited, getattr(g, "within_aim", False),
homeview.peak_engaged(c),
red and "banner" in row,
red and "banner" not in row,
c._peak_floor_limited))
t += lag.tick
finally:
if task is not None:
task.cancel()
try:
await task
except asyncio.CancelledError:
pass
main_files.live.datetime, homeview.datetime, p1mod.time = real
_price.load_prices, _st.load_prices = real_load
return c
out["c"] = asyncio.run(go())
out["quarters"] = {
datetime.fromtimestamp(q * QUARTER_S, L).strftime("%H:%M"): s / k
for q, (s, k) in sorted(out["sums"].items()) if k >= QUARTER_S - 1}
out["errors"] = [x for x in _ERRORS.getvalue().splitlines()
if "PEAK_GUARD_FLOOR_LIMITED" in x]
return out
def show(tag, r):
print(f" {tag}: quarters "
f"{ {k: round(v, 1) for k, v in r['quarters'].items()} }, "
f"guard cycles {len(r['seen'])}, floor-limited "
f"{sum(1 for s in r['seen'] if s[1])}, within-aim "
f"{sum(1 for s in r['seen'] if s[2])}, Why peak "
f"{sum(1 for s in r['seen'] if s[3])}, notes {len(r['notes'])}, "
f"errors {len(r['errors'])}")
def quiet(r):
"""No reserve alarm in any form: ERROR, notification, red row, latch,
"Why" peak, and no red saturated row."""
return (not r["errors"] and not r["notes"]
and not any(s[3] or s[4] or s[5] or s[6] for s in r["seen"]))
def on_aim(r, aim):
q = r["quarters"]
return len(q) >= 3 and all(v <= aim + TOL for v in q.values())
# ============================================================================ #
print("\n2. a real overrun under the reserve still alarms")
def evening(t):
"""600 W, then an oven and a car charger from 20 minutes on."""
return 600.0 if t < 1200 else 6500.0
for tag, onset, kw in (
("night grid charge, then 6500 W", 1200.0, dict(house=evening)),
("modes off, 5500 W all along", 0.0,
dict(house=5500.0, modes=None, socs=(15.0, 12.0)))):
o = opts(modes=kw.get("modes", OWNER) is not None)
head = drive(o, minutes=35, **kw)
base = without_fix(lambda: drive(o, minutes=35, **kw))
show("head " + tag, head)
show("fix reverted", base)
# From the load's onset: before it, the fix reverted shows the night's
# false alarm (part 1).
first_h = next((s[0] for s in head["seen"] if s[6] and s[0] >= onset),
None)
first_b = next((s[0] for s in base["seen"] if s[6] and s[0] >= onset),
None)
check(f"⭐ {tag}: the ERROR and the notification, naming both "
f"batteries",
head["errors"] and head["notes"]
and all("inverter-a and inverter-b" in n for _t, n in head["notes"]))
_th = [t for t, _n in head["notes"]]
_tb = [t for t, _n in base["notes"] if t >= onset]
print(f" notifications at {_th} s; with the fix reverted {_tb} s")
check(f"{tag}: the first at the same cycle as before the fix "
f"({first_h} s, {first_b} s), and none that was not raised before",
first_h is not None and first_h == first_b
and present(nth(_th, 0)) and nth(_th, 0) == nth(_tb, 0)
and set(_th) <= set(_tb))
check(f"{tag}: the red peak row and its banner while it stands",
any(s[4] for s in head["seen"]))
def burst(t):
"""600 W, a 6 500 W load from 20 to 25 minutes, then 600 W again while
the night charge goes on."""
return 6500.0 if 1200 <= t < 1500 else 600.0
# F3 (review): `_peak_landing()` resets its latch when the guard lets go, so
# a real overrun does not keep the later landing errors alarming.
_bh = drive(opts(), house=burst, off=0.99, minutes=61)
_bb = without_fix(lambda: drive(opts(), house=burst, off=0.99,
minutes=61))
show("head real overrun, then the night again", _bh)
show("fix reverted", _bb)
# The burst banked a new month peak, which the later quarters stay under.
_new_peak = _bh["c"].peak_guard.ceiling_w
def _late(r):
"""From the next quarter on: the overrun's own quarter ends over."""
return [x for x in r["seen"] if x[0] >= 1800]
print(f" notifications at {[t for t, _n in _bh['notes']]} s; with the fix "
f"reverted {[t for t, _n in _bb['notes']]} s; limit after the burst "
f"{_new_peak:.0f} W")
check("⭐ after a real overrun ends, the latch is reset: the alarm came "
"during the overrun, and the later quarters' landings are quiet "
"(no notification, no 'Why' peak, no red row) and under the new peak",
any(1200 <= t < 1500 for t, _n in _bh["notes"])
and not [t for t, _n in _bh["notes"] if t >= 1800]
and not any(x[3] or x[4] or x[5] for x in _late(_bh))
and present(nth([v for k, v in _bh["quarters"].items()
if k >= "22:30"], 0))
and all(v <= _new_peak for k, v in _bh["quarters"].items()
if k >= "22:30"))
check("...not vacuous: the guard wanted power at those landings, and with "
"the fix reverted they show the 'Why' peak or an alarm",
any(x[2] for x in _late(_bh))
and (any(x[3] or x[4] or x[5] for x in _late(_bb))
or bool([t for t, _n in _bb["notes"] if t >= 1800])))
# ============================================================================ #
print("\n3. misses_aim() on its own")
START = datetime(2026, 10, 30, 21, 15, tzinfo=timezone.utc)
def proj(projected, elapsed, held):
return Projection(projected, projected, elapsed, 1.0, True, START, held)
check("the rig's case: 3452 W against 3450 W, 0.3 s left, charging "
"1250 W from the grid: not a miss",
not peakguard.misses_aim(proj(3452.0, 899.7, 3452.0), batt_w=-1250.0,
target_w=AIM_CAP))
check("...although decide() wants power there (its gain, 900 / 0.3 s)",
(peakguard.decide(proj(3452.0, 899.7, 3452.0), batt_w=-1250.0,
cap_w=3500, margin_w=50, reading=None,
achievable_w=0.0, soc=10.0, soc_floor=20.0)
.wanted_w or 0.0) > 1000.0)
check("a quarter heading 11 W over the aim with the batteries at 0 W is a "
"miss", peakguard.misses_aim(proj(3461.0, 899.7, 3461.0), batt_w=0.0,
target_w=AIM_CAP))
check("...and 10 W is not (ALARM_MISS_W, as for 'Load too high')",
not peakguard.misses_aim(proj(3460.0, 899.7, 3460.0), batt_w=0.0,
target_w=AIM_CAP))
check("the add-on's own grid charge counts as stoppable: 4000 W on the "
"meter mid-quarter, 3000 W of it charging, is not a miss",
not peakguard.misses_aim(proj(2500.0, 450.0, 4000.0), batt_w=-3000.0,
target_w=AIM_CAP))
check("...and a house of 6000 W the batteries are covering is one",
peakguard.misses_aim(proj(1000.0, 450.0, 0.0), batt_w=6000.0,
target_w=AIM_CAP))
check("no battery reading, or no seconds left: not a miss (decide() files "
"nothing there)",
not peakguard.misses_aim(proj(9000.0, 450.0, 9000.0), batt_w=None,
target_w=AIM_CAP)
and not peakguard.misses_aim(proj(9000.0, 900.0, 9000.0), batt_w=0.0,
target_w=AIM_CAP))
# ============================================================================ #
print()
if fails:
print(f"{len(fails)} SAFETY-126 check(s) FAILED:")
for f in fails:
print(f" - {f}")
sys.exit(1)
print("all SAFETY-126 checks passed")
+114 -4
View File
@@ -2,6 +2,14 @@
"""EV-03: a model of an Alfen car charger behind Home Assistant, for the unit """EV-03: a model of an Alfen car charger behind Home Assistant, for the unit
tests and, later, for TEST-23. tests and, later, for TEST-23.
EV-04 ADDS THE WRITE SIDE: `request_current()` and `request_phases()` are what
the add-on's writes reach. The new state is taken after `lag_s` seconds of
model time (the read-back lag), the power RAMPS to it, and `refuse` makes the
charger ignore a write ("ignore": Home Assistant says yes, the charger does not
change) or Home Assistant refuse it ("error"). `log` records every write with
the model's clock and the power and setpoint at that moment, so a test can
prove the safe phase sequence (0 A first, under 100 W before the phases move).
WHERE IT LIVES, AND WHY. The rig's hardware sims (`hwsim.py`, `plantsim.py`) are WHERE IT LIVES, AND WHY. The rig's hardware sims (`hwsim.py`, `plantsim.py`) are
in the infra repo admin/goodwe under `sim/`, pinned by `.gitea/infra-pin`; there in the infra repo admin/goodwe under `sim/`, pinned by `.gitea/infra-pin`; there
is no `sim/` in this repository. This card may write only to this repository, so is no `sim/` in this repository. This card may write only to this repository, so
@@ -51,6 +59,18 @@ class SimCharger:
self.unavailable = False self.unavailable = False
self.login_on = True self.login_on = True
self.error = "0: No Error" self.error = "0: No Error"
# EV-04: the write side
self.t = 0.0 # model seconds
self.lag_s = 0.0 # a write shows in the read-back this late
self.refuse = None # None | "ignore" | "error"
self._snap = None # `freeze()`: the readings stop moving
self._frozen_w = None # `freeze_power()`: only the power does
self.no_energy = False # a charger with no energy entity
self.ramp_w_s = RAMP_W_S # how fast the power follows its target
self.stop_delay_s = 0.0 # mode3 stays C this long after 0 A
self._c_hold = 0.0
self.log = [] # (t, what, value, power_w, setpoint_a)
self._pending = []
# -- the world acts on it ------------------------------------------------- # -- the world acts on it -------------------------------------------------
def plug_in(self, car_phases=3): def plug_in(self, car_phases=3):
@@ -76,6 +96,44 @@ class SimCharger:
"""mode3 E or F: the charger's own error states.""" """mode3 E or F: the charger's own error states."""
self.state, self.power_w = letter, 0.0 self.state, self.power_w = letter, 0.0
# -- what the add-on's writes reach (EV-04) ----------------------------------
def request_current(self, a):
"""`number.set_value` on the current. False: Home Assistant refused it
(out of the entity's 0-40 A range, or `refuse == "error"`)."""
a = float(a)
if a != a or a < 0.0 or a > 40.0 or self.refuse == "error":
return False
self.log.append((self.t, "current", a, self.power_w, self.setpoint_a))
if self.refuse == "ignore":
return True
self._later("current", a)
return True
def request_phases(self, n):
"""`select.select_option` on the installation's allowed phases."""
if self.refuse == "error" or n not in (1, 3):
return False
self.log.append((self.t, "phases", n, self.power_w, self.setpoint_a))
if self.refuse == "ignore":
return True
self._later("phases", n)
return True
def _later(self, what, v):
if self.lag_s <= 0:
self._apply(what, v)
else:
self._pending.append((self.t + self.lag_s, what, v))
def _apply(self, what, v):
if what == "current":
self.setpoint_a = self.readback_a = max(0.0, min(v, self.station_a))
else:
self.phases_allowed = 3 if v == 3 else 1
def writes(self, what=None):
return [x for x in self.log if what in (None, x[1])]
def go_unavailable(self, on=True): def go_unavailable(self, on=True):
self.unavailable = bool(on) self.unavailable = bool(on)
@@ -94,13 +152,22 @@ class SimCharger:
def tick(self, seconds=1.0): def tick(self, seconds=1.0):
for _ in range(int(max(1, round(seconds)))): for _ in range(int(max(1, round(seconds)))):
self.t += 1.0
for p in [x for x in self._pending if x[0] <= self.t]:
self._pending.remove(p)
self._apply(p[1], p[2])
if self.state in ("E", "F"): # a fault: nothing flows, it stays if self.state in ("E", "F"): # a fault: nothing flows, it stays
self.power_w = 0.0 self.power_w = 0.0
continue continue
if self.state != "A": if self.state != "A":
self.state = "C" if self.target_w() > 0 else "B" if self.target_w() > 0:
self.state, self._c_hold = "C", 0.0
elif self.state == "C" and self._c_hold < self.stop_delay_s:
self._c_hold += 1.0 # the car has not let go yet
else:
self.state = "B"
tgt = self.target_w() tgt = self.target_w()
step = RAMP_W_S step = self.ramp_w_s
if self.power_w < tgt: if self.power_w < tgt:
self.power_w = min(tgt, self.power_w + step) self.power_w = min(tgt, self.power_w + step)
else: else:
@@ -113,7 +180,20 @@ class SimCharger:
if self.phases_used and self.power_w else 0.0) if self.phases_used and self.power_w else 0.0)
return [per if i < self.phases_used else 0.0 for i in range(3)] return [per if i < self.phases_used else 0.0 for i in range(3)]
def freeze(self, on=True):
"""A stuck sensor: Home Assistant goes on serving the readings of this
moment, whatever the charger does after it."""
self._snap = self._build() if on else None
def freeze_power(self, on=True):
"""Only the power sensor sticks, at what it reads now; the energy meter
and the rest go on telling the truth."""
self._frozen_w = self.power_w if on else None
def states(self) -> dict: def states(self) -> dict:
return self._snap if self._snap is not None else self._build()
def _build(self) -> dict:
x = self.x x = self.x
bad = "unavailable" if self.unavailable else None bad = "unavailable" if self.unavailable else None
@@ -134,7 +214,8 @@ class SimCharger:
{"A": "Available", "B": "EV Connected", {"A": "Available", "B": "EV Connected",
"C": "Charging Normal"}.get(self.state, "Error")), "C": "Charging Normal"}.get(self.state, "Error")),
st(f"sensor.{x}_active_power_total_socket_1", st(f"sensor.{x}_active_power_total_socket_1",
f"{self.power_w:.0f}", "W"), f"{self.power_w if self._frozen_w is None else self._frozen_w:.0f}",
"W"),
st(f"sensor.{x}_meter_reading_socket_1", f"{self.kwh:.2f}", st(f"sensor.{x}_meter_reading_socket_1", f"{self.kwh:.2f}",
"kWh"), "kWh"),
st(f"sensor.{x}_current_l1_socket_1", f"{amps[0]:.1f}", "A"), st(f"sensor.{x}_current_l1_socket_1", f"{amps[0]:.1f}", "A"),
@@ -153,7 +234,10 @@ class SimCharger:
"state": bad or ("on" if self.login_on else "off"), "state": bad or ("on" if self.login_on else "off"),
"attributes": {"device_class": "connectivity"}}), "attributes": {"device_class": "connectivity"}}),
] ]
return dict(rows) out = dict(rows)
if self.no_energy:
out.pop(f"sensor.{x}_meter_reading_socket_1", None)
return out
class FakeHa: class FakeHa:
@@ -195,10 +279,20 @@ class FakeHa:
async def set_number(self, entity_id, value): async def set_number(self, entity_id, value):
self.sets.append((entity_id, value)) self.sets.append((entity_id, value))
c = self.charger
if c is not None and entity_id == \
f"number.{c.x}_power_connector_max_current_socket_1":
return c.request_current(value)
return True return True
async def call(self, domain, service, data=None): async def call(self, domain, service, data=None):
self.calls.append((domain, service, data)) self.calls.append((domain, service, data))
c = self.charger
if c is not None and domain == "select" and service == "select_option" \
and (data or {}).get("entity_id") == \
f"select.{c.x}_installation_max_allowed_phases":
return c.request_phases(
3 if "3" in str((data or {}).get("option")) else 1)
return True return True
def charger_writes(self): def charger_writes(self):
@@ -251,6 +345,22 @@ def _selftest():
assert c.state == "B" and c.power_w == 0 # under 6 A: paused assert c.state == "B" and c.power_w == 0 # under 6 A: paused
c.set_current(10); c.car_full(); c.tick(5) c.set_current(10); c.car_full(); c.tick(5)
assert c.state == "B" and c.power_w == 0 and c.readback_a == 10 assert c.state == "B" and c.power_w == 0 and c.readback_a == 10
# EV-04: writes, the read-back lag, a refusal
w = SimCharger(); w.plug_in(); w.tick(1)
assert w.request_current(12) and w.setpoint_a == 12
assert not w.request_current(41) and not w.request_current(-1)
w.lag_s = 3.0
assert w.request_current(8) and w.readback_a == 12
w.tick(2); assert w.readback_a == 12
w.tick(1); assert w.readback_a == 8
w.refuse = "ignore"
assert w.request_current(6) and w.readback_a == 8
w.refuse = "error"
assert not w.request_current(6) and not w.request_phases(3)
w.refuse = None; w.lag_s = 0.0
assert w.request_phases(3) and w.phases_allowed == 3
assert [x[1] for x in w.writes()] == ["current", "current", "current",
"phases"], w.writes()
c.go_unavailable() c.go_unavailable()
assert c.states()[f"sensor.wallbox_active_power_total_socket_1"]["state"] \ assert c.states()[f"sensor.wallbox_active_power_total_socket_1"]["state"] \
== "unavailable" == "unavailable"
+189
View File
@@ -0,0 +1,189 @@
#!/usr/bin/env python3
"""EV-04: the real Controller on the SAFETY-81 plant, plus a car charger.
python3 tools/ev04_peak.py # a few runs and what they raised
A 1 s cycle, a 3500 W cap, one battery switched Off (so only the peak guard
makes it give, at most `rating` W), a P1 meter that publishes 0.3 s before each
cycle, and `chargersim.SimCharger` behind the same Home Assistant: its power
is part of the load the meter sees, and the add-on reads and writes it through
the real driver. `events` is `{second: fn(plant, controller)}`, run before that
cycle: unplug, freeze the reading, step the house, change the user's current.
Used by test_ev04.py (sections 9 to 11) and, later, by the rig test."""
import asyncio
import logging
import os
import sys
import tempfile
import time
from datetime import timedelta
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
import opt11_identity as rig # noqa: E402
import main_files # noqa: E402
import safety81_sim as s81 # noqa: E402
from app import packmode # noqa: E402
from app.main import Controller # noqa: E402
from app.p1 import make_sample, split_signed # noqa: E402
from app.store import unit_key # noqa: E402
from chargersim import SimCharger # noqa: E402
SET = "number.wallbox_power_connector_max_current_socket_1"
PHASES = "select.wallbox_installation_max_allowed_phases"
ALARMS = ("goodwe_peak_saturated", "goodwe_peak_soc_floor")
OVER = "goodwe_car_over"
class CarPlant(s81._Plant):
"""The SAFETY-81 plant with a charger on the same meter: the grid sees the
house, the car and what the battery does."""
def __init__(self, house, rating, soc, charger):
super().__init__(lambda at: house(at) + charger.power_w, rating, soc)
self.ch = charger
async def state(self, entity_id):
return self.ch.states().get(entity_id)
async def set_number(self, e, v):
if e == SET:
return self.ch.request_current(float(v))
return await super().set_number(e, v)
async def call(self, domain, service, data=None):
if domain == "select" and service == "select_option":
n = 3 if "3" in str((data or {}).get("option")) else 1
return self.ch.request_phases(n)
return await super().call(domain, service, data)
class CarPlantN(CarPlant):
"""EV-10b: N batteries, each its own setpoint, power and SoC (`soc` is a
dict {"a": %, "b": %}); `rating` is per battery. The grid sees them all."""
def __init__(self, house, rating, soc, charger):
super().__init__(house, rating, 0.0, charger)
self.socs = dict(soc)
self.hists = {u: [(-1e9, 0.0)] for u in self.socs}
def batt_of(self, u, at):
w = 0.0
for when, v in self.hists[u]:
if when <= at:
w = v
return max(-self.rating, min(self.rating, float(round(w))))
def batt(self, at):
return sum(self.batt_of(u, at) for u in self.socs)
async def number(self, e, invert=False):
for u in self.socs:
if e == "sensor.soc_" + u:
return self.socs[u]
if e == "sensor.batt_" + u:
return self.batt_of(u, self.t)
return await super().number(e, invert)
async def set_number(self, e, v):
if e.startswith("number.sp_"):
self.hists[e[-1]].append((self.t + s81.RESPONSE_S, float(v)))
return True
return await super().set_number(e, v)
def drive(house, *, dur=300.0, rating=2000.0, soc=60.0, cap=3500.0, margin=50,
opts=None, plug=True, setpoint=16, phases=3, mode="manual",
user_a=16, events=None, sim=None, store=None, n=1, plant_cls=None,
dev_w=5000.0):
"""Run it. Returns a namespace-like dict: plant, controller, charger, the
notification ids raised with their second, and the controller's rows."""
sim = sim or SimCharger(setpoint_a=setpoint)
if plug:
sim.plug_in()
sim.phases_allowed = phases
o = rig._options(n, dict({
"meter_source": "ha_signed", "p1_net_entity": "sensor.net",
"meter_phases": 1, "peak_cap_w": cap, "peak_margin_w": margin,
"battery_modes_enabled": True, "max_w": rating,
"ev_charger": "alfen_ha", "ev_max_a": 16, "ev_phases": "auto",
"ev_current_entity": SET}, **(opts or {})))
store = store or rig._Store()
for u in "ab"[:n]:
store.data[unit_key("inverter-" + u, packmode.USE_KEY)] = False
store.data[packmode.USE_KEY] = False
db = os.path.join(tempfile.mkdtemp(prefix="ev4-"), "tariff.db")
out = {}
async def go():
plant = (plant_cls or CarPlant)(house, rating, soc, sim)
c = Controller(o, plant, store, rig._Pub(), stop=asyncio.Event(),
peak_db_path=db)
for i in c.inverters:
i.dev_min, i.dev_max = -dev_w, dev_w
c.auto = True
clock = [0.0]
c.car_now = lambda: clock[0]
if hasattr(c.charger, "_sleep"):
async def sleep(s):
sim.tick(s)
clock[0] += s
c.charger._sleep = sleep
c.charger._clock = lambda: clock[0]
real_dt = main_files.live.datetime
class _DT(real_dt):
@classmethod
def now(cls, tz=None):
return rig.BASE + timedelta(seconds=clock[0])
main_files.live.datetime = _DT
c.car_mode, c.car_n, c.car_a = mode, phases, float(user_a)
snaps = []
try:
t = 0.0
while t < dur:
plant.t = clock[0] = t
fn = events_in.get(int(t)) if t == int(t) else None
if fn is not None:
fn(plant, c)
sim.tick(1.0)
ts = t - s81.SAMPLE_LEAD_S
plant.meter = plant.grid(ts)
imp, exp = split_signed(plant.meter)
c.p1.submit(make_sample(
"ha_signed", imp, exp, phases=1,
ingest_ts=rig.BASE + timedelta(seconds=ts),
ingest_mono=time.monotonic()))
await c.read_inputs(now_mono=t)
await c.cycle()
await c.car_settle()
snaps.append((t, c.car_explains, c.car_over,
(c.peak_guard.engaged if c.peak_guard else None),
plant.batt(t), sim.power_w))
t += s81.TICK
finally:
main_files.live.datetime = real_dt
raised = [(at, nid) for at, nid in plant.notes]
out.update(plant=plant, c=c, sim=sim, raised=raised, snaps=snaps,
store=store)
events_in = events or {}
asyncio.run(go())
return out
def ids(out, *wanted):
return [(t, n) for t, n in out["raised"] if n in wanted]
if __name__ == "__main__":
logging.disable(logging.CRITICAL)
for name, kw in (
("car 11 kW, house 1.1 kW, Manual",
dict(house=s81.constant(1100.0))),
("same, Off", dict(house=s81.constant(1100.0), mode="off"))):
r = drive(**kw)
print(f"{name:34s} alarms {ids(r, *ALARMS)} "
f"car notice {ids(r, OVER)}")
+295
View File
@@ -0,0 +1,295 @@
#!/usr/bin/env python3
"""EV-05: the real Controller on a sunny plant with N batteries and a car.
python3 tools/ev05_sun.py # mock-up scenario 2, both priorities
A 1 s cycle, a P1 meter that publishes 0.3 s before each cycle, N batteries
each with ITS OWN rating and level (switched On, so the zero-grid loop charges
them from the export), and `chargersim.SimCharger` behind the same Home
Assistant. The meter sees `house + car - sun - batteries` (battery discharge
positive), so the spare sun the add-on computes is `sun - house` whatever it
does. A battery at 100 % takes no charge. `events` is `{second: fn(plant, c)}`,
run before that cycle. `race=True` uses the production order (read, the writer
task settles, then the cycle), as test_ev04.py's `World.step_race`.
Used by test_ev05.py and, later, by the rig test."""
import asyncio
import logging
import os
import sys
import tempfile
from datetime import timedelta
HERE = os.path.dirname(os.path.abspath(__file__))
sys.path.insert(0, HERE)
import opt11_identity as rig # noqa: E402
import main_files # noqa: E402
from app import packmode # noqa: E402
from app.main import Controller # noqa: E402
from app.p1 import make_sample, split_signed # noqa: E402
from app.store import unit_key # noqa: E402
from chargersim import SimCharger # noqa: E402
from app import p1 as _p1 # noqa: E402
SET = "number.wallbox_power_connector_max_current_socket_1"
PHASES = "select.wallbox_installation_max_allowed_phases"
ALARMS = ("goodwe_peak_saturated", "goodwe_peak_soc_floor")
RESPONSE_S = 0.5 # a battery reaches its new command this much later
SAMPLE_LEAD_S = 0.3
class SunPlant:
"""The house, the sun, N batteries and the charger on one meter."""
def __init__(self, house, sun, ratings, socs, charger):
self.house, self.sun = house, sun
self.ratings, self.socs = dict(ratings), dict(socs)
self.ch = charger
self.t = 0.0
self.hists = {u: [(-1e9, 0.0)] for u in self.ratings}
self.notes = [] # (t, notification id) raised
self.dismissed = []
self.sets = [] # (t, entity, value): every number write
# Every charger write the model took, as `SimCharger.log` has it but
# on THIS clock (the model's own runs ahead while a write waits).
self.wlog = []
self.meter = 0.0
self.meter_on = True # False: the meter stops publishing
self.batt_nan = set() # units whose battery figure reads None
self.utc_off = 0.0 # the wall clock jumps, the model clock not
self.ha_down = False # Home Assistant answers nothing (SAFETY-112)
self.response_s = RESPONSE_S # a slow battery takes longer
def batt_of(self, u, at):
w = 0.0
for when, v in self.hists[u]:
if when <= at:
w = v
r = self.ratings[u]
w = max(-r, min(r, float(round(w))))
if self.socs[u] >= 100.0 and w < 0.0:
w = 0.0 # a full battery takes no charge
return w
def batt(self, at):
return sum(self.batt_of(u, at) for u in self.ratings)
def grid(self, at):
return self.house(at) + self.ch.power_w - self.sun(at) - self.batt(at)
# -- Home Assistant -----------------------------------------------------
async def limits(self, e):
return (-5000.0, 5000.0, 1.0)
async def state(self, entity_id):
if self.ha_down:
return None
return self.ch.states().get(entity_id)
async def states(self):
if self.ha_down:
return []
return list(self.ch.states().values())
async def call(self, domain, service, data=None):
if self.ha_down:
return False
if service == "create":
self.notes.append((self.t, (data or {}).get("notification_id")))
if service == "dismiss":
self.dismissed.append((self.t, (data or {}).get("notification_id")))
if domain == "select" and service == "select_option":
n = 3 if "3" in str((data or {}).get("option")) else 1
return self._logged("phases", n, self.ch.request_phases)
return True
def _logged(self, what, v, fn):
n0, row = len(self.ch.log), (self.t, what, v, self.ch.power_w,
self.ch.setpoint_a)
ok = fn(v)
if len(self.ch.log) > n0:
self.wlog.append(row)
return ok
async def number(self, e, invert=False):
if self.ha_down:
return None
for u in self.ratings:
if e == "sensor.soc_" + u:
return self.socs[u]
if e == "sensor.batt_" + u:
return None if u in self.batt_nan else self.batt_of(u, self.t)
if e in ("sensor.grid", "sensor.net"):
return self.meter
return None
async def set_number(self, e, v):
if self.ha_down:
return False
self.sets.append((self.t, e, float(v)))
if e == SET:
return self._logged("current", float(v), self.ch.request_current)
if e.startswith("number.sp_"):
self.hists[e[-1]].append((self.t + self.response_s, float(v)))
return True
def drive(house, sun, *, dur=600.0, ratings=None, socs=None, cap=3500.0,
margin=100, opts=None, plug=True, setpoint=0, phases=1, mode="solar",
first="batteries", events=None, sim=None, store=None, race=False,
on_cycle=None, car_phases=3, t0=0.0, caps=None):
"""Run it. Returns a dict: plant, controller, charger, notifications with
their second, and a per-second trace. `caps` ({unit: kWh}) lets each
battery's level move with what it charges or gives; without it the
levels stand still."""
ratings = ratings or {"a": 5000.0, "b": 4600.0}
socs = socs or {u: 50.0 for u in ratings}
sim = sim or SimCharger(setpoint_a=setpoint)
if plug:
sim.plug_in(car_phases=car_phases)
sim.phases_allowed = phases
units = sorted(ratings)
o = rig._options(len(units), dict({
"meter_source": "ha_signed", "p1_net_entity": "sensor.net",
"meter_phases": 1, "peak_cap_w": cap, "peak_margin_w": margin,
"battery_modes_enabled": True,
"ev_charger": "alfen_ha", "ev_max_a": 16, "ev_phases": "auto",
"ev_current_entity": SET}, **(opts or {})))
if len(units) == 1:
o["max_w"] = ratings[units[0]]
else:
o["inverters"] = [dict(x, max_w=ratings[x["name"][-1]])
for x in o["inverters"]]
store = store or rig._Store()
store.data["car_mode"] = mode
store.data["car_sun_first"] = first
for u in units:
store.data[unit_key("inverter-" + u, packmode.USE_KEY)] = True
db = os.path.join(tempfile.mkdtemp(prefix="ev5-"), "tariff.db")
out = {}
events_in = events or {}
async def go():
plant = SunPlant(house, sun, ratings, socs, sim)
c = Controller(o, plant, store, rig._Pub(), stop=asyncio.Event(),
peak_db_path=db)
for i in c.inverters:
r = ratings[i.name[-1]] if len(units) > 1 else ratings[units[0]]
i.dev_min, i.dev_max = -r, r
c.auto = True
clock = [t0]
c.car_now = lambda: clock[0]
real_time = _p1.time
class _Time:
"""The meter's age on the model clock, so a silent meter goes
stale in model seconds."""
def __getattr__(self, k):
return getattr(real_time, k)
@staticmethod
def monotonic():
return clock[0]
_p1.time = _Time()
if hasattr(c.charger, "_sleep"):
async def sleep(s):
sim.tick(s)
clock[0] += s
c.charger._sleep = sleep
c.charger._clock = lambda: clock[0]
real_dt = main_files.live.datetime
class _DT(real_dt):
@classmethod
def now(cls, tz=None):
return rig.BASE + timedelta(seconds=clock[0] + plant.utc_off)
main_files.live.datetime = _DT
trace = []
try:
t = t0
while t < t0 + dur:
plant.t = clock[0] = t
fn = events_in.get(int(t)) if t == int(t) else None
if fn is not None:
r = fn(plant, c)
if asyncio.iscoroutine(r):
await r
sim.tick(1.0)
ts = t - SAMPLE_LEAD_S
if plant.meter_on and not plant.ha_down:
plant.meter = plant.grid(ts)
imp, exp = split_signed(plant.meter)
c.p1.submit(make_sample(
"ha_signed", imp, exp, phases=1,
ingest_ts=rig.BASE + timedelta(seconds=ts),
ingest_mono=ts))
await c.read_inputs(now_mono=t)
if race:
await c.car_settle()
await c.cycle()
else:
await c.cycle()
await c.car_settle()
w = c.car_solar
g = c.peak_guard
trace.append(dict(
t=t, a=w.plan.a, why=w.plan.why, n=w.plan.n,
sp=sim.setpoint_a, rb=sim.readback_a,
ph=sim.phases_allowed, car=sim.power_w, st=sim.state,
grid=plant.grid(t), batt=plant.batt(t),
house=plant.house(t), sun=plant.sun(t),
cut=c.car_cut_w, explains=c.car_explains,
lim=bool(g is not None and (g.floor_limited
or g.saturated)),
floor=(None if g is None else g.floor_w),
excess=(None if g is None else g.excess_w),
want=(None if g is None else g.wanted_w),
since=c._car_want_since,
able=c._car_batt_able(), socs=dict(plant.socs),
proj=(None if g is None else g.projected_w),
target=(None if g is None else g.target_w),
would=w.would, single=w.single,
spare=c.car_spare_w(t), ok=w.plan.ok_since,
red=[x["id"] for x in c.checks()
if x["ok"] is False and not x["warn"]]
if on_cycle == "rows" else []))
if callable(on_cycle):
on_cycle(plant, c, t)
for u, kwh in (caps or {}).items():
# 1 s of W, as a percent of kWh: W / 3600 / (kWh x 1000) x 100
lv = plant.socs[u] - plant.batt_of(u, t) / 36000.0 / kwh
plant.socs[u] = max(0.0, min(100.0, lv))
t += 1.0
await c.car_settle()
finally:
main_files.live.datetime = real_dt
_p1.time = real_time
out.update(plant=plant, c=c, sim=sim, trace=trace, store=store,
raised=list(plant.notes))
asyncio.run(go())
return out
def ids(out, *wanted):
return [(t, n) for t, n in out["raised"] if n in wanted]
def writes(out, what="current"):
"""(t, value) of every charger write of that kind, in model seconds."""
return [(x[0], x[2]) for x in out["sim"].writes(what)]
def const(w):
return lambda t: float(w)
if __name__ == "__main__":
logging.disable(logging.CRITICAL)
for first in ("batteries", "car"):
r = drive(const(900.0), const(7900.0), dur=600, first=first,
socs={"a": 71.0, "b": 100.0})
print(f"scenario 2, {first} first: writes {writes(r)} phases "
f"{writes(r, 'phases')} batteries {r['plant'].batt(599):.0f} W "
f"grid {r['plant'].grid(599):.0f} W")
+23 -2
View File
@@ -109,7 +109,7 @@ class Hass:
# real `Controller._read_charger()` reads it, so the card is what the add-on # real `Controller._read_charger()` reads it, so the card is what the add-on
# draws, not a picture. # draws, not a picture.
CAR_STATES = ("car", "car_none", "car_waiting", "car_full", "car_unreach", CAR_STATES = ("car", "car_none", "car_waiting", "car_full", "car_unreach",
"car_setup") "car_setup", "car_manual_cover", "car_manual_over")
CAR_ENTITY = "number.wallbox_power_connector_max_current_socket_1" CAR_ENTITY = "number.wallbox_power_connector_max_current_socket_1"
SIM = SimCharger() SIM = SimCharger()
@@ -126,7 +126,7 @@ def car_setup(state):
"""Put the model in the state's situation.""" """Put the model in the state's situation."""
global SIM global SIM
SIM = SimCharger(name="other" if state == "car_setup" else "wallbox") SIM = SimCharger(name="other" if state == "car_setup" else "wallbox")
if state in ("car", "car_unreach"): if state in ("car", "car_unreach", "car_manual_cover", "car_manual_over"):
SIM.plug_in() SIM.plug_in()
SIM.set_phases(3) SIM.set_phases(3)
SIM.set_current(16) SIM.set_current(16)
@@ -332,6 +332,27 @@ def controller(state):
for inv in c.inverters: for inv in c.inverters:
inv.batt = 0.0 inv.batt = 0.0
c.car.stale_s = 15.0 c.car.stale_s = 15.0
if state in ("car_manual_cover", "car_manual_over"):
# EV-04, Manual at 16 A on 3 phases. First moment: the batteries give
# 5 kW and the period stays on the aim. Second: they are at the peak
# reserve, so the charge you set sets the month's peak.
c.car_mode, c.car_a, c.car_n = "manual", 16.0, 3
if state == "car_manual_cover":
c.pv_w, c.grid = 4100.0, 3450.0
for inv in c.inverters:
inv.batt = 2500.0
c.peak_guard = PeakDecision(
engaged=True, floor_w=3000.0, ceiling_w=3500.0,
ceiling_from="cap", projected_w=3450.0, excess_w=1500.0)
else:
c.pv_w, c.grid = 2400.0, 10200.0
for inv in c.inverters:
inv.soc, inv.batt = 19.0, 0.0
c.peak_guard = PeakDecision(
engaged=True, floor_w=0.0, ceiling_w=3500.0,
ceiling_from="cap", projected_w=10200.0, excess_w=6750.0,
floor_limited=True, soc=19.0, soc_floor=20.0)
c.car_over = c.car_explains = True
if state == "alarm": if state == "alarm":
c.inverters[0].sign_wd.tripped = True c.inverters[0].sign_wd.tripped = True
if state in P3: if state in P3:
+16 -1
View File
@@ -285,7 +285,7 @@ configuration:
description: "The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never." description: "The add-on makes every decision but keeps every inverter at 0 W. 'auto' does this while control is stopped, 'on' always, 'off' never."
ev_charger: ev_charger:
name: "Car charger · Charger" name: "Car charger · Charger"
description: "Which car charger the add-on reads. Off leaves everything as it is. This version only reads the charger and never changes it." description: "Which car charger the add-on drives. Off leaves everything as it is. In Off mode the add-on only reads the charger and never changes it."
ev_current_entity: ev_current_entity:
name: "Car charger · Current setting entity" name: "Car charger · Current setting entity"
description: "The entity that sets the charger's current. The add-on finds the charger's other entities from its name." description: "The entity that sets the charger's current. The add-on finds the charger's other entities from its name."
@@ -295,6 +295,21 @@ configuration:
ev_phases: ev_phases:
name: "Car charger · Phases" name: "Car charger · Phases"
description: "How many phases the charger may use: 1, 3, or 1 and 3 (auto)." description: "How many phases the charger may use: 1, 3, or 1 and 3 (auto)."
ev_batt_cover:
name: "Car charger · Batteries help with the peak"
description: "While the car charges. On: the batteries cover it down to the peak reserve. Off: the peak guard leaves the car out, so the car alone can set the peak."
ev_mode_start:
name: "Car charger · Mode after a restart"
description: "Keep the last mode, or start in Off. In Solar a restart sets the charger to 0 A first, other modes leave its current."
ev_margin_w:
name: "Car charger · Sun kept back (W)"
description: "Solar: this much spare sun is never given to the car."
ev_start_min:
name: "Car charger · Start after (minutes)"
description: "Solar: the car starts after this long with enough spare sun."
ev_pause_min:
name: "Car charger · Pause after (minutes)"
description: "Solar: with too little sun the car holds 6 A this long, then pauses."
auto_start: auto_start:
name: "Advanced · Start control on boot" name: "Advanced · Start control on boot"
description: "Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart." description: "Off by default. Leave it off until the site is commissioned, so someone presses Start after each restart."
+16 -1
View File
@@ -266,7 +266,7 @@ configuration:
description: "De add-on neemt elke beslissing maar houdt elke omvormer op 0 W. 'auto' doet dit zolang de regeling gestopt is, 'on' altijd, 'off' nooit." description: "De add-on neemt elke beslissing maar houdt elke omvormer op 0 W. 'auto' doet dit zolang de regeling gestopt is, 'on' altijd, 'off' nooit."
ev_charger: ev_charger:
name: "Laadpaal · Laadpaal" name: "Laadpaal · Laadpaal"
description: "Welke laadpaal de add-on leest. Uit laat alles zoals het is. Deze versie leest de laadpaal alleen en wijzigt niets." description: "Welke laadpaal de add-on stuurt. Uit laat alles zoals het is. In modus Uit leest de add-on de laadpaal alleen en wijzigt niets."
ev_current_entity: ev_current_entity:
name: "Laadpaal · Entiteit van de laadstroom" name: "Laadpaal · Entiteit van de laadstroom"
description: "De entiteit die de stroom van de laadpaal instelt. De add-on vindt de andere entiteiten van de laadpaal via de naam." description: "De entiteit die de stroom van de laadpaal instelt. De add-on vindt de andere entiteiten van de laadpaal via de naam."
@@ -276,6 +276,21 @@ configuration:
ev_phases: ev_phases:
name: "Laadpaal · Fasen" name: "Laadpaal · Fasen"
description: "Hoeveel fasen de laadpaal mag gebruiken: 1, 3, of 1 en 3 (auto)." description: "Hoeveel fasen de laadpaal mag gebruiken: 1, 3, of 1 en 3 (auto)."
ev_batt_cover:
name: "Laadpaal · Batterijen helpen met de piek"
description: "Terwijl de auto laadt. Aan: de batterijen dekken ze tot de piekreserve. Uit: de piekbewaking laat de auto buiten beschouwing, dus de auto alleen kan de piek bepalen."
ev_mode_start:
name: "Laadpaal · Modus na een herstart"
description: "De laatste modus houden, of starten in Uit. In Zon zet een herstart de laadpaal eerst op 0 A, andere modi laten haar stroom."
ev_margin_w:
name: "Laadpaal · Zon achtergehouden (W)"
description: "Zon: zoveel zonne-overschot krijgt de auto nooit."
ev_start_min:
name: "Laadpaal · Starten na (minuten)"
description: "Zon: de auto start na zo lang genoeg zonne-overschot."
ev_pause_min:
name: "Laadpaal · Pauzeren na (minuten)"
description: "Zon: met te weinig zon houdt de auto zo lang 6 A en pauzeert dan."
auto_start: auto_start:
name: "Geavanceerd · Regeling starten bij opstarten" name: "Geavanceerd · Regeling starten bij opstarten"
description: "Staat standaard uit. Laat het uit tot de installatie in dienst is, zodat iemand na elke herstart op Start drukt." description: "Staat standaard uit. Laat het uit tot de installatie in dienst is, zodat iemand na elke herstart op Start drukt."