OPT-11 P3: price runs per battery
checks / unit (pull_request) Successful in 13m45s
infra-pin / fresh (pull_request) Successful in 1s

Cheap and expensive hours as runs of consecutive firm price slots
(priceruns.py); each battery's role per tick from its mode (modetrade.py):
grid charging for Leftover solar / Cheap hours only, never Solar first;
holding for the expensive runs; selling per battery (pack_sell) above the
spread and the floor. The site trade is sized inside the modes (loop bound)
and the peak guard's headroom; a run edge reseeds the loop. Cheap hours only
and selling are enabled on the Batteries screen and in the HA select
(appended). The site Why row no longer says "held back" when the peak limit
pushes power up (F2). Modes off: byte-identical to 7a00f12 on the trade path.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Claude dev agent
2026-09-29 02:37:44 +02:00
parent 7a00f12c76
commit 902524ae5e
19 changed files with 2202 additions and 113 deletions
+58 -18
View File
@@ -120,13 +120,15 @@ for st, want in WANT.items():
for e, n in zip(en, nl)))
_modes = ROWS[("modes", "en")]
check("modes on: each row carries its switch and mode, and Today says the "
"mode's plan is not made yet (OPT-11 P3/P4), without inventing one",
check("modes on: each row carries its switch and mode; Today says Solar "
"first follows the house and, before any cycle has made the price "
"runs (OPT-11 P3), that Leftover solar is not planned yet",
_modes["modes_on"] is True
and [(b["use"], b["mode_key"]) for b in _modes["batteries"]]
== [(True, "solar_first"), (True, "leftover_solar")]
and all(b["today_line"] == EN["home_words"]["today"]["not_planned"]
for b in _modes["batteries"]))
and [b["today_line"] for b in _modes["batteries"]]
== [EN["home_words"]["today"]["house"],
EN["home_words"]["today"]["not_planned"]])
_off = ROWS[("running", "en")]
check("modes off: no switch, no mode, and Today and Why say it follows the "
"house", _off["modes_on"] is False
@@ -212,13 +214,19 @@ print(f" {_kinds}")
check("Off: no 'follows the house', no trade, no monthly cycle for B",
not _kinds[1] and "house" in _kinds[0])
_p = build("off", now=MORNING)
_m = build("modes", now=MORNING)
# OPT-11 P3: with modes on the plan shows each battery's price runs, which a
# control cycle makes; make them as the cycle does (`_mode_roles()`).
_mc = D.controller("modes")
_mc._mode_roles(MORNING, None)
_m = build("modes", c=_mc, now=MORNING)
_kinds = {i: {r["kind"] for r in _p["plan"]["runs"] if r["battery"] == i}
for i in (0, 1)}
print(f" morning: {_kinds}, lines {_p['plan']['lines']}")
check("in the morning, with trades and a cycle ahead: A has them, Off B has "
"no block and waits for no cycle (with B on, it does)",
{"house", "grid", "give", "cycle"} <= _kinds[0] and not _kinds[1]
check("in the morning, with trades and a cycle ahead: Solar first A follows "
"the house and has its cycle but no price block (OPT-11 P3: Solar first "
"never trades), Off B has no block and waits for no cycle; with B on "
"(Leftover solar) B has its cheap and expensive runs and waits",
{"house", "cycle"} == _kinds[0] and not _kinds[1]
and not any(B_NAME in x for x in _p["plan"]["lines"])
and {"grid", "give"} <= {r["kind"] for r in _m["plan"]["runs"]
if r["battery"] == 1}
@@ -290,6 +298,22 @@ _cases = [
(dict(mode=packmode.LEFTOVER_SOLAR, sf_ahead=True), "leftover"),
(dict(mode=packmode.LEFTOVER_SOLAR), "leftover_alone"),
({}, "solar_first"),
# OPT-11 P3: the battery's role in the price runs, and no plan.
(dict(mode=packmode.CHEAP_HOURS, role="charge"), "grid_charge"),
(dict(role="rest"), "rests_charge"),
(dict(mode=packmode.CHEAP_HOURS, role="sell", giving=True), "selling"),
(dict(mode=packmode.LEFTOVER_SOLAR, role="give", giving=True),
"expensive"),
(dict(mode=packmode.LEFTOVER_SOLAR, role="hold", has_at=True), "saves"),
(dict(mode=packmode.CHEAP_HOURS, role="hold"), "saves_later"),
(dict(mode=packmode.CHEAP_HOURS, role="house", plan="no_prices"),
"no_prices"),
(dict(mode=packmode.LEFTOVER_SOLAR, role="house", plan="no_spread",
giving=True), "no_spread"),
# ...and the urgent reasons still come first.
(dict(role="charge", refused=-1), "refuses_charge"),
(dict(role="sell", peak=True), "peak"),
(dict(role="hold", off=True), "off"),
]
_wrong = [(kw, want, why(**kw)) for kw, want in _cases if why(**kw) != want]
print(f" {_wrong}")
@@ -336,9 +360,13 @@ _r = asyncio.run(_serve("modes", [
"nl"),
({"action": "pack_use", "unit": B, "value": True}, "en"),
({"action": "pack_mode", "unit": A, "value": "cheap_hours"}, "en"),
({"action": "pack_sell", "unit": A, "value": True}, "en"),
({"action": "pack_sell", "unit": A, "value": "yes"}, "en"),
({"action": "pack_mode", "unit": A, "value": "sell_only"}, "en"),
]))
(_s1, _j1), (_, _st1), (_s2, _j2), (_, _st2), (_s3, _), (_, _st3), \
(_s4, _j4), (_, _st4) = _r
(_s4, _j4), (_, _st4), (_s5, _j5), (_, _st5), (_s6, _j6), (_, _st6), \
(_s7, _j7), (_, _st7) = _r
check("switch B off: 200, and /status shows B Off with 'You switched it off.'",
_s1 == 200 and _j1["result"]["use"] is False
and _st1["batteries"][1]["mode_key"] == "off"
@@ -351,9 +379,17 @@ check("set A to Leftover solar: 200, and /status?lang=nl shows it in Dutch",
check("switch B back on: its stored mode returns",
_s3 == 200 and _st3["batteries"][1]["mode_key"]
== packmode.LEFTOVER_SOLAR)
check("a mode the list only shows greyed out is refused with a plain 400, and "
"nothing changes", _s4 == 400 and _j4["ok"] is False and _j4["error"]
and _st4["batteries"][0]["mode_choice"] == packmode.LEFTOVER_SOLAR)
check("OPT-11 P3: Cheap hours only is a mode now: 200, and /status shows it",
_s4 == 200 and _st4["batteries"][0]["mode_choice"]
== packmode.CHEAP_HOURS and _st4["batteries"][0]["can_sell"] is True)
check("...selling on for A: 200, stored, and /status says so",
_s5 == 200 and _j5["result"]["sell"] is True
and _st5["batteries"][0]["sell"] is True)
check("...a selling value that is not true or false, and a mode that does not "
"exist, are refused with a plain 400, and nothing changes",
_s6 == 400 and _j6["error"] and _s7 == 400 and _j7["error"]
and _st7["batteries"][0]["sell"] is True
and _st7["batteries"][0]["mode_choice"] == packmode.CHEAP_HOURS)
_r = asyncio.run(_serve("running", [
({"action": "pack_use", "unit": B, "value": False}, "en")]))
check("with battery modes off the switch is refused with the plain reason, "
@@ -378,12 +414,16 @@ _acts = set(re.findall(r'packAct\("(\w+)"', JS))
check(f"the cards post only the existing actions ({sorted(_acts)}), as "
f"{{action, unit, value}}", _acts == set(web.PACK_ACTIONS)
and "action: what, unit: b.name, value: value" in JS)
check("the switch is a real switch and the list names cheap hours as coming "
"later, not choosable", 'role: "switch"' in JS and '"aria-checked"' in JS
and 'h("option", { value: "", disabled: true }, t("batteries.later"))'
in JS)
check("the selling switch is greyed out until OPT-11 P3 (no pack_sell is "
"posted)", "pack_sell" not in JS and "disabled: true })" in JS)
check("the switch is a real switch and the list offers the three modes, "
"cheap hours included, with nothing greyed out",
'role: "switch"' in JS and '"aria-checked"' in JS
and 'const MODES = ["solar_first", "leftover_solar", "cheap_hours"];'
in JS and "batteries.later" not in JS)
check("the selling switch posts pack_sell, and is greyed out where selling "
"does not apply (Off, Solar first)",
'packAct("pack_sell", b, ' in JS
and "const can = b.use && b.can_sell === true;" in JS
and "disabled: !can" in JS)
_T = uipage.ui_text("en")
_lay = uipage.layout(D.schema_ui(D.CONFIG), {"en": {}})
_simple = [f for g in _lay["groups"] for p in g["parts"] for f in p["fields"]