From e2c7085d2c6d793d07a5668a5389b0b02bef37a7 Mon Sep 17 00:00:00 2001 From: "Setti Solutions S.R.L" Date: Thu, 5 Nov 2026 13:14:49 +0200 Subject: [PATCH] cantabile_edge, cantabile_modbus, cantabile_eebus 0.1.901: full source --- README.md | 2 +- THIRD-PARTY-NOTICES.md | 18 + cantabile_edge/DOCS.md | 18 + cantabile_edge/addon-run | 9 + cantabile_edge/config.yaml | 7 +- cantabile_edge/icon.png | Bin 12462 -> 8385 bytes cantabile_edge/logo.png | Bin 15401 -> 14309 bytes cantabile_edge/translations/de.yaml | 10 + cantabile_edge/translations/en.yaml | 9 + cantabile_eebus/CHANGELOG.md | 10 + cantabile_eebus/DOCS.md | 19 +- cantabile_eebus/config.yaml | 2 +- cantabile_eebus/icon.png | Bin 12462 -> 8385 bytes cantabile_eebus/logo.png | Bin 15401 -> 14309 bytes cantabile_modbus/config.yaml | 2 +- cantabile_modbus/icon.png | Bin 12462 -> 8385 bytes cantabile_modbus/logo.png | Bin 15401 -> 14309 bytes src/edge/cantabile_edge/bundles.py | 134 ++-- src/edge/cantabile_edge/cli.py | 8 +- src/edge/cantabile_edge/config.py | 6 +- src/edge/cantabile_edge/controller.py | 41 +- src/edge/cantabile_edge/controls.py | 218 ++++++- src/edge/cantabile_edge/devpage.py | 122 +++- src/edge/cantabile_edge/executor.py | 13 + src/edge/cantabile_edge/fcmodels.py | 151 ++++- src/edge/cantabile_edge/guard.py | 3 +- src/edge/cantabile_edge/i18n_de.py | 19 + src/edge/cantabile_edge/inputs.py | 274 +++++++- src/edge/cantabile_edge/inventory.py | 19 +- src/edge/cantabile_edge/localml.py | 21 +- src/edge/cantabile_edge/optimizer.py | 563 ++++++++++++++-- src/edge/cantabile_edge/preferences.py | 53 +- src/edge/cantabile_edge/pvforecast.py | 1 + src/edge/cantabile_edge/shades.py | 13 +- src/edge/cantabile_edge/steady.py | 42 +- src/edge/cantabile_edge/trainlib.py | 8 +- src/edge/link/go.mod | 3 +- src/edge/link/go.sum | 2 + src/edge/link/hae2e_test.go | 396 ++++++++++++ src/edge/link/hatunnel.go | 636 ++++++++++++++++++ src/edge/link/hatunnel_test.go | 713 +++++++++++++++++++++ src/edge/link/hauser.go | 381 +++++++++++ src/edge/link/local.go | 12 +- src/edge/link/main.go | 26 +- src/edge/link/terminal.go | 2 + src/edge/tests/test_base_load.py | 10 +- src/edge/tests/test_control_parts.py | 42 +- src/edge/tests/test_devpage.py | 73 ++- src/edge/tests/test_heat_sources.py | 212 ++++++ src/edge/tests/test_inputs_fresh.py | 6 +- src/edge/tests/test_model_series.py | 51 +- src/edge/tests/test_plan_partial_tariff.py | 147 +++++ src/edge/tests/test_refuse.py | 260 ++++++++ src/edge/tests/test_room_refusal.py | 218 +++++++ src/edge/tests/test_shades.py | 21 + src/edge/tests/test_shift.py | 145 +++++ src/edge/tests/test_switchover.py | 4 +- src/eebus-bridge/core.go | 198 +++++- src/eebus-bridge/core_test.go | 88 +++ src/eebus-bridge/eebus.go | 5 + src/eebus-bridge/eebus_test.go | 18 + src/eebus-bridge/grid.go | 49 +- src/eebus-bridge/law.go | 38 ++ src/eebus-bridge/model.go | 3 + src/eebus-bridge/page.go | 48 +- src/eebus-bridge/page_test.go | 33 + src/eebus-bridge/sim.go | 2 +- src/profiles/fronius-gen24.json | 5 +- src/profiles/hm8042-hybrid.json | 11 +- src/profiles/huawei-sun2000.json | 5 +- src/profiles/sma-sunny-boy.json | 5 +- src/profiles/solaredge-sunspec.json | 5 +- src/profiles/vaillant-mypyllant.json | 3 +- src/profiles/victron-gx.json | 5 +- src/profiles/viessmann-vicare.json | 3 +- tests/test_addon.py | 11 + 76 files changed, 5380 insertions(+), 330 deletions(-) create mode 100644 src/edge/link/hae2e_test.go create mode 100644 src/edge/link/hatunnel.go create mode 100644 src/edge/link/hatunnel_test.go create mode 100644 src/edge/link/hauser.go create mode 100644 src/edge/tests/test_heat_sources.py create mode 100644 src/edge/tests/test_plan_partial_tariff.py create mode 100644 src/edge/tests/test_refuse.py create mode 100644 src/edge/tests/test_room_refusal.py create mode 100644 src/edge/tests/test_shift.py create mode 100644 src/eebus-bridge/law.go diff --git a/README.md b/README.md index 2bfff7f..e3126a1 100644 --- a/README.md +++ b/README.md @@ -22,7 +22,7 @@ Settings → Add-ons → Add-on store → ⋮ → Repositories, add `https://git.setti.solutions/Daniel/cantabile-ha-addons`, then install the add-on. The Supervisor pulls the prebuilt images (`git.setti.solutions/daniel/cantabile-ha--:`, -named by `image:` in each `config.yaml`); this version: `0.1.676`, arch amd64. +named by `image:` in each `config.yaml`); this version: `0.1.901`, arch amd64. ## Layout diff --git a/THIRD-PARTY-NOTICES.md b/THIRD-PARTY-NOTICES.md index 705a758..8dd4d4c 100644 --- a/THIRD-PARTY-NOTICES.md +++ b/THIRD-PARTY-NOTICES.md @@ -15,6 +15,24 @@ licences permit use and redistribution with these notices. ## Go modules of the link (src/edge/link) +### github.com/coder/websocket v1.8.15 + +``` +Copyright (c) 2025 Coder + +Permission to use, copy, modify, and distribute this software for any +purpose with or without fee is hereby granted, provided that the above +copyright notice and this permission notice appear in all copies. + +THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES +WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR +ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES +WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN +ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF +OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. +``` + ### github.com/creack/pty v1.1.24 ``` diff --git a/cantabile_edge/DOCS.md b/cantabile_edge/DOCS.md index 96ca727..d35cc9e 100644 --- a/cantabile_edge/DOCS.md +++ b/cantabile_edge/DOCS.md @@ -49,6 +49,24 @@ nothing more is collected or sent. their settings) and **Building** (joining a building). It also sets up Home Assistant's Energy dashboard while you have none of your own. Your own dashboards are never changed. +- **Cantabile support may open this Home Assistant** (off by default): when + you turn it on, Cantabile's support team can open this Home Assistant + through Cantabile's connection to help you, signed in as a user of its + own, "Cantabile support" (an administrator, so that it can look at your + integrations, logs and repairs; never the owner, and never with your + password, which it cannot change either). The add-on makes that user and + gives it a new password for each session that nobody sees; afterwards the + user is disabled again and has no password. A session lasts at most an + hour, ends after 15 minutes without use, and every request is recorded. + You see the user in Settings → People while it exists, and while a + session is open the add-on's own pages (below) say so at the top, with + **End now**: it ends the session at once and disables the user again. + Turning the option off and restarting the add-on ends it too. On these + pages the user "Cantabile support" cannot switch reading or control on, + change a protection or make the other choices that are yours. Home + Assistant must answer plain HTTP on its own port for this (with an + `ssl_certificate` in its `http:` configuration support is told it cannot + open it). ## Pages diff --git a/cantabile_edge/addon-run b/cantabile_edge/addon-run index 2a65fbb..115fc6c 100755 --- a/cantabile_edge/addon-run +++ b/cantabile_edge/addon-run @@ -275,6 +275,15 @@ def main(): put(f"{DATA}/claim-code", code + "\n", own=own) env["CANTABILE_MODE"] = opts.get("mode", "shadow") env["CANTABILE_DASHBOARDS"] = "1" if opts.get("dashboards", True) else "0" + # Remote Home Assistant for Cantabile support (edge/link/hatunnel.go): + # only when the owner turns it on here (off by default); the link then + # offers it and keeps HA's "Cantabile support" user, through the + # Supervisor. Turning it off (and the add-on's restart) ends a session. + if opts.get("support_ha") is True: + env["CANTABILE_HA_REMOTE"] = "1" + log("remote Home Assistant for Cantabile support: allowed in the configuration") + else: + env.pop("CANTABILE_HA_REMOTE", None) mqtt(env, own) put(f"{DATA}/config.yaml", CONFIG, 0o644, own, keep=True) diff --git a/cantabile_edge/config.yaml b/cantabile_edge/config.yaml index 4e0a3e6..6c6037d 100644 --- a/cantabile_edge/config.yaml +++ b/cantabile_edge/config.yaml @@ -3,7 +3,7 @@ # the Hub's, wrapped by addon-run (Dockerfile). The image is prebuilt, # per arch (README.md: building it from src/). name: Cantabile Edge Agent -version: "0.1.676" +version: "0.1.901" slug: cantabile_edge description: Plans your home's energy with Cantabile and, with your consent, runs the devices you choose. url: https://cantabile.cloud @@ -41,15 +41,20 @@ map: # consent_data: the owner's consent, given here when installing (needed: the # add-on connects to Cantabile only with it); consent_control: control, # separately (the Hub's wizard has the same two; DOCS.md "Your consent"). +# support_ha: Cantabile's team may open this Home Assistant as its user +# "Cantabile support" (an administrator, never the owner) through Cantabile's +# connection; off unless the owner turns it on (edge/link/hatunnel.go). options: consent_data: false consent_control: false mode: shadow claim_code: "" dashboards: true + support_ha: false schema: consent_data: bool consent_control: bool mode: list(off|shadow) claim_code: password? dashboards: bool + support_ha: bool diff --git a/cantabile_edge/icon.png b/cantabile_edge/icon.png index 21af6267a93ecf60ad695a9218b0672417745b8e..075b818315e9f642eb6b76e34b4beeb334d5e857 100644 GIT binary patch literal 8385 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 Q4*?)AtpffnWfb)P01bP_umAu6 diff --git a/cantabile_edge/logo.png b/cantabile_edge/logo.png index b002d1915d3aaafacb5ffce48f894d0ffd0a1ba6..0b64f8f036c88de3899b6b7e34ac80bfe6bba9ea 100644 GIT binary patch literal 14309 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 + Wenn Sie dies einschalten, darf das Support-Team von Cantabile dieses + Home Assistant über die Verbindung zu Cantabile öffnen, angemeldet als + Benutzer „Cantabile support“ (ein Administrator; nie Sie und nie mit + Ihrem Passwort). Jede Sitzung wird aufgezeichnet, dauert höchstens eine + Stunde und endet nach 15 Minuten ohne Nutzung; danach wird der + Benutzer wieder deaktiviert. Schalten Sie es aus und starten Sie das + Add-on neu, um eine Sitzung sofort zu beenden. diff --git a/cantabile_edge/translations/en.yaml b/cantabile_edge/translations/en.yaml index 8807b57..64316e8 100644 --- a/cantabile_edge/translations/en.yaml +++ b/cantabile_edge/translations/en.yaml @@ -27,3 +27,12 @@ configuration: Cantabile's dashboard in Home Assistant (one sidebar entry: overview, energy, devices, building), and the Energy dashboard while you have none of your own. + support_ha: + name: Cantabile support may open this Home Assistant + description: >- + When you turn this on, Cantabile's support team may open this Home + Assistant through Cantabile's connection, signed in as the user + "Cantabile support" (an administrator; never you, and never with your + password). Each session is recorded, lasts at most an hour and ends + after 15 minutes without use; the user is disabled again afterwards. + Turn it off and restart the add-on to end a session at once. diff --git a/cantabile_eebus/CHANGELOG.md b/cantabile_eebus/CHANGELOG.md index 66aa6be..5feec4b 100644 --- a/cantabile_eebus/CHANGELOG.md +++ b/cantabile_eebus/CHANGELOG.md @@ -1,5 +1,15 @@ # Changelog +## Unreleased + +- Declares to the grid operator's control box only what is known: the + heat pumps' and wallboxes' reported power, else the rating you enter on + a device's page. Unknown: nothing is declared and the grid operator's + use case (LPC) is not offered; the page says why. No more 32 kW, 6 kW per + heat pump or 16 A x 3 per wallbox stood in for an unknown power. +- The failsafe limit and time are the control box's own; until it sent + them §14a's 4.2 kW for the use case's shortest 2 hours. + ## 0.1.x - First version (experimental, not yet tried with real devices): pairs diff --git a/cantabile_eebus/DOCS.md b/cantabile_eebus/DOCS.md index d245507..f6ca8e4 100644 --- a/cantabile_eebus/DOCS.md +++ b/cantabile_eebus/DOCS.md @@ -49,8 +49,23 @@ lifts its limit, and it can't be unpaired on the page (only the grid operator, through Cantabile). While it limits the home, the add-on passes the limit on to the heat pumps and wallboxes at once and the Cantabile agent plans within it. Without the control box's heartbeat for two -minutes the failsafe limit holds (4.2 kW unless the control box set -another) for its failsafe time. +minutes the failsafe limit holds for its failsafe time: the control box's +own values; until it sent them §14a's minimum of 4.2 kW (BNetzA +BK6-22-300) for the shortest time the EEBUS use case allows (2 hours). + +Toward the control box the add-on declares the controllable devices' +nominal power: what the heat pumps and wallboxes report (a heat pump's +nominal power, a wallbox's maximum current and phases), else the rating +you enter on a device's page (from its nameplate). It never declares a +guess: while any heat pump or wallbox has no known power, or none is +paired, nothing is declared and the add-on does not offer the grid +operator's use case (LPC); the page's grid card says why ("nominal power +unknown: enter the controllable devices' ratings") and which device needs +a rating. When a limit ends, a wallbox goes back to its own maximum +current, else to the current it had before; if neither is known it stays +and the page says so. While its power is not known, a device's share of a +limit is an equal one (the sum never exceeds the limit), and a W budget is +turned into amps as if on three phases (never more than the budget). ## Protection diff --git a/cantabile_eebus/config.yaml b/cantabile_eebus/config.yaml index 7077af8..b1bef30 100644 --- a/cantabile_eebus/config.yaml +++ b/cantabile_eebus/config.yaml @@ -4,7 +4,7 @@ # Assistant that isn't a Cantabile Hub. Devices are paired on its page # (ingress), by their SKI. name: Cantabile EEBUS -version: "0.1.676" +version: "0.1.901" slug: cantabile_eebus description: Pairs with EEBUS devices (the grid operator's control box, heat pumps, wallboxes, inverters), shows them in Home Assistant under Cantabile's names and hands the grid operator's §14a limit to the Cantabile agent; every control with its protection. url: https://cantabile.cloud diff --git a/cantabile_eebus/icon.png b/cantabile_eebus/icon.png index 21af6267a93ecf60ad695a9218b0672417745b8e..075b818315e9f642eb6b76e34b4beeb334d5e857 100644 GIT binary patch literal 8385 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 Q4*?)AtpffnWfb)P01bP_umAu6 diff --git a/cantabile_eebus/logo.png b/cantabile_eebus/logo.png index b002d1915d3aaafacb5ffce48f894d0ffd0a1ba6..0b64f8f036c88de3899b6b7e34ac80bfe6bba9ea 100644 GIT binary patch literal 14309 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 Q4*?)AtpffnWfb)P01bP_umAu6 diff --git a/cantabile_modbus/logo.png b/cantabile_modbus/logo.png index b002d1915d3aaafacb5ffce48f894d0ffd0a1ba6..0b64f8f036c88de3899b6b7e34ac80bfe6bba9ea 100644 GIT binary patch literal 14309 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, "step_s": 900, "steps": 192, "expires", "currency": "EUR", "unit": "ct/kWh", "import": [192 numbers|null], "export": [...], "estimated": [indexes], "other": {...}, "sources": [...]} - After `expires` (or outside its steps): the last known flat price (the - mean of its import prices), and the plan says so. Without any tariff: - the configured default price. + Its prices are taken as they are, the steps fleet estimated (listed in + "estimated": the day-ahead before it is published) too; a step it has no + price for (null, or beyond its steps) has none here either. After + `expires`, or without any tariff, there is no price at all: no default, + no last price held (docs/parameters.md U1). prices() says so (status + "none" and the reason); the planner then plans without prices (comfort, + limits and the owner's musts only) and the box's panel says why and what + to do. A missing export price is no price, not 0 ct (optimizer.py). + Gas and heat (fleet heatprice.go, 2026-11-05): "gas" and "heat" per step + (ct/kWh gross: gas billed on Hs, heat delivered), null where none; + carrier_prices() reads them the same way (no default, nothing held past + the bundle's expiry). A bundle may price gas or heat alone. Model v1 (the forecasts' data; the ML in ml/ is a placeholder, 2026-10-28): {"v":1, "kind":"model", "id", "site" (or "*"), "issued", "expires"?, @@ -115,12 +124,12 @@ def _check_tariff(d: dict): raise ValueError("not a v1 tariff") if int(d["step_s"]) != 900 or int(d["start"]) % 900: raise ValueError("steps of 900 s from a quarter hour") - for k in ("import", "export"): + for k in ("import", "export", "gas", "heat"): v = d.get(k) or [] if not isinstance(v, list) or not all(x is None or isinstance(x, (int, float)) for x in v): raise ValueError(f"{k}: numbers or null") - if not [x for x in d.get("import") or [] if x is not None]: - raise ValueError("no import price") + if not [x for k in ("import", "gas", "heat") for x in d.get(k) or [] if x is not None]: + raise ValueError("no import, gas or heat price") SERIES_MAX = 400 # a model's series: steps of 900 s (~4 days) @@ -220,9 +229,28 @@ def _check_market(d: dict): @dataclass class Prices: - import_ct: list[float] - export_ct: list[float] - note: str # what the prices are ("tariff ", "flat fallback ...") + import_ct: list # per step ct/kWh, or None where the tariff has no price + export_ct: list # per step ct/kWh, or None (export unpriced: no value, not 0 ct) + note: str # what the prices are ("tariff ", "no tariff: ...") + status: str = "tariff" # tariff | none (no price to plan with) + reason: str = "" # none: never | expired | other_site | no_price_now + tariff_id: str = "" + expired_at: int = 0 # the tariff's expiry (reason expired) + priced_steps: int = 0 # the steps from the first with an import price, without a gap + + +NO_TARIFF = "no tariff: price optimisation off" +NO_TARIFF_WHY = { + "never": "no tariff received yet: the platform has none for this site, or has not delivered it", + "expired": "the tariff {id} expired at {at}", + "other_site": "the tariff file is another site's", + "no_price_now": "the tariff {id} has no import price for now", +} + + +def no_tariff_note(reason: str, tariff_id: str = "", expired_at: int = 0) -> str: + at = datetime.fromtimestamp(expired_at, timezone.utc).strftime("%Y-%m-%d %H:%M UTC") if expired_at else "" + return f"{NO_TARIFF} ({NO_TARIFF_WHY.get(reason, reason).format(id=tariff_id, at=at)})" def _ahead_terms(ah, start: int, step_s: int, steps: int, terms) -> list | None: @@ -262,13 +290,12 @@ def _ahead_terms(ah, start: int, step_s: int, steps: int, terms) -> list | None: class Bundles: - def __init__(self, state_dir: str, site: str, default_price_ct: float = 30.0): - self.site, self.default = site, default_price_ct + def __init__(self, state_dir: str, site: str): + self.site = site self.tariff = _File(os.path.join(state_dir, "tariff.json"), _check_tariff) self.model = _File(os.path.join(state_dir, "model.json"), _check_model) self.flats = _File(os.path.join(state_dir, "flats.json"), _check_flats) self.market = _File(os.path.join(state_dir, "market.json"), _check_market) - self.flat: float | None = None # the last known tariff's mean import price self._box_key, self._box, self.box_errors = None, {}, {} self._box_cache: dict = {} # (series, start, model id) -> the box's forecast @@ -278,39 +305,66 @@ class Bundles: return (self.tariff.stamp(), self.model.stamp()) def prices(self, start: int, step_s: int, steps: int, now: float) -> Prices: + """The tariff's prices for the horizon, as they are: None where it + has none. No tariff, another site's, an expired one or none for the + first step: status "none", no prices at all, and why.""" t = self.tariff.get() - if t is not None and t.get("site") not in (self.site, None, ""): - t = None # the link refuses these; a copied file must not count either - if t is not None: - imp = [x for x in t["import"] if x is not None] - self.flat = sum(imp) / len(imp) - flat = self.flat if self.flat is not None else self.default - # feed-in without a price is counted at 0 ct: the plan then values PV - # export at nothing (it may curtail or self-consume more), so its note says so + none = [None] * steps if t is None: - note = "no tariff yet: default price" if self.flat is None else "no tariff: last known flat price" - return Prices([flat] * steps, [0.0] * steps, note + "; feed-in at 0 ct/kWh") - expired = now >= t.get("expires", 0) - out_i, out_e, outside, no_export = [], [], 0, 0 + return Prices(none, list(none), no_tariff_note("never"), "none", "never") + if t.get("site") not in (self.site, None, ""): + return Prices(none, list(none), no_tariff_note("other_site"), "none", "other_site") + tid, exp = str(t.get("id") or ""), int(t.get("expires", 0) or 0) + if now >= exp: + return Prices(none, list(none), no_tariff_note("expired", tid, exp), "none", "expired", tid, exp) + imp, exs = t["import"], t.get("export") or [] + out_i, out_e = [], [] for k in range(steps): i = (start + k * step_s - t["start"]) // 900 - pi = t["import"][i] if not expired and 0 <= i < len(t["import"]) else None - pe = (t.get("export") or [])[i] if not expired and 0 <= i < len(t.get("export") or []) else None - outside += pi is None - no_export += pe is None - out_i.append(pi if pi is not None else flat) - out_e.append(pe if pe is not None else 0.0) - if expired: - note = f"tariff {t.get('id')} expired: flat {flat:.1f} ct/kWh" - elif outside: - note = f"tariff {t.get('id')}; {outside} of {steps} steps at the flat {flat:.1f} ct/kWh" - else: - note = f"tariff {t.get('id')}" - if no_export == steps: - note += "; feed-in at 0 ct/kWh" + # a step after the tariff's expiry has no price either + live = start + k * step_s < exp + out_i.append(imp[i] if live and 0 <= i < len(imp) else None) + out_e.append(exs[i] if live and 0 <= i < len(exs) else None) + n = next((k for k, v in enumerate(out_i) if v is None), steps) + if n == 0: + return Prices(none, list(none), no_tariff_note("no_price_now", tid), "none", "no_price_now", tid, exp) + note = f"tariff {tid}" + if n < steps: + note += f"; prices for {n * step_s / 3600:g} h of {steps * step_s / 3600:g} h: the plan covers those" + no_export = sum(v is None for v in out_e[:n]) + if no_export == n: + note += "; no export price: export unpriced (no value)" elif no_export: - note += f"; feed-in at 0 ct/kWh in {no_export} of {steps} steps (no export price)" - return Prices(out_i, out_e, note) + note += f"; no export price in {no_export} of {n} steps: export unpriced there" + est = len([x for x in t.get("estimated") or [] if isinstance(x, int)]) + if est: + note += f"; {est} steps estimated by the platform" + return Prices(out_i, out_e, note, "tariff", "", tid, exp, n) + + def carrier_prices(self, carrier: str, start: int, step_s: int, steps: int, now: float) -> list: + """The tariff's gas or heat prices for the horizon (ct/kWh gross), + None where it has none: no tariff, another site's, expired, a step + beyond it or a bundle without the series.""" + t = self.tariff.get() + none = [None] * steps + if t is None or t.get("site") not in (self.site, None, "") or now >= int(t.get("expires", 0) or 0): + return none + xs, exp = t.get(carrier) or [], int(t.get("expires", 0) or 0) + out = [] + for k in range(steps): + i = (start + k * step_s - t["start"]) // 900 + out.append(xs[i] if start + k * step_s < exp and 0 <= i < len(xs) else None) + return out + + def box_params(self, now: float) -> dict: + """The Parameters page's values the box plans with (fleet heatprice.go + boxParams: the tariff bundle's "params", e.g. heat.hybrid_switch_eur), + {} without a valid tariff bundle: what needs one is refused.""" + t = self.tariff.get() + if t is None or t.get("site") not in (self.site, None, "") or now >= int(t.get("expires", 0) or 0): + return {} + p = t.get("params") + return {k: v for k, v in p.items() if isinstance(k, str)} if isinstance(p, dict) else {} def tariff_now(self, now: float) -> dict | None: """The tariff in force for HA: import now and next step, export now, diff --git a/src/edge/cantabile_edge/cli.py b/src/edge/cantabile_edge/cli.py index 2a30b78..ced5733 100644 --- a/src/edge/cantabile_edge/cli.py +++ b/src/edge/cantabile_edge/cli.py @@ -21,8 +21,12 @@ from .mapping import Mapping, suggest class _Json(logging.Formatter): def format(self, r): - return json.dumps({"time": self.formatTime(r, "%Y-%m-%dT%H:%M:%S"), "level": r.levelname, - "logger": r.name, "msg": r.getMessage()}) + out = {"time": self.formatTime(r, "%Y-%m-%dT%H:%M:%S"), "level": r.levelname, + "logger": r.name, "msg": r.getMessage()} + if r.exc_info: + # a logged exception's traceback (exc_info=True) in the same line + out["exc"] = self.formatException(r.exc_info) + return json.dumps(out) def _logging(): diff --git a/src/edge/cantabile_edge/config.py b/src/edge/cantabile_edge/config.py index 4f54843..eb9ae20 100644 --- a/src/edge/cantabile_edge/config.py +++ b/src/edge/cantabile_edge/config.py @@ -54,7 +54,6 @@ class Config: replan_debounce_s: float = 3.0 # a pause after a change before planning again solve_timeout_s: float = 60.0 # the optimiser's subprocess is killed after this plan_stale_s: int = 1800 # older plans: the safe defaults - default_price_ct: float = 30.0 # ct/kWh when no tariff ever came # The site's grid connection (W): the plan's import and export are at most # this. 3 x 230 V x 63 A, a German house connection's usual main fuse; # a site with a smaller fuse (or a building's larger one) sets its own. @@ -90,6 +89,11 @@ def load(path: str | None, require_site: bool = True) -> Config: sink = SinkConfig(**(raw.pop("sink", None) or {})) ha = raw.pop("ha", None) or {} token_file = os.environ.get("HA_TOKEN_FILE", ha.get("token_file", "")) + # a price without a tariff is no longer configurable (docs/parameters.md U1): + # an older file's default_price_ct is ignored, said once + if raw.pop("default_price_ct", None) is not None: + import logging + logging.getLogger(__name__).warning("config: default_price_ct is ignored: without a tariff the plan has no prices") cfg = Config(sink=sink, ha_url=ha.get("url", Config.ha_url), **raw) env = os.environ cfg.site_id = env.get("CANTABILE_SITE_ID", cfg.site_id) diff --git a/src/edge/cantabile_edge/controller.py b/src/edge/cantabile_edge/controller.py index b97dcbc..c4de3ad 100644 --- a/src/edge/cantabile_edge/controller.py +++ b/src/edge/cantabile_edge/controller.py @@ -90,7 +90,7 @@ class Controller: self.mode = Mode(cfg.state_dir, cfg.mode) self.col = Collector() self.history = History(os.path.join(cfg.state_dir, "history.json")) - self.bundles = Bundles(cfg.state_dir, cfg.site_id, cfg.default_price_ct) + self.bundles = Bundles(cfg.state_dir, cfg.site_id) self.guard = Guard(self.controls, consent, self.mode, override_hold_s=cfg.override_hold_s, min_switch_s=cfg.min_switch_s, max_actions_per_hour=cfg.max_actions_per_hour, clock=clock) self.saved_limits = self._load_limits() # the console's (limits.json) @@ -256,8 +256,28 @@ class Controller: return {c.kind for c in self.controls if c.kind in ("heating", "cooling", "ev")} # -- plans --------------------------------------------------------------- + def owner_ratings(self): + """The owner's ratings of each control's device (the panel's Devices + page: devices-specs.json, written by the Hub's devices tool) into + the controls (Control.rated, rated_device): a battery's capacity, + power and efficiency where the mapping and the device say none.""" + try: + with open(os.path.join(self.cfg.state_dir, "devices-specs.json")) as f: + specs = json.load(f).get("devices") or {} + except (OSError, ValueError, AttributeError): + specs = {} + by = {} + for d in specs.values() if isinstance(specs, dict) else []: + if not isinstance(d, dict): + continue + for cid in d.get("controls") or []: + by.setdefault(cid, (d.get("ratings") or {}, str(d.get("name") or ""))) + for c in self.controls: + c.rated, c.rated_device = by.get(c.id, ({}, "")) + def model_state(self) -> dict: now = self.clock() + self.owner_ratings() start = int(now // inputs_mod.STEP_S * inputs_mod.STEP_S) # sealed devices are not planned at all # and of a thermostat that heats and cools only its active side @@ -314,9 +334,11 @@ class Controller: self.executor.inputs_ok = self.inputs_fresh() self.act_now.set() # carry out a new plan now n = sum(len(v) for v in plan["devices"].values()) - log.info("plan %s (%s, %.1f s): %d changes in 48 h, %.2f EUR vs %.2f EUR baseline; %s", - plan["id"], plan["status"], plan["solve_s"], n, plan["cost_eur"], plan["baseline_eur"], - plan.get("price_note", "")) + cost = (f"{plan['cost_eur']:.2f} EUR vs {plan['baseline_eur']:.2f} EUR baseline" + if plan.get("cost_eur") is not None and plan.get("baseline_eur") is not None else "no cost (no tariff)") + log.info("plan %s (%s, %.1f s): %d changes, %s; %s%s", plan["id"], plan["status"], plan["solve_s"], n, cost, + plan.get("price_note", ""), + "".join(f"; {k} not planned: {v['why']}" for k, v in (plan.get("refused") or {}).items())) await self._publish("plan", self.public_plan(plan)) for cb in self.on_plan: await cb(plan) @@ -328,6 +350,9 @@ class Controller: "mode": plan["mode"], "devices": plan["devices"], "cost_eur": plan["cost_eur"], "baseline_eur": plan["baseline_eur"], "status": plan["status"], "prices": plan.get("price_note", ""), "model": plan.get("model", ""), + # without a tariff: priced false, cost and baseline null (U1); controls not + # planned and why (U2); absent from older agents + "priced": plan.get("priced", True), "refused": plan.get("refused", {}), "sources": plan.get("sources", {}), # for the building (shed_w/grid_w per step, 24 h): absent from older agents "flex": plan.get("flex", {}), @@ -364,6 +389,8 @@ class Controller: while not stop.is_set(): try: n = self.prefs.take_inbox({c.id: c for c in self.controls}, self.tz) + while self.prefs.outbox: # the owner's own tariff to the cloud (link op own_tariff) + await self._publish("own_tariff", self.prefs.outbox.pop(0)) if n or self.prefs.prune(self.clock()): await self._prefs_changed() except Exception as e: @@ -417,7 +444,8 @@ class Controller: control at its safe default), and HA sends no update for an unchanged value, so its age says nothing.""" for c in self.controls: - for role in ("temp", "soc"): + # a battery without its state of charge is not planned (inputs.battery_refusal), the rest is + for role in ("temp",): if role in c.entities and self.col.value(c.entities[role]) is None: return False return True @@ -518,7 +546,8 @@ class Controller: try: await self.make_plan() except Exception as e: - log.warning("plan: %s", e) + # with its traceback: where it failed (the message alone did not say) + log.warning("plan: %s", e, exc_info=True) self.wake.clear() woken = False try: diff --git a/src/edge/cantabile_edge/controls.py b/src/edge/cantabile_edge/controls.py index 41412a5..48f96d5 100644 --- a/src/edge/cantabile_edge/controls.py +++ b/src/edge/cantabile_edge/controls.py @@ -16,7 +16,7 @@ that the owner's consent for the whole site must cover control consent: false entities: {charge_from_grid: switch.inverter_charge_from_grid, setpoint: number.battery_power, soc: sensor.battery_soc} - params: {capacity_wh: 10000, max_charge_w: 3000, max_discharge_w: 3000} + params: {capacity_wh: 10000, max_charge_w: 3000, max_discharge_w: 3000, efficiency: 0.95} limits: {soc_pct: {owner: [20, 100]}} safe: {charge_from_grid: false} @@ -30,7 +30,18 @@ Kinds, their entities (* needed) and what the executor sets (channels): battery charge_from_grid (switch) and/or setpoint (number, W: + charge, - discharge); mode (select: the inverter's own mode, set to params.manual_option while the plan sets power, else to - params.auto_option); soc (sensor %), power (sensor W). + params.auto_option); soc (sensor %), power (sensor W); + the device's own ratings where it reports them: capacity + (sensor kWh or Wh), rated_power (sensor W or kW, charge and + discharge), efficiency (sensor %, round trip). + The battery's facts (battery_facts): capacity, charge and + discharge power and efficiency from the mapping's params, else + the device's reported ratings (those entities), else the owner's + ratings on the panel (devices-specs.json: battery_kwh, + battery_kw, battery_efficiency_pct). No default stands in for + any of them (docs/parameters.md U2): without one the battery is + not planned and the plan says which is missing and where to + enter it; without a state of charge from its sensor neither. With a setpoint the agent sets the power there (and the mode) and keeps charge_from_grid OFF: on many inverters (and the simulated ones) the switch means "charge at full power" and would @@ -38,7 +49,28 @@ Kinds, their entities (* needed) and what the executor sets (channels): Only a battery without a setpoint (an HM8042 as the profile has it: the switch alone) is driven through charge_from_grid. heating climate* (target temperature) or switch* (on/off, a boiler); - temp (sensor °C, else the climate's current temperature) + temp (sensor °C, else the climate's current temperature); + source (select: a hybrid's heat source, its options named in + params.source_options {heat_pump: ..., boiler: ...}); efficiency + (sensor %, read only: a boiler's rated efficiency). + What makes the heat (params.heat_source; docs/methods.md E6): + electric (default) electricity at params.cop (a heat pump + ~3, direct electric 1): its heat costs the import + price ÷ COP + heat_pump the same, with params.cop_curve [[°C outside, COP], + ...] from its datasheet where given + boiler gas: heat costs the gas price ÷ the boiler's + efficiency (heat out per kWh of gas billed, Hs) + district the heat price per kWh (the heat meter's: the + site's heat tariff or its building's) + hybrid a heat pump and a boiler; the plan chooses one per + quarter-hour (the cheaper heat, in the comfort's + bounds) and sets the source select + The boiler's efficiency and max_heat_w (W of heat) are facts of + the device (FACTS: the mapping's params, else its efficiency + sensor, else the owner's ratings boiler_efficiency_pct and + heat_kw); without them, or without the gas or heat price, the + control is not planned and the panel says why (U2's rule). cooling climate* (hvac_mode cool/off, target temperature); temp A climate's own range (its min_temp..max_temp) narrows the kind's range, and a target temperature is rounded to its @@ -74,8 +106,14 @@ log = logging.getLogger(__name__) # kind -> {entity role: allowed domains}; the roles the executor writes ENTITIES = { "battery": {"charge_from_grid": ("switch", "input_boolean"), "setpoint": ("number", "input_number"), - "mode": ("select", "input_select"), "soc": ("sensor", "input_number"), "power": ("sensor",)}, - "heating": {"climate": ("climate",), "switch": ("switch", "input_boolean"), "temp": ("sensor",)}, + "mode": ("select", "input_select"), "soc": ("sensor", "input_number"), "power": ("sensor",), + # read only: the device's own ratings (battery_facts) + "capacity": ("sensor", "input_number"), "rated_power": ("sensor", "input_number"), + "efficiency": ("sensor", "input_number")}, + "heating": {"climate": ("climate",), "switch": ("switch", "input_boolean"), "temp": ("sensor",), + "source": ("select", "input_select"), + # read only: the boiler's own rated efficiency (%; heat_facts) + "efficiency": ("sensor", "input_number")}, "cooling": {"climate": ("climate",), "temp": ("sensor",)}, "ev": {"switch": ("switch", "input_boolean"), "current": ("number", "input_number"), "connected": ("binary_sensor", "input_boolean"), "soc": ("sensor", "input_number"), @@ -84,25 +122,34 @@ ENTITIES = { "phases": ("sensor",), "power": ("sensor",), "current_measured": ("sensor",)}, "cover": {"cover": ("cover",)}, } -WRITES = {"charge_from_grid", "setpoint", "mode", "climate", "switch", "current", "cover"} +WRITES = {"charge_from_grid", "setpoint", "mode", "climate", "switch", "current", "cover", "source"} NEEDED = {"battery": (("charge_from_grid", "setpoint"),), "heating": (("climate", "switch"),), "cooling": (("climate",),), "ev": (("switch",),), "cover": (("cover",),)} # defaults per kind (params may override each) PARAMS = { - "battery": {"capacity_wh": 5000.0, "max_charge_w": 2500.0, "max_discharge_w": 2500.0, "efficiency": 0.95, - "soc_pct": 50.0, # soc_pct: the estimate when no sensor says - "manual_option": "manual", "auto_option": "self-consumption", "min_switch_s": 0.0, + # capacity_wh, max_charge_w, max_discharge_w, efficiency (one way, 0-1): + # facts of the device, no default (FACTS; battery_facts) + "battery": {"manual_option": "manual", "auto_option": "self-consumption", "min_switch_s": 0.0, # steady.py: the least time between two changes of a mode / a setpoint, and # the least gain (ct) a battery's change must bring over its hold "hold_mode_s": 1800.0, "hold_set_s": 900.0, "min_gain_ct": 1.0}, - "heating": {"r_k_per_kw": 10.0, "c_kwh_per_k": 3.0, "max_power_w": 2000.0, "comfort_c": 21.0, - "setback_c": 17.0, "cop": 1.0, # cop 1: electric; a heat pump ~3 + # r_k_per_kw, c_kwh_per_k (the room), max_power_w, cop (the device): facts, + # no default (FACTS: without them the room is not optimised, + # inputs.room_refusal). comfort_c / setback_c / setup_c: the box's copy of + # the Parameters rows comfort.heating_setpoints / comfort.cooling_setpoints + # (docs/parameters.md C7) until the bundle carries them; the owner's + # schedule (preferences.py) and the mapping's win + "heating": {"comfort_c": 21.0, "setback_c": 17.0, "min_switch_s": 600.0, # the room's other heat (W; the model's fit, inputs._room_rc): internal - # (a number, or 24 by local hour) and the sun's per W/m² of irradiance - "internal_gain_w": 0.0, "solar_m2": 0.0, "hold_mode_s": 1800.0, "hold_set_s": 900.0, "min_gain_ct": 1.0}, - "cooling": {"r_k_per_kw": 10.0, "c_kwh_per_k": 3.0, "max_power_w": 1500.0, "comfort_c": 25.0, - "setup_c": 28.0, "cop": 3.0, "min_switch_s": 600.0, "internal_gain_w": 0.0, "solar_m2": 0.0, + # (a number, or 24 by local hour) and the sun's per W/m² of irradiance; + # none modelled unless the fit or the mapping gives it + "internal_gain_w": 0.0, "solar_m2": 0.0, "hold_mode_s": 1800.0, "hold_set_s": 900.0, "min_gain_ct": 1.0, + # what makes the heat (docs/methods.md E6): electric | heat_pump | boiler | district | hybrid; + # a hybrid's source select options; a heat pump's datasheet COP by outside temperature + "heat_source": "electric", "source_options": {}, "cop_curve": []}, + "cooling": {"comfort_c": 25.0, + "setup_c": 28.0, "min_switch_s": 600.0, "internal_gain_w": 0.0, "solar_m2": 0.0, "hold_mode_s": 1800.0, "hold_set_s": 900.0, "min_gain_ct": 1.0}, "ev": {"need_wh": 10000.0, "departure": "07:00", "min_current_a": 6.0, "max_current_a": 16.0, "phases": None, "voltage": 230.0, "min_switch_s": 0.0, # phases: None, not said (evphases.py) @@ -113,6 +160,25 @@ PARAMS = { } +# params a kind accepts without a default: facts of the device that come +# from the mapping, the device or its owner, or the feature refuses +FACTS = {"battery": ("capacity_wh", "max_charge_w", "max_discharge_w", "efficiency"), + # the room's R and C, the device's electric power and COP (room_refusal); + # a boiler's or a heat station's: its efficiency (heat per kWh of gas billed, Hs, 0-1) + # and its most heat (W); heat_facts + "heating": ("r_k_per_kw", "c_kwh_per_k", "max_power_w", "cop", "boiler_efficiency", "max_heat_w"), + "cooling": ("r_k_per_kw", "c_kwh_per_k", "max_power_w", "cop")} +HEAT_SOURCES = ("electric", "heat_pump", "boiler", "district", "hybrid") +# the owner's ratings of a heating device (devices-specs.json) and their labels +HEAT_RATINGS = {"boiler_efficiency": ("boiler_efficiency_pct", "Boiler efficiency, % (heat per kWh of gas billed)"), + "max_heat_w": ("heat_kw", "Most heat output, kW")} +# the owner's ratings (the panel's Devices page, devices-specs.json) and +# where to enter each: (rating, its label on the panel, the mapping's param) +BATTERY_RATINGS = {"capacity": ("battery_kwh", "Battery capacity, kWh", "capacity_wh"), + "power": ("battery_kw", "Battery power, kW", "max_charge_w and max_discharge_w"), + "efficiency": ("battery_efficiency_pct", "Battery round-trip efficiency, %", "efficiency")} + + def ev_volts(params: dict, purpose: str) -> float: """A charger's volts x phases (W per A) for a purpose: "plan" (the plan's power per A) or "order" (the grid order's current bound, @@ -148,18 +214,83 @@ class Control: entity_range: dict = field(default_factory=dict) # quantity -> (lo, hi) the device itself reports (a climate's) switchover: dict = field(default_factory=dict) # heating/cooling pair on one climate (switchover.py) name: str = "" # the owner's name for it (mapping `name`), else label() guesses + # the owner's ratings of its device (devices-specs.json: battery_kwh, ...) + # and that device's name, set by the controller; the device's own + # reported ratings (its capacity/rated_power/efficiency entities) by + # inputs.device_state + rated: dict = field(default_factory=dict) + rated_device: str = "" + reported: dict = field(default_factory=dict) def label(self) -> str: """A name for people: the mapping's, else the id in words ("living_room_cooling": "Living room cooling").""" return self.name or (self.id.replace("_", " ").strip().capitalize() or self.id) - def p(self, name: str) -> float | str: - return self.params.get(name, PARAMS[self.kind][name]) + def p(self, name: str) -> float | str | None: + """A param: the mapping's, else the kind's default; a fact without + a default (FACTS) is None when the mapping has none.""" + if name in self.params: + return self.params[name] + if name in FACTS.get(self.kind, ()): + return None + return PARAMS[self.kind][name] + + def battery_facts(self) -> tuple[dict, list[str], dict]: + """A battery's capacity_wh, max_charge_w, max_discharge_w and + efficiency (one way): the mapping's params, else the device's + reported ratings, else the owner's (the panel); never a default. + (facts, the missing ones: "capacity", "power", "efficiency", per + fact where it came from: mapping | device | owner).""" + out, src, rep, own = {}, {}, self.reported or {}, self.rated or {} + + def pick(key, device, owner): + for where, v in (("mapping", self.params.get(key)), ("device", device), ("owner", owner)): + x = _num(v) + if x is not None and x > 0: + out[key], src[key] = x, where + return + kwh, kw, eff_pct = (_num(own.get(k)) for k in ("battery_kwh", "battery_kw", "battery_efficiency_pct")) + pick("capacity_wh", rep.get("capacity_wh"), kwh * 1000.0 if kwh else None) + pick("max_charge_w", rep.get("rated_power_w"), kw * 1000.0 if kw else None) + pick("max_discharge_w", rep.get("rated_power_w"), kw * 1000.0 if kw else None) + # round trip -> one way: charging and discharging lose alike (the + # optimiser's eff x charge, discharge / eff: eff² round trip) + rt = rep.get("efficiency_pct") + pick("efficiency", _one_way(rt), _one_way(eff_pct)) + missing = [m for m, keys in (("capacity", ("capacity_wh",)), ("power", ("max_charge_w", "max_discharge_w")), + ("efficiency", ("efficiency",))) if any(k not in out for k in keys)] + return out, missing, src + + def heat_facts(self) -> tuple[dict, list[str], dict]: + """A heating control's boiler_efficiency (0-1, heat per kWh of gas + billed) and max_heat_w where its heat_source needs them (boiler, + hybrid: both; district: max_heat_w): the mapping's params, else the + device's (its efficiency sensor, in %), else the owner's ratings + (boiler_efficiency_pct, heat_kw); never a default. (facts, the + missing ones, per fact where it came from).""" + src = str(self.p("heat_source") or "electric") + need = {"boiler": ("boiler_efficiency", "max_heat_w"), "hybrid": ("boiler_efficiency", "max_heat_w"), + "district": ("max_heat_w",)}.get(src, ()) + out, where, rep, own = {}, {}, self.reported or {}, self.rated or {} + eff_pct, kw = _num(own.get("boiler_efficiency_pct")), _num(own.get("heat_kw")) + cands = {"boiler_efficiency": (("mapping", self.params.get("boiler_efficiency")), + ("device", _pct(rep.get("efficiency_pct"))), ("owner", _pct(eff_pct))), + "max_heat_w": (("mapping", self.params.get("max_heat_w")), ("owner", kw * 1000.0 if kw else None))} + for k in need: + for w, v in cands[k]: + x = _num(v) + if x is not None and x > 0 and (k != "boiler_efficiency" or x <= 1.0): + out[k], where[k] = x, w + break + return out, [k for k in need if k not in out], where def device_range(self, q: str) -> tuple[float, float]: if self.kind == "battery" and q == "power_w": - return (-float(self.p("max_discharge_w")), float(self.p("max_charge_w"))) + # without its power known nothing but 0 may be set (no plan + # sets one then; a command is refused by the guard) + f, _, _ = self.battery_facts() + return (-float(f.get("max_discharge_w") or 0.0), float(f.get("max_charge_w") or 0.0)) if self.kind == "ev" and q == "current_a": return (0.0, float(self.p("max_current_a"))) lo, hi = RANGE[self.kind][q] @@ -203,6 +334,49 @@ def _num(v) -> float | None: return x if x == x and abs(x) != float("inf") else None +def _pct(v) -> float | None: + """A percentage as a share (0-1], or None.""" + x = _num(v) + return x / 100.0 if x is not None and 0 < x <= 100 else None + + +def _one_way(round_trip_pct) -> float | None: + """A round-trip efficiency in % as the one-way factor (its square root), + or None (not a number in 1..100).""" + x = _num(round_trip_pct) + return (x / 100.0) ** 0.5 if x is not None and 0 < x <= 100 else None + + +def _check_heat(cid: str, p: dict, ents: dict): + src = p.get("heat_source", "electric") + if src not in HEAT_SOURCES: + raise ValueError(f"control {cid}: heat_source is one of {', '.join(HEAT_SOURCES)}") + curve = p.get("cop_curve") or [] + if not isinstance(curve, list) or not all(isinstance(x, (list, tuple)) and len(x) == 2 and _num(x[0]) is not None + and _num(x[1]) is not None and float(x[1]) > 0 for x in curve): + raise ValueError(f"control {cid}: cop_curve is [[outside °C, COP > 0], ...]") + opts = p.get("source_options") or {} + if not isinstance(opts, dict) or set(opts) - {"heat_pump", "boiler"}: + raise ValueError(f"control {cid}: source_options names the select's options for heat_pump and boiler") + if src == "hybrid" and ("source" not in ents or set(opts) != {"heat_pump", "boiler"}): + raise ValueError(f"control {cid}: a hybrid needs its source select and source_options for heat_pump and boiler") + + +def cop_at(params: dict, t_out: float) -> float: + """A heat pump's COP at an outside temperature: its datasheet curve + (cop_curve, linear between the points, held beyond the ends), else + params cop.""" + pts = sorted((float(a), float(b)) for a, b in (params.get("cop_curve") or [])) + if not pts: + return float(params.get("cop") or PARAMS["heating"]["cop"]) + if t_out <= pts[0][0]: + return pts[0][1] + for (t0, c0), (t1, c1) in zip(pts, pts[1:]): + if t_out <= t1: + return c0 + (c1 - c0) * (t_out - t0) / (t1 - t0) if t1 > t0 else c1 + return pts[-1][1] + + def _check_cover(cid: str, p: dict): for k in ("open_pct", "shade_pct", "closed_pct"): if k in p and (_num(p[k]) is None or not 0 <= float(p[k]) <= 100): @@ -243,11 +417,17 @@ def parse(raw: list | None, reading_assets: set[str], rooms: set[str] | None = N if not any(a in ents for a in alts): raise ValueError(f"control {cid}: needs {' or '.join(alts)}") params = dict(c.get("params") or {}) - unknown = set(params) - set(PARAMS[kind]) + unknown = set(params) - set(PARAMS[kind]) - set(FACTS.get(kind, ())) if unknown: raise ValueError(f"control {cid}: unknown params {', '.join(sorted(unknown))}") if kind == "cover": _check_cover(cid, params) + for k in FACTS.get(kind, ()): + if k in params and (_num(params[k]) is None or float(params[k]) <= 0 or + (k.endswith("efficiency") and float(params[k]) > 1)): + raise ValueError(f"control {cid}: {k} is a number above 0" + (" and at most 1" if k.endswith("efficiency") else "")) + if kind == "heating": + _check_heat(cid, params, ents) sw = {} if c.get("switchover") is not None: if kind not in ("heating", "cooling") or "climate" not in ents: diff --git a/src/edge/cantabile_edge/devpage.py b/src/edge/cantabile_edge/devpage.py index de09a60..c076755 100644 --- a/src/edge/cantabile_edge/devpage.py +++ b/src/edge/cantabile_edge/devpage.py @@ -42,11 +42,24 @@ control are switched on here as on the Hub's Devices page (the agent starts again, as the Hub's tool restarts it); without it the page points to the add-on's configuration. Protection (protected / not, never sealed) and a thermostat's heating or cooling choice are the owner's, here as on the Hub. + +Remote Home Assistant for Cantabile support (item 19; the +add-on's option support_ha, off by default): while support has this Home +Assistant open (as its own HA user "Cantabile support", an administrator, +so it can open these pages too) both pages show it at the top with End +now, the add-on's own button: the link (edge/link/hatunnel.go) writes the +open sessions and its pid into its state directory (support-ha.json), End +now sends it SIGUSR1, as the Hub's panel does, and the link closes the +session and disables that user. What the Hub's panel keeps from support +stays the owner's here too: reading and control, protection, heating or +cooling, a shade's window, indoor or outdoor and the weather choice are +refused to the "Cantabile support" user. """ import asyncio import json import logging import os +import signal import time import urllib.parse @@ -61,6 +74,16 @@ from .joinpage import CSS, E, JoinPage log = logging.getLogger(__name__) PAGES = ("devices", "building") +# The Home Assistant user Cantabile support signs in as (edge/link/hauser.go +# haSupportUsername); HA's ingress names it in X-Remote-User-Name. +SUPPORT_USERNAME = "cantabile-support" +# Only the owner's (the Hub panel's post_devices refuses them to support). +OWNERS_ONLY = {"consent": M("Reading and control are the owner's to switch on."), + "protect": M("Protection is the owner's to change."), + "switchover": M("Heating or cooling is the owner's to choose."), + "shade": M("The shade's room and window are the owner's to set."), + "place": M("Indoor or outdoor is the owner's to choose."), + "weather": M("The weather forecast is the owner's to choose.")} SWITCHOVER_WORDS = {"heating": M("Heating"), "cooling": M("Cooling"), "season": M("By season (heating October to April, cooling May to September)"), "outdoor": M("By outdoor temperature")} @@ -118,6 +141,7 @@ section.set{border-top:1px solid #d5ded9;margin-top:1rem}section.set h3{margin:. .row{display:flex;gap:.6rem}.row>div{flex:1}.right{text-align:right} details.remove summary{color:#b3261e;cursor:pointer;padding:.8rem 0 .2rem}button.danger{background:none;color:#b3261e;box-shadow:inset 0 0 0 2px #b3261e} details.more summary{cursor:pointer;margin:.6rem 0} +.box.support{background:#fbe9c9;border-color:#e8c37a}.box.support form{display:inline;margin:0 0 0 .4rem}.box.support button{margin:.3rem 0 0} details.info{display:inline;position:relative}details.info>summary{display:inline-flex;align-items:center;justify-content:center;width:1.2rem;height:1.2rem;margin:0 .35rem;vertical-align:.1em;list-style:none;border:1px solid #5a6b62;border-radius:50%;color:#5a6b62;font:italic 600 .72rem/1 Georgia,serif;cursor:pointer} details.info>summary::-webkit-details-marker{display:none}details.info>.info-body{position:absolute;left:0;z-index:3;width:min(22rem,80vw);margin-top:.4rem;padding:.7rem .9rem;background:#fff;color:#1d2a24;border:1px solid #d5ded9;border-radius:8px;box-shadow:0 6px 24px rgba(0,0,0,.18);font-size:.9rem;font-weight:normal} @supports selector(:has(a)){form.changes .save{display:none}form.changes:has(input:default:not(:checked),input:checked:not(:default),option:checked:not(:default),input[value=outdoor]:checked) .save{display:inline-block} @@ -126,7 +150,8 @@ form.changes:not(:has(input[value=outdoor]:checked)) .outdoor{display:none}} .badge.quiet{background:none;box-shadow:inset 0 0 0 1px #2b3a32;color:#9fb0a6}.badge.warn{background:#3a2c12;color:#f3c77e}.pill.on{background:#19302a;color:#a6e0bf} .dot.on{background:#5cc493}.add,section.set{border-color:#2b3a32}a.box.dev:hover{border-color:#5cc493}select{background:#18221d;color:#e3ebe6;border:1px solid #3a4b42} details.remove summary{color:#f08a80}button.danger{background:none;color:#f08a80;box-shadow:inset 0 0 0 2px #f08a80} -details.info>.info-body{background:#18221d;color:#e3ebe6;border-color:#2b3a32}details.info>summary{border-color:#9fb0a6;color:#9fb0a6}}""" +details.info>.info-body{background:#18221d;color:#e3ebe6;border-color:#2b3a32}details.info>summary{border-color:#9fb0a6;color:#9fb0a6} +.box.support{background:#3a2c12;border-color:#6b5222}}""" # HA's hash (#devices, #building: Cantabile's dashboard) to this page's ?p= HASH_SCRIPT = ("(function(){try{var P=window.parent;if(P===window)return;var m=/^#(devices|building)$/.exec(P.location.hash||'');" "if(m&&location.search.indexOf('p=')<0&&location.search.indexOf('code=')<0)location.replace('?p='+m[1])}" @@ -844,10 +869,10 @@ def messages(msg: str, err: str) -> str: return (f'
{E(msg)}
' if msg else "") + (f'
{E(err)}
' if err else "") -def page_devices(v: dict, msg: str = "", err: str = "") -> str: +def page_devices(v: dict, msg: str = "", err: str = "", banner: str = "") -> str: about = E(T("Home Assistant's devices that a Cantabile device profile knows. Use one with Cantabile to see it on " "Cantabile's dashboard and to let Cantabile read it once you have given your consent.")) - body = [f"

