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

Use shorthand attribute in derivative sensor (#128610)

Browse source
This commit is contained in:
G Johansson 2024-10-18 09:33:02 +02:00 • committed by GitHub
parent 1abc953cad
commit 6ff2ce1895
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 8 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
homeassistant/components/derivative/sensor.py
View file

@ -5,7 +5,6 @@ from __future__ import annotations
from datetime import datetime, timedelta from datetime import datetime, timedelta
from decimal import Decimal, DecimalException from decimal import Decimal, DecimalException
import logging import logging
from typing import TYPE_CHECKING
import voluptuous as vol import voluptuous as vol
@ -162,7 +161,7 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
self._attr_device_info = device_info self._attr_device_info = device_info
self._sensor_source_id = source_entity self._sensor_source_id = source_entity
self._round_digits = round_digits self._round_digits = round_digits
self._state: float | int | Decimal = 0 self._attr_native_value = round(Decimal(0), round_digits)
# List of tuples with (timestamp_start, timestamp_end, derivative) # List of tuples with (timestamp_start, timestamp_end, derivative)
self._state_list: list[tuple[datetime, datetime, Decimal]] = [] self._state_list: list[tuple[datetime, datetime, Decimal]] = []
@ -190,7 +189,10 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
restored_data.native_unit_of_measurement restored_data.native_unit_of_measurement
) )
try: try:
self._state = Decimal(restored_data.native_value) # type: ignore[arg-type] self._attr_native_value = round(
Decimal(restored_data.native_value), # type: ignore[arg-type]
self._round_digits,
)
except SyntaxError as err: except SyntaxError as err:
_LOGGER.warning("Could not restore last state: %s", err) _LOGGER.warning("Could not restore last state: %s", err)
@ -270,12 +272,11 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
if elapsed_time > self._time_window: if elapsed_time > self._time_window:
derivative = new_derivative derivative = new_derivative
else: else:
derivative = Decimal(0) derivative = Decimal(0.00)
for start, end, value in self._state_list: for start, end, value in self._state_list:
weight = calculate_weight(start, end, new_state.last_updated) weight = calculate_weight(start, end, new_state.last_updated)
derivative = derivative + (value * Decimal(weight)) derivative = derivative + (value * Decimal(weight))
self._attr_native_value = round(derivative, self._round_digits)
self._state = derivative
self.async_write_ha_state() self.async_write_ha_state()
self.async_on_remove( self.async_on_remove(
@ -283,11 +284,3 @@ class DerivativeSensor(RestoreSensor, SensorEntity):
self.hass, self._sensor_source_id, calc_derivative self.hass, self._sensor_source_id, calc_derivative
) )
) )
@property
def native_value(self) -> float | int | Decimal:
"""Return the state of the sensor."""
value = round(self._state, self._round_digits)
if TYPE_CHECKING:
assert isinstance(value, (float, int, Decimal))
return value

2
tests/components/derivative/test_init.py
View file

@ -42,7 +42,7 @@ async def test_setup_and_remove_config_entry(
# Check the platform is setup correctly # Check the platform is setup correctly
state = hass.states.get(derivative_entity_id) state = hass.states.get(derivative_entity_id)
assert state.state == "0" assert state.state == "0.0"
assert "unit_of_measurement" not in state.attributes assert "unit_of_measurement" not in state.attributes
assert state.attributes["source"] == "sensor.input" assert state.attributes["source"] == "sensor.input"