Add variable support to template rendering

homeassistant/util/template.py

@@ -5,37 +5,17 @@ homeassistant.util.template
 Template utility methods for rendering strings with HA data.
 """
 # pylint: disable=too-few-public-methods
-from jinja2.sandbox import SandboxedEnvironment
+from jinja2.sandbox import ImmutableSandboxedEnvironment
-
-ENV = SandboxedEnvironment()
 
 
-def forgiving_round(value, precision=0):
+def render(hass, template, variables=None, **kwargs):
-    """ Rounding method that accepts strings. """
-    try:
-        return int(float(value)) if precision == 0 else round(float(value),
-                                                              precision)
-    except ValueError:
-        # If value can't be converted to float
-        return value
-
-
-def multiply(value, amount):
-    """ Converts to float and multiplies value. """
-    try:
-        return float(value) * amount
-    except ValueError:
-        # If value can't be converted to float
-        return value
-
-ENV.filters['round'] = forgiving_round
-ENV.filters['multiply'] = multiply
-
-
-def render(hass, template):
     """ Render given template. """
-    return ENV.from_string(template).render(
+    if variables is not None:
-        states=AllStates(hass))
+        kwargs.update(variables)
+
+    return ENV.from_string(template, {
+        'states': AllStates(hass)
+    }).render(kwargs)
 
 
 class AllStates(object):
@@ -66,3 +46,26 @@ class DomainStates(object):
             (state for state in self._hass.states.all()
              if state.domain == self._domain),
             key=lambda state: state.entity_id))
+
+
+def forgiving_round(value, precision=0):
+    """ Rounding method that accepts strings. """
+    try:
+        return int(float(value)) if precision == 0 else round(float(value),
+                                                              precision)
+    except ValueError:
+        # If value can't be converted to float
+        return value
+
+
+def multiply(value, amount):
+    """ Converts to float and multiplies value. """
+    try:
+        return float(value) * amount
+    except ValueError:
+        # If value can't be converted to float
+        return value
+
+ENV = ImmutableSandboxedEnvironment()
+ENV.filters['round'] = forgiving_round
+ENV.filters['multiply'] = multiply

tests/util/test_template.py

@@ -64,3 +64,11 @@ class TestUtilTemplate(unittest.TestCase):
             template.render(
                 self.hass,
                 '{{ states.sensor.temperature.state | multiply(10) | round }}'))
+
+    def test_passing_vars_as_keywords(self):
+        self.assertEqual(
+            '127', template.render(self.hass, '{{ hello }}', hello=127))
+
+    def test_passing_vars_as_vars(self):
+        self.assertEqual(
+            '127', template.render(self.hass, '{{ hello }}', {'hello': 127}))