evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compile statistics for energy sensors (#50829)

Browse source 
* Compile statistics for energy sensors

* Update tests

* Rename abs_value to state

* Tweak

* Recreate statistics table

* Pylint

* Try to fix test

* Fix statistics for multiple energy sensors

* Fix energy statistics when last_reset is not set
This commit is contained in:
Erik Montnemery 2021-05-20 13:05:15 +02:00 • committed by GitHub
parent aaae4cfc8f
commit e16a8063a5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
12 changed files with 437 additions and 112 deletions
Download patch file Download diff file Expand all files Collapse all files

38
homeassistant/components/recorder/statistics.py
View file

@ -25,6 +25,9 @@ QUERY_STATISTICS = [
Statistics.mean,
Statistics.min,
Statistics.max,
Statistics.last_reset,
Statistics.state,
Statistics.sum,
]
STATISTICS_BAKERY = "recorder_statistics_bakery"
@ -97,16 +100,38 @@ def statistics_during_period(hass, start_time, end_time=None, statistic_id=None)
statistic_ids = [statistic_id] if statistic_id is not None else None
return _sorted_statistics_to_dict(
hass, session, stats, start_time, statistic_ids
return _sorted_statistics_to_dict(stats, statistic_ids)
def get_last_statistics(hass, number_of_stats, statistic_id=None):
"""Return the last number_of_stats statistics."""
with session_scope(hass=hass) as session:
baked_query = hass.data[STATISTICS_BAKERY](
lambda session: session.query(*QUERY_STATISTICS)
)
if statistic_id is not None:
baked_query += lambda q: q.filter_by(statistic_id=bindparam("statistic_id"))
baked_query += lambda q: q.order_by(
Statistics.statistic_id, Statistics.start.desc()
)
baked_query += lambda q: q.limit(bindparam("number_of_stats"))
stats = execute(
baked_query(session).params(
number_of_stats=number_of_stats, statistic_id=statistic_id
)
)
statistic_ids = [statistic_id] if statistic_id is not None else None
return _sorted_statistics_to_dict(stats, statistic_ids)
def _sorted_statistics_to_dict(
hass,
session,
stats,
start_time,
statistic_ids,
):
"""Convert SQL results into JSON friendly data structure."""
@ -130,6 +155,9 @@ def _sorted_statistics_to_dict(
"mean": db_state.mean,
"min": db_state.min,
"max": db_state.max,
"last_reset": _process_timestamp_to_utc_isoformat(db_state.last_reset),
"state": db_state.state,
"sum": db_state.sum,
}
for db_state in group
)