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

Use device area/floor in intent_script (#130644)

Browse Source 
* Use device area/floor in intent_script

* Add test
This commit is contained in:
Artur Pragacz 2024-12-07 06:49:07 +01:00 committed by GitHub
parent 16484dcee5
commit 61fbfc3d40
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 28 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
homeassistant/components/intent_script/__init__.py
View File

@ -148,6 +148,8 @@ class ScriptIntentHandler(intent.IntentHandler):
vol.Any("name", "area", "floor"): cv.string,
vol.Optional("domain"): vol.All(cv.ensure_list, [cv.string]),
vol.Optional("device_class"): vol.All(cv.ensure_list, [cv.string]),
vol.Optional("preferred_area_id"): cv.string,
vol.Optional("preferred_floor_id"): cv.string,
}
def __init__(self, intent_type: str, config: ConfigType) -> None:
@ -205,7 +207,14 @@ class ScriptIntentHandler(intent.IntentHandler):
)
if match_constraints.has_constraints:
match_result = intent.async_match_targets(hass, match_constraints)
match_preferences = intent.MatchTargetsPreferences(
area_id=slots.get("preferred_area_id"),
floor_id=slots.get("preferred_floor_id"),
)
match_result = intent.async_match_targets(
hass, match_constraints, match_preferences
)
if match_result.is_match:
targets = {}

22
tests/components/intent_script/test_init.py
View File

@ -4,7 +4,7 @@ from unittest.mock import patch
from homeassistant import config as hass_config
from homeassistant.components.intent_script import DOMAIN
from homeassistant.const import SERVICE_RELOAD
from homeassistant.const import ATTR_FRIENDLY_NAME, SERVICE_RELOAD
from homeassistant.core import HomeAssistant
from homeassistant.helpers import (
area_registry as ar,
@ -235,17 +235,31 @@ async def test_intent_script_targets(
floor_1 = floor_registry.async_create("first floor")
kitchen = area_registry.async_get_or_create("kitchen")
area_registry.async_update(kitchen.id, floor_id=floor_1.floor_id)
bathroom = area_registry.async_get_or_create("bathroom")
entity_registry.async_get_or_create(
"light", "demo", "1234", suggested_object_id="kitchen"
"light", "demo", "kitchen", suggested_object_id="kitchen"
)
entity_registry.async_update_entity("light.kitchen", area_id=kitchen.id)
hass.states.async_set("light.kitchen", "off")
hass.states.async_set(
"light.kitchen", "off", attributes={ATTR_FRIENDLY_NAME: "overhead light"}
)
entity_registry.async_get_or_create(
"light", "demo", "bathroom", suggested_object_id="bathroom"
)
entity_registry.async_update_entity("light.bathroom", area_id=bathroom.id)
hass.states.async_set(
"light.bathroom", "off", attributes={ATTR_FRIENDLY_NAME: "overhead light"}
)
response = await intent.async_handle(
hass,
"test",
"Targets",
{"name": {"value": "kitchen"}, "domain": {"value": "light"}},
{
"name": {"value": "overhead light"},
"domain": {"value": "light"},
"preferred_area_id": {"value": "kitchen"},
},
)
assert len(calls) == 1
assert calls[0].data["targets"] == {"entities": ["light.kitchen"]}