From 1b913b8088dbefce21e74c26ca880a4e2ac6c7a1 Mon Sep 17 00:00:00 2001
From: Paulus Schoutsen <balloob@gmail.com>
Date: Fri, 13 Sep 2024 23:21:31 -0400
Subject: [PATCH] Fix Assist Satellite making up conversation IDs (#125933)

---
 .../components/assist_satellite/entity.py     | 15 ++++---
 .../assist_satellite/test_entity.py           | 42 ++++++++++++-------
 2 files changed, 34 insertions(+), 23 deletions(-)

diff --git a/homeassistant/components/assist_satellite/entity.py b/homeassistant/components/assist_satellite/entity.py
index 5da182ed9df..c00cb26cb63 100644
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -28,7 +28,6 @@ from homeassistant.components.tts import (
 from homeassistant.core import Context, callback
 from homeassistant.helpers import entity
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.util import ulid
 
 from .const import AssistSatelliteEntityFeature
 from .errors import AssistSatelliteError, SatelliteBusyError
@@ -240,16 +239,11 @@ class AssistSatelliteEntity(entity.Entity):
         assert self._context is not None
 
         # Reset conversation id if necessary
-        if (self._conversation_id_time is None) or (
+        if self._conversation_id_time and (
             (time.monotonic() - self._conversation_id_time) > _CONVERSATION_TIMEOUT_SEC
         ):
             self._conversation_id = None
-
-        if self._conversation_id is None:
-            self._conversation_id = ulid.ulid()
-
-        # Update timeout
-        self._conversation_id_time = time.monotonic()
+            self._conversation_id_time = None
 
         # Set entity state based on pipeline events
         self._run_has_tts = False
@@ -311,6 +305,11 @@ class AssistSatelliteEntity(entity.Entity):
             self._set_state(AssistSatelliteState.LISTENING_COMMAND)
         elif event.type is PipelineEventType.INTENT_START:
             self._set_state(AssistSatelliteState.PROCESSING)
+        elif event.type is PipelineEventType.INTENT_END:
+            assert event.data is not None
+            # Update timeout
+            self._conversation_id_time = time.monotonic()
+            self._conversation_id = event.data["intent_output"]["conversation_id"]
         elif event.type is PipelineEventType.TTS_START:
             # Wait until tts_response_finished is called to return to waiting state
             self._run_has_tts = True
diff --git a/tests/components/assist_satellite/test_entity.py b/tests/components/assist_satellite/test_entity.py
index 3e58239f921..2af3af89681 100644
--- a/tests/components/assist_satellite/test_entity.py
+++ b/tests/components/assist_satellite/test_entity.py
@@ -69,22 +69,34 @@ async def test_entity_state(
     assert kwargs["start_stage"] == PipelineStage.STT
     assert kwargs["end_stage"] == PipelineStage.TTS
 
-    for event_type, expected_state in (
-        (PipelineEventType.RUN_START, AssistSatelliteState.LISTENING_WAKE_WORD),
-        (PipelineEventType.RUN_END, AssistSatelliteState.LISTENING_WAKE_WORD),
-        (PipelineEventType.WAKE_WORD_START, AssistSatelliteState.LISTENING_WAKE_WORD),
-        (PipelineEventType.WAKE_WORD_END, AssistSatelliteState.LISTENING_WAKE_WORD),
-        (PipelineEventType.STT_START, AssistSatelliteState.LISTENING_COMMAND),
-        (PipelineEventType.STT_VAD_START, AssistSatelliteState.LISTENING_COMMAND),
-        (PipelineEventType.STT_VAD_END, AssistSatelliteState.LISTENING_COMMAND),
-        (PipelineEventType.STT_END, AssistSatelliteState.LISTENING_COMMAND),
-        (PipelineEventType.INTENT_START, AssistSatelliteState.PROCESSING),
-        (PipelineEventType.INTENT_END, AssistSatelliteState.PROCESSING),
-        (PipelineEventType.TTS_START, AssistSatelliteState.RESPONDING),
-        (PipelineEventType.TTS_END, AssistSatelliteState.RESPONDING),
-        (PipelineEventType.ERROR, AssistSatelliteState.RESPONDING),
+    for event_type, event_data, expected_state in (
+        (PipelineEventType.RUN_START, {}, AssistSatelliteState.LISTENING_WAKE_WORD),
+        (PipelineEventType.RUN_END, {}, AssistSatelliteState.LISTENING_WAKE_WORD),
+        (
+            PipelineEventType.WAKE_WORD_START,
+            {},
+            AssistSatelliteState.LISTENING_WAKE_WORD,
+        ),
+        (PipelineEventType.WAKE_WORD_END, {}, AssistSatelliteState.LISTENING_WAKE_WORD),
+        (PipelineEventType.STT_START, {}, AssistSatelliteState.LISTENING_COMMAND),
+        (PipelineEventType.STT_VAD_START, {}, AssistSatelliteState.LISTENING_COMMAND),
+        (PipelineEventType.STT_VAD_END, {}, AssistSatelliteState.LISTENING_COMMAND),
+        (PipelineEventType.STT_END, {}, AssistSatelliteState.LISTENING_COMMAND),
+        (PipelineEventType.INTENT_START, {}, AssistSatelliteState.PROCESSING),
+        (
+            PipelineEventType.INTENT_END,
+            {
+                "intent_output": {
+                    "conversation_id": "mock-conversation-id",
+                }
+            },
+            AssistSatelliteState.PROCESSING,
+        ),
+        (PipelineEventType.TTS_START, {}, AssistSatelliteState.RESPONDING),
+        (PipelineEventType.TTS_END, {}, AssistSatelliteState.RESPONDING),
+        (PipelineEventType.ERROR, {}, AssistSatelliteState.RESPONDING),
     ):
-        kwargs["event_callback"](PipelineEvent(event_type, {}))
+        kwargs["event_callback"](PipelineEvent(event_type, event_data))
         state = hass.states.get(ENTITY_ID)
         assert state.state == expected_state, event_type