♻️ Skip redundant energy fetches and emit statistics at real timestamps #18

Open

mat wants to merge 2 commits from fix/5-energy-hour-offset into main

pull from: fix/5-energy-hour-offset

merge into: mat:main

mat:main

mat:feat/c7-reauth

mat:docs/api-exploration

mat:docs/47-setup-tutorial

mat:fix/46-value-guard

mat:feat/40-site-metrics

mat:chore/release-0.4.0

mat:7-problème-de-connexion-version-anterieure-a-gen4-2

mat:update-python-comwatt

mat:7-problème-de-connexion-version-anterieure-a-gen4

mat:3-adjust-update-frequency-for-comwattenergysensor

mat:9-enhancement-request-additional-device-control-modes-for-comwatt-integration

mat:fix/power-sensor

mat:fix/device-child-not-containing-id#10

mat:4-optimize-api-client-handling-for-multiple-sensors

mat:use-go.comwatt.com

Conversation 0 Commits 2 Files changed 2 +344 -27

mat commented 2026-04-24 17:08:26 +00:00

Owner

Copy link

Summary

Closes MateoGreil/homeassistant-comwatt#3, MateoGreil/homeassistant-comwatt#5, MateoGreil/homeassistant-comwatt#42.

Two related fixes to ComwattEnergySensor bundled because they live in the same code path:

Skip the call when the bucket can't have changed (#3)

The QUANTITY/HOUR endpoint only publishes a new bucket once per hour, so polling every 2 min was 29 wasted calls per hour per device. The coordinator now tracks the last successful fetch time per device and skips the call while the cached result is < 55 min old. Power fetches are unchanged.

