Skip to content

Accept more templates in service fields #150239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
emontnemery merged 3 commits into from
Nov 3, 2025
Merged

Accept more templates in service fields #150239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
faa2402
Accept more templates in service fields
arturpragacz Aug 3, 2025
52eea79
test
arturpragacz Oct 30, 2025
696d91c
Add comments in test
arturpragacz Nov 3, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 12 additions & 4 deletions homeassistant/helpers/config_validation.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1359,16 +1359,24 @@ def platform_only_config_schema(domain: str) -> Callable[[dict], dict]:
vol.All(list, template_complex),
),
vol.Optional(ATTR_DEVICE_ID): vol.Any(
ENTITY_MATCH_NONE, vol.All(ensure_list, [vol.Any(dynamic_template, str)])
ENTITY_MATCH_NONE,
dynamic_template,
vol.All(ensure_list, [vol.Any(dynamic_template, str)]),
),
vol.Optional(ATTR_AREA_ID): vol.Any(
ENTITY_MATCH_NONE, vol.All(ensure_list, [vol.Any(dynamic_template, str)])
ENTITY_MATCH_NONE,
dynamic_template,
vol.All(ensure_list, [vol.Any(dynamic_template, str)]),
),
vol.Optional(ATTR_FLOOR_ID): vol.Any(
ENTITY_MATCH_NONE, vol.All(ensure_list, [vol.Any(dynamic_template, str)])
ENTITY_MATCH_NONE,
dynamic_template,
vol.All(ensure_list, [vol.Any(dynamic_template, str)]),
),
vol.Optional(ATTR_LABEL_ID): vol.Any(
ENTITY_MATCH_NONE, vol.All(ensure_list, [vol.Any(dynamic_template, str)])
ENTITY_MATCH_NONE,
dynamic_template,
vol.All(ensure_list, [vol.Any(dynamic_template, str)]),
),
}

Expand Down
23 changes: 23 additions & 0 deletions tests/helpers/test_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -469,6 +469,7 @@ async def test_service_call(hass: HomeAssistant) -> None:
"floor_id": ["test-floor-id"],
}

# Templated strings in target fields
config = {
"action": "{{ 'test_domain.test_service' }}",
"target": {
Expand All @@ -489,6 +490,7 @@ async def test_service_call(hass: HomeAssistant) -> None:
"floor_id": ["floor-first", "floor-second"],
}

# Templated dict as target
config = {
"action": "{{ 'test_domain.test_service' }}",
"target": "{{ var_target }}",
Expand All @@ -511,6 +513,27 @@ async def test_service_call(hass: HomeAssistant) -> None:
"entity_id": ["light.static"],
}

# Templated lists as target fields
config = {
Comment thread
arturpragacz marked this conversation as resolved.
"action": "{{ 'test_domain.test_service' }}",
"target": {
"area_id": "{{ ['area-42', 'area-51'] }}",
"device_id": "{{ ['abcdef', 'fedcba'] }}",
"entity_id": "{{ ['light.static', 'light.dynamic'] }}",
"floor_id": "{{ ['floor-first', 'floor-second'] }}",
},
}

await service.async_call_from_config(hass, config)
await hass.async_block_till_done()

assert dict(calls[3].data) == {
"area_id": ["area-42", "area-51"],
"device_id": ["abcdef", "fedcba"],
"entity_id": ["light.static", "light.dynamic"],
"floor_id": ["floor-first", "floor-second"],
}


async def test_service_template_service_call(hass: HomeAssistant) -> None:
"""Test legacy service_template call with templating."""
Expand Down