Home-Assistant
/
core
mirror of https://github.com/home-assistant/core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add type hints on `Template().__init__()` (#82574)

pull/82564/head^2
Jan Bouwhuis 2022-11-23 20:26:55 +01:00 committed by GitHub
parent 27e6b69656
commit 23bc39b7f4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
homeassistant/components/esphome/__init__.py
View File

@ -146,8 +146,7 @@ async def async_setup_entry( # noqa: C901
if service.data_template:
try:
data_template = {
key: Template(value) # type: ignore[no-untyped-call]
for key, value in service.data_template.items()
key: Template(value) for key, value in service.data_template.items()
}
template.attach(hass, data_template)
service_data.update(

2
homeassistant/components/mqtt/models.py
View File

@ -152,7 +152,7 @@ class MqttCommandTemplate:
values[ATTR_NAME] = self._entity.name
if not self._template_state:
self._template_state = template.TemplateStateFromEntityId(
self._command_template.hass, self._entity.entity_id
self._entity.hass, self._entity.entity_id
)
values[ATTR_THIS] = self._template_state

2
homeassistant/components/shell_command/__init__.py
View File

@ -43,7 +43,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
cache[cmd] = prog, args, args_compiled
else:
prog, args = cmd.split(" ", 1)
args_compiled = template.Template(args, hass)
args_compiled = template.Template(str(args), hass)
cache[cmd] = prog, args, args_compiled
if args_compiled:

2
homeassistant/components/websocket_api/commands.py
View File

@ -446,7 +446,7 @@ async def handle_render_template(
) -> None:
"""Handle render_template command."""
template_str = msg["template"]
template_obj = template.Template(template_str, hass) # type: ignore[no-untyped-call]
template_obj = template.Template(template_str, hass)
variables = msg.get("variables")
timeout = msg.get("timeout")
info = None

4
homeassistant/helpers/config_validation.py
View File

@ -594,7 +594,7 @@ 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)) # type: ignore[no-untyped-call]
template_value = template_helper.Template(str(value))
try:
template_value.ensure_valid()
@ -612,7 +612,7 @@ 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)) # type: ignore[no-untyped-call]
template_value = template_helper.Template(str(value))
try:
template_value.ensure_valid()
return template_value

21
homeassistant/helpers/template.py
View File

@ -19,6 +19,7 @@ import re
import statistics
from struct import error as StructError, pack, unpack_from
import sys
from types import CodeType
from typing import Any, NoReturn, TypeVar, cast, overload
from urllib.parse import urlencode as urllib_urlencode
import weakref
@ -330,19 +331,19 @@ class Template:
"_hash_cache",
)
def __init__(self, template, hass=None):
def __init__(self, template: str, hass: HomeAssistant | None = None) -> None:
"""Instantiate a template."""
if not isinstance(template, str):
raise TypeError("Expected template to be a string")
self.template: str = template.strip()
self._compiled_code = None
self._compiled_code: CodeType | None = None
self._compiled: jinja2.Template | None = None
self.hass = hass
self.is_static = not is_template_string(template)
self._exc_info = None
self._limited = None
self._strict = None
self._exc_info: sys._OptExcInfo | None = None
self._limited: bool | None = None
self._strict: bool | None = None
self._hash_cache: int = hash(self.template)
@property
@ -383,10 +384,10 @@ class Template:
If limited is True, the template is not allowed to access any function or filter depending on hass or the state machine.
"""
if self.is_static:
if not parse_result or self.hass.config.legacy_templates:
if not parse_result or self.hass and self.hass.config.legacy_templates:
return self.template
return self._parse_result(self.template)
assert self.hass is not None, "hass variable not set on template"
return run_callback_threadsafe(
self.hass.loop,
partial(self.async_render, variables, parse_result, limited, **kwargs),
@ -408,7 +409,7 @@ class Template:
If limited is True, the template is not allowed to access any function or filter depending on hass or the state machine.
"""
if self.is_static:
if not parse_result or self.hass.config.legacy_templates:
if not parse_result or self.hass and self.hass.config.legacy_templates:
return self.template
return self._parse_result(self.template)
@ -424,7 +425,7 @@ class Template:
render_result = render_result.strip()
if self.hass.config.legacy_templates or not parse_result:
if not parse_result or self.hass and self.hass.config.legacy_templates:
return render_result
return self._parse_result(render_result)
@ -494,6 +495,7 @@ class Template:
finish_event = asyncio.Event()
def _render_template() -> None:
assert self.hass is not None, "hass variable not set on template"
try:
_render_with_context(self.template, compiled, **kwargs)
except TimeoutError:
@ -608,6 +610,7 @@ class Template:
self._strict is None or self._strict == strict
), "can't change between strict and non strict template"
assert not (strict and limited), "can't combine strict and limited template"
assert self._compiled_code is not None, "template code was not compiled"
self._limited = limited
self._strict = strict