LLM: skip local handling of search media query (home-assistant#154496)

Author: balloob

homeassistant/components/assist_pipeline/pipeline.py

@@ -19,7 +19,14 @@
 import hass_nabucasa
 import voluptuous as vol
 
-from homeassistant.components import conversation, stt, tts, wake_word, websocket_api
+from homeassistant.components import (
+    conversation,
+    media_player,
+    stt,
+    tts,
+    wake_word,
+    websocket_api,
+)
 from homeassistant.const import ATTR_SUPPORTED_FEATURES, MATCH_ALL
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -130,7 +137,10 @@ def validate_language(data: dict[str, Any]) -> Any:
 @callback
 def _async_local_fallback_intent_filter(result: RecognizeResult) -> bool:
     """Filter out intents that are not local fallback."""
-    return result.intent.name in (intent.INTENT_GET_STATE)
+    return result.intent.name in (
+        intent.INTENT_GET_STATE,
+        media_player.INTENT_MEDIA_SEARCH_AND_PLAY,
+    )
 
 
 @callback

homeassistant/components/media_player/__init__.py

@@ -104,6 +104,7 @@
     ATTR_SOUND_MODE_LIST,
     CONTENT_AUTH_EXPIRY_TIME,
     DOMAIN,
+    INTENT_MEDIA_SEARCH_AND_PLAY,
     REPEAT_MODES,
     SERVICE_BROWSE_MEDIA,
     SERVICE_CLEAR_PLAYLIST,

homeassistant/components/media_player/const.py

@@ -43,6 +43,16 @@
 
 DOMAIN = "media_player"
 
+INTENT_MEDIA_PAUSE = "HassMediaPause"
+INTENT_MEDIA_UNPAUSE = "HassMediaUnpause"
+INTENT_MEDIA_NEXT = "HassMediaNext"
+INTENT_MEDIA_PREVIOUS = "HassMediaPrevious"
+INTENT_PLAYER_MUTE = "HassMediaPlayerMute"
+INTENT_PLAYER_UNMUTE = "HassMediaPlayerUnmute"
+INTENT_SET_VOLUME = "HassSetVolume"
+INTENT_SET_VOLUME_RELATIVE = "HassSetVolumeRelative"
+INTENT_MEDIA_SEARCH_AND_PLAY = "HassMediaSearchAndPlay"
+
 
 class MediaPlayerState(
     StrEnum,

homeassistant/components/media_player/intent.py

@@ -30,23 +30,22 @@
     ATTR_MEDIA_VOLUME_LEVEL,
     ATTR_MEDIA_VOLUME_MUTED,
     DOMAIN,
+    INTENT_MEDIA_NEXT,
+    INTENT_MEDIA_PAUSE,
+    INTENT_MEDIA_PREVIOUS,
+    INTENT_MEDIA_SEARCH_AND_PLAY,
+    INTENT_MEDIA_UNPAUSE,
+    INTENT_PLAYER_MUTE,
+    INTENT_PLAYER_UNMUTE,
+    INTENT_SET_VOLUME,
+    INTENT_SET_VOLUME_RELATIVE,
     SERVICE_PLAY_MEDIA,
     SERVICE_SEARCH_MEDIA,
     MediaClass,
     MediaPlayerEntityFeature,
     MediaPlayerState,
 )
 
-INTENT_MEDIA_PAUSE = "HassMediaPause"
-INTENT_MEDIA_UNPAUSE = "HassMediaUnpause"
-INTENT_MEDIA_NEXT = "HassMediaNext"
-INTENT_MEDIA_PREVIOUS = "HassMediaPrevious"
-INTENT_PLAYER_MUTE = "HassMediaPlayerMute"
-INTENT_PLAYER_UNMUTE = "HassMediaPlayerUnmute"
-INTENT_SET_VOLUME = "HassSetVolume"
-INTENT_SET_VOLUME_RELATIVE = "HassSetVolumeRelative"
-INTENT_MEDIA_SEARCH_AND_PLAY = "HassMediaSearchAndPlay"
-
 _LOGGER = logging.getLogger(__name__)
 
 

tests/components/assist_pipeline/test_pipeline.py

@@ -12,6 +12,7 @@
 from homeassistant.components import (
     assist_pipeline,
     conversation,
+    media_player,
     media_source,
     stt,
     tts,
@@ -682,6 +683,17 @@ def test_fallback_intent_filter() -> None:
         )
         is True
     )
+    assert (
+        _async_local_fallback_intent_filter(
+            RecognizeResult(
+                intent=Intent(media_player.INTENT_MEDIA_SEARCH_AND_PLAY),
+                intent_data=IntentData([]),
+                entities={},
+                entities_list=[],
+            )
+        )
+        is True
+    )
     assert (
         _async_local_fallback_intent_filter(
             RecognizeResult(