jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-19 19:27:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow service data template to return a dict (#57105)

Browse Source
This commit is contained in:
Chris Browet 2021-10-23 21:10:30 +02:00 committed by GitHub
parent 9ae7f0ecd7
commit e961d92b5e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 40 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
homeassistant/helpers/config_validation.py
View File

@ -929,8 +929,10 @@ SERVICE_SCHEMA = vol.All(
vol.Exclusive(CONF_SERVICE_TEMPLATE, "service name"): vol.Any( vol.Exclusive(CONF_SERVICE_TEMPLATE, "service name"): vol.Any(
service, dynamic_template service, dynamic_template
), ),
vol.Optional("data"): vol.All(dict, template_complex), vol.Optional("data"): vol.Any(template, vol.All(dict, template_complex)),
vol.Optional("data_template"): vol.All(dict, template_complex), vol.Optional("data_template"): vol.Any(
template, vol.All(dict, template_complex)
),
vol.Optional(CONF_ENTITY_ID): comp_entity_ids, vol.Optional(CONF_ENTITY_ID): comp_entity_ids,
vol.Optional(CONF_TARGET): vol.Any(ENTITY_SERVICE_FIELDS, dynamic_template), vol.Optional(CONF_TARGET): vol.Any(ENTITY_SERVICE_FIELDS, dynamic_template),
} }

7
homeassistant/helpers/service.py
View File

@ -234,7 +234,12 @@ def async_prepare_call_from_config(
continue continue
try: try:
template.attach(hass, config[conf]) template.attach(hass, config[conf])
service_data.update(template.render_complex(config[conf], variables)) render = template.render_complex(config[conf], variables)
if not isinstance(render, dict):
raise HomeAssistantError(
"Error rendering data template: Result is not a Dictionary"
)
service_data.update(render)
except TemplateError as ex: except TemplateError as ex:
raise HomeAssistantError(f"Error rendering data template: {ex}") from ex raise HomeAssistantError(f"Error rendering data template: {ex}") from ex

32
tests/components/automation/test_init.py
View File

@ -45,9 +45,9 @@ def calls(hass):
return async_mock_service(hass, "test", "automation") return async_mock_service(hass, "test", "automation")
async def test_service_data_not_a_dict(hass, calls): async def test_service_data_not_a_dict(hass, caplog, calls):
"""Test service data not dict.""" """Test service data not dict."""
with assert_setup_component(0, automation.DOMAIN): with assert_setup_component(1, automation.DOMAIN):
assert await async_setup_component( assert await async_setup_component(
hass, hass,
automation.DOMAIN, automation.DOMAIN,
@ -59,6 +59,34 @@ async def test_service_data_not_a_dict(hass, calls):
}, },
) )
hass.bus.async_fire("test_event")
await hass.async_block_till_done()
assert len(calls) == 0
assert "Result is not a Dictionary" in caplog.text
async def test_service_data_single_template(hass, calls):
"""Test service data not dict."""
with assert_setup_component(1, automation.DOMAIN):
assert await async_setup_component(
hass,
automation.DOMAIN,
{
automation.DOMAIN: {
"trigger": {"platform": "event", "event_type": "test_event"},
"action": {
"service": "test.automation",
"data": "{{ { 'foo': 'bar' } }}",
},
}
},
)
hass.bus.async_fire("test_event")
await hass.async_block_till_done()
assert len(calls) == 1
assert calls[0].data["foo"] == "bar"
async def test_service_specify_data(hass, calls): async def test_service_specify_data(hass, calls):
"""Test service data.""" """Test service data."""