Skip to content

Add a FileSystemLoader to load external Jinja templates #85665

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

Closed
DanielBaulig wants to merge 2 commits into from
Closed

Add a FileSystemLoader to load external Jinja templates #85665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7707f25
Add a FileSystemLoader to load external Jinja templates
DanielBaulig Jan 11, 2023
d97d6e7
Merge branch 'dev' into enable-jinja2-import-include
DanielBaulig Jan 29, 2023
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
18 changes: 16 additions & 2 deletions homeassistant/helpers/template.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import logging
import math
from operator import attrgetter, contains
import os
import random
import re
import statistics
Expand All @@ -36,7 +37,7 @@
import async_timeout
from awesomeversion import AwesomeVersion
import jinja2
from jinja2 import pass_context, pass_environment, pass_eval_context
from jinja2 import FileSystemLoader, pass_context, pass_environment, pass_eval_context
from jinja2.sandbox import ImmutableSandboxedEnvironment
from jinja2.utils import Namespace
import voluptuous as vol
Expand Down Expand Up @@ -2035,7 +2036,20 @@ def __init__(self, hass, limited=False, strict=False):
undefined = LoggingUndefined
else:
undefined = jinja2.StrictUndefined
super().__init__(undefined=undefined)

loader: type[FileSystemLoader] | None = None
if hass is not None:
loader = FileSystemLoader(
os.path.join(
hass.config.config_dir,
"templates",
)
)

super().__init__(
undefined=undefined,
loader=loader,
)
self.hass = hass
self.template_cache: weakref.WeakValueDictionary[
str | jinja2.nodes.Template, CodeType | str | None
Expand Down