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

Don't run timer callbacks for delayed commands (#120367)

Browse Source 
* Don't send timer events for delayed commands

* Don't run timer callbacks for delayed commands
This commit is contained in:
Michael Hansen 2024-06-24 15:21:51 -05:00 committed by GitHub
parent d0961ca473
commit 6d917f0242
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 20 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
homeassistant/components/intent/timers.py
View File

@ -278,7 +278,7 @@ class TimerManager:
name=f"Timer {timer_id}", name=f"Timer {timer_id}",
) )
if timer.device_id in self.handlers: if (not timer.conversation_command) and (timer.device_id in self.handlers):
self.handlers[timer.device_id](TimerEventType.STARTED, timer) self.handlers[timer.device_id](TimerEventType.STARTED, timer)
_LOGGER.debug( _LOGGER.debug(
"Timer started: id=%s, name=%s, hours=%s, minutes=%s, seconds=%s, device_id=%s", "Timer started: id=%s, name=%s, hours=%s, minutes=%s, seconds=%s, device_id=%s",
@ -317,7 +317,7 @@ class TimerManager:
timer.cancel() timer.cancel()
if timer.device_id in self.handlers: if (not timer.conversation_command) and (timer.device_id in self.handlers):
self.handlers[timer.device_id](TimerEventType.CANCELLED, timer) self.handlers[timer.device_id](TimerEventType.CANCELLED, timer)
_LOGGER.debug( _LOGGER.debug(
"Timer cancelled: id=%s, name=%s, seconds_left=%s, device_id=%s", "Timer cancelled: id=%s, name=%s, seconds_left=%s, device_id=%s",
@ -346,7 +346,7 @@ class TimerManager:
name=f"Timer {timer_id}", name=f"Timer {timer_id}",
) )
if timer.device_id in self.handlers: if (not timer.conversation_command) and (timer.device_id in self.handlers):
self.handlers[timer.device_id](TimerEventType.UPDATED, timer) self.handlers[timer.device_id](TimerEventType.UPDATED, timer)
if seconds > 0: if seconds > 0:
@ -384,7 +384,7 @@ class TimerManager:
task = self.timer_tasks.pop(timer_id) task = self.timer_tasks.pop(timer_id)
task.cancel() task.cancel()
if timer.device_id in self.handlers: if (not timer.conversation_command) and (timer.device_id in self.handlers):
self.handlers[timer.device_id](TimerEventType.UPDATED, timer) self.handlers[timer.device_id](TimerEventType.UPDATED, timer)
_LOGGER.debug( _LOGGER.debug(
"Timer paused: id=%s, name=%s, seconds_left=%s, device_id=%s", "Timer paused: id=%s, name=%s, seconds_left=%s, device_id=%s",
@ -410,7 +410,7 @@ class TimerManager:
name=f"Timer {timer.id}", name=f"Timer {timer.id}",
) )
if timer.device_id in self.handlers: if (not timer.conversation_command) and (timer.device_id in self.handlers):
self.handlers[timer.device_id](TimerEventType.UPDATED, timer) self.handlers[timer.device_id](TimerEventType.UPDATED, timer)
_LOGGER.debug( _LOGGER.debug(
"Timer unpaused: id=%s, name=%s, seconds_left=%s, device_id=%s", "Timer unpaused: id=%s, name=%s, seconds_left=%s, device_id=%s",
@ -426,15 +426,6 @@ class TimerManager:
timer.finish() timer.finish()
if timer.device_id in self.handlers:
self.handlers[timer.device_id](TimerEventType.FINISHED, timer)
_LOGGER.debug(
"Timer finished: id=%s, name=%s, device_id=%s",
timer_id,
timer.name,
timer.device_id,
)
if timer.conversation_command: if timer.conversation_command:
# pylint: disable-next=import-outside-toplevel # pylint: disable-next=import-outside-toplevel
from homeassistant.components.conversation import async_converse from homeassistant.components.conversation import async_converse
@ -451,6 +442,15 @@ class TimerManager:
), ),
"timer assist command", "timer assist command",
) )
elif timer.device_id in self.handlers:
self.handlers[timer.device_id](TimerEventType.FINISHED, timer)
_LOGGER.debug(
"Timer finished: id=%s, name=%s, device_id=%s",
timer_id,
timer.name,
timer.device_id,
)
def is_timer_device(self, device_id: str) -> bool: def is_timer_device(self, device_id: str) -> bool:
"""Return True if device has been registered to handle timer events.""" """Return True if device has been registered to handle timer events."""

18
tests/components/intent/test_timers.py
View File

@ -1430,18 +1430,10 @@ async def test_start_timer_with_conversation_command(
timer_name = "test timer" timer_name = "test timer"
test_command = "turn on the lights" test_command = "turn on the lights"
agent_id = "test_agent" agent_id = "test_agent"
finished_event = asyncio.Event()
@callback mock_handle_timer = MagicMock()
def handle_timer(event_type: TimerEventType, timer: TimerInfo) -> None: async_register_timer_handler(hass, device_id, mock_handle_timer)
if event_type == TimerEventType.FINISHED:
assert timer.conversation_command == test_command
assert timer.conversation_agent_id == agent_id
finished_event.set()
async_register_timer_handler(hass, device_id, handle_timer)
# Device id is required if no conversation command
timer_manager = TimerManager(hass) timer_manager = TimerManager(hass)
with pytest.raises(ValueError): with pytest.raises(ValueError):
timer_manager.start_timer( timer_manager.start_timer(
@ -1468,9 +1460,11 @@ async def test_start_timer_with_conversation_command(
assert result.response_type == intent.IntentResponseType.ACTION_DONE assert result.response_type == intent.IntentResponseType.ACTION_DONE
async with asyncio.timeout(1): # No timer events for delayed commands
await finished_event.wait() mock_handle_timer.assert_not_called()
# Wait for process service call to finish
await hass.async_block_till_done()
mock_converse.assert_called_once() mock_converse.assert_called_once()
assert mock_converse.call_args.args[1] == test_command assert mock_converse.call_args.args[1] == test_command