jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-24 21:57:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Avoid converting to same units when compiling stats (#109531)

Browse Source
This commit is contained in:
J. Nick Koston 2024-02-04 08:21:05 -06:00 committed by GitHub
parent 9de9852c94
commit 3db0331378
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 12 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
homeassistant/components/sensor/recorder.py
View File

@ -222,13 +222,14 @@ def _normalize_states(
converter = statistics.STATISTIC_UNIT_TO_UNIT_CONVERTER[statistics_unit] converter = statistics.STATISTIC_UNIT_TO_UNIT_CONVERTER[statistics_unit]
valid_fstates: list[tuple[float, State]] = [] valid_fstates: list[tuple[float, State]] = []
convert: Callable[[float], float] convert: Callable[[float], float] | None = None
last_unit: str | None | object = object() last_unit: str | None | object = object()
valid_units = converter.VALID_UNITS
for fstate, state in fstates: for fstate, state in fstates:
state_unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT) state_unit = state.attributes.get(ATTR_UNIT_OF_MEASUREMENT)
# Exclude states with unsupported unit from statistics # Exclude states with unsupported unit from statistics
if state_unit not in converter.VALID_UNITS: if state_unit not in valid_units:
if WARN_UNSUPPORTED_UNIT not in hass.data: if WARN_UNSUPPORTED_UNIT not in hass.data:
hass.data[WARN_UNSUPPORTED_UNIT] = set() hass.data[WARN_UNSUPPORTED_UNIT] = set()
if entity_id not in hass.data[WARN_UNSUPPORTED_UNIT]: if entity_id not in hass.data[WARN_UNSUPPORTED_UNIT]:
@ -247,13 +248,20 @@ def _normalize_states(
LINK_DEV_STATISTICS, LINK_DEV_STATISTICS,
) )
continue continue
if state_unit != last_unit: if state_unit != last_unit:
# The unit of measurement has changed since the last state change # The unit of measurement has changed since the last state change
# recreate the converter factory # recreate the converter factory
convert = converter.converter_factory(state_unit, statistics_unit) if state_unit == statistics_unit:
convert = None
else:
convert = converter.converter_factory(state_unit, statistics_unit)
last_unit = state_unit last_unit = state_unit
valid_fstates.append((convert(fstate), state)) if convert is not None:
fstate = convert(fstate)
valid_fstates.append((fstate, state))
return statistics_unit, valid_fstates return statistics_unit, valid_fstates