jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-08-03 02:28:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add numerical_value state attribute to sensor

Browse Source
This commit is contained in:
Erik 2023-02-01 13:58:43 +01:00
parent 4dba9c09fc
commit 65324431a4
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
homeassistant/components/sensor/__init__.py
View File

@ -62,6 +62,7 @@ from homeassistant.util import dt as dt_util
from .const import ( # noqa: F401 from .const import ( # noqa: F401
ATTR_LAST_RESET, ATTR_LAST_RESET,
ATTR_NUMERICAL_VALUE,
ATTR_OPTIONS, ATTR_OPTIONS,
ATTR_STATE_CLASS, ATTR_STATE_CLASS,
CONF_STATE_CLASS, CONF_STATE_CLASS,
@ -167,6 +168,7 @@ class SensorEntity(Entity):
_last_reset_reported = False _last_reset_reported = False
_sensor_option_precision: int | None = None _sensor_option_precision: int | None = None
_sensor_option_unit_of_measurement: str | None | UndefinedType = UNDEFINED _sensor_option_unit_of_measurement: str | None | UndefinedType = UNDEFINED
__numerical_value: int | float | None = None
@callback @callback
def add_to_platform_start( def add_to_platform_start(
@ -312,6 +314,7 @@ class SensorEntity(Entity):
@property @property
def state_attributes(self) -> dict[str, Any] | None: def state_attributes(self) -> dict[str, Any] | None:
"""Return state attributes.""" """Return state attributes."""
attrs: dict[str, Any] = {}
if last_reset := self.last_reset: if last_reset := self.last_reset:
if ( if (
self.state_class != SensorStateClass.TOTAL self.state_class != SensorStateClass.TOTAL
@ -334,9 +337,11 @@ class SensorEntity(Entity):
) )
if self.state_class == SensorStateClass.TOTAL: if self.state_class == SensorStateClass.TOTAL:
return {ATTR_LAST_RESET: last_reset.isoformat()} attrs[ATTR_LAST_RESET] = last_reset.isoformat()
if (numerical_value := self.__numerical_value) is not None:
attrs[ATTR_NUMERICAL_VALUE] = numerical_value
return None return attrs
@property @property
def native_value(self) -> StateType | date | datetime | Decimal: def native_value(self) -> StateType | date | datetime | Decimal:
@ -461,6 +466,7 @@ class SensorEntity(Entity):
@property @property
def state(self) -> Any: # noqa: C901 def state(self) -> Any: # noqa: C901
"""Return the state of the sensor and perform unit conversions, if needed.""" """Return the state of the sensor and perform unit conversions, if needed."""
self.__numerical_value = None
native_unit_of_measurement = self.native_unit_of_measurement native_unit_of_measurement = self.native_unit_of_measurement
unit_of_measurement = self.unit_of_measurement unit_of_measurement = self.unit_of_measurement
value = self.native_value value = self.native_value
@ -581,8 +587,8 @@ class SensorEntity(Entity):
return value return value
# From here on a numerical value is expected # From here on a numerical value is expected
numerical_value: int | float | Decimal numerical_value: int | float
if not isinstance(value, (int, float, Decimal)): if not isinstance(value, (int, float)):
try: try:
if isinstance(value, str) and "." not in value: if isinstance(value, str) and "." not in value:
numerical_value = int(value) numerical_value = int(value)
@ -645,12 +651,12 @@ class SensorEntity(Entity):
) )
precision = precision + floor(ratio_log) precision = precision + floor(ratio_log)
converted_numerical_value = converter.convert( numerical_value = converter.convert(
float(numerical_value), float(numerical_value),
native_unit_of_measurement, native_unit_of_measurement,
unit_of_measurement, unit_of_measurement,
) )
value = f"{converted_numerical_value:.{precision}f}" value = f"{numerical_value:.{precision}f}"
# This can be replaced with adding the z option when we drop support for # This can be replaced with adding the z option when we drop support for
# Python 3.10 # Python 3.10
value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value) value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value)
@ -660,6 +666,8 @@ class SensorEntity(Entity):
# Python 3.10 # Python 3.10
value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value) value = NEGATIVE_ZERO_PATTERN.sub(r"\1", value)
self.__numerical_value = numerical_value
# Validate unit of measurement used for sensors with a device class # Validate unit of measurement used for sensors with a device class
if ( if (
not self._invalid_unit_of_measurement_reported not self._invalid_unit_of_measurement_reported

1
homeassistant/components/sensor/const.py
View File

@ -55,6 +55,7 @@ DOMAIN: Final = "sensor"
CONF_STATE_CLASS: Final = "state_class" CONF_STATE_CLASS: Final = "state_class"
ATTR_LAST_RESET: Final = "last_reset" ATTR_LAST_RESET: Final = "last_reset"
ATTR_NUMERICAL_VALUE: Final = "numerical_value"
ATTR_STATE_CLASS: Final = "state_class" ATTR_STATE_CLASS: Final = "state_class"
ATTR_OPTIONS: Final = "options" ATTR_OPTIONS: Final = "options"