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

Use a debouncer when updating ZHA group state (#53263)

Browse Source
This commit is contained in:
Alexei Chetroi 2021-08-24 13:09:36 -04:00 committed by GitHub
parent 29f1fab7f7
commit 2927dcd809
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
homeassistant/components/zha/entity.py
View File

@ -10,6 +10,7 @@ from typing import Any
from homeassistant.const import ATTR_NAME from homeassistant.const import ATTR_NAME
from homeassistant.core import CALLBACK_TYPE, Event, callback from homeassistant.core import CALLBACK_TYPE, Event, callback
from homeassistant.helpers import entity from homeassistant.helpers import entity
from homeassistant.helpers.debounce import Debouncer
from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE from homeassistant.helpers.device_registry import CONNECTION_ZIGBEE
from homeassistant.helpers.dispatcher import ( from homeassistant.helpers.dispatcher import (
async_dispatcher_connect, async_dispatcher_connect,
@ -34,7 +35,7 @@ from .core.typing import CALLABLE_T, ChannelType, ZhaDeviceType
_LOGGER = logging.getLogger(__name__) _LOGGER = logging.getLogger(__name__)
ENTITY_SUFFIX = "entity_suffix" ENTITY_SUFFIX = "entity_suffix"
UPDATE_GROUP_FROM_CHILD_DELAY = 0.2 UPDATE_GROUP_FROM_CHILD_DELAY = 0.5
class BaseZhaEntity(LogMixin, entity.Entity): class BaseZhaEntity(LogMixin, entity.Entity):
@ -230,6 +231,7 @@ class ZhaGroupEntity(BaseZhaEntity):
self._entity_ids: list[str] = entity_ids self._entity_ids: list[str] = entity_ids
self._async_unsub_state_changed: CALLBACK_TYPE | None = None self._async_unsub_state_changed: CALLBACK_TYPE | None = None
self._handled_group_membership = False self._handled_group_membership = False
self._change_listener_debouncer: Debouncer | None = None
@property @property
def available(self) -> bool: def available(self) -> bool:
@ -256,6 +258,14 @@ class ZhaGroupEntity(BaseZhaEntity):
signal_override=True, signal_override=True,
) )
if self._change_listener_debouncer is None:
self._change_listener_debouncer = Debouncer(
self.hass,
self,
cooldown=UPDATE_GROUP_FROM_CHILD_DELAY,
immediate=False,
function=functools.partial(self.async_update_ha_state, True),
)
self._async_unsub_state_changed = async_track_state_change_event( self._async_unsub_state_changed = async_track_state_change_event(
self.hass, self._entity_ids, self.async_state_changed_listener self.hass, self._entity_ids, self.async_state_changed_listener
) )
@ -271,10 +281,7 @@ class ZhaGroupEntity(BaseZhaEntity):
def async_state_changed_listener(self, event: Event): def async_state_changed_listener(self, event: Event):
"""Handle child updates.""" """Handle child updates."""
# Delay to ensure that we get updates from all members before updating the group # Delay to ensure that we get updates from all members before updating the group
self.hass.loop.call_later( self.hass.create_task(self._change_listener_debouncer.async_call())
UPDATE_GROUP_FROM_CHILD_DELAY,
lambda: self.async_schedule_update_ha_state(True),
)
async def async_will_remove_from_hass(self) -> None: async def async_will_remove_from_hass(self) -> None:
"""Handle removal from Home Assistant.""" """Handle removal from Home Assistant."""

4
tests/components/zha/test_light.py
View File

@ -297,12 +297,12 @@ async def async_test_on_off_from_light(hass, cluster, entity_id):
"""Test on off functionality from the light.""" """Test on off functionality from the light."""
# turn on at light # turn on at light
await send_attributes_report(hass, cluster, {1: 0, 0: 1, 2: 3}) await send_attributes_report(hass, cluster, {1: 0, 0: 1, 2: 3})
await hass.async_block_till_done() await async_wait_for_updates(hass)
assert hass.states.get(entity_id).state == STATE_ON assert hass.states.get(entity_id).state == STATE_ON
# turn off at light # turn off at light
await send_attributes_report(hass, cluster, {1: 1, 0: 0, 2: 3}) await send_attributes_report(hass, cluster, {1: 1, 0: 0, 2: 3})
await hass.async_block_till_done() await async_wait_for_updates(hass)
assert hass.states.get(entity_id).state == STATE_OFF assert hass.states.get(entity_id).state == STATE_OFF