{E(T('Devices'))}{info(about)}

" + messages(msg, err)] + body = [banner + f"

{E(T('Devices'))}{info(about)}

" + messages(msg, err)] rooms = v.get("rooms") or [] if v.get("devices"): n = len(v["devices"]) @@ -872,15 +897,15 @@ def page_devices(v: dict, msg: str = "", err: str = "") -> str: return html(T("Cantabile: devices"), "".join(body), "devices") -def page_device(v: dict, dev_id: str, msg: str = "", err: str = "") -> str: +def page_device(v: dict, dev_id: str, msg: str = "", err: str = "", banner: str = "") -> str: """One device in use: its state and values, then its settings, each section saving on its own. The list when there is no such device.""" d = next((x for x in v.get("devices") or [] if x["id"] == dev_id), None) if not d: - return page_devices(v, msg, err) + return page_devices(v, msg, err, banner) rooms = v.get("rooms") or [] vals = device_values(d) - body = (f'‹ {E(T("Devices"))}

{E(d["name"])}

' + body = (banner + f'‹ {E(T("Devices"))}

{E(d["name"])}

' f'
{model_line(d)} {status_badge(d.get("status"))}
{messages(msg, err)}' f'
{device_state(d)}' + (f'{E(vals)}' if vals else "") + "
" @@ -894,12 +919,57 @@ def page_refused(why: str, page: str = "devices") -> str: return html("Cantabile", f"

{E(head)}

{E(why)}
", page) +class SupportSessions: + """Cantabile support's open Home Assistant session, as the link writes + it (/support-ha.json: its pid, the sessions), and End now.""" + + def __init__(self, link_state: str, proc: str = "/proc", kill=os.kill): + self.path = os.path.join(link_state, "support-ha.json") + self.proc, self.kill = proc, kill + + def state(self) -> dict: + st = _read_json(self.path, {}) + return st if isinstance(st, dict) else {} + + def open(self) -> list[dict]: + return [x for x in self.state().get("sessions") or [] if isinstance(x, dict)] + + def end(self) -> bool: + """SIGUSR1 to the link (only to a process that is the link): True if sent.""" + pid = self.state().get("pid") + if not isinstance(pid, int) or pid <= 1: + return False + try: + with open(os.path.join(self.proc, str(pid), "cmdline"), "rb") as f: + if b"cantabile-link" not in f.read().split(b"\0")[0]: + return False + self.kill(pid, signal.SIGUSR1) + except OSError: + return False + return True + + +def support_banner(sessions: list[dict], page: str) -> str: + """While support has this Home Assistant open: who, how long, End now.""" + if not sessions: + return "" + who = ", ".join(sorted({str(x.get("by") or T("Cantabile support")) for x in sessions})) + since = min((x.get("since") or 0) for x in sessions) + n = max(0, int((time.time() - since) // 60)) if since else 0 + return (f'
{E(T("Cantabile support has this Home Assistant open"))} ' + + E(TN("({who}, for {n} minute), signed in as the user \"Cantabile support\". Everything they do is recorded.", + "({who}, for {n} minutes), signed in as the user \"Cantabile support\". Everything they do is recorded.", + n, who=who)) + + form("end-support", hidden(p=page), T("End now"), inline=True) + "
") + + class App(JoinPage): """The add-on's pages: Devices (the first) and Building or community.""" def __init__(self, fleet, devices: Devices, location=None, admin=None): super().__init__(fleet, **({"location": location} if location else {})) self.devices = devices + self.support = SupportSessions(getattr(fleet, "link_state", "") or os.environ.get("CANTABILE_LINK_STATE", "/data/link")) # admin(user_id) -> bool: the agent's HA client asks HA (ha.is_admin) self.admin = admin or self._admin @@ -924,21 +994,51 @@ class App(JoinPage): return 200, page_refused(T("Cantabile could not ask Home Assistant who you are ({error}).", error=e), page) if not ok: return 200, page_refused(T("Only an administrator of Home Assistant can use this page."), page) + f = ({k: v[0] for k, v in urllib.parse.parse_qs(data.decode("utf-8", "replace")).items()} + if method == "POST" else {}) + if f.get("do") == "end-support": + # the add-on's End now (any administrator: the owner, or support itself) + sent = await asyncio.to_thread(self.support.end) + msg, err = ((T("Ended. Cantabile support's session is closed and the user \"Cantabile support\" is disabled " + "again (a few seconds)."), "") if sent else + ("", T("No session to end, or Cantabile's connection is not running."))) + if page == "building": + return 200, self.with_banner(await asyncio.to_thread(self.get, {}), "building", msg, err) + return 200, page_devices(await self.devices.view(), msg, err, self.banner("devices")) if page == "building": status, out = await super().respond(method, url, hdr, data, peer) if status == 200: - out = out.replace("", f"\n{MORE_CSS}", 1) \ - .replace("", "" + nav("building"), 1) + out = self.with_banner(out, "building") return status, out if url.path not in ("/", "") or method not in ("GET", "POST"): return 404, T("Not found") dev_id = (q.get("d") or [""])[0] + banner = self.banner("devices") if method == "GET": v = await self.devices.view() - return 200, page_device(v, dev_id) if dev_id else page_devices(v) - f = {k: v[0] for k, v in urllib.parse.parse_qs(data.decode("utf-8", "replace")).items()} + return 200, page_device(v, dev_id, banner=banner) if dev_id else page_devices(v, banner=banner) by = hdr.get("x-remote-user-display-name") or hdr.get("x-remote-user-name") or "owner" - return 200, await self.post_devices(f, by) + if self.is_support(hdr) and f.get("do") in OWNERS_ONLY: + err = T(OWNERS_ONLY[f["do"]]) + v = await self.devices.view() + return 200, page_device(v, f.get("id", ""), err=err, banner=banner) if f.get("id") else \ + page_devices(v, err=err, banner=banner) + return 200, (await self.post_devices(f, by)).replace("" + nav("devices"), "" + nav("devices") + banner, 1) + + def is_support(self, hdr: dict) -> bool: + """The request is the "Cantabile support" HA user's (HA's ingress + names it: its username, or its id while a session is open).""" + uid = hdr.get("x-remote-user-id", "") + return (hdr.get("x-remote-user-name", "") == SUPPORT_USERNAME + or bool(uid) and uid in {x.get("ha_user") for x in self.support.open()}) + + def banner(self, page: str) -> str: + return support_banner(self.support.open(), page) + + def with_banner(self, out: str, page: str, msg: str = "", err: str = "") -> str: + """JoinPage's page with this app's style, nav and support banner.""" + return out.replace("", f"\n{MORE_CSS}", 1) \ + .replace("", "" + nav(page) + self.banner(page) + messages(msg, err), 1) async def post_devices(self, f: dict, by: str = "owner") -> str: dv, do, msg, err = self.devices, f.get("do", ""), "", "" diff --git a/src/edge/cantabile_edge/executor.py b/src/edge/cantabile_edge/executor.py index 87624ab..f5d8670 100644 --- a/src/edge/cantabile_edge/executor.py +++ b/src/edge/cantabile_edge/executor.py @@ -102,6 +102,12 @@ def actions_for(c, want, col, level="plan", why="") -> list[Action]: act("climate", "set_temperature", {"temperature": float(v)}, float(v), "temp_c") elif v in ("on", "off"): switch("switch", v == "on") + # a hybrid's heat source (optimizer: the heat pump or the boiler, the cheaper heat now) + src = want.get("source") if isinstance(want, dict) else None + if c.kind == "heating" and src and "source" in e: + opt = (c.p("source_options") or {}).get(src) + if opt and col.state(e["source"]) != str(opt): + act("source", "select_option", {"option": str(opt)}, str(opt)) elif c.kind == "ev": v = want.get("set") if isinstance(want, dict) else want if v == "off": @@ -166,6 +172,13 @@ class Executor: if cmd: self.commands.pop(c.id, None) fresh = self.plan is not None and now - self.plan.get("made", 0) <= self.stale and self.inputs_ok + if fresh and c.id in (self.plan.get("refused") or {}): + # not planned: a room's fallback schedule (optimizer.fallback_entries), + # else its safe default (a battery without its facts, docs/parameters.md U2) + e = _plan_value(self.plan, c.id, now) + if e is not None: + return e, "plan", e.get("why", "") + return safe_want(c), "plan", "not planned: " + str(self.plan["refused"][c.id].get("why", "")) if fresh: e = _plan_value(self.plan, c.id, now) return e, "plan", (e or {}).get("why", "") diff --git a/src/edge/cantabile_edge/fcmodels.py b/src/edge/cantabile_edge/fcmodels.py index 797f1bf..d51d589 100644 --- a/src/edge/cantabile_edge/fcmodels.py +++ b/src/edge/cantabile_edge/fcmodels.py @@ -22,6 +22,16 @@ metered). The kinds: with the Mieterstrom pricing) times the site's calibration (pvcalib.py). +The series (SERIES_FEATURES; methods.md B1-B2, B13-B16): electric `load`, +`base_load`, `pv` (W); thermal `heat` (heat delivered for space heating, +W) and `dhw` (heat for hot water, W) with the weather, the wind, the room +model's heat loss (`loss`: the site's fitted UA times the indoor less the +outdoor temperature) and the expected occupancy (`occ`: the occupancy +series' hour-of-week profile); `occupancy` (the share of a site's presence +sensors that see someone, 0..1) and `ev_plug` (cars plugged in at the +site's chargers, 0..1 per charger) on the calendar alone. The same kinds +and the same code for each: a new series is data and features. + A model is a JSON-able dict ("params"); fit_* makes it, predict() uses it. intraday() carries the last hours' error against the meter into the next hours (the box every 15 minutes; methods.md B10). @@ -54,6 +64,16 @@ MIN_GBM_SLOTS = 96 # a day of data at least LOAD_FEATURES = ["hod", "dow", "off", "how", "lag7", "temp", "ghi", "cloud", "hdd", "special", "doy_sin", "doy_cos", "daylight"] PV_FEATURES = ["hod", "how", "lag7", "temp", "ghi", "cloud", "elev", "az", "phys", "doy_sin", "doy_cos", "daylight"] +HEAT_FEATURES = ["hod", "dow", "off", "how", "lag7", "temp", "ghi", "cloud", "hdd", "wind", "special", "doy_sin", "doy_cos", + "daylight", "loss", "occ"] +DHW_FEATURES = ["hod", "dow", "off", "how", "lag7", "temp", "special", "doy_sin", "doy_cos", "occ"] +PRESENCE_FEATURES = ["hod", "dow", "off", "how", "lag7", "special", "doy_sin", "doy_cos"] +SERIES_FEATURES = {"pv": PV_FEATURES, "heat": HEAT_FEATURES, "dhw": DHW_FEATURES, "occupancy": PRESENCE_FEATURES, + "ev_plug": PRESENCE_FEATURES} +# shares, not watts: occupancy 0..1, ev_plug the cars plugged in (0..1 per +# charger); their nMAE's floor and their profiles' digits differ (level_floor) +FRACTION_SERIES = ("occupancy", "ev_plug") +UPPER = {"occupancy": 1.0} # a share of the sensors: never above 1 FEATURES_V1 = {"load": ["hod", "dow", "off", "how", "lag7", "temp", "ghi", "cloud", "hdd"], # before 2026-11-04 "pv": ["hod", "how", "lag7", "temp", "ghi", "cloud", "elev", "az", "phys"]} CATEGORICAL = ("special",) @@ -63,13 +83,33 @@ CATEGORICAL = ("special",) # (measured 2026-11-04, building's synthetic site: a cold snap 12 K below the # coldest day trained on, held-out nMAE 29.5 % -> 6.4 %; an ordinary winter # week 3.8 % -> 3.3 %; methods.md B10) -LINEAR_SERIES: tuple = ("load", "base_load") +LINEAR_SERIES: tuple = ("load", "base_load", "heat") +# ... but only with this much history (days between the first and last +# metered slot): on a few days linear leaves overfit (measured on the sim +# farm 2026-11-04, ~3.6 days: nMAE 1.07 with them, 0.58 without) +LINEAR_MIN_DAYS = 14.0 # recency (methods.md B10): a slot's weight max(0.5^(age/30 d), 0.25 x the # season's likeness (cos of the age over a year, last year's same weeks # count), 0.05) HALF_LIFE_D, SEASON_W, FLOOR_W = 30.0, 0.25, 0.05 +def feature_names(series: str) -> list[str]: + """A series' current features (SERIES_FEATURES; the load's for the rest).""" + return list(SERIES_FEATURES.get(series, LOAD_FEATURES)) + + +def level_floor(series: str) -> float: + """The metered mean under which nMAE is not given (metrics): 1 W for + a power, 0.01 for a share (FRACTION_SERIES).""" + return 0.01 if series in FRACTION_SERIES else 1.0 + + +def digits(series: str) -> int: + """The decimals an hour-of-week profile keeps: 1 for watts, 3 for a share.""" + return 3 if series in FRACTION_SERIES else 1 + + # ---- the calendar ------------------------------------------------------------- def _easter(y: int) -> date: @@ -209,6 +249,14 @@ class Weather: elev: np.ndarray az: np.ndarray hours: list = field(default_factory=list) # the records (pvforecast.Hour), for pvforecast + wind: np.ndarray | None = None # m/s, the record of the slot's hour (None: no record had it) + + def slice(self, sl: slice) -> "Weather": + return Weather(self.temp[sl], self.ghi[sl], self.cloud[sl], self.elev[sl], self.az[sl], self.hours, + None if self.wind is None else self.wind[sl]) + + def wind_or_nan(self, n: int) -> np.ndarray: + return np.full(n, np.nan) if self.wind is None else self.wind def sun(t: np.ndarray, lat: float | None, lon: float | None) -> tuple[np.ndarray, np.ndarray]: @@ -228,7 +276,7 @@ def weather(t: np.ndarray, hours: list, lat: float | None, lon: float | None) -> pvforecast.forecast does), else a clear sky dimmed by the cloud cover.""" n = len(t) el, az = sun(t, lat, lon) - temp, ghi, cloud = np.full(n, np.nan), np.full(n, np.nan), np.full(n, np.nan) + temp, ghi, cloud, wind = np.full(n, np.nan), np.full(n, np.nan), np.full(n, np.nan), np.full(n, np.nan) if not hours: return Weather(temp, ghi, cloud, el, az, []) by_end = {} @@ -249,6 +297,8 @@ def weather(t: np.ndarray, hours: list, lat: float | None, lon: float | None) -> continue if h.cloud_pct is not None: cloud[i] = h.cloud_pct + if getattr(h, "wind_ms", None) is not None: + wind[i] = h.wind_ms if lat is None or lon is None: if h.solar_kwh_m2 is not None: ghi[i] = h.solar_kwh_m2 * 1000.0 @@ -264,14 +314,15 @@ def weather(t: np.ndarray, hours: list, lat: float | None, lon: float | None) -> ghi[i] = h.solar_kwh_m2 * 1000.0 * (4 * mine / s) if s > 0 else 0.0 elif h.cloud_pct is not None: ghi[i] = pvforecast.cloud_dimmed(pvforecast.clear_sky_ghi(el[i]), h.cloud_pct) - return Weather(temp, ghi, cloud, el, az, list(hours)) + return Weather(temp, ghi, cloud, el, az, list(hours), wind if not np.isnan(wind).all() else None) # ---- metrics ------------------------------------------------------------------ -def metrics(y: np.ndarray, p: np.ndarray) -> dict: +def metrics(y: np.ndarray, p: np.ndarray, floor: float = 1.0) -> dict: """MAE and RMSE (W) and nMAE (MAE over the mean metered value) on the - slots where both exist; nMAE None when the metered mean is ~0 (a night).""" + slots where both exist; nMAE None when the metered mean is ~0 (a night; + under `floor`: level_floor).""" m = ~(np.isnan(y) | np.isnan(p)) if not m.any(): return {"n": 0, "mae": None, "rmse": None, "nmae": None} @@ -279,13 +330,14 @@ def metrics(y: np.ndarray, p: np.ndarray) -> dict: mae = float(np.abs(e).mean()) level = float(np.abs(y[m]).mean()) return {"n": int(m.sum()), "mae": mae, "rmse": float(np.sqrt((e ** 2).mean())), - "nmae": mae / level if level > 1.0 else None} + "nmae": mae / level if level > floor else None} # ---- how: the hour-of-week profile ----------------------------------------------- -def fit_how(t: np.ndarray, y: np.ndarray, tz: str, weights: np.ndarray | None = None) -> dict: - """weights: per slot (recency_weights); None: all alike.""" +def fit_how(t: np.ndarray, y: np.ndarray, tz: str, weights: np.ndarray | None = None, ndigits: int = 1) -> dict: + """weights: per slot (recency_weights); None: all alike. ndigits: the + values' decimals (digits(series): a share keeps 3).""" cal = calendar(t, tz) vals: list[float | None] = [] have = ~np.isnan(y) @@ -299,7 +351,7 @@ def fit_how(t: np.ndarray, y: np.ndarray, tz: str, weights: np.ndarray | None = if v is None: # the same hour on the other weekdays, else the mean same = [vals[d * 24 + h % 24] for d in range(7) if vals[d * 24 + h % 24] is not None] v = sum(same) / len(same) if same else overall - out.append(round(max(v, 0.0), 1)) + out.append(round(max(v, 0.0), ndigits)) return {"kind": "how", "values": out, "tz": tz} @@ -321,10 +373,13 @@ def _lag7(t: np.ndarray, y: np.ndarray, hist_t: np.ndarray | None, hist_y: np.nd def features(series: str, t: np.ndarray, w: Weather, how_p: dict, tz: str, lag7: np.ndarray, phys: np.ndarray | None, names: list[str] | None = None, lat: float | None = None, - state: str | None = None, kept: list | None = None) -> tuple[np.ndarray, list[str]]: + state: str | None = None, kept: list | None = None, room: dict | None = None, + occ: list | None = None) -> tuple[np.ndarray, list[str]]: """The feature matrix; names: a model's own list (default: the series' current one). kept: the special days' types the model learnt - (the others count as normal).""" + (the others count as normal). room: {"ua_w_per_k", "t_in_c"} (the heat + loss UA x (indoor - outdoor), W; methods.md B13), occ: the occupancy's + 168 hour-of-week values (the expected share present); NaN without them.""" cal = calendar(t, tz, state) special = cal["special"] if kept is not None: @@ -334,11 +389,23 @@ def features(series: str, t: np.ndarray, w: Weather, how_p: dict, tz: str, lag7: "how": how_values(how_p, t, tz), "lag7": lag7, "temp": w.temp, "ghi": w.ghi, "cloud": w.cloud, "hdd": np.maximum(15.0 - w.temp, 0.0), "elev": w.elev, "az": w.az, "phys": phys if phys is not None else np.full(len(t), np.nan), "special": special, - "doy_sin": np.sin(ang), "doy_cos": np.cos(ang), "daylight": daylight_h(cal["doy"], lat)} - names = list(names) if names is not None else (PV_FEATURES if series == "pv" else LOAD_FEATURES) + "doy_sin": np.sin(ang), "doy_cos": np.cos(ang), "daylight": daylight_h(cal["doy"], lat), + "wind": w.wind_or_nan(len(t)), "loss": heat_loss(room, w.temp), + "occ": how_values({"values": occ}, t, tz) if occ and len(occ) == 168 else np.full(len(t), np.nan)} + names = list(names) if names is not None else feature_names(series) return np.column_stack([cols[c] for c in names]), names +def heat_loss(room: dict | None, temp: np.ndarray) -> np.ndarray: + """The room model's heat loss per slot (W): UA (W/K) x (indoor - + outdoor), never below 0; NaN without a fitted UA or an indoor + temperature (methods.md B13.1).""" + ua, tin = (room or {}).get("ua_w_per_k"), (room or {}).get("t_in_c") + if not ua or tin is None: + return np.full(len(temp), np.nan) + return np.maximum(float(ua) * (float(tin) - temp), 0.0) + + def special_kept(t: np.ndarray, y: np.ndarray, tz: str, state: str | None = None, at_least: int = 2) -> list[int]: """The special days' types with at least 2 metered days in (t, y).""" cal = calendar(t, tz, state) @@ -354,28 +421,41 @@ def special_kept(t: np.ndarray, y: np.ndarray, tz: str, state: str | None = None def fit_gbm(series: str, t: np.ndarray, y: np.ndarray, w: Weather, tz: str, lag7: np.ndarray, phys: np.ndarray | None, lat: float | None = None, state: str | None = None, weights: np.ndarray | None = None, linear: bool | None = None, - names: list[str] | None = None) -> dict | None: + names: list[str] | None = None, base: np.ndarray | None = None, room: dict | None = None, + occ: list | None = None) -> dict | None: """weights: per slot (recency_weights; None: all alike); linear: leaves with linear models (default: series in LINEAR_SERIES); names: the - features (default: the series' current list).""" + features (default: the series' current list); base: a forecast per slot + the trees learn the difference to (LightGBM's init_score: the cloud + teacher's, methods.md B11), then params["base"] and predict_gbm needs it. + room, occ: the heat series' room model and occupancy profile + (features), kept in the params where the features use them.""" import lightgbm as lgb - have = ~np.isnan(y) + have = ~np.isnan(y) if base is None else ~(np.isnan(y) | np.isnan(base)) if have.sum() < MIN_GBM_SLOTS: return None - how_p = fit_how(t, y, tz, weights) + how_p = fit_how(t, y, tz, weights, digits(series)) kept = special_kept(t, y, tz, state) - X, names = features(series, t, w, how_p, tz, lag7, phys, names, lat, state, kept) + X, names = features(series, t, w, how_p, tz, lag7, phys, names, lat, state, kept, room, occ) params = dict(GBM_PARAMS) - if linear if linear is not None else series in LINEAR_SERIES: + span_days = float(t[have][-1] - t[have][0]) / 86400.0 if have.any() else 0.0 + if linear if linear is not None else (series in LINEAR_SERIES and span_days >= LINEAR_MIN_DAYS): params["linear_tree"] = True cat = [c for c in CATEGORICAL if c in names] ds = lgb.Dataset(X[have], y[have], feature_name=names, categorical_feature=cat or "auto", - weight=None if weights is None else np.asarray(weights, dtype=float)[have]) + weight=None if weights is None else np.asarray(weights, dtype=float)[have], + init_score=None if base is None else np.asarray(base, dtype=float)[have]) m = lgb.train(params, ds, num_boost_round=GBM_ROUNDS) out = {"kind": "gbm", "model": m.model_to_string(), "features": names, "how": how_p["values"], "tz": tz, "cap_w": float(np.nanpercentile(y[have], 99.9)) * 1.2 if have.any() else None} if "special" in names: out["special_kept"] = kept + if "loss" in names and room and room.get("ua_w_per_k") and room.get("t_in_c") is not None: + out["room"] = {"ua_w_per_k": round(float(room["ua_w_per_k"]), 3), "t_in_c": round(float(room["t_in_c"]), 2)} + if "occ" in names and occ and len(occ) == 168: + out["occ"] = [round(float(x), 3) for x in occ] + if base is not None: + out["base"] = "teacher" if params.get("linear_tree"): out["linear"] = True return out @@ -410,23 +490,30 @@ def box_params(params: dict) -> dict: def predict_gbm(params: dict, series: str, t: np.ndarray, w: Weather, lag7: np.ndarray, - phys: np.ndarray | None, lat: float | None = None, state: str | None = None) -> np.ndarray: + phys: np.ndarray | None, lat: float | None = None, state: str | None = None, + base: np.ndarray | None = None) -> np.ndarray: tz = params.get("tz", "UTC") names = params["features"] if not isinstance(names, list) or any(n not in FEATURE_NAMES for n in names): raise ValueError("gbm: features this code does not know") X, names = features(series, t, w, {"values": params["how"]}, tz, lag7, phys, names, lat, state, - params.get("special_kept")) + params.get("special_kept"), params.get("room"), params.get("occ")) p = np.asarray(_predictor(params).predict(X), dtype=float) + if params.get("base"): # trees on a base forecast (fit_gbm's base): the sum is the difference + if base is None: + raise ValueError("gbm: trained on a base forecast, none given") + p = np.asarray(base, dtype=float) + p p = np.maximum(p, 0.0) if params.get("cap_w"): p = np.minimum(p, params["cap_w"]) + if series in UPPER: + p = np.minimum(p, UPPER[series]) if series == "pv": p = np.where(w.elev <= 0, 0.0, p) if not np.isnan(w.elev).all() else p return p -FEATURE_NAMES = frozenset(LOAD_FEATURES) | frozenset(PV_FEATURES) | {"doy"} +FEATURE_NAMES = frozenset(LOAD_FEATURES) | frozenset(PV_FEATURES) | frozenset(HEAT_FEATURES) | frozenset(DHW_FEATURES) | {"doy"} # ---- one entry point ----------------------------------------------------------- @@ -443,6 +530,12 @@ class Site: azimuth: float = 180.0 pvgis_monthly: list | None = None # PVGIS's kWh per kWp per month (pvcalib.pvgis_monthly) state: str | None = None # the German state (NW, BY, ...): carnival, school holidays; None: unknown + # the heat series (methods.md B13): the room model's UA (W/K) and the + # indoor temperature (°C) its loss uses, the occupancy's hour-of-week + # profile (168 shares); kept in a gbm's params when it is fitted + ua_w_per_k: float | None = None + t_in_c: float | None = None + occ_how: list | None = None def phys_prior(t: np.ndarray, w: Weather, s: Site) -> np.ndarray | None: @@ -454,15 +547,17 @@ def phys_prior(t: np.ndarray, w: Weather, s: Site) -> np.ndarray | None: def fit(kind: str, series: str, t: np.ndarray, y: np.ndarray, w: Weather, s: Site, - hist_t: np.ndarray | None = None, hist_y: np.ndarray | None = None) -> dict | None: + hist_t: np.ndarray | None = None, hist_y: np.ndarray | None = None, base: np.ndarray | None = None) -> dict | None: """A model of this kind on (t, y), or None where the kind cannot be made (too little data, PV physics without a location or weather). Recent slots weigh more (recency_weights; pvcalib has its own).""" if kind == "how": - return fit_how(t, y, s.tz, recency_weights(t)) if (~np.isnan(y)).any() else None + return fit_how(t, y, s.tz, recency_weights(t), digits(series)) if (~np.isnan(y)).any() else None if kind == "gbm": prior = phys_prior(t, w, s) if series == "pv" else None - return fit_gbm(series, t, y, w, s.tz, _lag7(t, y, hist_t, hist_y), prior, s.lat, s.state, recency_weights(t)) + room = {"ua_w_per_k": s.ua_w_per_k, "t_in_c": s.t_in_c} if s.ua_w_per_k else None + return fit_gbm(series, t, y, w, s.tz, _lag7(t, y, hist_t, hist_y), prior, s.lat, s.state, recency_weights(t), + base=base, room=room, occ=s.occ_how) if kind == "pvphys": if series != "pv": return None @@ -478,7 +573,7 @@ def fit(kind: str, series: str, t: np.ndarray, y: np.ndarray, w: Weather, s: Sit def predict(params: dict, series: str, t: np.ndarray, w: Weather, s: Site, - hist_t: np.ndarray | None = None, hist_y: np.ndarray | None = None) -> np.ndarray: + hist_t: np.ndarray | None = None, hist_y: np.ndarray | None = None, base: np.ndarray | None = None) -> np.ndarray: """The model's forecast per slot (W). hist_*: metered history before t (the week-ago lag; NaN where unknown).""" kind = params["kind"] @@ -487,7 +582,7 @@ def predict(params: dict, series: str, t: np.ndarray, w: Weather, s: Site, if kind == "gbm": prior = phys_prior(t, w, s) if series == "pv" else None nan = np.full(len(t), np.nan) - return predict_gbm(params, series, t, w, _lag7(t, nan, hist_t, hist_y), prior, s.lat, s.state) + return predict_gbm(params, series, t, w, _lag7(t, nan, hist_t, hist_y), prior, s.lat, s.state, base) if kind == "pvphys": ss = Site(s.tz, s.lat, s.lon, s.kwp, params.get("tilt", s.tilt), params.get("azimuth", s.azimuth), state=s.state) prior = phys_prior(t, w, ss) diff --git a/src/edge/cantabile_edge/guard.py b/src/edge/cantabile_edge/guard.py index f780adc..25ea56e 100644 --- a/src/edge/cantabile_edge/guard.py +++ b/src/edge/cantabile_edge/guard.py @@ -154,7 +154,8 @@ class Guard: tr.commanded[a.entity] = (now, a.value) c = self.controls.get(a.control) boiler = c is not None and c.kind in ("heating", "cooling") and a.channel == "switch" - tr.changed["set" if a.quantity or boiler else "mode"] = now + # a hybrid's heat source: its own hold (steady.py _hold_source) + tr.changed["source" if a.channel == "source" else "set" if a.quantity or boiler else "mode"] = now if a.domain == "cover": tr.moved = now if a.quantity == "": diff --git a/src/edge/cantabile_edge/i18n_de.py b/src/edge/cantabile_edge/i18n_de.py index 1d29751..b5f38d8 100644 --- a/src/edge/cantabile_edge/i18n_de.py +++ b/src/edge/cantabile_edge/i18n_de.py @@ -424,4 +424,23 @@ MESSAGES = { 'heat delivered (thermal)': 'gelieferte Wärme (thermisch)', 'heat energy (thermal)': 'Wärmemenge (thermisch)', 'heat {v} (thermal)': 'Wärme {v} (thermisch)', + # remote Home Assistant for Cantabile support (devpage.py) + "Cantabile support has this Home Assistant open": "Der Cantabile-Support hat dieses Home Assistant geöffnet", + "Cantabile support": "Cantabile-Support", + ("({who}, for {n} minute), signed in as the user \"Cantabile support\". Everything they do is recorded.", + "({who}, for {n} minutes), signed in as the user \"Cantabile support\". Everything they do is recorded."): + ("({who}, seit {n} Minute), angemeldet als Benutzer „Cantabile support“. Alles, was er tut, wird aufgezeichnet.", + "({who}, seit {n} Minuten), angemeldet als Benutzer „Cantabile support“. Alles, was er tut, wird aufgezeichnet."), + "End now": "Jetzt beenden", + "Ended. Cantabile support's session is closed and the user \"Cantabile support\" is disabled again (a few seconds).": + "Beendet. Die Sitzung des Cantabile-Supports ist geschlossen und der Benutzer „Cantabile support“ wieder " + "deaktiviert (in wenigen Sekunden).", + "No session to end, or Cantabile's connection is not running.": + "Keine Sitzung zu beenden, oder Cantabiles Verbindung läuft nicht.", + "Reading and control are the owner's to switch on.": "Auslesen und Steuerung schaltet nur der Eigentümer ein.", + "Protection is the owner's to change.": "Den Schutz ändert nur der Eigentümer.", + "Heating or cooling is the owner's to choose.": "Heizen oder Kühlen wählt der Eigentümer.", + "The shade's room and window are the owner's to set.": "Raum und Fenster der Beschattung legt der Eigentümer fest.", + "Indoor or outdoor is the owner's to choose.": "Innen oder außen wählt der Eigentümer.", + "The weather forecast is the owner's to choose.": "Die Wettervorhersage wählt der Eigentümer.", } diff --git a/src/edge/cantabile_edge/inputs.py b/src/edge/cantabile_edge/inputs.py index 2fa82c6..bd06bfa 100644 --- a/src/edge/cantabile_edge/inputs.py +++ b/src/edge/cantabile_edge/inputs.py @@ -3,8 +3,9 @@ inputs' entities (presence, temperatures, humidity, outside temperature, sun, weather), a short local history of load and PV (the fallback when no model bundle says), and the 15-minute model state for the horizon. A -room's R and C: the mapping's, else the model bundle's (its rooms), else -the defaults; sources.rooms says which per control. +room's R and C: the mapping's, else the box's or the cloud's fit (the +model bundle's rooms); none: the room is not planned (room_refusal) and keeps a fallback schedule; sources.rooms says which per +control. None of this leaves the site; only the plan does (controller.py). @@ -284,10 +285,11 @@ def device_state(c, col: Collector, now: float) -> dict: e = c.entities st = {} if c.kind == "battery": - soc = col.value(e.get("soc", "")) - st["soc_pct"] = soc if soc is not None else float(c.p("soc_pct")) - st["soc_estimated"] = soc is None + # the state of charge from its sensor only (no estimate: docs/parameters.md U2) + st["soc_pct"] = col.value(e.get("soc", "")) st["charge_from_grid"] = col.state(e.get("charge_from_grid", "")) == "on" + if hasattr(c, "reported"): + c.reported = battery_reported(c, col) elif c.kind in ("heating", "cooling"): t = col.value(e.get("temp", "")) if t is None and e.get("climate"): @@ -298,6 +300,12 @@ def device_state(c, col: Collector, now: float) -> dict: st["hvac"] = col.state(e["climate"]) else: st["on"] = col.state(e.get("switch", "")) == "on" + if c.kind == "heating" and e.get("source"): + # a hybrid's source now, in the plan's words (heat_pump | boiler) + opts = {str(v): k for k, v in (c.p("source_options") or {}).items()} + st["source"] = opts.get(str(col.state(e["source"]))) + if c.kind == "heating" and e.get("efficiency") and hasattr(c, "reported"): + c.reported = {"efficiency_pct": col.value(e["efficiency"])} elif c.kind == "ev": conn = e.get("connected") st["connected"] = col.state(conn) == "on" if conn else True @@ -317,6 +325,105 @@ def device_state(c, col: Collector, now: float) -> dict: return st +def _scaled(col: Collector, eid: str, units: dict) -> float | None: + """An entity's value converted by its unit (units: unit -> factor; a + unit not in it: None, never a guess at the scale).""" + v = col.value(eid) if eid else None + if v is None: + return None + f = units.get(col.attr(eid, "unit_of_measurement")) + return v * f if f is not None else None + + +def battery_reported(c, col: Collector) -> dict: + """The battery's own ratings where its device reports them (the + control's capacity, rated_power and efficiency entities): capacity_wh, + rated_power_w, efficiency_pct (round trip); absent where it does not.""" + e, out = c.entities, {} + cap = _scaled(col, e.get("capacity", ""), {"kWh": 1000.0, "Wh": 1.0}) + pw = _scaled(col, e.get("rated_power", ""), {"kW": 1000.0, "W": 1.0}) + eff = _scaled(col, e.get("efficiency", ""), {"%": 1.0}) + for k, v in (("capacity_wh", cap), ("rated_power_w", pw), ("efficiency_pct", eff)): + if v is not None and v > 0: + out[k] = v + return out + + +def battery_refusal(c, st: dict) -> dict | None: + """Why a battery is not planned (docs/parameters.md U2), or None: its + capacity, power or efficiency unknown (the mapping, the device and its + owner's ratings have none), or no state of charge from its sensor. + {"why": the reasons, "where": where to enter what is missing, + "missing": [...]}.""" + from .controls import BATTERY_RATINGS + _, missing, _ = c.battery_facts() + why = [f"battery {m} unknown" for m in missing] + if st.get("soc_pct") is None: + why.append("SoC unknown (no state-of-charge sensor)" if not c.entities.get("soc") + else "SoC unknown (the state-of-charge sensor has no value)") + if not why: + return None + where = "" + if missing: + labels = ", ".join(BATTERY_RATINGS[m][1] for m in missing) + params = ", ".join(BATTERY_RATINGS[m][2] for m in missing) + dev = getattr(c, "rated_device", "") or "" + where = (f"on the panel: Devices, {dev}, Ratings ({labels})" if dev else + f"on the panel: Devices, the battery's device, Ratings ({labels}); or in the mapping's params ({params})") + if st.get("soc_pct") is None: + where = (where + "; " if where else "") + "map the battery's state-of-charge sensor (soc)" + return {"why": "; ".join(why), "where": where, "missing": missing + (["soc"] if st.get("soc_pct") is None else [])} + + +HYBRID_SWITCH_KEY = "heat.hybrid_switch_eur" # the Parameters page's (via the tariff bundle) + + +def heating_refusal(c, params: dict, price_gas: list, price_heat: list, prices_status: str, + box_params: dict | None = None) -> dict | None: + """Why a heating control is not planned (docs/methods.md E6, the + owner's rule: refuse, never guess), or None: a boiler's efficiency or + a boiler's / heat station's most heat unknown, no gas price (boiler, + hybrid) or heat price (district) for now, a hybrid without an + electricity price to compare with. {"why", "where", "missing"}.""" + from .controls import HEAT_RATINGS + src = str(params.get("heat_source") or "electric") + if src == "electric": + return None + _, missing, _ = c.heat_facts() + why = [f"{HEAT_RATINGS[m][1].split(',')[0].lower()} unknown" for m in missing] + where = [] + if src in ("heat_pump", "hybrid") and "cop" not in (c.params or {}) and not (c.params or {}).get("cop_curve"): + # a heat pump's COP is the device's (its datasheet): no default stands in + why.append("heat pump COP unknown") + where.append("the mapping's params: cop_curve (the datasheet's COP by outside temperature) or cop") + missing = missing + ["cop"] + if src == "hybrid" and (box_params or {}).get(HYBRID_SWITCH_KEY) is None: + why.append(f"parameter {HYBRID_SWITCH_KEY} not received") + where.append("the admin Parameters page (Gas and heat); it reaches the box with its tariff") + missing = missing + [HYBRID_SWITCH_KEY] + rated = [m for m in missing if m in HEAT_RATINGS] + if rated: + labels = ", ".join(HEAT_RATINGS[m][1] for m in rated) + dev = getattr(c, "rated_device", "") or "" + where.append(f"on the panel: Devices, {dev or 'the heating device'}, Ratings ({labels}); or in the mapping's params " + f"({', '.join(rated)})" + ("; or map the boiler's efficiency sensor" if "boiler_efficiency" in rated else "")) + if src in ("boiler", "hybrid") and (not price_gas or price_gas[0] is None): + why.append("no gas price for now") + where.append("the site's gas tariff (console: the site's tariff, Gas)") + missing = missing + ["gas_price"] + if src == "district" and (not price_heat or price_heat[0] is None): + why.append("no heat price for now") + where.append("the site's heat tariff, or its building's heat price (console: Buildings, rules)") + missing = missing + ["heat_price"] + if src == "hybrid" and prices_status == "none": + why.append("no electricity price to compare the heat pump with") + where.append("the site's electricity tariff") + missing = missing + ["electricity_price"] + if not why: + return None + return {"why": "; ".join(why), "where": "; ".join(where), "missing": missing} + + SET_POSITION = 4 # HA's CoverEntityFeature.SET_POSITION @@ -350,6 +457,12 @@ def model_state(now: float, controls, inputs, col: Collector, bundles, history, start = int(now // STEP_S * STEP_S) zone = ZoneInfo(tz or "UTC") prices = bundles.prices(start, STEP_S, STEPS, now) + # gas and heat per step (fleet heatprice.go): what a boiler's and district heat cost + cp = getattr(bundles, "carrier_prices", None) + price_gas = cp("gas", start, STEP_S, STEPS, now) if cp else [None] * STEPS + price_heat = cp("heat", start, STEP_S, STEPS, now) if cp else [None] * STEPS + bp = getattr(bundles, "box_params", None) + box_params = bp(now) if bp else {} # the base load: the house without the planned devices (Finding A2-a), so # the plan, the building's shift and the grid order's base (optimizer) # do not count them twice. The model's base_load_w is that; its load_w @@ -431,7 +544,11 @@ def model_state(now: float, controls, inputs, col: Collector, bundles, history, continue h = datetime.fromtimestamp(start + k * STEP_S, timezone.utc).astimezone(zone).hour occupied.append(1 if occupied_hours[0] <= h < occupied_hours[1] else 0) - devices, rooms_src, phases_src = [], {}, {} + devices, rooms_src, phases_src, refused, battery_src, heat_src = [], {}, {}, {}, {}, {} + # a room's COP and comfort temperatures: the mapping's (the device's facts, the owner's), or the + # defaults (optimizer.shift_envelope publishes no shift from defaults); rooms not planned + # (room_refusal) with what their fallback schedule needs + cop_src, band_src, fallback = {}, {}, [] one_room = sum(c.kind in ("heating", "cooling") for c in controls) == 1 for c in controls: if hasattr(c, "learn_range"): @@ -448,26 +565,87 @@ def model_state(now: float, controls, inputs, col: Collector, bundles, history, {"phases": None, "source": "assumed"}) params["phases"] = info["phases"] phases_src[c.id] = {"phases": info["phases"], "source": info["source"]} + st = device_state(c, col, now) if c.kind in ("heating", "cooling"): - rooms_src[c.id] = _room_rc(c, params, bundles, one_room, now) + # the room's and the device's facts the mapping gives (no defaults: controls.FACTS) + params.update({k: float(c.params[k]) for k in ("r_k_per_kw", "c_kwh_per_k", "max_power_w", "cop") + if k in c.params}) + source = "electric" if c.kind == "cooling" else str(params.get("heat_source") or "electric") + if c.kind == "heating" and source == "electric" and "cop" not in params: + params["cop"] = 1.0 # a resistive heater: all its electricity becomes heat (physics) + src, power = _room_rc(c, params, bundles, one_room, now) + rooms_src[c.id] = src + # an electric fit runs in electric equivalents: the COP cancels (_room_rc) + cop_src[c.id] = ("mapping" if "cop" in c.params or c.params.get("cop_curve") else + "electric heater" if c.kind == "heating" and source == "electric" else + "electric fit" if power == "electric" and "cop" in params else "none") + # comfort/setback/setup: the mapping's, else the box's copy of the Parameters rows + # comfort.heating_setpoints / comfort.cooling_setpoints (docs/parameters.md C7) + band_src[c.id] = "mapping" if any(k in c.params for k in ("comfort_c", "setback_c", "setup_c")) else "defaults" + # what is missing for the room and for its heat source (methods E6) + nos = [room_refusal(c, st, src, power, source)] + if c.kind == "heating": + nos.append(heating_refusal(c, params, price_gas, price_heat, getattr(prices, "status", "tariff"), + box_params)) + nos = [n for n in nos if n is not None] + if nos: + # not planned: its limits and a fallback schedule (the owner's or + # installer's preferences: optimizer.fallback_entries) + no = {"why": "; ".join(n["why"] for n in nos if n.get("why")), + "where": "; ".join(n["where"] for n in nos if n.get("where")), + "missing": [m for n in nos for m in n.get("missing") or []]} + refused[c.id] = dict(no, kind=c.kind, name=c.label() if hasattr(c, "label") else c.id) + fallback.append({"id": c.id, "kind": c.kind, "params": params, "state": st, "bounds": bounds, + "channels": sorted(c.writable())}) + continue + if c.kind == "heating" and hasattr(c, "heat_facts"): + facts, _, fsrc = c.heat_facts() + params.update(facts) + if facts: + heat_src[c.id] = fsrc + if c.kind == "battery": + no = battery_refusal(c, st) + if no is not None: + refused[c.id] = dict(no, kind="battery", name=c.label() if hasattr(c, "label") else c.id) + continue + facts, _, fsrc = c.battery_facts() + params.update(facts) + battery_src[c.id] = fsrc + # the battery's power from its facts (device_range ran before them in bounds) + b = c.bounds("power_w", (extra_limits or {}).get(c.id)) + bounds["power_w"] = [b.lo, b.hi, b.lo_by, b.hi_by] devices.append({"id": c.id, "kind": c.kind, "params": params, - "state": device_state(c, col, now), "bounds": bounds, + "state": st, "bounds": bounds, "channels": sorted(c.writable())}) clouds = _hourly(weather_forecast or [], "cloud_coverage", start, STEPS) sky = [max(0.0, min(1.0, 1 - c / 100.0)) for c in clouds] if clouds else [1.0] * STEPS ghi, ghi_src = irradiance(start, location, sky, sun if peak > 100 else None) out = {"v": 1, "start": start, "step_s": STEP_S, "steps": STEPS, "tz": tz, "price_import": prices.import_ct, "price_export": prices.export_ct, "price_note": prices.note, + "price_gas": price_gas, "price_heat": price_heat, "params": box_params, + # the tariff's state (bundles.Prices): status tariff | none, why none, the steps it prices + "prices": {"status": getattr(prices, "status", "tariff"), "reason": getattr(prices, "reason", ""), + "tariff": getattr(prices, "tariff_id", ""), "expired_at": getattr(prices, "expired_at", 0), + "priced_steps": getattr(prices, "priced_steps", STEPS)}, "load_w": load, "pv_w": pv, "t_out": t_out, "sun": sun, "occupied": occupied, "sky": sky, "ghi_w_m2": ghi, "location": location or {}, "sources": {"load": load_src, "pv": pv_src, "t_out": t_src, "model": bundles.model_id(), "sky": "weather forecast" if clouds else "clear", "rooms": rooms_src, "ghi": ghi_src, + "rooms_cop": cop_src, "rooms_band": band_src, "ev_phases": phases_src, + **({"battery": battery_src} if battery_src else {}), + **({"heating": heat_src} if heat_src else {}), **({"intraday": intraday} if intraday else {}), # per series the steps from the cloud's forecast, the box's own model # (its kind and weather) and the hour-of-week profile (methods.md B9) "forecast": {k: v for k, v in fc_src.items() if v}}, "devices": devices, "building": building or {}, "grid_order": grid_order or {}, + # controls not planned and why (docs/parameters.md U2: a battery without its facts; + # a room without its R/C fit, power, COP or temperature) + "refused": refused, + # the rooms among them: their limits and params for a fallback schedule + # (preferences.apply gives their schedule, optimizer.fallback_entries the setpoints) + "fallback": fallback, # the market's contracts in force as sources and sinks (shadow, the market's step 2) "market": bundles.market_for_model(start, STEP_S, STEPS, now) if hasattr(bundles, "market_for_model") else []} if grid_max_w: @@ -508,12 +686,21 @@ def irradiance(start: int, location: dict | None, sky: list[float], def _room_rc(c, params: dict, bundles, only_one: bool, now: float) -> str: - """A heating or cooling control's R and C: the mapping's own, else the - model's room (bundles.room_rc), else the defaults. A room fitted against - the electric power: C * cop and R / cop (the same RC; the optimiser's - heat is cop * P). Into params; where they came from.""" - if "r_k_per_kw" in c.params or "c_kwh_per_k" in c.params: - return "mapping" + """A heating or cooling control's R and C: the mapping's own (both), else + the model's room (the box's fit in force, else the cloud's: + bundles.room_rc), else none (never the built-in defaults: the room is + not planned, room_refusal). A room fitted against the + electric power: C * cop and R / cop (the same RC; the optimiser's heat + is cop * P): the COP cancels, so without the mapping's cop the model + runs in electric equivalents (cop 1 by construction, not a default). + Into params; (where they came from: mapping | box model | model | + partial (the mapping sets one of the two) | none, the power the fit is + against: thermal | electric | "").""" + has = [k for k in ("r_k_per_kw", "c_kwh_per_k") if k in c.params] + if len(has) == 2: + return "mapping", "thermal" + if has: + return "partial", "" # the box's own fit where it is in force (boxtrain.py), else the cloud's own = getattr(bundles, "own", None) rc = own.room_rc(c.id, str(c.params.get("area") or ""), only_one) if own is not None else None @@ -522,12 +709,17 @@ def _room_rc(c, params: dict, bundles, only_one: bool, now: float) -> str: get = getattr(bundles, "room_rc", None) rc = get(c.id, str(c.params.get("area") or ""), only_one, now) if get else None if rc is None: - return "defaults" + return "none", "" r, cap = rc["r_k_per_kw"], rc["c_kwh_per_k"] gain, solar = rc.get("gain_w") or 0.0, rc.get("solar_m2") or 0.0 - cop = number(params.get("cop")) or 1.0 - if rc.get("power") == "electric" and cop > 0: - # fitted in electric equivalents: the heat is cop times (like C) + electric = str(params.get("heat_source") or "electric") in ("electric", "heat_pump") + if rc.get("power") == "electric" and electric: + # fitted in electric equivalents: the heat is cop times (like C); without + # the mapping's COP (a cooler, or a heat pump with its curve alone) the + # model stays in electric equivalents (cop 1) + cop = number(params.get("cop")) or 1.0 + if c.kind == "cooling" or "cop" in params: + params["cop"] = cop r, cap = r / cop, cap * cop gain = [g * cop for g in gain] if isinstance(gain, list) else gain * cop solar *= cop @@ -538,7 +730,51 @@ def _room_rc(c, params: dict, bundles, only_one: bool, now: float) -> str: params["internal_gain_w"] = gain if "solar_m2" not in c.params: params["solar_m2"] = solar - return src + return src, ("electric" if rc.get("power") == "electric" else "thermal") + + +def room_refusal(c, st: dict, rc: str, power: str, source: str = "electric") -> dict | None: + """Why a heating or cooling room is not planned (docs/parameters.md E3: R/C measured, power and COP the device's), or + None: no R/C (no fit, the mapping sets neither, or only one of the + two), the heater's or cooler's electric power unknown (max_power_w), + the COP unknown where the model needs it (the mapping's R/C or a fit + against the heat; an electric fit needs none), or no room temperature + now. {"why", "where", "missing": [...]} (the plan adds "fallback": + schedule | own | none). The room keeps its limits, and its thermostat + follows the owner's or installer's schedule (preferences) meanwhile, + else its own setpoint (optimizer.fallback_entries).""" + why, where, missing = [], [], [] + if rc == "partial": + have = "r_k_per_kw" if "r_k_per_kw" in c.params else "c_kwh_per_k" + lack = "c_kwh_per_k" if have == "r_k_per_kw" else "r_k_per_kw" + why.append(f"the mapping sets {have} but not {lack}") + where.append("the mapping's params: both r_k_per_kw and c_kwh_per_k, or neither (the room's fit is used)") + missing.append(lack) + elif rc == "none": + why.append("no R/C fit for this room yet (no room model)") + where.append("nothing to do: the box fits the room from its measured temperature and heating (nightly, once " + "there are a few days of history); or the installer enters r_k_per_kw and c_kwh_per_k in the " + "mapping's params") + missing += ["r_k_per_kw", "c_kwh_per_k"] + # the electric power: a cooler's, and a heater's that runs on electricity (a boiler's or a heat + # station's heat is its max_heat_w: heating_refusal) + if "max_power_w" not in c.params and (c.kind == "cooling" or source in ("electric", "heat_pump", "hybrid")): + why.append(f"the {'heating' if c.kind == 'heating' else 'cooling'}'s electric power unknown") + where.append("the mapping's params (max_power_w, W)") + missing.append("max_power_w") + # a cooler's COP (a heater's: electric 1, a heat pump's or hybrid's: heating_refusal) + if c.kind == "cooling" and rc in ("mapping", "model", "box model") and power != "electric" and "cop" not in c.params: + why.append("COP unknown (heat per kWh of electricity)") + where.append("the mapping's params (cop)") + missing.append("cop") + if st.get("temp_c") is None: + why.append("room temperature unknown" + (" (no temperature sensor)" if not c.entities.get("temp") and + not c.entities.get("climate") else " (no value now)")) + where.append("map the room's temperature sensor (temp), or a thermostat that reports its temperature") + missing.append("temp") + if not why: + return None + return {"why": "; ".join(why), "where": "; ".join(where), "missing": missing} def _quantities(c) -> list[str]: diff --git a/src/edge/cantabile_edge/inventory.py b/src/edge/cantabile_edge/inventory.py index e3b2698..4574de3 100644 --- a/src/edge/cantabile_edge/inventory.py +++ b/src/edge/cantabile_edge/inventory.py @@ -64,13 +64,29 @@ def battery_ratings(controls) -> dict: if "capacity_wh" in c.params: kwh += float(c.params["capacity_wh"]) / 1000 if "max_charge_w" in c.params or "max_discharge_w" in c.params: - kw += max(float(c.p("max_charge_w")), float(c.p("max_discharge_w"))) / 1000 + kw += max(float(c.params.get("max_charge_w") or 0), float(c.params.get("max_discharge_w") or 0)) / 1000 out = {"battery_kwh": round(kwh, 3)} if kwh > 0 else {} if out and kw > 0: out["battery_kw"] = round(kw, 3) return out +def heating_ratings(controls) -> dict: + """A heating control's boiler efficiency as its mapping states it + (params boiler_efficiency, 0-1; controls.heat_facts' first source): + the cloud's gas forecast divides the heat forecast by it (methods.md + B14). Never a default.""" + for c in controls: + if c.kind == "heating" and "boiler_efficiency" in c.params: + try: + v = float(c.params["boiler_efficiency"]) + except (TypeError, ValueError): + continue + if 0 < v <= 1: + return {"boiler_efficiency": round(v, 4)} + return {} + + def build(mapping, registries: dict, specs: dict, policy: dict, now: float, ev_phases: dict | None = None) -> dict: """ev_phases: per EV control its phase count and source (evphases.py), told on the device of the control ("1 phase, learned" in the console).""" @@ -129,6 +145,7 @@ def build(mapping, registries: dict, specs: dict, policy: dict, now: float, ev_p hd = devs.get(d) or {} mine = {control_of[e] for e in eids if e in control_of} ratings = battery_ratings([controls[i] for i in sorted(mine - rated)]) + ratings.update(heating_ratings([controls[i] for i in sorted(mine - rated)])) rated |= mine if not d and not ratings: continue # entities without a device: nothing to tell but a battery's ratings diff --git a/src/edge/cantabile_edge/localml.py b/src/edge/cantabile_edge/localml.py index 31d8a64..ba3b6ac 100644 --- a/src/edge/cantabile_edge/localml.py +++ b/src/edge/cantabile_edge/localml.py @@ -40,11 +40,13 @@ from . import fcmodels, pvcalib, pvforecast log = logging.getLogger(__name__) SLOT_S = 900 -SERIES = {"load_w": "load", "pv_w": "pv", "base_load_w": "base_load"} # the bundle's names: fcmodels' +SERIES = {"load_w": "load", "pv_w": "pv", "base_load_w": "base_load", # the bundle's names: fcmodels' + # the carriers' (methods.md B13-B16): the box carries their models, it plans on none of them yet + "heat_w": "heat", "dhw_w": "dhw", "occupancy": "occupancy", "ev_plug": "ev_plug"} # the agent's history (inputs.History) a series' lag comes from: its load_w # is the base load already (the house without the planned devices), which # is the load where the box plans none (the only case its load_w is used) -HISTORY = {"load_w": "load_w", "base_load_w": "load_w", "pv_w": "pv_w"} +HISTORY = {"load_w": "load_w", "base_load_w": "load_w", "pv_w": "pv_w"} # the carriers': none kept (no lag) SITE_FIELDS = {"tz": str, "lat": float, "lon": float, "kwp": float, "tilt": float, "azimuth": float, "state": str} @@ -62,7 +64,7 @@ class Model: def __init__(self, name: str, d: dict): if name not in SERIES or not isinstance(d, dict) or not isinstance(d.get("params"), dict): - raise ValueError("a model: {params, site} for load_w, pv_w or base_load_w") + raise ValueError("a model: {params, site} for " + ", ".join(SERIES)) self.name, self.series = name, SERIES[name] p, s = dict(d["params"]), d.get("site") or {} if not isinstance(s, dict): @@ -88,9 +90,10 @@ class Model: elif self.kind == "gbm": # the features it was trained with: today's, or those before the # special days and the yearly rhythm (fcmodels.FEATURES_V1) - key = "pv" if self.series == "pv" else "load" - want = fcmodels.PV_FEATURES if key == "pv" else fcmodels.LOAD_FEATURES - if p.get("features") not in (want, fcmodels.FEATURES_V1[key]) or not _numbers(p.get("how"), 168) \ + want = fcmodels.feature_names(self.series) + v1 = fcmodels.FEATURES_V1.get("pv" if self.series == "pv" else "load") if self.series in ("load", "base_load", "pv") \ + else None + if p.get("features") not in (want, v1) or not _numbers(p.get("how"), 168) \ or "model" in p or not all(isinstance(k, int) for k in p.get("special_kept") or []): raise ValueError(f"gbm: the features {', '.join(want)}, 168 hour-of-week values, trees") if p.get("cap_w") is not None and not _num(p["cap_w"]): @@ -148,12 +151,12 @@ def ha_hours(forecast: list[dict] | None) -> list: def cloud_hours(recs) -> list: - """The bundle's "weather": [{"end", "solar", "cloud", "temp"}].""" + """The bundle's "weather": [{"end", "solar", "cloud", "temp", "wind"}].""" out = [] for r in recs if isinstance(recs, list) else []: if not isinstance(r, dict) or not isinstance(r.get("end"), int) or r["end"] % 3600: continue - v = [float(r[k]) if _num(r.get(k)) else None for k in ("solar", "cloud", "temp")] + v = [float(r[k]) if _num(r.get(k)) else None for k in ("solar", "cloud", "temp", "wind")] out.append(pvforecast.Hour(datetime.fromtimestamp(r["end"], timezone.utc), *v)) return out @@ -211,7 +214,7 @@ def predict(model: Model, t: list[int], history, ha_forecast: list[dict] | None, covered = [((ts // 3600 + 1) * 3600) in src for ts in t] s = model.site w = fcmodels.weather(ta, hours, s.lat, s.lon) - ht, hy = _history(history, HISTORY[model.name], int(ta[0]) - 7 * 86400, int(ta[0])) + ht, hy = _history(history, HISTORY.get(model.name, ""), int(ta[0]) - 7 * 86400, int(ta[0])) p = fcmodels.predict(model.params, model.series, ta, w, s, ht, hy) if any(covered) else np.full(len(t), np.nan) clim = model.climate(ta) if not all(covered) else None out: list[float | None] = [] diff --git a/src/edge/cantabile_edge/optimizer.py b/src/edge/cantabile_edge/optimizer.py index 82f2ad1..736315e 100644 --- a/src/edge/cantabile_edge/optimizer.py +++ b/src/edge/cantabile_edge/optimizer.py @@ -6,7 +6,29 @@ every 15 minutes in a subprocess with a time limit (controller.py): Objective: the grid's cost (the tariff's import and export prices) plus penalties for comfort the plan gives up and for the floors and limits it -would cross. Floors and limits are soft here, with a penalty far above any +would cross. + +Prices (docs/parameters.md U1; no price is ever made up): + - no tariff (none received, expired, none for now: state["prices"] + status "none"): the plan is made without prices, for comfort, the + limits and the owner's musts only. The meter's energy and the devices' + energy carry a tiny engineering weight (NO_PRICE_EUR_KWH: of plans + otherwise equal, the one that moves the least energy), so nothing is + shifted, pre-heated, stored or exported for a price; the battery stays + in its own mode unless a reserve the owner set needs charging; the + market's contracts are not planned (nothing to compare them with). + The plan's cost and baseline are None and its price_note says why. + - a tariff that prices only the first n steps (beyond its end, or a gap): + the plan covers those n steps only (_cut), never a step without a + price as if it were free. + - a step without an export price: export is unpriced there, it carries + no value (neither earned nor charged, coefficient 0) - not "0 ct" as a + fact: the plan exports what it cannot use, but never discharges a + battery or plans anything to export, and the meter's import/export + switch treats it as worth nothing. Curtailing (spill) has its own small + engineering cost (SPILL_EUR_KWH), so PV is never curtailed while the + meter can take it, whatever export is worth; a negative export price + (a real one) still curtails. Floors and limits are soft here, with a penalty far above any price, so there is always a plan (a room already below its floor must be able to come back); the executor's guard enforces them hard on every action. @@ -19,7 +41,13 @@ Device models (one function each, small and replaceable): (internal_gain_w, solar_m2 x the irradiance; the sun's only where the room has no cover in the plan, which carries it)); comfort target when occupied, setback/setup otherwise; a - switched boiler is on/off (binary) + switched boiler is on/off (binary). Only with its R and C (the + mapping's both, or a fit: never built-in defaults), its electric + power (max_power_w), its COP where the model needs it and its + temperature now; else the room is not planned (inputs. + room_refusal): its thermostat follows the owner's + or installer's schedule within the room's limits + (fallback_entries), else keeps its own setpoint ev the energy needed by the departure time, between min and max current (binary), only while connected cover the share of the sun's heat into its room (0 closed .. 1 open); @@ -28,6 +56,22 @@ Device models (one function each, small and replaceable): season, quiet hours) its positions are fixed to it and its plan entries are the schedule's moves +Heat by its source (docs/methods.md E6; params.heat_source, the prices +state["price_gas"] and state["price_heat"] per step, fleet heatprice.go): + electric / heat_pump electric W through the meter at the import price; heat + = COP x W (params cop, or cop_curve at the step's + outside temperature) + boiler gas W (billed, Hs) at the gas price; heat = the + boiler's efficiency x W; up to max_heat_w of heat + district heat W at the heat price; up to max_heat_w + hybrid both, one at a time (a binary per step: the heat pump + or the boiler), each change of source costing the + Parameters page's heat.hybrid_switch_eur (state + "params", from the tariff bundle: no flapping) +The plan's cost then counts gas and heat too (gas_eur, heat_eur). A control +whose price or facts are missing never reaches the plan (inputs.py +heating_refusal: refused with the reason). + The grid operator's limit (gridorder.py, state["grid_order"]: §14a through the EEBUS bridge): the controllable consumers may draw at most limit_w from the grid beyond the household's own net load, i.e. the import @@ -70,7 +114,7 @@ from zoneinfo import ZoneInfo import highspy from highspy.highs import highs_linear_expression as Lin -from .controls import ev_volts +from .controls import cop_at, ev_volts from .evphases import words as phase_words PENALTY_LIMIT = 5.0 # EUR per unit and step across a floor or limit (K, % of a battery, kWh) @@ -91,6 +135,10 @@ CHANGE_EUR_KW = 0.002 # EUR per kW a device's power changes from one step to # boiler must not be switched back and forth) CLOSED_EUR = 0.00002 # EUR per step for a closed cover: open when nothing is at stake MARKET_MAX_W = 100000.0 # W: a contract without a maximum, and the meter's import/export switch +NO_PRICE_EUR_KWH = 1e-4 # EUR per kWh through the meter and per kWh a device uses, without a tariff + # only (ENG: a tie-break toward the least energy, not a price) +SPILL_EUR_KWH = 1e-3 # EUR per kWh of PV curtailed (ENG: never curtail while the meter takes it; + # above NO_PRICE_EUR_KWH so export wins over spill without a tariff) GRID_MAX_W = 43470.0 # W: the site's connection when the state does not say (state["grid_max_w"], # config grid_max_w): a German house connection's usual 63 A main fuse, # 3 x 230 V x 63 A @@ -105,6 +153,11 @@ class Model: self.flows = [[] for _ in range(self.T)] # (+1 into the house's balance | -1 out of it, var) self.cost = [] # (coef, var) self.devices = {} # id -> (kind, vars for the plan) + # False: no tariff, no prices (_prepare); a state not prepared: priced + # where it has a tariff and an import price for every step + self.priced = s["priced"] if "priced" in s else ( + (s.get("prices") or {}).get("status", "tariff") != "none" and + all(v is not None for v in (s.get("price_import") or [None])[:self.T])) def var(self, lo=0.0, hi=highspy.kHighsInf, cost=0.0, integer=False): v = self.h.addVariable(lb=lo, ub=hi, type=highspy.HighsVarType.kInteger if integer else @@ -121,9 +174,17 @@ class Model: self.h.addConstr(d - b + a >= 0) self.h.addConstr(d + b - a >= 0) - def eur_wh(self, t: int, price_ct: float) -> float: - """EUR for one W held for one step at this price.""" - return self.dt / 1000.0 * price_ct / 100.0 + def eur_wh(self, t: int, price_ct: float | None) -> float: + """EUR for one W held for one step at this price (None: no price, 0).""" + return 0.0 if price_ct is None else self.dt / 1000.0 * price_ct / 100.0 + + def use_cost(self, t: int = 0) -> float: + """Without a tariff: a device's energy's tie-break weight per W and + step (NO_PRICE_EUR_KWH; rising a little over the horizon, so of + equal plans the earlier wins); with one 0 (its prices count).""" + if self.priced: + return 0.0 + return self.dt / 1000.0 * NO_PRICE_EUR_KWH * (1.0 + t / max(1, self.T)) # -- the house ------------------------------------------------------- def grid(self): @@ -143,9 +204,14 @@ class Model: for t in range(self.T): net = s["load_w"][t] - s["pv_w"][t] hi_in, hi_out = max(cap, net), max(cap, -net) - gi = self.var(0.0, hi_in, cost=self.eur_wh(t, s["price_import"][t])) - go = self.var(0.0, hi_out, cost=-self.eur_wh(t, s["price_export"][t])) - spill = self.var(0.0, max(0.0, s["pv_w"][t])) + if self.priced: + gi = self.var(0.0, hi_in, cost=self.eur_wh(t, s["price_import"][t])) + # an unpriced export (None) carries no value: coefficient 0 + go = self.var(0.0, hi_out, cost=-self.eur_wh(t, s["price_export"][t])) + else: + gi = self.var(0.0, hi_in, cost=self.dt / 1000.0 * NO_PRICE_EUR_KWH) + go = self.var(0.0, hi_out, cost=self.dt / 1000.0 * NO_PRICE_EUR_KWH) + spill = self.var(0.0, max(0.0, s["pv_w"][t]), cost=self.dt / 1000.0 * SPILL_EUR_KWH) self.gin.append(gi) self.gout.append(go) self.gcap.append((hi_in, hi_out)) @@ -155,8 +221,11 @@ class Model: """The meter's import/export switch where the feed-in pays at least the import price (grid), outside the steps in skip (market's own).""" s = self.s + if not self.priced: + return # both carry the same tiny weight: doing both never pays for t in range(self.T): - if t in skip or s["price_export"][t] < s["price_import"][t]: + pe = s["price_export"][t] if s["price_export"][t] is not None else 0.0 # unpriced: worth nothing + if t in skip or pe < s["price_import"][t]: continue hi_in, hi_out = self.gcap[t] imp = self.var(0.0, 1.0, integer=True) @@ -261,7 +330,7 @@ class Model: max_ch = max(0.0, min(float(p["max_charge_w"]), phi)) max_dis = max(0.0, min(float(p["max_discharge_w"]), -plo)) soc0 = cap * min(max(float(st["soc_pct"]), 0.0), 100.0) / 100.0 - mean_price = sum(self.s["price_import"]) / self.T + mean_price = sum(self.s["price_import"]) / self.T if self.priced else None soc, prev, ch, dis = [], soc0, [], [] pref = d.get("pref") # the owner's reserve per step (preferences.py) floors = [] @@ -270,8 +339,8 @@ class Model: if pref and not (pref.get("off") is not None and pref["group"][t] == pref["off"]): lo_t = min(max(lo_pct, pref["floor_pct"][t]), hi_pct) floors.append(lo_t) - c = self.var(0.0, max_ch) - x = self.var(0.0, max_dis) + c = self.var(0.0, max_ch, cost=self.use_cost(t)) + x = self.var(0.0, max_dis, cost=self.use_cost(t)) z = self.var(0.0, 1.0, integer=True) self.h.addConstr(c - max_ch * z <= 0) self.h.addConstr(x + max_dis * z <= max_dis) @@ -286,17 +355,24 @@ class Model: ch.append(c) dis.append(x) prev = e - # energy left at the end is worth the mean price: no draining at the horizon - short = self.var(cost=mean_price / 100.0 / 1000.0) - self.h.addConstr(prev + short >= min(soc0, hi_pct / 100.0 * cap)) + # energy left at the end is worth the mean price: no draining at the + # horizon (without a tariff nothing is drained for a price anyway) + if mean_price is not None: + short = self.var(cost=mean_price / 100.0 / 1000.0) + self.h.addConstr(prev + short >= min(soc0, hi_pct / 100.0 * cap)) self.smooth([c - x for c, x in zip(ch, dis)]) self.devices[d["id"]] = ("battery", {"ch": ch, "dis": dis, "soc": soc, "cap": cap, "max_dis": max_dis, - "floor_wh": lo_pct / 100.0 * cap, "floors": floors}) + "floor_wh": lo_pct / 100.0 * cap, "floors": floors, + "max_ch": max_ch, "eff": eff, "soc0": soc0, "hi_wh": hi_pct / 100.0 * cap}) def room(self, d, cooling: bool, gains): p, st, b = d["params"], d["state"], d["bounds"] r, c = float(p["r_k_per_kw"]), float(p["c_kwh_per_k"]) - pmax, cop = float(p["max_power_w"]), float(p["cop"]) + # the device's electric power and COP: facts (inputs.room_refusal / heating_refusal left out + # a room without them); a boiler or a heat station draws no electricity in the plan + elec = cooling or str(p.get("heat_source") or "electric") in ("electric", "heat_pump", "hybrid") + pmax = float(p["max_power_w"]) if elec else 0.0 + cop = float(p["cop"]) if p.get("cop") is not None else 0.0 # 0: none (a curve alone, or no electricity) lo, hi = b["temp_c"][0], b["temp_c"][1] comfort = float(p["comfort_c"]) other = float(p["setup_c"] if cooling else p["setback_c"]) @@ -304,6 +380,21 @@ class Model: t0 = float(t0) if t0 is not None else comfort switched = not cooling and "switch" in d["channels"] and "climate" not in d["channels"] temps, powers, prev = [], [], t0 + band = [] # per step the owner's band (the shift envelope's: shift_envelope) + # what makes the heat (module docstring; inputs.py refused it where a price or fact is missing) + src = "electric" if cooling else str(p.get("heat_source") or "electric") + # facts and parameters, never defaults: inputs.heating_refusal left out a control without them + eff = float(p["boiler_efficiency"]) if src in ("boiler", "hybrid") else None + qmax = float(p["max_heat_w"]) if src in ("boiler", "hybrid", "district") else 0.0 + gmax = qmax / eff if eff else 0.0 + switch_eur = float((self.s.get("params") or {})["heat.hybrid_switch_eur"]) if src == "hybrid" else 0.0 + gas = self.s.get("price_gas") or [None] * self.T + dhp = self.s.get("price_heat") or [None] * self.T + t_out = self.s["t_out"] + cops = [cop_at(p, t_out[t]) if p.get("cop_curve") else cop for t in range(self.T)] + els, gss, dhs, prev_u = [], [], [], None + if src == "hybrid" and st.get("source") in ("heat_pump", "boiler"): + prev_u = 1.0 if st["source"] == "heat_pump" else 0.0 # the source now: a change from it counts a = self.dt / (r * c) internal = self.hourly(p.get("internal_gain_w") or 0.0) solar = float(p.get("solar_m2") or 0.0) @@ -311,21 +402,52 @@ class Model: pref = d.get("pref") # the owner's schedule and overrides (preferences.py) cap = (self.s.get("building") or {}).get("thermostat_cap") for t in range(self.T): - if switched: - u = self.var(0.0, 1.0, integer=True) - pw = self.var(0.0, pmax) - self.h.addConstr(pw - pmax * u == 0) - else: - pw = self.var(0.0, pmax) - self.flows[t].append((-1, pw)) + terms = [] # (W of heat per W of input, the input) + pw = pg = ph = None + if src in ("electric", "heat_pump", "hybrid"): + if switched and src != "hybrid": + u = self.var(0.0, 1.0, integer=True) + pw = self.var(0.0, pmax, cost=self.use_cost(t)) + self.h.addConstr(pw - pmax * u == 0) + else: + pw = self.var(0.0, pmax, cost=self.use_cost(t)) + self.flows[t].append((-1, pw)) + terms.append((cops[t], pw)) + if src in ("boiler", "hybrid"): + cost = self.eur_wh(t, gas[t]) # the gas price per W of gas for the step + if switched and src == "boiler": + u = self.var(0.0, 1.0, integer=True) + pg = self.var(0.0, gmax, cost=cost) + self.h.addConstr(pg - gmax * u == 0) + else: + pg = self.var(0.0, gmax, cost=cost) + terms.append((eff, pg)) + if src == "district": + ph = self.var(0.0, qmax, cost=self.eur_wh(t, dhp[t])) + terms.append((1.0, ph)) + if src == "hybrid": + hu = self.var(0.0, 1.0, integer=True) # 1: the heat pump, 0: the boiler + self.h.addConstr(pw - pmax * hu <= 0) + self.h.addConstr(pg + gmax * hu <= gmax) + if prev_u is not None: + sw = self.var(cost=switch_eur) + self.h.addConstr(sw - hu + prev_u >= 0) + self.h.addConstr(sw + hu - prev_u >= 0) + prev_u = hu + els.append(pw) + gss.append(pg) + dhs.append(ph) + heat = sum((k * v for k, v in terms), start=Lin()) + main = pw if pw is not None else pg if pg is not None else ph tt = self.var(-50.0, 80.0) sign = -1.0 if cooling else 1.0 covers = gains(t) gain = sum((g * gx for g, gx in covers), start=Lin()) # the fit's (B6): its internal gain, and its sun where no cover carries it fixed = internal[t] + (solar * ghi[t] if not covers and t < len(ghi) else 0.0) - # T[t+1] = T[t] (1 - a) + a T_out + dt/C (± cop P/1000 + sun gain/1000 + fixed gains/1000) - self.h.addConstr(tt - (1 - a) * prev - sign * self.dt / c * cop / 1000.0 * pw + # T[t+1] = T[t] (1 - a) + a T_out + dt/C (± heat/1000 + sun gain/1000 + fixed gains/1000); + # heat: COP x electric W, efficiency x gas W, district W (module docstring) + self.h.addConstr(tt - (1 - a) * prev - sign * self.dt / c / 1000.0 * heat - self.dt / c / 1000.0 * gain == a * self.s["t_out"][t] + self.dt / c / 1000.0 * fixed) occ = self.s["occupied"][t + 1] if t + 1 < self.T else self.s["occupied"][t] want, must = (comfort if occ else other), None @@ -335,6 +457,13 @@ class Model: want, must = pref["base"][t], None # pref_costs: the plan without this group target = min(max(want, lo), hi) capped = bool(cap) and cap["from_step"] <= t < cap["to_step"] + # heating: from its target (and must) up to its upper bound (under a building's cap); cooling mirrored + if cooling: + b_hi = min(target, must) if must is not None else target + band.append((max(lo, cap["value"]) if capped else lo, max(min(b_hi, hi), lo))) + else: + b_lo = max(target, must) if must is not None else target + band.append((min(max(b_lo, lo), hi), min(hi, cap["value"]) if capped else hi)) if must is not None: # a bound inside the bounds in force, and under a building's cap mv = min(max(must, lo), hi) @@ -361,11 +490,19 @@ class Model: else: self.h.addConstr(tt - miss_cap <= cap["value"]) # heating: not above it temps.append(tt) - powers.append(pw) + powers.append(main) prev = tt - self.smooth(powers) + self.smooth(powers if src != "hybrid" else [a_ + b_ for a_, b_ in zip(els, gss)]) + # power: the electric input (None for gas and district heat: no electricity to shed or price); + # gas, district: their inputs; heat: per step the heat terms self.devices[d["id"]] = ("cooling" if cooling else "heating", - {"temp": temps, "power": powers, "pmax": pmax, "switched": switched}) + {"temp": temps, "power": els, "gas": gss, "district": dhs, "src": src, + "cops": cops, "eff": eff, + "pmax": {"electric": pmax, "heat_pump": pmax, "hybrid": pmax, "boiler": gmax, + "district": qmax}[src], "switched": switched, + # the shift envelope (electric sources only): Wh of electricity per K at the mean COP + "keep": 1 - a, "wh_per_k": 1000.0 * c / (sum(cops) / len(cops)) if cops and min(cops) > 0 else 0.0, + "band": band}) def hourly(self, v) -> list[float]: """A number, or 24 by local hour, per step.""" @@ -397,7 +534,7 @@ class Model: powers.append(None) continue y = self.var(0.0, 1.0, integer=True) - pw = self.var(0.0, imax * volts) + pw = self.var(0.0, imax * volts, cost=self.use_cost(t)) self.h.addConstr(pw - imax * volts * y <= 0) self.h.addConstr(pw - imin * volts * y >= 0) self.flows[t].append((-1, pw)) @@ -417,7 +554,9 @@ class Model: self.h.addConstr(total + short >= need) self.smooth([p for p in powers if p is not None]) self.devices[d["id"]] = ("ev", {"power": powers, "volts": volts, "dep": dep, - "pmax": imax * volts if imax >= imin else 0.0}) + "pmax": imax * volts if imax >= imin else 0.0, "need": need, + # the ready-by and the energy known (shift_envelope): not the defaults + "known": ev_known(st, pref)}) def cover(self, d, room_ids): p, b = d["params"], d["bounds"] @@ -488,6 +627,19 @@ class Model: return self.h.modelStatusToString(status) +def ev_known(st: dict, pref: dict | None) -> bool: + """A car's ready-by and energy are facts: the ready-by the owner's + preference or the car's (its charger's departure entity), the energy + the car's (energy-needed entity) or the owner's (kWh, or % with the + car's state of charge and capacity). The mapping's defaults (need_wh, + departure) are not; a preference in % without the car's charge falls + back to them (preferences.py), so it is not either.""" + dep = bool(pref) or st.get("departure") is not None + need = st.get("need_wh") is not None or bool(pref) and ( + pref.get("kwh") is not None or (pref.get("soc_pct") is not None and bool(pref.get("capacity_wh")))) + return dep and need + + def departure_step(s: dict, hhmm: str) -> int: """The step of the next departure (local time), within the horizon.""" zone = ZoneInfo(s.get("tz") or "UTC") @@ -503,8 +655,55 @@ def _round(v: float, step: float) -> float: return round(v / step) * step +def _prepare(s: dict) -> dict: + """The state as the plan takes it (U1): without a tariff (status none, + or no import price for the first step) priced False and no market; a + tariff that prices only the first n steps: the horizon cut to them.""" + pi = s.get("price_import") or [] + status = (s.get("prices") or {}).get("status", "tariff") + # gas and heat: a boiler's or district heat's steps only while their price lasts + n = s["steps"] + srcs = {str((d.get("params") or {}).get("heat_source") or "electric") for d in s.get("devices") or [] if d["kind"] == "heating"} + for key, need in (("price_gas", {"boiler", "hybrid"}), ("price_heat", {"district"})): + xs = s.get(key) or [] + if srcs & need and xs: + n = min(n, next((k for k, v in enumerate(xs) if v is None), len(xs))) + if n == 0: + n = s["steps"] # refused upstream (inputs.heating_refusal): nothing to cut for + if status == "none" or not pi or pi[0] is None: + s = dict(s, priced=False, market=[]) + return _cut(s, n) if n < s["steps"] else s + n = min(n, next((k for k, v in enumerate(pi) if v is None), len(pi))) + s = dict(s, priced=True) + return _cut(s, n) if n < s["steps"] else s + + +def _cut(s: dict, n: int) -> dict: + """The state for its first n steps: every per-step list (any list of + the horizon's length, at any depth) cut to n, the step ranges (from_step, + to_step, dep_step) kept inside it (a car's ready-by beyond it: "beyond").""" + T = s["steps"] + + def cut(x): + if isinstance(x, list): + return [cut(v) for v in (x[:n] if len(x) == T else x)] + if isinstance(x, dict): + y = {k: cut(v) for k, v in x.items()} + for k in ("from_step", "to_step"): + if isinstance(y.get(k), int): + y[k] = min(y[k], n) + if isinstance(y.get("dep_step"), int) and y["dep_step"] > n: + y["dep_step"], y["beyond"] = n, True + return y + return x + out = cut(s) + out["steps"] = n + return out + + def plan(s: dict, time_limit: float = 30.0) -> dict: t0 = time.time() + s = _prepare(s) m = Model(s) status = m.solve(time_limit) val = m.h.getSolution().col_value @@ -522,22 +721,46 @@ def plan(s: dict, time_limit: float = 30.0) -> dict: devices[d["id"]] = entries market = market_plan(s, m, x) energy = energy_of(s, m, x, market) + heat_cost = carrier_costs(s, m, x) + if energy is not None: + energy += heat_cost["gas_eur"] + heat_cost["heat_eur"] + base = baseline(s, m, x) out = {"v": 1, "made": int(time.time()), "start": start, "step_s": step, "status": status, "solve_s": round(time.time() - t0, 2), "devices": devices, "flex": flexibility(m, x), - "cost_eur": round(energy, 2), "baseline_eur": round(baseline(s, m, x), 2), + # without a tariff no cost: None, never a cost at a made-up price + "cost_eur": round(energy, 2) if energy is not None else None, + "baseline_eur": round(base, 2) if base is not None else None, + "priced": m.priced, "steps": T, "price_state": s.get("prices") or {}, "price_note": s.get("price_note", ""), "sources": s.get("sources", {})} + if heat_cost["gas_eur"] or heat_cost["heat_eur"]: + out["gas_eur"], out["heat_eur"] = round(heat_cost["gas_eur"], 2), round(heat_cost["heat_eur"], 2) + # rooms not planned (inputs.room_refusal): the thermostat's + # fallback schedule, and which one in their refusal + refused = copy.deepcopy(s.get("refused") or {}) + for d in s.get("fallback") or []: + entries = fallback_entries(s, d) + if entries: + devices[d["id"]] = entries + if d["id"] in refused: + refused[d["id"]]["fallback"] = ("schedule" if entries else + "own" if "climate" in d.get("channels", []) else "none") + if refused: + out["refused"] = refused # controls not planned, and why (U2, E6) if market: out["market"] = market - if any(d.get("pref") for d in s["devices"]): - out["prefs"] = pref_feedback(s, m, x) - if s.get("prefs_cost"): + if any(d.get("pref") for d in s["devices"]) or any(d.get("pref") for d in s.get("fallback") or []): + out["prefs"] = pref_feedback(s, m, x) + fallback_feedback(s) + if s.get("prefs_cost") and energy is not None: out["prefs_cost"] = pref_costs(s, energy, t0 + time_limit) return out def energy_of(s, m, x, market=None) -> float: - """The plan's cost for power (EUR): the grid's import less its feed-in, - and the market's contracts.""" + """The plan's cost for power (EUR): the grid's import less its feed-in + (an unpriced export counts nothing), and the market's contracts; None + without a tariff.""" + if not m.priced: + return None pi, pe = s["price_import"], s["price_export"] e = sum(m.eur_wh(t, pi[t]) * x(m.gin[t]) - m.eur_wh(t, pe[t]) * x(m.gout[t]) for t in range(m.T)) return e + sum(c["cost_eur"] for c in (market if market is not None else market_plan(s, m, x))) @@ -646,7 +869,7 @@ def _ev_feedback(s, d, pref, v, x, m) -> dict: short = max(0.0, pref["need_wh"] - wh) pi = s["price_import"] f["planned_kwh"] = round(wh / 1000.0, 2) - f["charge_eur"] = round(sum(m.eur_wh(t, pi[t]) * pw[t] for t in range(dep)), 2) + f["charge_eur"] = round(sum(m.eur_wh(t, pi[t]) * pw[t] for t in range(dep)), 2) if m.priced else None reached = "" if pref.get("soc_pct") is not None and pref.get("capacity_wh"): pct = min(100.0, float(pref["soc_pct"]) + 100.0 * wh / pref["capacity_wh"]) @@ -752,26 +975,34 @@ def market_plan(s, m, x) -> list[dict]: vs += (e * pi[t] - pay * price) / 100.0 else: cost -= e * price / 100.0 - vs += e * (price - pe[t]) / 100.0 + vs += e * (price - (pe[t] or 0.0)) / 100.0 # an unpriced export: worth nothing out.append({"id": c["id"], "name": c.get("name", ""), "direction": c["direction"], "price_ct": c["price_ct"], "steps": steps, "planned_kwh": round(kwh, 4), "paid_kwh": round(paid_kwh, 4), "cost_eur": round(cost, 4), "vs_grid_eur": round(vs, 4)}) return out -FLEX_STEPS = 96 # 24 h at 15 min: what a building plans with +FLEX_STEPS = 96 # 24 h at 15 min: what a building plans with (shed_w, grid_w) +SHIFT_STEPS = 192 # 48 h: the shift envelope (the band prices' horizon) +SHIFT_DEVICES = 16 # devices in a shift envelope at most (the fleet's storage bound) def flexibility(m, x) -> dict: """What the flat could do for its building (the building asks for flexibility, it doesn't cap averages; building/README.md hole - 3), per step for the next 24 h: grid_w, the planned import; shed_w, how - much of it the controllable devices (heating, cooling, EV, the battery's - charging) could drop in that step, plus what the battery could still - discharge (its spare power, bounded by the energy above its floor): what - a load_limit can take away without touching the household's own use.""" + 3), per step for the next 24 h: grid_w, the planned import through the + meter (the grid's and a market contract's: a flat supplied by its + building's pool imports through a contract, and its gin alone was 0, so + shed_w was 0 too: docs/methods.md A11); shed_w, how much of it the + controllable devices (heating, cooling, EV, the battery's charging) + could drop in that step, plus what the battery could still discharge + (its spare power, bounded by the energy above its floor): what a + load_limit can take away without touching the household's own use. + shift (48 h, shift_envelope): the energy the devices can move, for a + building's price bands; absent where no device's facts are known.""" n = min(m.T, FLEX_STEPS) - grid = [round(x(m.gin[t])) for t in range(n)] + bought = [x(m.gin[t]) + sum((x(v) for v in m.buy[t]), 0.0) for t in range(m.T)] + grid = [round(bought[t]) for t in range(n)] shed = [0.0] * n for kind, v in m.devices.values(): if v is None: @@ -785,9 +1016,110 @@ def flexibility(m, x) -> dict: for t in range(min(n, len(cols or []))): if cols[t] is not None and hasattr(cols[t], "index"): # an EV's steps after departure are empty shed[t] += max(x(cols[t]), 0.0) - # net_w: import less export, the member's draw as planned (the box's forecast of it upward, boxtrain.py) - return {"grid_w": grid, "shed_w": [round(min(sh, g)) for sh, g in zip(shed, grid)], - "net_w": [round(x(m.gin[t]) - x(m.gout[t])) for t in range(n)]} + out = {"grid_w": grid, "shed_w": [round(min(sh, g)) for sh, g in zip(shed, grid)], + "net_w": [round(bought[t] - x(m.gout[t]) - sum((x(v) for v in m.sell[t]), 0.0)) for t in range(n)]} + sh = shift_envelope(m, x) + if sh: + out["shift"] = sh + return out + + +def _x(x, v) -> float: + """A step's value: a variable's, or 0 where there is none (an EV's steps after departure).""" + return x(v) if v is not None and hasattr(v, "index") else 0.0 + + +def shift_envelope(m, x) -> dict | None: + """The energy each controllable device can move over the next 48 h, + from what the plan already knows (docs/methods.md A11), for the + building's price bands (building/mieterstrom.py: the flats' agents + re-plan against the band prices; the building models that response + with this). Per device, per step (W, Wh; the step is step_s): + + battery base_w (the planned grid-side power: charge > 0, discharge + < 0), soc_wh (the state of charge at the start), lo_wh per + step (its floor: the bounds and the owner's reserve), max_wh + (its ceiling), ch_w, dis_w (its power), eta (one way), end_wh (the planned + last state of charge: the building keeps at least it) + ev, heating, cooling + base_w (planned), up_w / down_w (the most it can draw above / + below base_w), lo_wh / hi_wh (the bounds of the moved energy + store S_t = keep * S_(t-1) + (p_t - base_t) * dt, S_(-1) = 0), + keep (1 a lossless store: a car; a room's heat decays toward + its plan: 1 - dt / (R C)) + + Published only from facts: a battery with its ratings (a battery + without them is not planned at all: U2); a car plugged in whose + ready-by and energy are the owner's preference or the car's own (never + the defaults); a room whose R and C are fitted (or the mapping's) with + the device's COP (the mapping's, or none needed: a fit against the + electric power) and the owner's band (preferences, or the mapping's + comfort temperatures); a room without them is not planned at all. None of them: None.""" + s = m.s + n = min(m.T, SHIFT_STEPS) + if n <= 0: + return None + dt = m.dt + src = s.get("sources") or {} + rooms, cops, bands = src.get("rooms") or {}, src.get("rooms_cop") or {}, src.get("rooms_band") or {} + out = [] + for d in s["devices"]: + kind, v = m.devices.get(d["id"], (d["kind"], None)) + if v is None: + continue + if kind == "battery": + base = [_x(x, v["ch"][t]) - _x(x, v["dis"][t]) for t in range(n)] + out.append({"id": d["id"], "kind": "battery", "base_w": [round(b) for b in base], + "soc_wh": round(v["soc0"]), "lo_wh": [round(v["floors"][t] / 100.0 * v["cap"]) for t in range(n)], + "max_wh": round(v["hi_wh"]), "ch_w": round(v["max_ch"]), "dis_w": round(v["max_dis"]), + "eta": round(v["eff"], 4), "end_wh": round(_x(x, v["soc"][n - 1]))}) + elif kind == "ev": + if not v.get("known") or v["pmax"] <= 0: + continue + p = [_x(x, v["power"][t]) for t in range(n)] + dep = min(v["dep"], n) + if dep <= 0 or sum(p) <= 0 and v["need"] <= 0: + continue + up = [max(0.0, v["pmax"] - p[t]) if t < dep else 0.0 for t in range(n)] + down = [p[t] if t < dep else 0.0 for t in range(n)] + lo, hi, cum = [], [], 0.0 + for t in range(n): + cum += p[t] * dt + if t < dep - 1: # before the ready-by: between nothing and the need delivered + lo.append(-cum) + hi.append(max(0.0, v["need"] - cum)) + else: # at and after it: what the plan delivers (a ready-by beyond the horizon: no less by its end) + end = v["need"] - cum + lo.append(min(0.0, end) if v["dep"] <= n else 0.0) + hi.append(max(0.0, end)) + out.append({"id": d["id"], "kind": "ev", "base_w": [round(a) for a in p], "up_w": [round(a) for a in up], + "down_w": [round(a) for a in down], "lo_wh": [round(a) for a in lo], "hi_wh": [round(a) for a in hi], + "keep": 1.0}) + elif kind in ("heating", "cooling"): + if v.get("switched"): + continue # an on/off boiler: all or nothing, not a band of power + if v.get("src", "electric") not in ("electric", "heat_pump"): + continue # gas, district heat or a hybrid's choice: no electricity to shift as planned + if rooms.get(d["id"]) not in ("mapping", "model", "box model") or \ + cops.get(d["id"]) not in ("mapping", "electric fit", "electric heater") or v["wh_per_k"] <= 0: + continue # no fit or no COP: the heat it can hold is not known + if not d.get("pref") and bands.get(d["id"]) != "mapping": + continue # no band of the owner's + p = [_x(x, v["power"][t]) for t in range(n)] + temps = [_x(x, v["temp"][t]) for t in range(n)] + k, sign = v["wh_per_k"], (-1.0 if kind == "cooling" else 1.0) + lo, hi = [], [] + for t in range(n): + blo, bhi = v["band"][t] + a, b = sorted((sign * (blo - temps[t]) * k, sign * (bhi - temps[t]) * k)) + lo.append(min(a, 0.0)) # the plan's own temperature is always inside + hi.append(max(b, 0.0)) + out.append({"id": d["id"], "kind": kind, "base_w": [round(a) for a in p], + "up_w": [round(max(0.0, v["pmax"] - a)) for a in p], "down_w": [round(a) for a in p], + "lo_wh": [round(a) for a in lo], "hi_wh": [round(a) for a in hi], "keep": round(v["keep"], 6)}) + if not out: + return None + return {"v": 1, "start": s["start"], "step_s": s["step_s"], "steps": n, "devices": out[:SHIFT_DEVICES]} def _charge_why(pi, t) -> str: @@ -808,12 +1140,93 @@ def _charge_why(pi, t) -> str: def _key(e) -> tuple: """What makes a plan entry a change: a battery's self-consumption is one - state whatever its power (it follows the house).""" - return ("auto",) if e.get("auto") else (e["set"], e.get("grid")) + state whatever its power (it follows the house); a hybrid's source.""" + return ("auto",) if e.get("auto") else (e["set"], e.get("grid"), e.get("source")) + + +def carrier_costs(s, m, x) -> dict: + """What the plan's gas and district heat cost (EUR), at their prices.""" + gas, dh = s.get("price_gas") or [], s.get("price_heat") or [] + out = {"gas_eur": 0.0, "heat_eur": 0.0} + for kind, v in m.devices.values(): + if kind != "heating" or not v: + continue + for key, prices, col in (("gas_eur", gas, "gas"), ("heat_eur", dh, "district")): + for t, var in enumerate(v.get(col) or []): + if var is not None and t < len(prices) and prices[t] is not None: + out[key] += m.eur_wh(t, prices[t]) * x(var) + return out + + +def _inputs_w(v, t, x) -> float: + """A heating or cooling device's input in step t (W: electric, gas or + district heat; a hybrid's both).""" + return sum(x(c[t]) for c in (v.get("power"), v.get("gas"), v.get("district")) if c and c[t] is not None) GRID_ZERO_W = 50.0 # the meter's import and export below this: the battery balances the house +KEEP_OWN = "release" # executor.RELEASE: the thermostat keeps its own setpoint (nothing written) + + +def fallback_entries(s, d) -> list[dict]: + """A room not planned (inputs.room_refusal): its + thermostat's fallback schedule, no optimisation. Per step the target of + the owner's (or installer's) schedule and overrides in force + (preferences.room_series: a block's temperature, a must at least it; + outside the blocks the setback (heating) / setup (cooling); a boost; + away at the setback), rounded to the half degree and held inside the + room's bounds (the owner's and installer's limits, the device's range). + Without blocks (an override alone) the steps outside the override keep + the thermostat's own setpoint (KEEP_OWN). No schedule, or a switched + heater without a thermostat: none (the executor's safe value: the + device as it is).""" + pref = d.get("pref") + if not pref or "climate" not in (d.get("channels") or []): + return [] + cooling = d["kind"] == "cooling" + lo, hi = d["bounds"]["temp_c"][0], d["bounds"]["temp_c"][1] + lo_h = math.ceil(lo * 2) / 2 if lo is not None else None + hi_h = math.floor(hi * 2) / 2 if hi is not None else None + groups = pref["groups"] + blocks = any(g["kind"] == "block" for g in groups) + out = [] + for t in range(min(s["steps"], len(pref["target"]))): + g = pref["group"][t] + if g == -1 and not blocks: + e = {"set": KEEP_OWN, "why": "fallback: the thermostat's own setpoint (room not optimised, no schedule)"} + else: + want = float(pref["target"][t]) + must = pref["must"][t] + if must is not None: + want = min(want, float(must)) if cooling else max(want, float(must)) + v = _round(want, 0.5) + if lo_h is not None: + v = max(v, lo_h) + if hi_h is not None: + v = min(v, hi_h) + what = groups[g]["text"] if g >= 0 else ("setup" if cooling else "setback") + " outside your schedule" + e = {"set": v, "why": f"fallback schedule (room not optimised): {what}"} + if not out or _key(out[-1]) != _key(e): + out.append({"t": s["start"] + t * s["step_s"], **e}) + return out + + +def fallback_feedback(s) -> list[dict]: + """A not-planned room's preferences (fallback_entries): not optimised, + the thermostat set to them; met unknown (no plan of the room to tell).""" + out = [] + for d in s.get("fallback") or []: + pref = d.get("pref") + if not pref or "climate" not in (d.get("channels") or []): + continue + for gi, g in enumerate(pref["groups"]): + out.append({"control": d["id"], "group": g["group"], "kind": g["kind"], "how": g["how"], + "label": g["text"], "met": None, + "detail": "room not optimised: set as the thermostat's schedule" + if gi in pref["group"] else "not in the next 48 h"}) + return out + def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): """What a device is to do in step t, and why (a few words). grid_w: @@ -826,6 +1239,12 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): net = _round(net, 50.0) surplus = s["pv_w"][t] - s["load_w"][t] grid = net > max(0.0, surplus) + 50 + if not s.get("priced", True): + # no tariff: the battery in its own mode, unless the owner's + # reserve needs charging from the grid + if grid: + return {"set": net, "grid": True, "why": "charge to the reserve you set (no tariff)"} + return {"set": net, "grid": False, "auto": True, "why": "no tariff: the battery in its own mode"} if net > 0: why = _charge_why(pi, t) if grid else "PV surplus" elif net < 0: @@ -846,7 +1265,17 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): return {"set": net, "grid": grid, "why": why} if kind in ("heating", "cooling"): temp = x(v["temp"][t]) - pw = x(v["power"][t]) + pw = _inputs_w(v, t, x) + src = v.get("src", "electric") + # the price that buys the heat now, for the words + pr = {"boiler": s.get("price_gas"), "district": s.get("price_heat")}.get(src) or pi + pr_t = pr[t] if t < len(pr) else None + source = None + if src == "hybrid": + hp_w, gas_w = x(v["power"][t]), x(v["gas"][t]) + source = "heat_pump" if hp_w >= gas_w and hp_w > 50 else "boiler" if gas_w > 50 else None + if source == "boiler": + pr_t = (s.get("price_gas") or [None] * (t + 1))[t] ahead = s["occupied"][min(t + 4, s["steps"] - 1)] pref = d.get("pref") if pref: @@ -856,7 +1285,7 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): tg, k0 = pref["target"], max(t - 1, 0) occ = sign * (tg[k0] - pref["base"][k0]) > 0 ahead = any(sign * (tg[k] - tg[k0]) > 0 for k in range(t, min(t + 4, len(tg)))) - if kind == "heating" and v["switched"]: + if kind == "heating" and v["switched"] and src != "hybrid": on = pw > 0.5 * v["pmax"] why = ("pre-heat before someone is home" if on and not occ and ahead else "keep the room warm" if on else "off: warm enough or away") @@ -885,8 +1314,13 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): want = max(want, float(pref["must"][t])) floor_t = min(max(math.floor(want * 2) / 2, math.ceil(lo * 2) / 2), math.floor(hi * 2) / 2) return {"set": min(target, floor_t), "why": "setback: away or night" if not occ else "warm enough"} - return {"set": target, "why": f"pre-heat while power is cheap ({pi[t]:.1f} ct)" if not occ and ahead - else "keep the room warm"} + what = {"boiler": "gas", "district": "heat"}.get(src if src != "hybrid" else (source or ""), "power") + e = {"set": target, "why": f"pre-heat while {what} is cheap ({pr_t:.1f} ct)" + if not occ and ahead and pr_t is not None else "keep the room warm"} + if source: + e["source"] = source + e["why"] += "; " + ("the heat pump: its heat is cheaper now" if source == "heat_pump" else "the boiler: its heat is cheaper now") + return e if kind == "ev": p = v["power"][t] if p is None: @@ -894,6 +1328,10 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): amps = round(x(p) / v["volts"]) ph = ((s.get("sources") or {}).get("ev_phases") or {}).get(d["id"]) ph = f"; {phase_words(ph)}" if ph else "" + if pi[t] is None: + if amps < 1: + return {"set": "off", "why": "not needed now (no tariff)" + ph} + return {"set": amps, "why": "charge for the departure (no tariff)" + ph} if amps < 1: return {"set": "off", "why": "wait for cheaper hours" + ph} return {"set": amps, "why": f"cheapest hours before departure ({pi[t]:.1f} ct){ph}"} @@ -918,7 +1356,10 @@ def _entry(d, kind, v, t, x, s, pi, grid_w=(1e9, 1e9)): def baseline(s, m, x) -> float: """An estimate of the cost without the plan: the house's net load at its prices, no battery, and the devices' energy (as the plan uses it) at the - mean import price, the EV's as soon as it is plugged in.""" + mean import price, the EV's as soon as it is plugged in; None without + a tariff.""" + if not m.priced: + return None T, pi, pe = m.T, s["price_import"], s["price_export"] cost = 0.0 for t in range(T): @@ -929,7 +1370,13 @@ def baseline(s, m, x) -> float: if not v: continue if kind in ("heating", "cooling"): - cost += sum(m.eur_wh(t, mean) * x(v["power"][t]) for t in range(T)) + # each input as the plan uses it at its mean price (electricity, gas, district heat) + cost += sum(m.eur_wh(t, mean) * x(v["power"][t]) for t in range(T) if v["power"][t] is not None) + for col, key in (("gas", "price_gas"), ("district", "price_heat")): + ps = [p for p in (s.get(key) or [])[:T] if p is not None] + if ps and any(c is not None for c in v.get(col) or []): + mp = sum(ps) / len(ps) + cost += sum(m.eur_wh(t, mp) * x(c) for t, c in enumerate(v[col]) if c is not None) elif kind == "ev": wh = sum(m.dt * x(p) for p in v["power"] if p is not None) asap = pi[:max(1, math.ceil(wh / max(1.0, v["volts"] * 16) / m.dt))] diff --git a/src/edge/cantabile_edge/preferences.py b/src/edge/cantabile_edge/preferences.py index 42ecf27..f62ee15 100644 --- a/src/edge/cantabile_edge/preferences.py +++ b/src/edge/cantabile_edge/preferences.py @@ -419,6 +419,13 @@ class Preferences: self.costs: dict = {"at": 0, "of": 0.0, "eur_day": {}} # the musts' costs, as of a plan self.feedback: list[dict] = [] self.errors: list[dict] = [] # the last refused changes (the panel shows them) + # the plan's state for the panel (docs/parameters.md U1, U2): planned with + # prices or not and why, the controls not planned and why + self.planning: dict = {} + # the owner's own tariff as on the bill, from the panel, for the cloud + # (the controller sends it through the link: op own_tariff) and its state + self.outbox: list[dict] = [] + self.own_tariff: dict = {} try: with open(self.path) as f: raw = json.load(f) @@ -596,11 +603,42 @@ class Preferences: os.remove(p) except OSError: pass - if isinstance(msg, dict): + if isinstance(msg, dict) and "own_tariff" in msg: + ok, why = self.take_own_tariff(msg) + log.info("own tariff from the panel: %s", why) + n += 1 + elif isinstance(msg, dict): self.apply_msg(msg, controls, tz, "owner", "panel:" + str(msg.get("by") or "owner")[:40]) n += 1 return n + def take_own_tariff(self, msg: dict) -> tuple[bool, str]: + """The owner's own tariff as on the bill (the panel, when the box has + no tariff): {"own_tariff": {"import_ct", "export_ct"?, "valid_from"?}, + "by"}: checked here, then sent to the cloud (outbox), which keeps it as + the site's own price (fleet site_tariffs) unless the site already has + a tariff chosen there, and sends the tariff bundle back. Gross ct/kWh.""" + o = msg.get("own_tariff") or {} + now = int(self.clock()) + + def ct(v, lo, hi): + try: + x = float(v) + except (TypeError, ValueError): + return None + return x if lo <= x <= hi and x == x else None + imp = ct(o.get("import_ct"), 0.0, 1000.0) + exp = ct(o.get("export_ct"), -100.0, 1000.0) if o.get("export_ct") not in (None, "") else None + if imp is None or imp == 0: + self.own_tariff = {"state": "refused", "why": "import price: ct/kWh, above 0 and at most 1000", "at": now} + return False, self.own_tariff["why"] + out = {"v": 1, "import_ct": imp, "by": str(msg.get("by") or "owner")[:40], "at": now} + if exp is not None: + out["export_ct"] = exp + self.outbox.append(out) + self.own_tariff = {"state": "sent", "import_ct": imp, "export_ct": exp, "at": now} + return True, f"sent: {imp:g} ct/kWh" + (f", export {exp:g} ct/kWh" if exp is not None else "") + def apply_msg(self, msg: dict, controls: dict, tz: str, level: str, by: str) -> tuple[bool, str]: """One change in the inbox's form (the panel's, the console's).""" now = self.clock() @@ -663,6 +701,13 @@ class Preferences: p = None if p is not None: d["pref"] = p + # rooms not planned (inputs.room_refusal): their schedule as the + # thermostat's fallback (optimizer.fallback_entries) + for d in state.get("fallback") or []: + if d["id"] in controls: + p = room_series(d, self.value(f"room:{d['id']}"), ovs, state, ends) + if p is not None: + d["pref"] = p state["prefs_cost"] = bool(any(d.get("pref") for d in state["devices"])) and ( self.changed_at > self.costs.get("of", 0) or now - self.costs.get("at", 0) >= COST_EVERY_S) return state @@ -688,6 +733,9 @@ class Preferences: f["text"] = feedback_words(f) fb.append(f) self.feedback = fb + self.planning = {"priced": plan.get("priced", True), "note": plan.get("price_note", ""), + "prices": plan.get("price_state") or {}, "refused": plan.get("refused") or {}, + "made": plan.get("made")} plan["prefs"] = fb plan.pop("prefs_cost", None) return fb @@ -717,7 +765,8 @@ class Preferences: b = c.bounds(q) cl.append({"id": c.id, "kind": c.kind, "name": c.label(), "bounds": [b.lo, b.hi], "setback_c": _p(c, "setback_c"), "setup_c": _p(c, "setup_c"), "comfort_c": _p(c, "comfort_c")}) - v = dict(self.public(), controls=cl, mode=mode, errors=self.errors, ha=self.ha, made=int(self.clock())) + v = dict(self.public(), controls=cl, mode=mode, errors=self.errors, ha=self.ha, made=int(self.clock()), + planning=self.planning, own_tariff=self.own_tariff) try: tmp = self.view_path + ".tmp" with open(tmp, "w") as f: diff --git a/src/edge/cantabile_edge/pvforecast.py b/src/edge/cantabile_edge/pvforecast.py index 5b106ad..37c467d 100644 --- a/src/edge/cantabile_edge/pvforecast.py +++ b/src/edge/cantabile_edge/pvforecast.py @@ -43,6 +43,7 @@ class Hour: solar_kwh_m2: float | None = None cloud_pct: float | None = None temp_c: float | None = None + wind_ms: float | None = None # mean wind speed, m/s (DWD through Bright Sky; the heat forecast, methods.md B13) def sun_position(t: datetime, lat: float, lon: float) -> tuple[float, float]: diff --git a/src/edge/cantabile_edge/shades.py b/src/edge/cantabile_edge/shades.py index 785512f..97ad792 100644 --- a/src/edge/cantabile_edge/shades.py +++ b/src/edge/cantabile_edge/shades.py @@ -15,7 +15,8 @@ Per 15-minute step of the plan, for a shade with its window's orientation cooling season the sun on the facade and the room warm (its temperature within 1 K of the setpoint, or outside 24 °C or more) or the next 3 hours dear (their mean - price 10 % above the horizon's): close to shade_pct + price 10 % above the horizon's, priced steps only: + no price, no dear hours): close to shade_pct (someone home: some daylight) or closed_pct (nobody home); open again (open_pct) when the sun has left heating season the sun on the facade (sunny, outside below 18 °C): @@ -154,8 +155,12 @@ def schedule(d: dict, s: dict, ctx: dict | None = None) -> dict: min_move = float(p.get("min_move_s", 1800)) night_ok = bool(float(p.get("night_moves", 0) or 0)) qf, qt = str(p.get("quiet_from", "22:00")), str(p.get("quiet_to", "07:00")) - prices = s.get("price_import") or [0.0] * T - mean = sum(prices) / len(prices) if prices else 0.0 + # the tariff's prices as they are: None where it has none (no tariff, or + # the steps past its end, bundles.prices). The dear hours are judged on + # the priced steps only; without a price there are none (no stand-in) + prices = list(s.get("price_import") or []) + priced = [x for x in prices if x is not None] + mean = sum(priced) / len(priced) if priced else 0.0 sky = s.get("sky") or [1.0] * T t_out = s.get("t_out") or [10.0] * T occupied = s.get("occupied") or [1] * T @@ -180,7 +185,7 @@ def schedule(d: dict, s: dict, ctx: dict | None = None) -> dict: season = ctx.get("season") or season_of(local.month) want, why, kind = None, "", None if season == "cooling": - ahead = prices[k:k + 12] + ahead = [x for x in prices[k:k + 12] if x is not None] dear = bool(ahead) and mean > 0 and sum(ahead) / len(ahead) > 1.1 * mean warm = (temp is not None and setpoint is not None and temp >= setpoint - 1.0) or \ (k < len(t_out) and t_out[k] >= 24.0) diff --git a/src/edge/cantabile_edge/steady.py b/src/edge/cantabile_edge/steady.py index 4d5be7d..ec37a2b 100644 --- a/src/edge/cantabile_edge/steady.py +++ b/src/edge/cantabile_edge/steady.py @@ -89,7 +89,8 @@ def _val(c, e): def _big(c, old, new) -> bool: if c.kind == "battery": - top = max(float(c.p("max_charge_w")), float(c.p("max_discharge_w"))) + f, _, _ = c.battery_facts() + top = max(f.get("max_charge_w") or 0.0, f.get("max_discharge_w") or 0.0) return abs(new - old) >= max(MIN_BATTERY_W, BATTERY_SHARE * top) - 1e-9 if c.kind in ("heating", "cooling"): return abs(new - old) >= TEMP_K - 1e-9 @@ -129,9 +130,10 @@ def stabilise(plan: dict, state: dict, controls, col, last_set=None, now: float In place; returns the plan.""" now = plan.get("made", 0) if now is None else now step = plan.get("step_s", 900) - end = plan.get("start", now) + step * state.get("steps", 192) - prices = state.get("price_import") or [] - feed = state.get("price_export") or [] + end = plan.get("start", now) + step * plan.get("steps", state.get("steps", 192)) + # the prices the plan had (none without a tariff: no gain to weigh then) + prices = [x for x in state.get("price_import") or [] if x is not None] + feed = [x for x in state.get("price_export") or [] if x is not None] spread = (max(prices) - min(prices + feed)) if prices else 0.0 # ct per kWh, at most devs = {d["id"]: d for d in state.get("devices") or []} kept_n = 0 @@ -158,6 +160,9 @@ def stabilise(plan: dict, state: dict, controls, col, last_set=None, now: float out = [] for i, e in enumerate(raw): new = _val(c, e) + if new == "release": + out.append(e) # nothing written (a room's fallback: its own setpoint) + continue if _same(cur, new): kind = None elif isinstance(cur, str) or isinstance(new, str): @@ -198,11 +203,13 @@ def stabilise(plan: dict, state: dict, controls, col, last_set=None, now: float changed[kind] = t if kind == "mode" and c.kind != "battery": changed["set"] = t + _hold_source(c, out, col, hold["mode"], last_set, now) # a plan lists changes only merged = [] for e in out: if merged and _same(_val(c, merged[-1]), _val(c, e)) and \ - (merged[-1].get("grid") == e.get("grid") or _val(c, e) == AUTO): + (merged[-1].get("grid") == e.get("grid") or _val(c, e) == AUTO) and \ + merged[-1].get("source") == e.get("source"): continue merged.append(e) plan["devices"][c.id] = merged @@ -210,6 +217,31 @@ def stabilise(plan: dict, state: dict, controls, col, last_set=None, now: float return plan +def _hold_source(c, entries, col, hold_s, last_set, now): + """A hybrid's heat source (a plan entry's "source") changes only after + the hold of a mode (params.hold_mode_s) since its last change: from the + agent's last command (the guard's record, kind "source"), then from the + plan's own changes. A held entry keeps the source in force, its why + says so. In place.""" + if c.kind != "heating" or "source" not in c.entities: + return + opts = {str(v): k for k, v in (c.p("source_options") or {}).items()} + cur = opts.get(str(col.state(c.entities["source"]))) + t_last = last_set(c.id, "source") if last_set else None + t_last = t_last if t_last is not None else -1e18 + for e in entries: + new = e.get("source") + if new is None or new == cur: + continue + t = max(e["t"], now) + if cur is not None and t - t_last < hold_s: + e["planned_source"], e["source"] = new, cur + e["why"] = (e.get("why", "") + "; " if e.get("why") else "") + \ + f"source kept: changed {int((t - t_last) // 60)} min ago (hold {hold_s / 60:.0f} min)" + continue + cur, t_last = new, t + + def _amount(c, a, b) -> str: unit = {"battery": "W", "heating": "K", "cooling": "K", "ev": "A"}[c.kind] d = abs(b - a) diff --git a/src/edge/cantabile_edge/trainlib.py b/src/edge/cantabile_edge/trainlib.py index 248d470..4c253b6 100644 --- a/src/edge/cantabile_edge/trainlib.py +++ b/src/edge/cantabile_edge/trainlib.py @@ -92,7 +92,7 @@ class SeriesResult: def wslice(w: fcmodels.Weather, sl: slice) -> fcmodels.Weather: - return fcmodels.Weather(w.temp[sl], w.ghi[sl], w.cloud[sl], w.elev[sl], w.az[sl], w.hours) + return w.slice(sl) # ---- one series, champion against challengers ----------------------------------- @@ -136,13 +136,13 @@ def train_series(series: str, t: np.ndarray, y: np.ndarray, w: fcmodels.Weather, res.runs.append(Run(series, kind, {}, None, note=f"not trained: {why}")) continue pred = fcmodels.predict(p, series, t[te], wslice(wt, te), site, hist_t, hist_y) - res.runs.append(Run(series, kind, fcmodels.metrics(y[te], pred), p)) + res.runs.append(Run(series, kind, fcmodels.metrics(y[te], pred, fcmodels.level_floor(series)), p)) base = next((r for r in res.runs if r.kind == "how" and r.params), None) res.baseline = base.metrics if base else None if champion is not None: try: pred = fcmodels.predict(champion, series, t[te], wslice(wt, te), site, hist_t, hist_y) - res.champion = fcmodels.metrics(y[te], pred) + res.champion = fcmodels.metrics(y[te], pred, fcmodels.level_floor(series)) except Exception as e: # a champion that can no longer run is replaced res.champion = None res.note = f"the model in force could not be scored ({e}): replaced" @@ -183,7 +183,7 @@ def score_params(params: dict, series: str, t: np.ndarray, y: np.ndarray, w: fcm except Exception as e: log.warning("benchmark %s: %s", series, e) return None - return fcmodels.metrics(y[te], pred) + return fcmodels.metrics(y[te], pred, fcmodels.level_floor(series)) # ---- the rooms --------------------------------------------------------------------- diff --git a/src/edge/link/go.mod b/src/edge/link/go.mod index b4d3f1d..e0d5e45 100644 --- a/src/edge/link/go.mod +++ b/src/edge/link/go.mod @@ -5,13 +5,14 @@ module git.setti.solutions/daniel/cantabile/edge/link go 1.26.0 require ( + github.com/coder/websocket v1.8.15 + github.com/creack/pty v1.1.24 github.com/nats-io/nats.go v1.54.0 github.com/nats-io/nkeys v0.4.16 golang.org/x/crypto v0.58.0 ) require ( - github.com/creack/pty v1.1.24 // indirect github.com/klauspost/compress v1.20.0 // indirect github.com/nats-io/nuid v1.0.1 // indirect golang.org/x/sys v0.49.0 // indirect diff --git a/src/edge/link/go.sum b/src/edge/link/go.sum index f5fcad1..d7fff0b 100644 --- a/src/edge/link/go.sum +++ b/src/edge/link/go.sum @@ -1,3 +1,5 @@ +github.com/coder/websocket v1.8.15 h1:6B2JPeOGlpff2Uz6vOEH1Vzpi0iUz20A+lPVhPHtNUA= +github.com/coder/websocket v1.8.15/go.mod h1:NX3SzP+inril6yawo5CQXx8+fk145lPDC6pumgx0mVg= github.com/creack/pty v1.1.24 h1:bJrF4RRfyJnbTJqzRLHzcGaZK1NeM5kTC9jGgovnR1s= github.com/creack/pty v1.1.24/go.mod h1:08sCNb52WyoAwi2QDyzUCTgcvVFhUzewun7wtTfvcwE= github.com/klauspost/compress v1.20.0 h1:a3C1ke2ohxFymNlb2HWAHjDeKCI90scRskErZkR0ezA= diff --git a/src/edge/link/hae2e_test.go b/src/edge/link/hae2e_test.go new file mode 100644 index 0000000..f897cf0 --- /dev/null +++ b/src/edge/link/hae2e_test.go @@ -0,0 +1,396 @@ +// Copyright © 2026 Setti Solutions S.R.L, www.setti.md. All rights reserved. + +//go:build hae2e + +package main + +// The box's side of remote HA's end-to-end test against a real Home +// Assistant (platform/ci/ha-remote-e2e.sh runs it with the fleet's side, +// platform/services/fleet/hae2e_test.go): HA onboarded as ha-setup does it +// (an owner, and the agent's own administrator with a long-lived token), +// then this process is the box: the signed ha-open command and the +// tunnel's messages over NATS, exactly as the link takes them (haOpenWith, +// haFrameWith), with HA on the box's network. "e2e.owner-end" stands in +// for the owner's End now (SIGUSR1 on a box). +// +// HAE2E_MODE=addon: the HA add-on's path (CANTABILE_HA_REMOTE=1 with the +// Supervisor's token, as addon-run sets it): HA at homeassistant:8123 on +// the test's network (an alias of the HA container) and the admin commands +// through ws://supervisor/core/websocket, here a stand-in for the +// Supervisor's WebSocket proxy (fakeSupervisor: as supervisor/api/proxy.py +// does it: auth_required with HA's version, the add-on's token, then every +// message passed on except supervisor/ and hassio/ commands, which are +// refused). Its token at HA is the agent's administrator's (the real +// Supervisor's user is HA's own "Supervisor", also an administrator). The +// owner's End now is the add-on page's (devpage.py): SIGUSR1 to the pid in +// the link's support-ha.json, which must list the session while it is open. + +import ( + "context" + "crypto/x509" + "encoding/json" + "encoding/pem" + "net/http" + "net/url" + "os" + "os/signal" + "strings" + "sync" + "syscall" + "testing" + "time" + + "github.com/coder/websocket" + "github.com/nats-io/nats.go" +) + +// fakeSupervisor: the Supervisor's WebSocket proxy for add-ons +// (/core/websocket), on :80 of the name "supervisor"; seen: the command +// types it passed to HA. +type fakeSupervisor struct { + addonToken, coreWS, coreToken string + mu sync.Mutex + seen []string + refused []string +} + +func (f *fakeSupervisor) ServeHTTP(w http.ResponseWriter, r *http.Request) { + if r.URL.Path != "/core/websocket" { + http.NotFound(w, r) + return + } + ctx := r.Context() + // Core first: its version for the add-on's greeting (the Supervisor knows it) + core, _, err := websocket.Dial(ctx, f.coreWS, nil) + if err != nil { + http.Error(w, "core", 502) + return + } + defer core.CloseNow() + core.SetReadLimit(64 << 20) + var hello struct { + Type string `json:"type"` + Version string `json:"ha_version"` + } + _, b, err := core.Read(ctx) + if err != nil || json.Unmarshal(b, &hello) != nil { + http.Error(w, "core", 502) + return + } + c, err := websocket.Accept(w, r, nil) + if err != nil { + return + } + defer c.CloseNow() + c.SetReadLimit(64 << 20) + wj := func(conn *websocket.Conn, v any) error { + b, _ := json.Marshal(v) + return conn.Write(ctx, websocket.MessageText, b) + } + wj(c, map[string]any{"type": "auth_required", "ha_version": hello.Version}) + actx, cancel := context.WithTimeout(ctx, 10*time.Second) + _, b, err = c.Read(actx) + cancel() + var auth struct { + Type, AccessToken, APIPassword string + } + var am map[string]any + json.Unmarshal(b, &am) + auth.AccessToken, _ = am["access_token"].(string) + auth.APIPassword, _ = am["api_password"].(string) + tok := auth.AccessToken + if tok == "" { + tok = auth.APIPassword + } + if err != nil || tok != f.addonToken { + wj(c, map[string]any{"type": "auth_invalid", "message": "Invalid access"}) + return + } + // the Supervisor's own sign-in at Core + wj(core, map[string]any{"type": "auth", "access_token": f.coreToken}) + if _, b, err = core.Read(ctx); err != nil || !strings.Contains(string(b), "auth_ok") { + return + } + wj(c, map[string]any{"type": "auth_ok", "ha_version": hello.Version}) + done := make(chan struct{}, 2) + go func() { // Core -> add-on: as it is + defer func() { done <- struct{}{} }() + for { + t, b, err := core.Read(ctx) + if err != nil || c.Write(ctx, t, b) != nil { + return + } + } + }() + go func() { // add-on -> Core: supervisor/ and hassio/ refused + defer func() { done <- struct{}{} }() + for { + t, b, err := c.Read(ctx) + if err != nil { + return + } + var m map[string]any + if json.Unmarshal(b, &m) != nil { + return + } + typ, _ := m["type"].(string) + if typ == "" || strings.HasPrefix(typ, "supervisor/") || strings.HasPrefix(typ, "hassio/") { + f.mu.Lock() + f.refused = append(f.refused, typ) + f.mu.Unlock() + wj(c, map[string]any{"id": m["id"], "type": "result", "success": false, + "error": map[string]any{"code": "unauthorized", "message": "Unauthorized"}}) + continue + } + f.mu.Lock() + f.seen = append(f.seen, typ) + f.mu.Unlock() + if core.Write(ctx, t, b) != nil { + return + } + } + }() + <-done +} + +func e2eWait(t *testing.T, path string, d time.Duration) []byte { + end := time.Now().Add(d) + for time.Now().Before(end) { + if b, err := os.ReadFile(path); err == nil && len(b) > 0 { + return b + } + time.Sleep(time.Second) + } + t.Fatalf("no %s", path) + return nil +} + +func e2ePost(t *testing.T, base, path string, body any, form url.Values, token string, out any) int { + var req *http.Request + if form != nil { + req, _ = http.NewRequest("POST", base+path, strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + } else { + b, _ := json.Marshal(body) + req, _ = http.NewRequest("POST", base+path, strings.NewReader(string(b))) + req.Header.Set("Content-Type", "application/json") + } + if token != "" { + req.Header.Set("Authorization", "Bearer "+token) + } + res, err := http.DefaultClient.Do(req) + if err != nil { + t.Fatalf("%s: %v", path, err) + } + defer res.Body.Close() + if out != nil { + json.NewDecoder(res.Body).Decode(out) + } + return res.StatusCode +} + +// e2eOnboard: HA's owner and the agent's administrator (as ha-setup). +func e2eOnboard(t *testing.T, addr string) string { + base := "http://" + addr + end := time.Now().Add(5 * time.Minute) + for { + res, err := http.Get(base + "/api/onboarding") + if err == nil { + res.Body.Close() + if res.StatusCode == 200 { + break + } + } + if time.Now().After(end) { + t.Fatal("HA did not start") + } + time.Sleep(2 * time.Second) + } + cid := "http://cantabile.local/" + var u struct { + AuthCode string `json:"auth_code"` + } + if st := e2ePost(t, base, "/api/onboarding/users", map[string]any{"client_id": cid, "name": "Owner", "username": "owner", + "password": randomSecret(), "language": "en"}, nil, "", &u); st != 200 { + t.Fatalf("onboarding users: %d", st) + } + var tok haTokens + e2ePost(t, base, "/auth/token", nil, url.Values{"grant_type": {"authorization_code"}, "code": {u.AuthCode}, "client_id": {cid}}, "", &tok) + for _, step := range []string{"core_config", "analytics"} { + e2ePost(t, base, "/api/onboarding/"+step, map[string]any{}, nil, tok.AccessToken, nil) + } + e2ePost(t, base, "/api/onboarding/integration", map[string]any{"client_id": cid, "redirect_uri": cid + "?auth_callback=1"}, nil, tok.AccessToken, nil) + ctx, cancel := context.WithTimeout(context.Background(), time.Minute) + defer cancel() + ws, err := haDial(ctx, "ws://"+addr+"/api/websocket", tok.AccessToken) + if err != nil { + t.Fatal(err) + } + r, err := ws.call(ctx, "config/auth/create", map[string]any{"name": "Cantabile Edge Agent", "group_ids": []string{"system-admin"}, "local_only": true}) + if err != nil { + t.Fatal(err) + } + var cr struct{ User haUserRow } + json.Unmarshal(r, &cr) + pw := randomSecret() + if _, err := ws.call(ctx, "config/auth_provider/homeassistant/create", map[string]any{"user_id": cr.User.ID, "username": "cantabile-agent", "password": pw}); err != nil { + t.Fatal(err) + } + ws.close() + cfg := haTunnelCfg{httpBase: base} + at, err := cfg.haLoginAs(ctx, "http://cantabile.local", "cantabile-agent", pw) + if err != nil { + t.Fatal(err) + } + aws, err := haDial(ctx, "ws://"+addr+"/api/websocket", at.AccessToken) + if err != nil { + t.Fatal(err) + } + defer aws.close() + r, err = aws.call(ctx, "auth/long_lived_access_token", map[string]any{"client_name": "Cantabile Edge Agent", "lifespan": 30}) + if err != nil { + t.Fatal(err) + } + var long string + json.Unmarshal(r, &long) + return long +} + +func TestHAE2EBox(t *testing.T) { + dir, addr, box := os.Getenv("HAE2E_DIR"), os.Getenv("HAE2E_HA_ADDR"), os.Getenv("HAE2E_BOX") + if dir == "" { + t.Skip("HAE2E_DIR not set") + } + token := e2eOnboard(t, addr) + os.WriteFile(dir+"/agent-token.tmp", []byte(token), 0o600) + os.Rename(dir+"/agent-token.tmp", dir+"/agent-token") + t.Setenv("CANTABILE_HA_REMOTE", "1") + addon := os.Getenv("HAE2E_MODE") == "addon" + var sv *fakeSupervisor + if addon { + // as addon-run starts the link: the option on, the Supervisor's + // token, nothing else (HA and the proxy by their names) + t.Setenv("CANTABILE_HUB", "") + t.Setenv("SUPERVISOR_TOKEN", randomSecret()) + t.Setenv("CANTABILE_LINK_STATE", t.TempDir()) + sv = &fakeSupervisor{addonToken: os.Getenv("SUPERVISOR_TOKEN"), coreWS: "ws://" + addr + "/api/websocket", coreToken: token} + go http.ListenAndServe(":80", sv) + // the add-on's End now (devpage.py): SIGUSR1 to the link + usr1 := make(chan os.Signal, 1) + signal.Notify(usr1, syscall.SIGUSR1) + go func() { + for range usr1 { + haCloseAll("ended by the owner") + } + }() + writeHAState() // the link's start + } else { + t.Setenv("CANTABILE_HA_ADDR", addr) + t.Setenv("CANTABILE_HA_TOKEN_FILE", dir+"/agent-token") + } + cfg, ok := haConfig() + if !ok { + t.Fatal("no config") + } + if addon && (cfg.addr != "homeassistant:8123" || cfg.adminWS != "ws://supervisor/core/websocket") { + t.Fatalf("not the add-on's path: %+v", cfg) + } + if addon { + // the Supervisor refuses its own commands through this proxy (as the real one) + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + w, err := haDial(ctx, cfg.adminWS, os.Getenv("SUPERVISOR_TOKEN")) + if err != nil { + t.Fatal(err) + } + if _, err := w.call(ctx, "supervisor/api", map[string]any{"endpoint": "/info", "method": "get"}); err == nil || + !strings.Contains(err.Error(), "unauthorized") { + t.Errorf("supervisor/ through the proxy: %v", err) + } + w.close() + if _, err := haDial(ctx, cfg.adminWS, "not-the-token"); err == nil { + t.Error("the proxy took another token") + } + cancel() + } + addonState := func() (st struct { + Pid int + Sessions []map[string]any + }) { + b, _ := os.ReadFile(haStateFile()) + json.Unmarshal(b, &st) + return + } + if err := cfg.haLeftover(context.Background()); err != nil { // the link's start + t.Fatal(err) + } + blk, _ := pem.Decode(e2eWait(t, dir+"/commands-pub.pem", 5*time.Minute)) + pub, err := x509.ParsePKIXPublicKey(blk.Bytes) + if err != nil { + t.Fatal(err) + } + nc, err := nats.Connect(os.Getenv("HAE2E_NATS")) + if err != nil { + t.Fatal(err) + } + defer nc.Close() + send := func(m map[string]any) { + b, _ := json.Marshal(m) + nc.Publish("ctb.site."+box+".ha", b) + } + nc.Subscribe("ctb.cmd."+box, func(m *nats.Msg) { + var w struct{ T string } + json.Unmarshal(m.Data, &w) + if w.T == "ha" { + haFrameWith(m.Data, send) + return + } + c, err := checkCommand(pub, box, m.Data, time.Now()) + if err != nil { + t.Logf("command refused: %v", err) + return + } + ok, msg := false, "unknown command" + if c.Cmd == "ha-open" { + ok, msg = haOpenWith(cfg, c, send) + if addon && ok { + if st := addonState(); st.Pid != os.Getpid() || len(st.Sessions) != 1 || st.Sessions[0]["kind"] != "ha" { + t.Errorf("the add-on's pages are not told of the session: %+v", st) + } + } + } + b, _ := json.Marshal(map[string]any{"v": 1, "id": c.ID, "ok": ok, "result": map[string]any{"message": msg}}) + nc.Publish("ctb.site."+box+".result", b) + }) + nc.Subscribe("e2e.owner-end", func(*nats.Msg) { + if !addon { + haCloseAll("ended by the owner") + return + } + // the add-on page's End now: the pid from the link's file, SIGUSR1 + if st := addonState(); st.Pid > 1 && len(st.Sessions) == 1 { + syscall.Kill(st.Pid, syscall.SIGUSR1) + } else { + t.Errorf("End now: no session in the link's file: %+v", st) + } + }) + nc.Flush() + os.WriteFile(dir+"/box-ready", []byte("1"), 0o644) + e2eWait(t, dir+"/done", 20*time.Minute) + haCloseAll("test over") + time.Sleep(2 * time.Second) + if addon { + if st := addonState(); len(st.Sessions) != 0 { + t.Errorf("sessions left in the link's file: %+v", st) + } + sv.mu.Lock() + seen := strings.Join(sv.seen, " ") + sv.mu.Unlock() + for _, want := range []string{"config/auth/list", "config/auth/create", "config/auth/update", + "config/auth_provider/homeassistant/create", "config/auth_provider/homeassistant/delete"} { + if !strings.Contains(seen, want) { + t.Errorf("%s did not go through the Supervisor's proxy", want) + } + } + t.Logf("through the Supervisor's proxy: %d commands", len(sv.seen)) + } +} diff --git a/src/edge/link/hatunnel.go b/src/edge/link/hatunnel.go new file mode 100644 index 0000000..2ba5190 --- /dev/null +++ b/src/edge/link/hatunnel.go @@ -0,0 +1,636 @@ +// Copyright © 2026 Setti Solutions S.R.L, www.setti.md. All rights reserved. + +package main + +import ( + "context" + "crypto/hmac" + "crypto/sha256" + "encoding/base64" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "io" + "log/slog" + "net" + "net/url" + "os" + "path/filepath" + "strconv" + "strings" + "sync" + "time" +) + +// Remote Home Assistant for Cantabile support (item 19): HA's +// whole interface (its pages, scripts, API and WebSocket) through the box's +// link, for one support session at a time. Opened like the terminal and the +// panel: a signed "ha-open" command with a random session key, on the +// owner's permission in a support request (until it ends) or for the +// Cantabile team (remote-shell, 1 hour); 15 minutes without a request from +// support close it, and so does the owner's End now (SIGUSR1, closeAll). +// +// The tunnel: Cantabile's console serves the session on its own host name +// (HA cannot run under a sub-path) and passes each browser connection as a +// stream: {"t":"ha", "k":"o"} opens one to HA's HTTP port, "d" carries bytes +// (base64, at most haChunk), "a" gives the sender credit back (each side +// sends at most haWindow bytes a stream before the other has taken them), +// "x" closes it; "c" closes the session. Every message from the console +// carries the session key's MAC and a sequence number (a replay or a gap is +// refused: a gap resets the open streams). The box answers on +// ctb.site..ha the same way ("e": HA closed its side). What goes through +// is HTTP/1.1 as the console writes it (it records each request: method, +// path, status, bytes; never bodies) and, after an upgrade, a WebSocket's +// bytes. The box limits the streams (haStreamsMax) and its upload to the +// console (bytes/s, the command's "rate" within haRateMin..haRateCap). +// +// Sign-in: the "Cantabile support" HA user (hauser.go), tokens for the +// session's origin, sent once to the console ({"k":"tok"}), which hands +// them to the support browser and keeps them nowhere else. + +const ( + haChunk = 32 << 10 // bytes per "d" message (base64: ~44 KB; a box may send 256 KiB) + haWindow = 256 << 10 // bytes in flight per stream and direction + haStreamsMax = 96 // open streams per session (a browser loads HA's scripts in parallel) + haRateDef = 1 << 20 // the box's upload to the console, bytes/s + haRateMin = 64 << 10 + haRateCap = 8 << 20 + haDialWait = 5 * time.Second + haSignInWait = 45 * time.Second +) + +// haTunnelCfg: where HA is from the link, and the agent's admin token. +type haTunnelCfg struct { + addr string // HA's HTTP port: host:port + httpBase string // http:// + adminWS string // the WebSocket the admin token works on + adminToken func() (string, error) +} + +// haConfig: the Hub (HA on 127.0.0.1:8123, the agent's token from +// ha-setup); an HA add-on site only when its owner turned the option on +// (addon-run sets CANTABILE_HA_REMOTE=1): Core at homeassistant:8123 on the +// Supervisor's network, the admin commands through the Supervisor's proxy +// with the add-on's own token. CANTABILE_HA_ADDR, CANTABILE_HA_ADMIN_WS and +// CANTABILE_HA_TOKEN_FILE override (tests). +func haConfig() (haTunnelCfg, bool) { + var c haTunnelCfg + switch { + case isHub(): + c.addr, c.adminWS = "127.0.0.1:8123", "ws://127.0.0.1:8123/api/websocket" + c.adminToken = fileToken("/data/cantabile/edge/ha-token") + case os.Getenv("CANTABILE_HA_REMOTE") == "1" && os.Getenv("SUPERVISOR_TOKEN") != "": + c.addr, c.adminWS = "homeassistant:8123", "ws://supervisor/core/websocket" + sv := os.Getenv("SUPERVISOR_TOKEN") + c.adminToken = func() (string, error) { return sv, nil } + case os.Getenv("CANTABILE_HA_REMOTE") == "1" && os.Getenv("CANTABILE_HA_ADDR") != "": + // tests: everything from the overrides below + default: + return c, false + } + if v := os.Getenv("CANTABILE_HA_ADDR"); v != "" { + c.addr, c.adminWS = v, "ws://"+v+"/api/websocket" + } + if v := os.Getenv("CANTABILE_HA_ADMIN_WS"); v != "" { + c.adminWS = v + } + if v := os.Getenv("CANTABILE_HA_TOKEN_FILE"); v != "" { + c.adminToken = fileToken(v) + } + if c.adminToken == nil { + return c, false + } + c.httpBase = "http://" + c.addr + return c, true +} + +type haMsg struct { + T string `json:"t"` // "ha" + S string `json:"s"` + N int64 `json:"n"` + K string `json:"k"` // o d a x c + I int64 `json:"i,omitempty"` + D string `json:"d,omitempty"` + W int64 `json:"w,omitempty"` + MAC string `json:"mac"` +} + +// haMAC: what the console signs each message with (session key). +func haMAC(key []byte, m haMsg) string { + h := hmac.New(sha256.New, key) + fmt.Fprintf(h, "ha|%s|%d|%s|%d|%s|%d", m.S, m.N, m.K, m.I, m.D, m.W) + return hex.EncodeToString(h.Sum(nil)) +} + +type haSession struct { + id, by, consent, origin string + key []byte + until, started time.Time + cfg haTunnelCfg + send func(map[string]any) // to the console (ctb.site..ha) + user *haUser + rate *haRate + once sync.Once + gone chan struct{} + + mu sync.Mutex + seqIn int64 + seqOut int64 + last time.Time + streams map[int64]*haStream +} + +type haStream struct { + id int64 + s *haSession + in chan []byte // from the console, to HA + done chan struct{} + once sync.Once + mu sync.Mutex + cond *sync.Cond + credit int64 // bytes this side may still send + conn net.Conn +} + +var ( + haMu sync.Mutex + haSessions = map[string]*haSession{} +) + +// out: one message to the console, numbered (under s.mu: the numbers go +// out in order). +func (s *haSession) out(m map[string]any) { + s.mu.Lock() + defer s.mu.Unlock() + s.seqOut++ + m["s"], m["n"] = s.id, s.seqOut + s.send(m) +} + +// haList: the open sessions for the owner's banner (writeTermState). +func haList() []map[string]any { + haMu.Lock() + defer haMu.Unlock() + out := []map[string]any{} + for _, s := range haSessions { + m := map[string]any{"by": s.by, "since": s.started.Unix(), "consent": s.consent, "kind": "ha"} + s.mu.Lock() + if s.user != nil { + m["ha_user"] = s.user.id // the add-on's pages know the support user by it (devpage.py) + } + s.mu.Unlock() + out = append(out, m) + } + return out +} + +// haStateFile: where an HA add-on site's link tells the add-on's own +// pages (edge/cantabile_edge/devpage.py) that support has this Home +// Assistant open: the link's state directory, which the agent (the same +// user in the add-on's container) reads; their End now sends the link +// SIGUSR1 (its pid is in the file), as the Hub's panel does. +func haStateFile() string { + return filepath.Join(env("CANTABILE_LINK_STATE", "/data/link"), "support-ha.json") +} + +// writeHAState: the open sessions for the owner: on the Hub the panel's +// banner (writeTermState); on an HA add-on site the add-on's pages. +func writeHAState() { + if isHub() { + writeTermState() + return + } + b, _ := json.Marshal(map[string]any{"pid": os.Getpid(), "user": haSupportName, "sessions": haList()}) + f := haStateFile() + if os.WriteFile(f+".tmp", b, 0o644) == nil { + os.Rename(f+".tmp", f) + } +} + +// haOrigin: the session's own origin as the console sent it: https (or +// http on a *.localhost name, for tests), a host whose first label is +// s-, nothing else. +func haOrigin(origin, id string) bool { + u, err := url.Parse(origin) + if err != nil || u.User != nil || u.Path != "" || u.RawQuery != "" || u.Fragment != "" { + return false + } + h := u.Hostname() + if !strings.HasPrefix(h, "s-"+id+".") || strings.ToLower(h) != h { + return false + } + return u.Scheme == "https" || (u.Scheme == "http" && strings.HasSuffix(h, ".localhost")) +} + +// haOpen: the "ha-open" command (signed): the session, the support user +// signed in, its tokens to the console. +func (l *link) haOpen(c command) (bool, string) { + cfg, ok := haConfig() + if !ok { + return false, "remote Home Assistant is not enabled on this site" + } + return haOpenWith(cfg, c, func(m map[string]any) { l.publish("ha", m) }) +} + +func haOpenWith(cfg haTunnelCfg, c command, send func(map[string]any)) (bool, string) { + id, keyHex, origin := c.Args["session"], c.Args["key"], c.Args["origin"] + key, err := hex.DecodeString(keyHex) + if err != nil || len(key) != 32 || id == "" || len(id) > 64 { + return false, "bad session" + } + if !haOrigin(origin, id) { + return false, "bad origin" + } + until := time.Now().Add(termMax) + if c.Args["consent"] != "" { + u, err := strconv.ParseInt(c.Args["until"], 10, 64) + if err != nil || time.Now().Unix() >= u { + return false, "the owner's permission has ended" + } + until = time.Unix(u, 0) + } + rate, _ := strconv.Atoi(c.Args["rate"]) + if rate == 0 { + rate = haRateDef + } + rate = min(max(rate, haRateMin), haRateCap) + s := &haSession{id: id, by: c.Args["by"], consent: c.Args["consent"], origin: origin, key: key, until: until, + started: time.Now(), last: time.Now(), cfg: cfg, send: send, rate: newHARate(rate), gone: make(chan struct{}), + streams: map[int64]*haStream{}} + // One session a box (the support user is one HA user: a second + // session's End would end the first's sign-in). + haMu.Lock() + for _, o := range haSessions { + haMu.Unlock() + if o.id == id { + return true, "already open" + } + return false, "Home Assistant is already open for Cantabile support (" + o.by + ")" + } + haSessions[id] = s + haMu.Unlock() + ctx, cancel := context.WithTimeout(context.Background(), haSignInWait) + hu, tok, err := cfg.haSignIn(ctx, origin) + cancel() + if err != nil { + haMu.Lock() + delete(haSessions, id) + haMu.Unlock() + slog.Warn("remote HA: sign-in failed", "session", id, "error", err) + return false, "the support user could not sign in to Home Assistant: " + err.Error() + } + s.mu.Lock() + s.user = hu + s.mu.Unlock() + b, _ := json.Marshal(tok) + s.out(map[string]any{"k": "tok", "d": base64.StdEncoding.EncodeToString(b)}) + writeHAState() + why := "Cantabile support opened your Home Assistant through Cantabile's console (" + s.by + "), signed in as \"" + haSupportName + "\"" + if s.consent != "" { + why += ", as you allowed in request " + s.consent + } + event("remote-ha", why) + slog.Info("remote HA open", "session", id, "by", s.by) + go s.watch() + return true, "Home Assistant open" +} + +// haEnd: why a session must close now ("" while it may stay open). +func haEnd(last, until, now time.Time) string { + switch { + case now.Sub(last) > termIdle: + return "closed after 15 minutes without a request" + case !now.Before(until): + return "closed: its time (or the owner's permission) ended" + } + return "" +} + +func (s *haSession) watch() { + t := time.NewTicker(10 * time.Second) + defer t.Stop() + for { + select { + case <-s.gone: + return + case <-t.C: + } + s.mu.Lock() + last := s.last + s.mu.Unlock() + if why := haEnd(last, s.until, time.Now()); why != "" { + s.close(why) + return + } + } +} + +// close: every stream closed at once (HA's WebSocket with it), the console +// told, then the support user disabled (its tokens removed by HA). +func (s *haSession) close(why string) { + s.once.Do(func() { + haMu.Lock() + delete(haSessions, s.id) + haMu.Unlock() + close(s.gone) + s.mu.Lock() + all := make([]*haStream, 0, len(s.streams)) + for _, st := range s.streams { + all = append(all, st) + } + s.mu.Unlock() + for _, st := range all { + st.close(false) + } + s.out(map[string]any{"k": "end", "why": why}) + writeHAState() + event("remote-ha", "Cantabile support's Home Assistant session closed ("+why+")") + slog.Info("remote HA closed", "session", s.id, "why", why) + if s.user == nil { + return + } + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + added, err := s.cfg.haEnd(ctx, s.user) + cancel() + if err != nil { + // tried again by haRetryDisable; its tokens stop at the latest then + slog.Error("remote HA: the support user is not disabled yet", "session", s.id, "error", err) + go haRetryDisable(s.cfg, s.user.id) + return + } + msg := "the Home Assistant user \"" + haSupportName + "\" is disabled again" + if len(added) > 0 { + msg += "; users added during the session: " + strings.Join(added, ", ") + } + event("remote-ha", msg) + s.out(map[string]any{"k": "rep", "disabled": true, "users_added": added}) + }) +} + +func haRetryDisable(cfg haTunnelCfg, id string) { + for i := 0; i < 30; i++ { + time.Sleep(20 * time.Second) + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + err := cfg.haDisable(ctx, id) + cancel() + if err == nil { + event("remote-ha", "the Home Assistant user \""+haSupportName+"\" is disabled again") + return + } + } +} + +// haCloseAll: the owner pressed End now. +func haCloseAll(why string) { + haMu.Lock() + var all []*haSession + for _, s := range haSessions { + all = append(all, s) + } + haMu.Unlock() + for _, s := range all { + s.close(why) + } +} + +// haStartup: a session open when the link stopped left the support user +// enabled: disabled as soon as HA answers. +func haStartup() { + cfg, ok := haConfig() + if !ok { + return + } + go func() { + for i := 0; i < 60; i++ { + ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second) + err := cfg.haLeftover(ctx) + cancel() + if err == nil { + return + } + time.Sleep(30 * time.Second) + } + }() +} + +// haFrame: one tunnel message from the console (checked with the key). +func (l *link) haFrame(raw []byte) { + haFrameWith(raw, func(m map[string]any) { l.publish("ha", m) }) +} + +func haFrameWith(raw []byte, send func(map[string]any)) { + var m haMsg + if json.Unmarshal(raw, &m) != nil { + return + } + haMu.Lock() + s := haSessions[m.S] + haMu.Unlock() + if s == nil { + if m.S != "" && (m.K == "o" || m.K == "d") { // traffic for a session gone: the console should stop + send(map[string]any{"s": m.S, "k": "end", "why": "no such session on the box"}) + } + return + } + if !hmac.Equal([]byte(haMAC(s.key, m)), []byte(m.MAC)) { + return + } + s.mu.Lock() + if m.N <= s.seqIn { + s.mu.Unlock() + return // a replay + } + gap := m.N != s.seqIn+1 + s.seqIn = m.N + if m.K == "o" || m.K == "d" { + s.last = time.Now() + } + var broken []*haStream + if gap { // a message lost: the open streams cannot be trusted + for _, st := range s.streams { + broken = append(broken, st) + } + } + st := s.streams[m.I] + s.mu.Unlock() + for _, b := range broken { + b.close(true) + if b == st { + st = nil + } + } + switch m.K { + case "c": + s.close("closed in Cantabile's console") + case "o": + s.open(m.I) + case "d": + if st == nil { + return + } + d, err := base64.StdEncoding.DecodeString(m.D) + if err != nil || len(d) > haChunk { + st.close(true) + return + } + select { + case st.in <- d: + default: // more than its window: the console broke the rules + st.close(true) + } + case "a": + if st != nil && m.W > 0 && m.W <= haWindow { + st.mu.Lock() + st.credit = min(st.credit+m.W, haWindow) + st.cond.Broadcast() + st.mu.Unlock() + } + case "x": + if st != nil { + st.close(false) + } + } +} + +// open: a new stream to HA's HTTP port. +func (s *haSession) open(i int64) { + s.mu.Lock() + if _, dup := s.streams[i]; dup || i <= 0 || len(s.streams) >= haStreamsMax { + s.mu.Unlock() + s.out(map[string]any{"k": "x", "i": i, "why": "too many streams"}) + return + } + st := &haStream{id: i, s: s, in: make(chan []byte, 1024), done: make(chan struct{}), credit: haWindow} + st.cond = sync.NewCond(&st.mu) + s.streams[i] = st + s.mu.Unlock() + go st.run() +} + +func (st *haStream) run() { + conn, err := net.DialTimeout("tcp", st.s.cfg.addr, haDialWait) + if err != nil { + st.close(true) + return + } + st.mu.Lock() + st.conn = conn + st.mu.Unlock() + select { + case <-st.done: // closed while dialling + conn.Close() + return + default: + } + go st.pump() + for { + select { + case <-st.done: + return + case b := <-st.in: + conn.SetWriteDeadline(time.Now().Add(time.Minute)) + if _, err := conn.Write(b); err != nil { + st.close(true) + return + } + st.s.out(map[string]any{"k": "a", "i": st.id, "w": len(b)}) + } + } +} + +// pump: HA's answer to the console, within the stream's credit and the +// session's rate. +func (st *haStream) pump() { + buf := make([]byte, haChunk) + for { + st.mu.Lock() + for st.credit <= 0 && !st.closed() { + st.cond.Wait() + } + n := min(st.credit, haChunk) + st.mu.Unlock() + if st.closed() { + return + } + k, err := st.conn.Read(buf[:n]) + if k > 0 { + if !st.s.rate.wait(k, st.done) { + return + } + st.mu.Lock() + st.credit -= int64(k) + st.mu.Unlock() + st.s.out(map[string]any{"k": "d", "i": st.id, "d": base64.StdEncoding.EncodeToString(buf[:k])}) + } + if err != nil { + if errors.Is(err, io.EOF) && !st.closed() { + st.s.out(map[string]any{"k": "e", "i": st.id}) + } + st.close(false) + return + } + } +} + +func (st *haStream) closed() bool { + select { + case <-st.done: + return true + default: + return false + } +} + +// close: tell=true also tells the console (a reset it did not ask for). +func (st *haStream) close(tell bool) { + st.once.Do(func() { + close(st.done) + st.mu.Lock() + if st.conn != nil { + st.conn.Close() + } + st.cond.Broadcast() + st.mu.Unlock() + st.s.mu.Lock() + delete(st.s.streams, st.id) + st.s.mu.Unlock() + if tell { + st.s.out(map[string]any{"k": "x", "i": st.id}) + } + }) +} + +// haRate: a token bucket of bytes per second (a second's worth of burst). +type haRate struct { + mu sync.Mutex + per float64 + tokens float64 + at time.Time +} + +func newHARate(per int) *haRate { + return &haRate{per: float64(per), tokens: float64(per), at: time.Now()} +} + +// wait: n bytes may go; false if done closed first. +func (r *haRate) wait(n int, done <-chan struct{}) bool { + for { + r.mu.Lock() + now := time.Now() + r.tokens = min(r.per, r.tokens+now.Sub(r.at).Seconds()*r.per) + r.at = now + if r.tokens >= float64(n) { + r.tokens -= float64(n) + r.mu.Unlock() + return true + } + need := time.Duration((float64(n) - r.tokens) / r.per * float64(time.Second)) + r.mu.Unlock() + select { + case <-done: + return false + case <-time.After(need): + } + } +} diff --git a/src/edge/link/hatunnel_test.go b/src/edge/link/hatunnel_test.go new file mode 100644 index 0000000..b39527b --- /dev/null +++ b/src/edge/link/hatunnel_test.go @@ -0,0 +1,713 @@ +// Copyright © 2026 Setti Solutions S.R.L, www.setti.md. All rights reserved. + +package main + +import ( + "bytes" + "context" + "encoding/base64" + "encoding/hex" + "encoding/json" + "io" + "log/slog" + "net" + "net/http" + "net/http/httptest" + "os" + "path/filepath" + "strings" + "sync" + "testing" + "time" + + "github.com/coder/websocket" +) + +// fakeHA: Home Assistant's user admin over its WebSocket, its login flow, +// a large page and a WebSocket echo (what the tunnel carries). +type fakeHA struct { + mu sync.Mutex + users map[string]*haUserRow + pw map[string]string // username -> password + local map[string]bool + admin map[string]bool + n int + big []byte + conns int // open echo WebSockets +} + +const fakeAdmin = "admin-token-for-tests" + +func newFakeHA() (*fakeHA, *httptest.Server) { + f := &fakeHA{users: map[string]*haUserRow{"owner": {ID: "owner", Name: "Owner", Username: "owner", IsOwner: true, IsActive: true}}, + pw: map[string]string{"owner": "owner-pw"}, local: map[string]bool{}, admin: map[string]bool{}, big: bytes.Repeat([]byte("0123456789abcdef"), 1<<16)} + m := http.NewServeMux() + m.HandleFunc("/api/websocket", f.ws) + m.HandleFunc("/auth/login_flow", func(w http.ResponseWriter, r *http.Request) { + var in map[string]any + json.NewDecoder(r.Body).Decode(&in) + if !strings.HasPrefix(in["client_id"].(string), "https://s-") || !strings.HasPrefix(in["redirect_uri"].(string), in["client_id"].(string)) { + w.WriteHeader(400) + return + } + json.NewEncoder(w).Encode(map[string]any{"flow_id": "F1", "type": "form"}) + }) + m.HandleFunc("/auth/login_flow/F1", func(w http.ResponseWriter, r *http.Request) { + var in map[string]string + json.NewDecoder(r.Body).Decode(&in) + f.mu.Lock() + ok := in["password"] != "" && f.pw[in["username"]] == in["password"] + f.mu.Unlock() + if !ok { + json.NewEncoder(w).Encode(map[string]any{"type": "form", "errors": map[string]string{"base": "invalid_auth"}}) + return + } + json.NewEncoder(w).Encode(map[string]any{"type": "create_entry", "result": "CODE1"}) + }) + m.HandleFunc("/auth/token", func(w http.ResponseWriter, r *http.Request) { + r.ParseForm() + if r.Form.Get("code") != "CODE1" { + w.WriteHeader(400) + return + } + json.NewEncoder(w).Encode(map[string]any{"access_token": "AT-very-secret", "refresh_token": "RT-very-secret", "expires_in": 1800, "token_type": "Bearer"}) + }) + m.HandleFunc("/big", func(w http.ResponseWriter, r *http.Request) { w.Write(f.big) }) + m.HandleFunc("/echo", func(w http.ResponseWriter, r *http.Request) { + c, err := websocket.Accept(w, r, nil) + if err != nil { + return + } + f.mu.Lock() + f.conns++ + f.mu.Unlock() + defer func() { f.mu.Lock(); f.conns--; f.mu.Unlock() }() + for { + t, b, err := c.Read(context.Background()) + if err != nil { + return + } + c.Write(context.Background(), t, b) + } + }) + return f, httptest.NewServer(m) +} + +func (f *fakeHA) ws(w http.ResponseWriter, r *http.Request) { + c, err := websocket.Accept(w, r, nil) + if err != nil { + return + } + ctx := context.Background() + write := func(v any) { b, _ := json.Marshal(v); c.Write(ctx, websocket.MessageText, b) } + write(map[string]any{"type": "auth_required"}) + var a map[string]any + _, b, _ := c.Read(ctx) + json.Unmarshal(b, &a) + if a["access_token"] != fakeAdmin { + write(map[string]any{"type": "auth_invalid"}) + return + } + write(map[string]any{"type": "auth_ok"}) + for { + _, b, err := c.Read(ctx) + if err != nil { + return + } + var m map[string]any + json.Unmarshal(b, &m) + id := m["id"] + ok := func(res any) { write(map[string]any{"id": id, "type": "result", "success": true, "result": res}) } + bad := func(code string) { + write(map[string]any{"id": id, "type": "result", "success": false, "error": map[string]string{"code": code}}) + } + f.mu.Lock() + switch m["type"] { + case "config/auth/list": + var out []haUserRow + for _, u := range f.users { + out = append(out, *u) + } + ok(out) + case "config/auth/create": + f.n++ + u := &haUserRow{ID: "u" + string(rune('0'+f.n)), Name: m["name"].(string), IsActive: true} + f.users[u.ID] = u + f.local[u.ID] = m["local_only"] == true + f.admin[u.ID] = len(m["group_ids"].([]any)) == 1 && m["group_ids"].([]any)[0] == "system-admin" + ok(map[string]any{"user": u}) + case "config/auth/update": + u := f.users[m["user_id"].(string)] + if u == nil { + bad("not_found") + break + } + if v, has := m["is_active"].(bool); has { + if u.IsOwner && !v { + bad("invalid") + break + } + u.IsActive = v + } + if v, has := m["local_only"].(bool); has { + f.local[u.ID] = v + } + ok(nil) + case "config/auth_provider/homeassistant/create": + u := f.users[m["user_id"].(string)] + if u == nil || u.Username != "" { + bad("credentials_exist") + break + } + u.Username = m["username"].(string) + f.pw[u.Username] = m["password"].(string) + ok(nil) + case "config/auth_provider/homeassistant/delete": + name := m["username"].(string) + var who *haUserRow + for _, u := range f.users { + if u.Username == name { + who = u + } + } + if who != nil && who.IsOwner { + bad("cannot_delete_owner_credentials") + break + } + if who != nil { + who.Username = "" + } + delete(f.pw, name) + ok(nil) + default: + bad("unknown_command") + } + f.mu.Unlock() + } +} + +func (f *fakeHA) support() haUserRow { + f.mu.Lock() + defer f.mu.Unlock() + for _, u := range f.users { + if u.Name == haSupportName { + return *u + } + } + return haUserRow{} +} + +// console: the console's side of the protocol, in memory. +type console struct { + t *testing.T + sid string + key []byte + sendMu sync.Mutex + mu sync.Mutex + n int64 + msgs chan map[string]any + pipes map[int64]chan []byte // per stream, in order (nil: closed) + sent map[int64]int64 + tokens []byte + ended chan string + report chan map[string]any + noAck bool +} + +func newConsole(t *testing.T, sid string) *console { + k := make([]byte, 32) + for i := range k { + k[i] = byte(i + 1) + } + c := &console{t: t, sid: sid, key: k, msgs: make(chan map[string]any, 4096), pipes: map[int64]chan []byte{}, + sent: map[int64]int64{}, ended: make(chan string, 4), report: make(chan map[string]any, 4)} + go c.loop() + return c +} + +func (c *console) fromBox(m map[string]any) { + b, _ := json.Marshal(m) // as over NATS + var v map[string]any + json.Unmarshal(b, &v) + c.msgs <- v +} + +func (c *console) loop() { + for m := range c.msgs { + i := int64(0) + if f, ok := m["i"].(float64); ok { + i = int64(f) + } + c.mu.Lock() + p := c.pipes[i] + c.mu.Unlock() + switch m["k"] { + case "tok": + c.mu.Lock() + c.tokens, _ = base64.StdEncoding.DecodeString(m["d"].(string)) + c.mu.Unlock() + case "d": + d, _ := base64.StdEncoding.DecodeString(m["d"].(string)) + c.mu.Lock() + c.sent[i] += int64(len(d)) + c.mu.Unlock() + if p != nil { + p <- d + } + case "e", "x": + if p != nil { + c.mu.Lock() + delete(c.pipes, i) + c.mu.Unlock() + close(p) + } + case "end": // as the console does: every stream of the session closed + c.mu.Lock() + for k, p := range c.pipes { + delete(c.pipes, k) + close(p) + } + c.mu.Unlock() + c.ended <- m["why"].(string) + case "rep": + c.report <- m + } + } +} + +// frame: one signed message to the box. +func (c *console) frame(k string, i int64, d string, w int64) { + c.sendMu.Lock() // in order, as the console publishes them + defer c.sendMu.Unlock() + c.mu.Lock() + c.n++ + m := haMsg{T: "ha", S: c.sid, N: c.n, K: k, I: i, D: d, W: w} + c.mu.Unlock() + m.MAC = haMAC(c.key, m) + b, _ := json.Marshal(m) + haFrameWith(b, c.fromBox) +} + +// conn: a stream as a net.Conn (an HTTP or WebSocket client dials it). +type tconn struct { + c *console + i int64 + pr *io.PipeReader +} + +func (t *tconn) Read(p []byte) (int, error) { return t.pr.Read(p) } +func (t *tconn) Write(p []byte) (int, error) { + n0 := len(p) + for len(p) > 0 { + n := min(len(p), haChunk) + t.c.frame("d", t.i, base64.StdEncoding.EncodeToString(p[:n]), 0) + p = p[n:] + } + return n0, nil +} +func (t *tconn) Close() error { t.c.frame("x", t.i, "", 0); t.pr.Close(); return nil } +func (t *tconn) LocalAddr() net.Addr { return &net.TCPAddr{} } +func (t *tconn) RemoteAddr() net.Addr { return &net.TCPAddr{} } +func (t *tconn) SetDeadline(time.Time) error { return nil } +func (t *tconn) SetReadDeadline(time.Time) error { return nil } +func (t *tconn) SetWriteDeadline(time.Time) error { return nil } + +func (c *console) dial(i int64) net.Conn { + pr, pw := io.Pipe() + ch := make(chan []byte, 1024) + c.mu.Lock() + c.pipes[i] = ch + c.mu.Unlock() + go func() { // in order to the reader, then credit back (unless the test holds it) + for d := range ch { + pw.Write(d) + c.mu.Lock() + noAck := c.noAck + c.mu.Unlock() + if !noAck { + c.frame("a", i, "", int64(len(d))) + } + } + pw.Close() + }() + c.frame("o", i, "", 0) + return &tconn{c: c, i: i, pr: pr} +} + +func (c *console) client() *http.Client { + var next int64 = 100 + var mu sync.Mutex + return &http.Client{Transport: &http.Transport{DisableKeepAlives: true, DialContext: func(context.Context, string, string) (net.Conn, error) { + mu.Lock() + next++ + i := next + mu.Unlock() + return c.dial(i), nil + }}} +} + +func haCmd(sid, origin string, extra map[string]string) command { + k := make([]byte, 32) + for i := range k { + k[i] = byte(i + 1) + } + a := map[string]string{"session": sid, "key": hex.EncodeToString(k), "by": "Ana (support)", "origin": origin} + for x, v := range extra { + a[x] = v + } + return command{ID: "c-" + sid, Cmd: "ha-open", Args: a} +} + +func TestHAOrigin(t *testing.T) { + id := "0f0e0d0c-0000-4000-8000-000000000001" + for o, want := range map[string]bool{ + "https://s-" + id + ".support.example.net": true, + "https://s-" + id + ".support.example.net:8443": true, + "http://s-" + id + ".support.localhost:18443": true, + "http://s-" + id + ".support.example.net": false, // http only on localhost + "https://s-other.support.example.net": false, + "https://x.s-" + id + ".support.example.net": false, + "https://s-" + id + ".support.example.net/": false, + "https://user@s-" + id + ".support.example.net": false, + "https://S-" + strings.ToUpper(id) + ".example.net": false, + "https://s-" + id + ".support.example.net/?x=1": false, + "javascript://s-" + id + ".support.example.net": false, + "https://s-" + id + ".support.example.net#fragment": false, + "https://s-" + id + "evil.example.net": false, + "https://s-" + id + ".support.example.net\n.foo.com": false, + } { + if haOrigin(o, id) != want { + t.Errorf("haOrigin(%q) = %v", o, !want) + } + } +} + +// The MAC as the console computes it (platform/services/fleet/haproxy_test.go +// has the same vector). +func TestHAMACVector(t *testing.T) { + m := haMsg{S: "sess", N: 7, K: "d", I: 3, D: "aGVsbG8="} + if got := haMAC([]byte("0123456789abcdef0123456789abcdef"), m); got != "f13d6ee375af9a65f2aa6f9d825f50d2b6932db6329bad76a628a0c4339401f0" { + t.Fatalf("haMAC = %s", got) + } +} + +func TestHAEnd(t *testing.T) { + now := time.Now() + if haEnd(now.Add(-14*time.Minute), now.Add(time.Hour), now) != "" { + t.Error("closed while in use") + } + if !strings.Contains(haEnd(now.Add(-16*time.Minute), now.Add(time.Hour), now), "15 minutes") { + t.Error("idle not closed") + } + if !strings.Contains(haEnd(now, now, now), "ended") { + t.Error("until not kept") + } +} + +// The whole session against a fake HA: the support user (admin, local +// only, not the owner) signed in, one session a box, a large answer under +// flow control, a WebSocket, a replay and a bad MAC ignored, the console's +// close, the user disabled and without a password after, no token in the +// box's logs. +func TestHASession(t *testing.T) { + var logs bytes.Buffer + old := slog.Default() + slog.SetDefault(slog.New(slog.NewTextHandler(&logs, &slog.HandlerOptions{Level: slog.LevelDebug}))) + defer slog.SetDefault(old) + f, srv := newFakeHA() + defer srv.Close() + addr := strings.TrimPrefix(srv.URL, "http://") + cfg := haTunnelCfg{addr: addr, httpBase: srv.URL, adminWS: "ws://" + addr + "/api/websocket", + adminToken: func() (string, error) { return fakeAdmin, nil }} + + sid := "0f0e0d0c-0000-4000-8000-000000000001" + origin := "https://s-" + sid + ".support.example.net" + con := newConsole(t, sid) + if ok, msg := haOpenWith(cfg, haCmd(sid, origin, map[string]string{"consent": "ABCD1234", "until": "1"}), con.fromBox); ok { + t.Fatalf("opened after the owner's permission ended: %s", msg) + } + if ok, msg := haOpenWith(cfg, haCmd(sid, "https://s-other.example.net", nil), con.fromBox); ok || msg != "bad origin" { + t.Fatalf("another origin: %v %s", ok, msg) + } + if ok, msg := haOpenWith(cfg, haCmd(sid, origin, map[string]string{"rate": "200000000"}), con.fromBox); !ok { + t.Fatalf("open: %s", msg) + } + defer haCloseAll("test over") + su := f.support() + if su.ID == "" || !su.IsActive || su.Username != haSupportUsername || su.IsOwner || !f.admin[su.ID] || !f.local[su.ID] { + t.Fatalf("support user: %+v admin %v local %v", su, f.admin[su.ID], f.local[su.ID]) + } + if f.users["owner"].Username != "owner" || f.pw["owner"] != "owner-pw" { + t.Fatal("the owner's login changed") + } + time.Sleep(50 * time.Millisecond) + con.mu.Lock() + tok := string(con.tokens) + con.mu.Unlock() + if !strings.Contains(tok, "AT-very-secret") || !strings.Contains(tok, "RT-very-secret") { + t.Fatalf("tokens: %q", tok) + } + // A second session on the box: refused. + sid2 := "0f0e0d0c-0000-4000-8000-000000000002" + if ok, msg := haOpenWith(cfg, haCmd(sid2, "https://s-"+sid2+".support.example.net", nil), con.fromBox); ok || !strings.Contains(msg, "already open") { + t.Fatalf("second session: %v %s", ok, msg) + } + + // A large answer, read through the tunnel. + cl := con.client() + res, err := cl.Get("http://ha/big") + if err != nil { + t.Fatal(err) + } + body, _ := io.ReadAll(res.Body) + res.Body.Close() + if !bytes.Equal(body, f.big) { + t.Fatalf("big: %d bytes", len(body)) + } + // Flow control: without credit the box stops at its window. + con.mu.Lock() + con.noAck = true + con.mu.Unlock() + c := con.dial(7) + c.Write([]byte("GET /big HTTP/1.1\r\nHost: ha\r\nConnection: close\r\n\r\n")) + time.Sleep(500 * time.Millisecond) + con.mu.Lock() + sent := con.sent[7] + con.noAck = false + con.mu.Unlock() + if sent != haWindow { + t.Fatalf("sent %d without credit, want the window %d", sent, haWindow) + } + c.Close() + + // A WebSocket through it. + ctx, cancel := context.WithTimeout(context.Background(), 10*time.Second) + defer cancel() + ws, _, err := websocket.Dial(ctx, "ws://ha/echo", &websocket.DialOptions{HTTPClient: cl}) + if err != nil { + t.Fatal(err) + } + ws.Write(ctx, websocket.MessageText, []byte(`{"type":"ping"}`)) + if _, b, err := ws.Read(ctx); err != nil || string(b) != `{"type":"ping"}` { + t.Fatalf("echo: %s %v", b, err) + } + + // A bad MAC and a replayed close: ignored. + m := haMsg{T: "ha", S: sid, N: 99999, K: "c", MAC: strings.Repeat("0", 64)} + b, _ := json.Marshal(m) + haFrameWith(b, con.fromBox) + con.mu.Lock() + m = haMsg{T: "ha", S: sid, N: 1, K: "c"} // an old number + con.mu.Unlock() + m.MAC = haMAC(con.key, m) + b, _ = json.Marshal(m) + haFrameWith(b, con.fromBox) + haMu.Lock() + open := haSessions[sid] != nil + haMu.Unlock() + if !open { + t.Fatal("a bad MAC or a replay closed the session") + } + if l := haList(); len(l) != 1 || l[0]["kind"] != "ha" { + t.Fatalf("banner: %v", l) + } + + // The console closes it: the WebSocket ends, the user is disabled. + con.frame("c", 0, "", 0) + select { + case why := <-con.ended: + if !strings.Contains(why, "console") { + t.Errorf("why: %s", why) + } + case <-time.After(5 * time.Second): + t.Fatal("no end") + } + rctx, rcancel := context.WithTimeout(ctx, 2*time.Second) + if _, _, err := ws.Read(rctx); err == nil || rctx.Err() != nil { + t.Fatalf("the WebSocket stayed open: %v", err) + } + rcancel() + select { + case <-con.report: + case <-time.After(5 * time.Second): + t.Fatal("no report") + } + if su := f.support(); su.IsActive || su.Username != "" { + t.Fatalf("after the end: %+v", su) + } + time.Sleep(100 * time.Millisecond) + f.mu.Lock() + echo := f.conns + f.mu.Unlock() + if echo != 0 { + t.Errorf("%d WebSockets still open at HA", echo) + } + // Traffic for the ended session: told it is gone. + con.frame("o", 50, "", 0) + select { + case why := <-con.ended: + if !strings.Contains(why, "no such session") { + t.Errorf("after the end: %s", why) + } + case <-time.After(2 * time.Second): + t.Fatal("no answer for a gone session") + } + + // Again, ended by the owner (End now): a new password, the same user. + con2 := newConsole(t, sid2) + if ok, msg := haOpenWith(cfg, haCmd(sid2, "https://s-"+sid2+".support.example.net", nil), con2.fromBox); !ok { + t.Fatalf("open again: %s", msg) + } + if su2 := f.support(); su2.ID != su.ID || !su2.IsActive { + t.Fatalf("a new user instead of the same: %+v", su2) + } + haCloseAll("ended by the owner") + if why := <-con2.ended; why != "ended by the owner" { + t.Errorf("why: %s", why) + } + <-con2.report + if su := f.support(); su.IsActive { + t.Fatal("still active after the owner's End") + } + for _, s := range []string{"AT-very-secret", "RT-very-secret", "CODE1"} { + if strings.Contains(logs.String(), s) { + t.Errorf("%s in the box's log", s) + } + } + f.mu.Lock() + for _, p := range f.pw { + if p != "owner-pw" && strings.Contains(logs.String(), p) { + t.Error("the support user's password in the log") + } + } + f.mu.Unlock() +} + +// A disabled-at-start leftover: the link's start disables an active +// support user (a session open when it stopped). +func TestHALeftover(t *testing.T) { + f, srv := newFakeHA() + defer srv.Close() + addr := strings.TrimPrefix(srv.URL, "http://") + cfg := haTunnelCfg{addr: addr, httpBase: srv.URL, adminWS: "ws://" + addr + "/api/websocket", + adminToken: func() (string, error) { return fakeAdmin, nil }} + f.users["s"] = &haUserRow{ID: "s", Name: haSupportName, Username: haSupportUsername, IsActive: true} + f.pw[haSupportUsername] = "left-over" + if err := cfg.haLeftover(context.Background()); err != nil { + t.Fatal(err) + } + if u := f.support(); u.IsActive || u.Username != "" { + t.Fatalf("left over: %+v", u) + } + // Never the owner, even with the support user's name. + f2, srv2 := newFakeHA() + defer srv2.Close() + f2.users["owner"].Name = haSupportName + f2.users["owner"].Username = "owner" + addr2 := strings.TrimPrefix(srv2.URL, "http://") + cfg2 := haTunnelCfg{addr: addr2, httpBase: srv2.URL, adminWS: "ws://" + addr2 + "/api/websocket", + adminToken: func() (string, error) { return fakeAdmin, nil }} + if err := cfg2.haLeftover(context.Background()); err != nil || !f2.users["owner"].IsActive { + t.Fatalf("the owner: %v %+v", err, f2.users["owner"]) + } +} + +// An HA add-on site: the add-on's option and the Supervisor's token give +// HA on the Supervisor's network and the admin commands through its proxy; +// without the option nothing (the default). +func TestHAConfigAddon(t *testing.T) { + t.Setenv("CANTABILE_HUB", "") + t.Setenv("CANTABILE_HA_ADDR", "") + t.Setenv("CANTABILE_HA_ADMIN_WS", "") + t.Setenv("CANTABILE_HA_TOKEN_FILE", "") + t.Setenv("SUPERVISOR_TOKEN", "sv-token") + t.Setenv("CANTABILE_HA_REMOTE", "") + if _, ok := haConfig(); ok { + t.Fatal("remote HA without the owner's option") + } + t.Setenv("CANTABILE_HA_REMOTE", "1") + c, ok := haConfig() + if !ok || c.addr != "homeassistant:8123" || c.httpBase != "http://homeassistant:8123" || c.adminWS != "ws://supervisor/core/websocket" { + t.Fatalf("add-on: %v %+v", ok, c) + } + if tok, _ := c.adminToken(); tok != "sv-token" { + t.Fatal("not the Supervisor's token") + } + t.Setenv("SUPERVISOR_TOKEN", "") + if _, ok := haConfig(); ok { + t.Fatal("remote HA without the Supervisor's token") + } +} + +// The add-on's pages learn of a session from the link's state directory +// (support-ha.json: the link's pid for End now, the sessions), and that it +// ended. +func TestHAAddonStateFile(t *testing.T) { + t.Setenv("CANTABILE_HUB", "") + dir := t.TempDir() + t.Setenv("CANTABILE_LINK_STATE", dir) + _, srv := newFakeHA() + defer srv.Close() + addr := strings.TrimPrefix(srv.URL, "http://") + cfg := haTunnelCfg{addr: addr, httpBase: srv.URL, adminWS: "ws://" + addr + "/api/websocket", + adminToken: func() (string, error) { return fakeAdmin, nil }} + read := func() (st struct { + Pid int + User string + Sessions []map[string]any + }) { + b, err := os.ReadFile(filepath.Join(dir, "support-ha.json")) + if err != nil { + t.Fatal(err) + } + json.Unmarshal(b, &st) + return + } + writeHAState() // the link's start + if st := read(); st.Pid != os.Getpid() || len(st.Sessions) != 0 { + t.Fatalf("at start: %+v", st) + } + sid := "0f0e0d0c-0000-4000-8000-0000000000a1" + con := newConsole(t, sid) + if ok, msg := haOpenWith(cfg, haCmd(sid, "https://s-"+sid+".support.example.net", map[string]string{"by": "Ana (Cantabile)"}), con.fromBox); !ok { + t.Fatalf("open: %s", msg) + } + st := read() + if len(st.Sessions) != 1 || st.Sessions[0]["kind"] != "ha" || st.Sessions[0]["by"] != "Ana (Cantabile)" || st.User != haSupportName || + st.Sessions[0]["ha_user"] == nil || st.Sessions[0]["ha_user"] == "" { + t.Fatalf("open: %+v", st) + } + haCloseAll("ended by the owner") + <-con.ended + if st := read(); len(st.Sessions) != 0 { + t.Fatalf("after the end: %+v", st) + } +} + +// HTTPS on HA's own port: the support person is told why, not a bare +// transport error. +func TestHAPlainHTTPOnly(t *testing.T) { + // as aiohttp with an ssl_context answers plain HTTP: a TLS alert, closed + ln, err := net.Listen("tcp", "127.0.0.1:0") + if err != nil { + t.Fatal(err) + } + defer ln.Close() + go func() { + for { + c, err := ln.Accept() + if err != nil { + return + } + c.Read(make([]byte, 4096)) + c.Write([]byte{0x15, 0x03, 0x01, 0x00, 0x02, 0x02, 0x46}) + c.Close() + } + }() + addr := ln.Addr().String() + cfg := haTunnelCfg{addr: addr, httpBase: "http://" + addr} + _, err = cfg.haLogin(context.Background(), "https://s-x.support.example.net", "pw") + if err == nil || !strings.Contains(err.Error(), "ssl_certificate") { + t.Fatalf("got %v", err) + } +} diff --git a/src/edge/link/hauser.go b/src/edge/link/hauser.go new file mode 100644 index 0000000..b45b34e --- /dev/null +++ b/src/edge/link/hauser.go @@ -0,0 +1,381 @@ +// Copyright © 2026 Setti Solutions S.R.L, www.setti.md. All rights reserved. + +package main + +import ( + "context" + "crypto/rand" + "encoding/hex" + "encoding/json" + "errors" + "fmt" + "io" + "net/http" + "net/url" + "os" + "strings" + + "github.com/coder/websocket" +) + +// The "Cantabile support" user in Home Assistant (item 19): +// support signs in to the owner's HA as this user, never as the owner and +// never with the owner's password. The box keeps it, with the agent's HA +// administrator token (the Hub: /data/cantabile/edge/ha-token, made by +// ha-setup; an HA add-on site: the Supervisor's token, through the +// Supervisor's WebSocket proxy). +// +// - An administrator, not the owner: what support looks into (integrations, +// devices and entities, HA's logs, repairs, restart, backups, add-ons on +// an HA OS site) is admin-only in HA; a plain user sees dashboards only. +// HA lets only the owner change another user's password +// (admin_change_password is owner-only since 2026.x), so this user cannot +// change or learn the owner's. +// - local_only: it signs in only from the box's own network (the box's link +// is its only way in; HA's remote access through Nabu Casa refuses it). +// - Between sessions it is disabled and has no password: a session gives it +// a new random password (its credentials made again), signs it in once +// through HA's own login flow on the box, and throws the password away; +// only the tokens go to the support browser. At the end it is disabled +// again (HA removes every refresh token of a disabled user, which also +// closes its WebSocket connections) and its credentials removed. + +const ( + haSupportName = "Cantabile support" + haSupportUsername = "cantabile-support" +) + +// haUser: the HA side of one session. +type haUser struct { + id string // the support user's id + before map[string]bool // the users there were at the start +} + +// haTokens: what HA's /auth/token answers (passed on to the browser). +type haTokens struct { + AccessToken string `json:"access_token"` + RefreshToken string `json:"refresh_token"` + ExpiresIn int `json:"expires_in"` + TokenType string `json:"token_type"` +} + +// haWS: a short WebSocket conversation with HA (commands, one at a time). +type haWS struct { + c *websocket.Conn + id int +} + +func haDial(ctx context.Context, wsURL, token string) (*haWS, error) { + c, _, err := websocket.Dial(ctx, wsURL, nil) + if err != nil { + return nil, fmt.Errorf("Home Assistant's WebSocket: %w", err) + } + c.SetReadLimit(16 << 20) + w := &haWS{c: c} + var hello struct{ Type string } + if err := w.read(ctx, &hello); err != nil || hello.Type != "auth_required" { + c.CloseNow() + return nil, errors.New("Home Assistant did not greet") + } + if err := w.write(ctx, map[string]any{"type": "auth", "access_token": token}); err != nil { + c.CloseNow() + return nil, err + } + if err := w.read(ctx, &hello); err != nil || hello.Type != "auth_ok" { + c.CloseNow() + return nil, errors.New("Home Assistant did not accept the agent's token") // never the token itself + } + return w, nil +} + +func (w *haWS) read(ctx context.Context, v any) error { + _, b, err := w.c.Read(ctx) + if err != nil { + return err + } + return json.Unmarshal(b, v) +} + +func (w *haWS) write(ctx context.Context, v any) error { + b, _ := json.Marshal(v) + return w.c.Write(ctx, websocket.MessageText, b) +} + +func (w *haWS) close() { w.c.Close(websocket.StatusNormalClosure, "") } + +// call: one command; its result, or HA's error. +func (w *haWS) call(ctx context.Context, typ string, args map[string]any) (json.RawMessage, error) { + w.id++ + m := map[string]any{"id": w.id, "type": typ} + for k, v := range args { + m[k] = v + } + if err := w.write(ctx, m); err != nil { + return nil, err + } + for { + var r struct { + ID int `json:"id"` + Type string `json:"type"` + Success bool `json:"success"` + Result json.RawMessage `json:"result"` + Error struct{ Code, Message string } + } + if err := w.read(ctx, &r); err != nil { + return nil, err + } + if r.ID != w.id || r.Type != "result" { + continue + } + if !r.Success { + return nil, &haErr{typ, r.Error.Code, r.Error.Message} + } + return r.Result, nil + } +} + +type haErr struct{ cmd, code, msg string } + +func (e *haErr) Error() string { return e.cmd + ": " + e.code + " " + e.msg } + +type haUserRow struct { + ID string `json:"id"` + Name string `json:"name"` + Username string `json:"username"` + IsOwner bool `json:"is_owner"` + IsActive bool `json:"is_active"` + SystemGenerated bool `json:"system_generated"` +} + +func haUsers(ctx context.Context, w *haWS) ([]haUserRow, error) { + r, err := w.call(ctx, "config/auth/list", nil) + if err != nil { + return nil, err + } + var us []haUserRow + return us, json.Unmarshal(r, &us) +} + +// haFindSupport: the support user among HA's users (by its username, else +// its name); never the owner or a user HA made itself. +func haFindSupport(us []haUserRow) *haUserRow { + for i, u := range us { + if u.Username == haSupportUsername && !u.IsOwner && !u.SystemGenerated { + return &us[i] + } + } + for i, u := range us { + if u.Name == haSupportName && u.Username == "" && !u.IsOwner && !u.SystemGenerated { + return &us[i] + } + } + return nil +} + +func randomSecret() string { + b := make([]byte, 32) + rand.Read(b) + return hex.EncodeToString(b) +} + +// haSignIn: the support user, enabled with a new password, signed in for +// the session's origin (HA's client id is the origin, as its own frontend +// uses it there). The password is thrown away. +func (c haTunnelCfg) haSignIn(ctx context.Context, origin string) (*haUser, *haTokens, error) { + tok, err := c.adminToken() + if err != nil { + return nil, nil, err + } + w, err := haDial(ctx, c.adminWS, tok) + if err != nil { + return nil, nil, err + } + defer w.close() + us, err := haUsers(ctx, w) + if err != nil { + return nil, nil, err + } + hu := &haUser{before: map[string]bool{}} + for _, u := range us { + hu.before[u.ID] = true + } + su := haFindSupport(us) + if su == nil { + r, err := w.call(ctx, "config/auth/create", map[string]any{"name": haSupportName, + "group_ids": []string{"system-admin"}, "local_only": true}) + if err != nil { + return nil, nil, err + } + var cr struct{ User haUserRow } + if json.Unmarshal(r, &cr) != nil || cr.User.ID == "" { + return nil, nil, errors.New("Home Assistant made no support user") + } + hu.id = cr.User.ID + hu.before[hu.id] = true // ours, not one support added + } else { + hu.id = su.ID + if su.Username != "" { // last session's password (normally gone already) + if _, err := w.call(ctx, "config/auth_provider/homeassistant/delete", map[string]any{"username": su.Username}); err != nil { + return nil, nil, err + } + } + } + if _, err := w.call(ctx, "config/auth/update", map[string]any{"user_id": hu.id, "name": haSupportName, "is_active": true, + "group_ids": []string{"system-admin"}, "local_only": true}); err != nil { + return nil, nil, err + } + pw := randomSecret() + if _, err := w.call(ctx, "config/auth_provider/homeassistant/create", map[string]any{"user_id": hu.id, + "username": haSupportUsername, "password": pw}); err != nil { + c.haDisable(context.Background(), hu.id) + return nil, nil, err + } + t, err := c.haLogin(ctx, origin, pw) + if err != nil { + c.haDisable(context.Background(), hu.id) + return nil, nil, err + } + return hu, t, nil +} + +// haLogin: HA's own login flow (as its sign-in page does it), on the box. +func (c haTunnelCfg) haLogin(ctx context.Context, origin, pw string) (*haTokens, error) { + return c.haLoginAs(ctx, origin, haSupportUsername, pw) +} + +func (c haTunnelCfg) haLoginAs(ctx context.Context, origin, username, pw string) (*haTokens, error) { + cid := origin + "/" + var flow struct { + FlowID string `json:"flow_id"` + Type string `json:"type"` + Result string `json:"result"` + Errors map[string]string + } + if err := c.haPost(ctx, "/auth/login_flow", map[string]any{"client_id": cid, "handler": []any{"homeassistant", nil}, + "redirect_uri": origin + "/?auth_callback=1"}, &flow); err != nil { + var ue *url.Error + if errors.As(err, &ue) && !ue.Timeout() { + // HA's port did not speak plain HTTP: on an HA add-on site most + // likely an ssl_certificate in HA's http: configuration (the + // tunnel goes to HA's own port on the Supervisor's network). + return nil, fmt.Errorf("Home Assistant did not answer over plain HTTP at %s (HTTPS on HA's own port, "+ + "ssl_certificate in its http: configuration, is not supported for remote access): %w", c.addr, err) + } + return nil, err + } + if flow.FlowID == "" { + return nil, errors.New("Home Assistant's login flow did not start") + } + if err := c.haPost(ctx, "/auth/login_flow/"+flow.FlowID, map[string]any{"client_id": cid, + "username": username, "password": pw}, &flow); err != nil { + return nil, err + } + if flow.Type != "create_entry" || flow.Result == "" { + return nil, fmt.Errorf("Home Assistant refused the support user's sign-in (%s %v)", flow.Type, flow.Errors) + } + form := url.Values{"grant_type": {"authorization_code"}, "code": {flow.Result}, "client_id": {cid}} + req, _ := http.NewRequestWithContext(ctx, "POST", c.httpBase+"/auth/token", strings.NewReader(form.Encode())) + req.Header.Set("Content-Type", "application/x-www-form-urlencoded") + res, err := http.DefaultClient.Do(req) + if err != nil { + return nil, err + } + defer res.Body.Close() + var t haTokens + if res.StatusCode != 200 || json.NewDecoder(io.LimitReader(res.Body, 64<<10)).Decode(&t) != nil || t.AccessToken == "" || t.RefreshToken == "" { + return nil, fmt.Errorf("Home Assistant gave no token (%d)", res.StatusCode) + } + if t.TokenType == "" { + t.TokenType = "Bearer" + } + return &t, nil +} + +func (c haTunnelCfg) haPost(ctx context.Context, path string, body, out any) error { + b, _ := json.Marshal(body) + req, _ := http.NewRequestWithContext(ctx, "POST", c.httpBase+path, strings.NewReader(string(b))) + req.Header.Set("Content-Type", "application/json") + res, err := http.DefaultClient.Do(req) + if err != nil { + return err + } + defer res.Body.Close() + if res.StatusCode != 200 { + return fmt.Errorf("Home Assistant %s: %d", path, res.StatusCode) + } + return json.NewDecoder(io.LimitReader(res.Body, 64<<10)).Decode(out) +} + +// haDisable: the support user disabled (HA removes its refresh tokens and +// so closes its connections) and its password removed; the users added +// since the start (support may have made some: the owner should know). +func (c haTunnelCfg) haDisable(ctx context.Context, id string) error { + _, err := c.haEnd(ctx, &haUser{id: id}) + return err +} + +func (c haTunnelCfg) haEnd(ctx context.Context, hu *haUser) ([]string, error) { + tok, err := c.adminToken() + if err != nil { + return nil, err + } + w, err := haDial(ctx, c.adminWS, tok) + if err != nil { + return nil, err + } + defer w.close() + if _, err := w.call(ctx, "config/auth/update", map[string]any{"user_id": hu.id, "is_active": false}); err != nil { + var he *haErr + if !errors.As(err, &he) || he.code != "not_found" { // someone removed it: nothing to disable + return nil, err + } + } + us, err := haUsers(ctx, w) + if err != nil { + return nil, err + } + var added []string + for _, u := range us { + if u.ID == hu.id && u.Username != "" { + w.call(ctx, "config/auth_provider/homeassistant/delete", map[string]any{"username": u.Username}) + } + if hu.before != nil && !hu.before[u.ID] && !u.SystemGenerated { + added = append(added, u.Name) + } + } + return added, nil +} + +// haLeftover: at the link's start (a session may have been open when it +// stopped): the support user disabled, if HA has one active. +func (c haTunnelCfg) haLeftover(ctx context.Context) error { + tok, err := c.adminToken() + if err != nil { + return err + } + w, err := haDial(ctx, c.adminWS, tok) + if err != nil { + return err + } + us, err := haUsers(ctx, w) + w.close() + if err != nil { + return err + } + if su := haFindSupport(us); su != nil && (su.IsActive || su.Username != "") { + return c.haDisable(ctx, su.ID) + } + return nil +} + +// fileToken: a token read from a file each time (a new agent token is +// written by ha-setup agent-token). +func fileToken(path string) func() (string, error) { + return func() (string, error) { + b, err := os.ReadFile(path) + if t := strings.TrimSpace(string(b)); err == nil && t != "" { + return t, nil + } + return "", errors.New("no Home Assistant token for the agent on this box") + } +} diff --git a/src/edge/link/local.go b/src/edge/link/local.go index a66bfa1..4d4c912 100644 --- a/src/edge/link/local.go +++ b/src/edge/link/local.go @@ -13,6 +13,8 @@ package main // agent -> link {"op":"plan"|"action","data":{...}} (published, no answer; // plans at most every 5 min, actions at most 120 an hour) // agent -> link {"op":"inventory","data":{...}} (the devices' specs; published at most every 10 min) +// agent -> link {"op":"own_tariff","data":{...}} (the owner's own price +// from the panel, docs/parameters.md U1; at most every minute) // agent -> link {"op":"state"} -> {"op":"state","ok":} // link -> agent {"op":"command","id":"","cmd":"...","args":{...}} // agent -> link {"op":"result","id":"","ok":true,"message":"..."} @@ -42,6 +44,7 @@ type local struct { rmu sync.Mutex lastPlan time.Time lastInv time.Time + lastOwn time.Time actions []time.Time } @@ -65,6 +68,13 @@ func (lc *local) allow(op string, now time.Time) bool { lc.lastPlan = now return true } + if op == "own_tariff" { + if !lc.lastOwn.IsZero() && now.Sub(lc.lastOwn) < time.Minute { + return false + } + lc.lastOwn = now + return true + } if op == "inventory" { if !lc.lastInv.IsZero() && now.Sub(lc.lastInv) < inventoryEvery { return false @@ -191,7 +201,7 @@ func (lc *local) serve(c net.Conn) { if len(m.Data) > 0 { lc.l.publish(m.Op, m.Data) } - case "plan", "action", "inventory": + case "plan", "action", "inventory", "own_tariff": if len(m.Data) > 0 && lc.allow(m.Op, time.Now()) { lc.l.publish(m.Op, m.Data) } diff --git a/src/edge/link/main.go b/src/edge/link/main.go index 9521d2e..8de4fcb 100644 --- a/src/edge/link/main.go +++ b/src/edge/link/main.go @@ -183,7 +183,7 @@ func run() error { return err } defer l.loc.close() - if isHub() { // the owner's End now in the panel: support's sessions close + if _, ok := haConfig(); ok || isHub() { // the owner's End now (the Hub's panel): support's sessions close usr1 := make(chan os.Signal, 1) signal.Notify(usr1, syscall.SIGUSR1) go func() { @@ -191,8 +191,14 @@ func run() error { l.closeAll() } }() - writeTermState() - writePanelState() + if isHub() { + writeTermState() + writePanelState() + } + if !isHub() { + writeHAState() // an HA add-on site: none open now (a file left by the last run said otherwise) + } + haStartup() // remote HA (hatunnel.go): a support user left enabled is disabled } go l.loop(ctx) <-ctx.Done() @@ -756,6 +762,9 @@ func (l *link) heartbeat() map[string]any { if p := l.pathInfo(); p != nil { hb["path"] = p } + if _, ok := haConfig(); ok { // support may open its Home Assistant (hatunnel.go) + hb["ha_remote"] = true + } // the bundles this link takes (bundles.go): as large, and as text hb["bundle_max"], hb["bundle_text"] = bundleMax, true c := consents(env("CANTABILE_CONSENT_FILE", @@ -882,9 +891,13 @@ func checkCommand(key crypto.PublicKey, site string, data []byte, now time.Time) } func (l *link) onCommand(m *nats.Msg) { + var w struct{ T string } + json.Unmarshal(m.Data, &w) + if w.T == "ha" { // remote HA's tunnel: checked with the session key (hatunnel.go) + l.haFrame(m.Data) + return + } if isHub() { - var w struct{ T string } - json.Unmarshal(m.Data, &w) switch w.T { case "term": // terminal keystrokes: checked with the session key (terminal.go) l.termInput(m.Data) @@ -930,6 +943,9 @@ func (l *link) do(c command) (bool, string, func()) { switch c.Cmd { case "site-moved", "restore-offer": // a reinstall merged into its earlier site (reinstall.go) return l.reinstallCmd(c) + case "ha-open": // remote HA for support (hatunnel.go): the Hub and HA add-on sites that allow it + ok, msg := l.haOpen(c) + return ok, msg, nil case "refresh": l.publish("hb", l.heartbeat()) return true, "heartbeat sent", nil diff --git a/src/edge/link/terminal.go b/src/edge/link/terminal.go index 7e0f404..a4a1426 100644 --- a/src/edge/link/terminal.go +++ b/src/edge/link/terminal.go @@ -109,6 +109,7 @@ func writeTermState() { } termsMu.Unlock() list = append(list, panelSessions()...) // Cantabile support in the panel (panel.go) + list = append(list, haList()...) // and in Home Assistant (hatunnel.go) b, _ := json.Marshal(map[string]any{"sessions": list}) os.WriteFile(runDir+"/agent-terminal.json.tmp", b, 0o644) os.Rename(runDir+"/agent-terminal.json.tmp", runDir+"/agent-terminal.json") @@ -126,6 +127,7 @@ func (l *link) closeAll() { l.termClose(s, "ended by the owner") } l.closePanels() + haCloseAll("ended by the owner") } func (l *link) termOpen(c command) (bool, string) { diff --git a/src/edge/tests/test_base_load.py b/src/edge/tests/test_base_load.py index ca72ae2..96c19bb 100644 --- a/src/edge/tests/test_base_load.py +++ b/src/edge/tests/test_base_load.py @@ -79,7 +79,9 @@ def test_model_state_plans_on_the_base_load(tmp_path): col = Collector() watts(col, sensor__load=6400, sensor__hp=4000, sensor__living_temp=15) ctl = [Control("living", "heating", {"climate": "climate.living", "temp": "sensor.living_temp"}, True, - {"max_power_w": 4000.0, "comfort_c": 22.0, "setback_c": 22.0})] + {"max_power_w": 4000.0, "comfort_c": 22.0, "setback_c": 22.0, + # the installer's room (never the built-in R/C) + "r_k_per_kw": 10.0, "c_kwh_per_k": 3.0, "cop": 1.0})] b = Bundles(str(tmp_path / "none"), SITE) s = model_state(START, ctl, m.inputs, col, b, None, "UTC", None) assert s["load_w"] == [2400.0] * len(s["load_w"]) and s["sources"]["load"] == "now" @@ -136,9 +138,11 @@ def test_bundle_carries_the_gains(tmp_path): bad = room_model(tmp_path, gain_w=[1.0] * 5) assert bad.room_rc("living") is None and "gain_w" in bad.model.error # into the model state: an electric fit's heat is cop times, like C - hp = Control("living", "heating", {"climate": "climate.living"}, True, {"cop": 3.0}) + hp = Control("living", "heating", {"climate": "climate.living"}, True, {"cop": 3.0, "max_power_w": 2000.0}) b = room_model(tmp_path, gain_w=100.0, solar_m2=2.0, power="electric") - s = model_state(START, [hp], site_mapping(tmp_path, [], []).inputs, Collector(), b, None, "UTC", None, + col = Collector() + col.on_entities({"a": {"climate.living": {"s": "heat", "a": {"current_temperature": 20.0}}}}) + s = model_state(START, [hp], site_mapping(tmp_path, [], []).inputs, col, b, None, "UTC", None, location={"latitude": 52.5, "longitude": 13.4}) p = s["devices"][0]["params"] assert (p["internal_gain_w"], p["solar_m2"]) == (300.0, 6.0) and s["sources"]["rooms"]["living"] == "model" diff --git a/src/edge/tests/test_control_parts.py b/src/edge/tests/test_control_parts.py index 4cc35ec..ebce890 100644 --- a/src/edge/tests/test_control_parts.py +++ b/src/edge/tests/test_control_parts.py @@ -112,45 +112,51 @@ def test_mapping_v3_refuses(tmp_path, bad, why): # -- bundles ------------------------------------------------------------------ -def test_tariff_and_fallbacks(tmp_path): - b = Bundles(str(tmp_path), SITE, default_price_ct=33) +def test_tariff_as_it_is_and_none_without(tmp_path): + """docs/parameters.md U1: no default price, no last price held: without + a tariff (never, expired, another site's) status none and no prices; + a step the tariff has no price for has none (the plan covers the priced + steps); an export without a price is unpriced (None), not 0 ct.""" + b = Bundles(str(tmp_path), SITE) start = 1_800_000_000 // 900 * 900 p = b.prices(start, 900, 4, start) - assert p.import_ct == [33] * 4 and "default" in p.note + assert (p.status, p.reason) == ("none", "never") and p.import_ct == [None] * 4 and p.export_ct == [None] * 4 + assert p.note.startswith("no tariff: price optimisation off (no tariff received yet") t = {"v": 1, "kind": "tariff", "id": "t1", "site": SITE, "issued": start, "start": start, "step_s": 900, "steps": 2, "expires": start + 7200, "currency": "EUR", "unit": "ct/kWh", "import": [10, None], "export": [5, 5]} (tmp_path / "tariff.json").write_text(json.dumps(t)) p = b.prices(start, 900, 4, start) - assert p.import_ct == [10, 10, 10, 10] and p.export_ct == [5, 5, 0, 0] and "3 of 4" in p.note - p = b.prices(start, 900, 2, start + 7200) # expired: the flat price, said - assert p.import_ct == [10, 10] and "expired" in p.note - os.remove(tmp_path / "tariff.json") - assert "last known flat" in b.prices(start, 900, 1, start).note + assert p.import_ct == [10, None, None, None] and p.export_ct == [5, 5, None, None] + assert p.status == "tariff" and p.priced_steps == 1 and "the plan covers those" in p.note + p = b.prices(start, 900, 2, start + 7200) # expired: no price at all, said with the time + assert (p.status, p.reason, p.tariff_id) == ("none", "expired", "t1") and p.import_ct == [None, None] + assert "the tariff t1 expired at" in p.note + os.remove(tmp_path / "tariff.json") # gone: never a last price held + assert b.prices(start, 900, 1, start).reason == "never" t["site"] = "cd" * 16 # another site's file: not taken (tmp_path / "tariff.json").write_text(json.dumps(t)) - assert b.prices(start, 900, 1, start).note.startswith("no tariff") + assert b.prices(start, 900, 1, start).reason == "other_site" + t.update(site=SITE, start=start + 900, id="t10") # no price for now: none + (tmp_path / "tariff.json").write_text(json.dumps(t)) + assert b.prices(start, 900, 2, start).reason == "no_price_now" -def test_feed_in_at_zero_is_said(tmp_path): - """Finding A1-a: where no export price is known the feed-in is 0 ct, and - the plan's note says so (no tariff, expired, no or a short export series).""" - b = Bundles(str(tmp_path), SITE, default_price_ct=33) +def test_export_unpriced_is_said(tmp_path): + b = Bundles(str(tmp_path), SITE) start = 1_800_000_000 // 900 * 900 - p = b.prices(start, 900, 4, start) - assert p.export_ct == [0.0] * 4 and "feed-in at 0 ct/kWh" in p.note t = {"v": 1, "kind": "tariff", "id": "t1", "site": SITE, "issued": start, "start": start, "step_s": 900, "steps": 4, "expires": start + 7200, "currency": "EUR", "unit": "ct/kWh", "import": [10, 10, 10, 10], "export": [5, 5, 5, 5]} (tmp_path / "tariff.json").write_text(json.dumps(t)) assert b.prices(start, 900, 4, start).note == "tariff t1" # all priced: nothing to say - assert "feed-in at 0 ct/kWh" in b.prices(start, 900, 2, start + 7200).note # expired t["export"] = [5, None, None, None] (tmp_path / "tariff.json").write_text(json.dumps(t)) - assert "feed-in at 0 ct/kWh in 3 of 4 steps" in b.prices(start, 900, 4, start).note + p = b.prices(start, 900, 4, start) + assert p.export_ct == [5, None, None, None] and "no export price in 3 of 4 steps: export unpriced" in p.note del t["export"] (tmp_path / "tariff.json").write_text(json.dumps(t)) - assert b.prices(start, 900, 4, start).note == "tariff t1; feed-in at 0 ct/kWh" + assert b.prices(start, 900, 4, start).note == "tariff t1; no export price: export unpriced (no value)" def test_model_bundle(tmp_path): diff --git a/src/edge/tests/test_devpage.py b/src/edge/tests/test_devpage.py index 25750ef..47f92ea 100644 --- a/src/edge/tests/test_devpage.py +++ b/src/edge/tests/test_devpage.py @@ -13,7 +13,7 @@ import pytest import yaml from cantabile_edge import i18n, propose -from cantabile_edge.devpage import App, Devices +from cantabile_edge.devpage import App, Devices, SupportSessions from cantabile_edge.joinpage import Fleet from cantabile_edge.mapping import Mapping @@ -302,6 +302,77 @@ def test_german(tmp_path): assert "Use with Cantabile" not in out +def test_support_session_banner_end_and_owners_choices(tmp_path): + """Remote HA for support on an add-on site: while the link says support + has this Home Assistant open, both pages show it with End now (SIGUSR1 + to the link, only to the link); the support user cannot change what is + the owner's (as on the Hub's panel).""" + import signal + import time + s = Site(tmp_path) + link, proc, killed = tmp_path / "link", tmp_path / "proc", [] + link.mkdir() + (proc / "4242").mkdir(parents=True) + (proc / "4242" / "cmdline").write_bytes(b"cantabile-link\0") + (proc / "77").mkdir() + (proc / "77" / "cmdline").write_bytes(b"python3\0-m\0cantabile_edge\0") + s.app.support = SupportSessions(str(link), proc=str(proc), kill=lambda pid, sig: killed.append((pid, sig))) + state = link / "support-ha.json" + assert "Cantabile support has this Home Assistant open" not in s.req() # no file: none + state.write_text(json.dumps({"pid": 4242, "sessions": []})) + assert "Cantabile support has this Home Assistant open" not in s.req() + state.write_text(json.dumps({"pid": 4242, "user": "Cantabile support", "sessions": [ + {"by": "Ana (Cantabile)", "since": int(time.time()) - 300, "consent": "", "kind": "ha"}]})) + out = s.req() + assert "Cantabile support has this Home Assistant open" in out and "Ana (Cantabile), for 5 minutes" in out + assert 'value="end-support"' in out and "End now" in out + assert "Cantabile support has this Home Assistant open" in s.req(query="p=building") + + def german(): + i18n.use("de") + return s.req() + import contextvars + out = contextvars.copy_context().run(german) + assert "Der Cantabile-Support hat dieses Home Assistant geöffnet" in out and "seit 5 Minuten" in out + assert "Jetzt beenden" in out + # the owner's End now (any administrator): the link gets SIGUSR1 + out = s.req("POST", "p=devices", {"do": "end-support"}) + assert "Ended. Cantabile support's session is closed" in out and killed == [(4242, signal.SIGUSR1)] + out = s.req("POST", "p=building", {"do": "end-support"}) + assert "Ended." in out and "