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

Migrate template NumberEntity to native_value (#73537)

Browse source
This commit is contained in:
Erik Montnemery 2022-06-15 17:06:44 +02:00 • committed by GitHub
parent b014d558ff
commit 7a82794ad7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
homeassistant/components/number/__init__.py
View file

@ -252,8 +252,6 @@ class NumberEntity(Entity):
@property @property
def native_step(self) -> float | None: def native_step(self) -> float | None:
"""Return the increment/decrement step.""" """Return the increment/decrement step."""
if hasattr(self, "_attr_native_step"):
return self._attr_native_step
if ( if (
hasattr(self, "entity_description") hasattr(self, "entity_description")
and self.entity_description.native_step is not None and self.entity_description.native_step is not None
@ -273,6 +271,8 @@ class NumberEntity(Entity):
): ):
self._report_deprecated_number_entity() self._report_deprecated_number_entity()
return self.entity_description.step return self.entity_description.step
if hasattr(self, "_attr_native_step"):
return self._attr_native_step
if (native_step := self.native_step) is not None: if (native_step := self.native_step) is not None:
return native_step return native_step
step = DEFAULT_STEP step = DEFAULT_STEP

38
homeassistant/components/template/number.py
View file

@ -119,45 +119,45 @@ class TemplateNumber(TemplateEntity, NumberEntity):
self._min_value_template = config[ATTR_MIN] self._min_value_template = config[ATTR_MIN]
self._max_value_template = config[ATTR_MAX] self._max_value_template = config[ATTR_MAX]
self._attr_assumed_state = self._optimistic = config[CONF_OPTIMISTIC] self._attr_assumed_state = self._optimistic = config[CONF_OPTIMISTIC]
self._attr_value = None self._attr_native_value = None
self._attr_step = None self._attr_native_step = None
self._attr_min_value = None self._attr_native_min_value = None
self._attr_max_value = None self._attr_native_max_value = None
async def async_added_to_hass(self) -> None: async def async_added_to_hass(self) -> None:
"""Register callbacks.""" """Register callbacks."""
self.add_template_attribute( self.add_template_attribute(
"_attr_value", "_attr_native_value",
self._value_template, self._value_template,
validator=vol.Coerce(float), validator=vol.Coerce(float),
none_on_template_error=True, none_on_template_error=True,
) )
self.add_template_attribute( self.add_template_attribute(
"_attr_step", "_attr_native_step",
self._step_template, self._step_template,
validator=vol.Coerce(float), validator=vol.Coerce(float),
none_on_template_error=True, none_on_template_error=True,
) )
if self._min_value_template is not None: if self._min_value_template is not None:
self.add_template_attribute( self.add_template_attribute(
"_attr_min_value", "_attr_native_min_value",
self._min_value_template, self._min_value_template,
validator=vol.Coerce(float), validator=vol.Coerce(float),
none_on_template_error=True, none_on_template_error=True,
) )
if self._max_value_template is not None: if self._max_value_template is not None:
self.add_template_attribute( self.add_template_attribute(
"_attr_max_value", "_attr_native_max_value",
self._max_value_template, self._max_value_template,
validator=vol.Coerce(float), validator=vol.Coerce(float),
none_on_template_error=True, none_on_template_error=True,
) )
await super().async_added_to_hass() await super().async_added_to_hass()
async def async_set_value(self, value: float) -> None: async def async_set_native_value(self, value: float) -> None:
"""Set value of the number.""" """Set value of the number."""
if self._optimistic: if self._optimistic:
self._attr_value = value self._attr_native_value = value
self.async_write_ha_state() self.async_write_ha_state()
await self.async_run_script( await self.async_run_script(
self._command_set_value, self._command_set_value,
@ -193,35 +193,35 @@ class TriggerNumberEntity(TriggerEntity, NumberEntity):
) )
@property @property
def value(self) -> float | None: def native_value(self) -> float | None:
"""Return the currently selected option.""" """Return the currently selected option."""
return vol.Any(vol.Coerce(float), None)(self._rendered.get(CONF_STATE)) return vol.Any(vol.Coerce(float), None)(self._rendered.get(CONF_STATE))
@property @property
def min_value(self) -> int: def native_min_value(self) -> int:
"""Return the minimum value.""" """Return the minimum value."""
return vol.Any(vol.Coerce(float), None)( return vol.Any(vol.Coerce(float), None)(
self._rendered.get(ATTR_MIN, super().min_value) self._rendered.get(ATTR_MIN, super().native_min_value)
) )
@property @property
def max_value(self) -> int: def native_max_value(self) -> int:
"""Return the maximum value.""" """Return the maximum value."""
return vol.Any(vol.Coerce(float), None)( return vol.Any(vol.Coerce(float), None)(
self._rendered.get(ATTR_MAX, super().max_value) self._rendered.get(ATTR_MAX, super().native_max_value)
) )
@property @property
def step(self) -> int: def native_step(self) -> int:
"""Return the increment/decrement step.""" """Return the increment/decrement step."""
return vol.Any(vol.Coerce(float), None)( return vol.Any(vol.Coerce(float), None)(
self._rendered.get(ATTR_STEP, super().step) self._rendered.get(ATTR_STEP, super().native_step)
) )
async def async_set_value(self, value: float) -> None: async def async_set_native_value(self, value: float) -> None:
"""Set value of the number.""" """Set value of the number."""
if self._config[CONF_OPTIMISTIC]: if self._config[CONF_OPTIMISTIC]:
self._attr_value = value self._attr_native_value = value
self.async_write_ha_state() self.async_write_ha_state()
await self._command_set_value.async_run( await self._command_set_value.async_run(
{ATTR_VALUE: value}, context=self._context {ATTR_VALUE: value}, context=self._context