Use shorthand attr for mqtt assumed_state (#100241)

This commit is contained in:
Jan Bouwhuis 2023-09-12 22:21:13 +02:00 committed by GitHub
parent eb0ab3de93
commit e3837cd1e0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
13 changed files with 26 additions and 78 deletions

View file

@ -161,7 +161,7 @@ class MqttNumber(MqttEntity, RestoreNumber):
def _setup_from_config(self, config: ConfigType) -> None:
"""(Re)Setup the entity."""
self._config = config
self._optimistic = config[CONF_OPTIMISTIC]
self._attr_assumed_state = config[CONF_OPTIMISTIC]
self._command_template = MqttCommandTemplate(
config.get(CONF_COMMAND_TEMPLATE), entity=self
@ -218,7 +218,7 @@ class MqttNumber(MqttEntity, RestoreNumber):
if self._config.get(CONF_STATE_TOPIC) is None:
# Force into optimistic mode.
self._optimistic = True
self._attr_assumed_state = True
else:
self._sub_state = subscription.async_prepare_subscribe_topics(
self.hass,
@ -237,7 +237,7 @@ class MqttNumber(MqttEntity, RestoreNumber):
"""(Re)Subscribe to topics."""
await subscription.async_subscribe_topics(self.hass, self._sub_state)
if self._optimistic and (
if self._attr_assumed_state and (
last_number_data := await self.async_get_last_number_data()
):
self._attr_native_value = last_number_data.native_value
@ -250,7 +250,7 @@ class MqttNumber(MqttEntity, RestoreNumber):
current_number = int(value)
payload = self._command_template(current_number)
if self._optimistic:
if self._attr_assumed_state:
self._attr_native_value = current_number
self.async_write_ha_state()
@ -261,8 +261,3 @@ class MqttNumber(MqttEntity, RestoreNumber):
self._config[CONF_RETAIN],
self._config[CONF_ENCODING],
)
@property
def assumed_state(self) -> bool:
"""Return true if we do optimistic updates."""
return self._optimistic