Emit statistics at the real bucket timestamp (#5, #42)

Previously the energy value was published under now even though the API bucket represents the previous hour, so the Energy dashboard attributed each reading to the wrong hour. The coordinator now forwards each new hourly bucket to async_add_external_statistics with the real bucket timestamp and a running cumulative sum, under an external statistic id comwatt:<device_id>_total_energy.

• Existing sensor.<device>_total_energy entity unchanged — users whose Energy dashboard points at it keep working.
• Parallel statistic comwatt:*_total_energy attributes energy to the correct hour; users can opt into it by adding it to the dashboard.

Guarded on "recorder" in hass.config.components so the coordinator stays usable when recorder is disabled.

Test plan

• New test_energy_fetch_is_skipped_within_interval — second refresh within the window does not re-call QUANTITY; advancing the cached timestamp triggers the call again.
• New test_new_energy_buckets_are_pushed_as_external_statistics — two new buckets produce one async_add_external_statistics call with the correct statistic id, cumulative sum, unit, and top-of-hour timestamp.
• pytest tests/ — 26 passed; ruff + mypy clean.
• Hands-on: after a few hours on your HA, open Settings → Dashboards → Energy → add a new energy source and check that comwatt:<device>_total_energy appears in the statistic picker. Compare the hour alignment to the existing sensor.*_total_energy entity.

## Summary Closes [MateoGreil/homeassistant-comwatt#3](https://github.com/MateoGreil/homeassistant-comwatt/issues/3), [MateoGreil/homeassistant-comwatt#5](https://github.com/MateoGreil/homeassistant-comwatt/issues/5), [MateoGreil/homeassistant-comwatt#42](https://github.com/MateoGreil/homeassistant-comwatt/issues/42). Two related fixes to `ComwattEnergySensor` bundled because they live in the same code path: ### Skip the call when the bucket can't have changed (#3) The QUANTITY/HOUR endpoint only publishes a new bucket once per hour, so polling every 2 min was 29 wasted calls per hour per device. The coordinator now tracks the last successful fetch time per device and skips the call while the cached result is < 55 min old. Power fetches are unchanged. ### Emit statistics at the real bucket timestamp (#5, #42) Previously the energy value was published under `now` even though the API bucket represents the previous hour, so the Energy dashboard attributed each reading to the wrong hour. The coordinator now forwards each new hourly bucket to `async_add_external_statistics` with the real bucket timestamp and a running cumulative sum, under an external statistic id `comwatt:<device_id>_total_energy`. - Existing `sensor.<device>_total_energy` entity **unchanged** — users whose Energy dashboard points at it keep working. - Parallel statistic `comwatt:*_total_energy` attributes energy to the correct hour; users can opt into it by adding it to the dashboard. Guarded on `"recorder" in hass.config.components` so the coordinator stays usable when recorder is disabled. ## Test plan - [x] New `test_energy_fetch_is_skipped_within_interval` — second refresh within the window does not re-call QUANTITY; advancing the cached timestamp triggers the call again. - [x] New `test_new_energy_buckets_are_pushed_as_external_statistics` — two new buckets produce one `async_add_external_statistics` call with the correct statistic id, cumulative sum, unit, and top-of-hour timestamp. - [x] `pytest tests/` — 26 passed; `ruff` + `mypy` clean. - [ ] Hands-on: after a few hours on your HA, open Settings → Dashboards → Energy → add a new energy source and check that `comwatt:<device>_total_energy` appears in the statistic picker. Compare the hour alignment to the existing `sensor.*_total_energy` entity.

mat added 1 commit 2026-04-24 17:08:26 +00:00

♻️ Skip redundant energy fetches and emit statistics at real timestamps ... 4a14c4d425

Closes #3, #5 and #42.

Two related energy-sensor issues addressed in one pass:

### #3 — "Adjust Update Frequency for ComwattEnergySensor"

The Comwatt QUANTITY/HOUR endpoint publishes a new bucket once per
hour, so polling it every 2 minutes was 29 wasted calls per hour per
device. The coordinator now tracks the last successful fetch time per
device and skips the call while the cached result is less than 55
minutes old. Power fetches are unchanged.

### #5 / #42 — hour offset / "délais de mise à jour"

Previously the energy sensor published the accumulated total under
timestamp `now`, even though the API bucket it came from represents
the **previous** hour. The Energy dashboard therefore attributed each
reading to the wrong hour, and new values only appeared after HA had
caught up with the 2-minute poll cadence.

The coordinator now forwards each new hourly bucket to
`async_add_external_statistics` with the real bucket timestamp and a
running cumulative sum, under an external statistic id
`comwatt:<device_id>_total_energy`. This:

- keeps the existing `sensor.<device>_total_energy` entity unchanged
  (no breaking change for users whose Energy dashboard points at it);
- exposes a parallel statistic attributed to the correct hour that
  users can opt into by adding `comwatt:*_total_energy` to the
  dashboard instead.

The push is guarded on `"recorder" in hass.config.components` so the
coordinator stays usable on the rare setup where the recorder is
disabled.

### Tests

- `test_energy_fetch_is_skipped_within_interval`: a second refresh
  within the window does not re-call QUANTITY; advancing the cached
  `last_fetched_at` triggers the call again.
- `test_new_energy_buckets_are_pushed_as_external_statistics`: two
  new buckets produce one `async_add_external_statistics` call with
  the correct statistic id, cumulative sum, unit, and top-of-hour
  timestamp.

mat referenced this pull request from a commit 2026-04-24 17:12:21 +00:00

✨ Add the remaining site-level metrics as sensors

mat referenced this pull request 2026-04-24 17:12:34 +00:00

✨ Add the remaining site-level metrics as sensors #19

mat force-pushed fix/5-energy-hour-offset from 4a14c4d425 to 1b23292466 2026-04-24 21:53:00 +00:00 Compare

mat referenced this pull request from a commit 2026-04-24 21:53:04 +00:00

✨ Add the remaining site-level metrics as sensors

mat self-assigned this 2026-04-29 10:03:15 +00:00

mat added 1 commit 2026-04-29 10:23:22 +00:00

🐛 Handle real Comwatt API types in energy statistics ... 8d78841b39

The /aggregations/time-series endpoint returns timestamps as ISO 8601
strings (e.g. "2026-04-29T10:00:00.000+0000") and device IDs as ints —
not the seconds-since-epoch ints and string IDs the test fixtures used.
Both shapes broke at runtime on first deploy.

- Add _parse_bucket_ts to normalise timestamps to UTC datetime,
  accepting ISO 8601 (with Z, +0000, +HH:MM, naive), epoch seconds,
  epoch milliseconds, and numeric strings; return None for garbage.
- Compare and store buckets as datetime instead of int, so the dedup
  check no longer mixes types.
- Stringify device_id before slugify; slugify rejects ints with a
  decoding error.
- Cover the parser with edge-case tests so future API drift is caught
  at the boundary.

All checks were successful

Hide all checks

Validate / validate-hacs (push) Has been skipped

Details

Validate / validate-hassfest (push) Has been skipped

Details

Validate / lint-ruff (push) Successful in 10s

Details

Validate / test-pytest (push) Successful in 1m50s

Details

Validate / type-check-mypy (push) Successful in 1m48s

Details

Validate / validate-hacs (pull_request) Has been skipped

Details

Validate / validate-hassfest (pull_request) Has been skipped

Details

Validate / lint-ruff (pull_request) Successful in 7s

Details

Validate / test-pytest (pull_request) Successful in 1m46s

Details

Validate / type-check-mypy (pull_request) Successful in 1m50s

Details

This pull request can be merged automatically.

This branch is out-of-date with the base branch

You are not authorized to merge this pull request.

View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.

git fetch -u origin fix/5-energy-hour-offset:fix/5-energy-hour-offset

git switch fix/5-energy-hour-offset

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch main

git merge --no-ff fix/5-energy-hour-offset

git switch fix/5-energy-hour-offset

git rebase main

git switch main

git merge --ff-only fix/5-energy-hour-offset

git switch fix/5-energy-hour-offset

git rebase main

git switch main

git merge --no-ff fix/5-energy-hour-offset

git switch main

git merge --squash fix/5-energy-hour-offset

git switch main

git merge --ff-only fix/5-energy-hour-offset

git switch main

git merge fix/5-energy-hour-offset

git push origin main

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

mat

1 participant

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

mat/homeassistant-comwatt!18

No description provided.