Home-Assistant/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-12-24 12:59:34 +00:00
Code Activity

Assist fixes (#109889)

Browse Source 
* Don't pass entity ids in hassil slot lists

* Use first completed response

* Add more tests
This commit is contained in:
Michael Hansen
2024-02-07 15:13:42 -06:00
committed by GitHub
parent b276a7863b
commit 1750f54da4
9 changed files with 354 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
homeassistant/helpers/intent.py
View File

@@ -403,11 +403,11 @@ class ServiceIntentHandler(IntentHandler):
slots = self.async_validate_slots(intent_obj.slots)
name_slot = slots.get("name", {})
entity_id: str | None = name_slot.get("value")
entity_name: str | None = name_slot.get("text")
if entity_id == "all":
entity_name: str | None = name_slot.get("value")
entity_text: str | None = name_slot.get("text")
if entity_name == "all":
# Don't match on name if targeting all entities
entity_id = None
entity_name = None
# Look up area first to fail early
area_slot = slots.get("area", {})
@@ -436,7 +436,7 @@ class ServiceIntentHandler(IntentHandler):
states = list(
async_match_states(
hass,
name=entity_id,
name=entity_name,
area=area,
domains=domains,
device_classes=device_classes,
@@ -447,7 +447,7 @@ class ServiceIntentHandler(IntentHandler):
if not states:
# No states matched constraints
raise NoStatesMatchedError(
name=entity_name or entity_id,
name=entity_text or entity_name,
area=area_name or area_id,
domains=domains,
device_classes=device_classes,
@@ -455,6 +455,9 @@ class ServiceIntentHandler(IntentHandler):
response = await self.async_handle_states(intent_obj, states, area)
# Make the matched states available in the response
response.async_set_states(matched_states=states, unmatched_states=[])
return response
async def async_handle_states(