evlli/hass-core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Pass hass instance when validating templates (#89242)

Browse source 
* Pass hass instance when validating templates

* Update tests

* Fix validating templates without hass

* Update service tests
This commit is contained in:
Erik Montnemery 2023-03-08 17:28:53 +01:00 • committed by GitHub
parent b0013247ff
commit 18cb53a35c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 97 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

20
homeassistant/helpers/config_validation.py
View file

@ -85,7 +85,12 @@ from homeassistant.const import (
WEEKDAYS,
UnitOfTemperature,
)
from homeassistant.core import split_entity_id, valid_entity_id
from homeassistant.core import (
HomeAssistant,
async_get_hass,
split_entity_id,
valid_entity_id,
)
from homeassistant.exceptions import TemplateError
from homeassistant.generated import currencies
from homeassistant.generated.countries import COUNTRIES
@ -597,7 +602,11 @@ def template(value: Any | None) -> template_helper.Template:
if isinstance(value, (list, dict, template_helper.Template)):
raise vol.Invalid("template value should be a string")
template_value = template_helper.Template(str(value))
hass: HomeAssistant | None = None
with contextlib.suppress(LookupError):
hass = async_get_hass()
template_value = template_helper.Template(str(value), hass)
try:
template_value.ensure_valid()
@ -615,7 +624,12 @@ def dynamic_template(value: Any | None) -> template_helper.Template:
if not template_helper.is_template_string(str(value)):
raise vol.Invalid("template value does not contain a dynamic template")
template_value = template_helper.Template(str(value))
hass: HomeAssistant | None = None
with contextlib.suppress(LookupError):
hass = async_get_hass()
template_value = template_helper.Template(str(value), hass)
try:
template_value.ensure_valid()
return template_value