Lift a Deadlines helper, unify the (node, index) Key #94

Merged

Claude merged 4 commits from refactor/deadlines-and-key-cleanup into refactor/code-hygiene 2026-09-28 06:44:24 +00:00

Conversation 1 Commits 4 Files changed 5 +75 -93

Claude commented 2026-09-28 06:30:34 +00:00

Collaborator

• Copy link
• Copy Markdown

Four small, independent cleanups in readings/reading_store/alarms/coordinator:

• ReadingStore._rearm/_cancel and AlarmStore._arm/_cancel were the same generic deadline dict twice over. Lifted into a Deadlines helper in readings.py; both stores' async_stop is now cancel_all().
• CampervanCoordinator.__init__ registered six frame listeners and six availability listeners one call at a time; replaced with two loops over a tuple of stores, keeping traffic first.
• Key = tuple[int, int] was defined separately in reading_store.py and platforms.py, and alarms.py reused the same name for an unrelated three-tuple. Defined once in readings.py, imported where needed, and renamed alarms' to AlarmKey.
• Inlined the one-line _changed wrappers in both stores, since nothing patches them.

Tested with the existing suite (tools/check equivalent: ruff, mypy, pytest), all green, no behaviour change.

Four small, independent cleanups in readings/reading_store/alarms/coordinator: - `ReadingStore._rearm`/`_cancel` and `AlarmStore._arm`/`_cancel` were the same generic deadline dict twice over. Lifted into a `Deadlines` helper in `readings.py`; both stores' `async_stop` is now `cancel_all()`. - `CampervanCoordinator.__init__` registered six frame listeners and six availability listeners one call at a time; replaced with two loops over a tuple of stores, keeping traffic first. - `Key = tuple[int, int]` was defined separately in `reading_store.py` and `platforms.py`, and alarms.py reused the same name for an unrelated three-tuple. Defined once in `readings.py`, imported where needed, and renamed alarms' to `AlarmKey`. - Inlined the one-line `_changed` wrappers in both stores, since nothing patches them. Tested with the existing suite (`tools/check` equivalent: ruff, mypy, pytest), all green, no behaviour change.

Claude added 4 commits 2026-09-28 06:30:34 +00:00

Lift ReadingStore/AlarmStore deadline dicts into a Deadlines helper b6112081ca

Loop-ify frame and availability listener registration 1646441301

Unify the (node, index) Key in readings, rename alarms' to AlarmKey 103a4c7d45

Inline the single-call _changed wrappers 2973a849b8

Claude reviewed 2026-09-28 06:33:37 +00:00

Claude left a comment

• Copy link
• Copy Markdown

Clean. Each of the four commits does exactly what it claims and nothing more, scoped to the five files agreed.

Checked and confirmed:

• Deadlines.arm() cancels any existing timer before starting a new one, matching the old _rearm/_arm behaviour exactly. _absence: Deadlines[int] and _staleness: Deadlines[Key] are separate instances with their own dicts, no cross-leakage.
• No test patches _rearm, _cancel, _arm or _changed — grepped the suite, nothing references them.
• Coordinator's frame-listener loop keeps traffic first, matching the original order. The availability-listener loop now also runs traffic/ota before discovery (previously discovery ran first), but none of the six stores' async_bus_availability_changed handlers read another store's state, so this reordering has no observable effect.
• AlarmKey rename is complete — no leftover references to a bare Key in alarms.py, and the unified Key = tuple[int, int] in readings.py is used consistently by reading_store.py and platforms.py.
• Full test suite passes (1218 passed, 3 skipped), ruff check/format and mypy clean on all five touched files.

Nothing to flag.

Clean. Each of the four commits does exactly what it claims and nothing more, scoped to the five files agreed. Checked and confirmed: - `Deadlines.arm()` cancels any existing timer before starting a new one, matching the old `_rearm`/`_arm` behaviour exactly. `_absence: Deadlines[int]` and `_staleness: Deadlines[Key]` are separate instances with their own dicts, no cross-leakage. - No test patches `_rearm`, `_cancel`, `_arm` or `_changed` — grepped the suite, nothing references them. - Coordinator's frame-listener loop keeps traffic first, matching the original order. The availability-listener loop now also runs traffic/ota before discovery (previously discovery ran first), but none of the six stores' `async_bus_availability_changed` handlers read another store's state, so this reordering has no observable effect. - `AlarmKey` rename is complete — no leftover references to a bare `Key` in alarms.py, and the unified `Key = tuple[int, int]` in readings.py is used consistently by reading_store.py and platforms.py. - Full test suite passes (1218 passed, 3 skipped), ruff check/format and mypy clean on all five touched files. Nothing to flag.

rob force-pushed refactor/deadlines-and-key-cleanup from 2973a849b8 to f76a319545 2026-09-28 06:44:18 +00:00 Compare

Claude merged commit 06e7697379 into refactor/code-hygiene 2026-09-28 06:44:24 +00:00

Claude deleted branch refactor/deadlines-and-key-cleanup 2026-09-28 06:44:24 +00:00

Claude referenced this pull request from a commit 2026-09-28 06:44:25 +00:00

Merge pull request 'Lift a Deadlines helper, unify the (node, index) Key' (#94) from refactor/deadlines-and-key-cleanup into refactor/code-hygiene

Sign in to join this conversation.

Reviewers

No reviewers

Labels

Clear labels

No items

No labels

Milestone

Clear milestone

No items

No milestone

Projects

Clear projects

No items

No project

Assignees

Clear assignees

No assignees

2 participants

Notifications

Subscribe

Due date

The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set

Reference

rob/CampervanHomeAssistant!94

No description provided.