Add context to scripts run by template entities (home-assistant#17329)

paulsm · Oct 15, 2018 · ac79ff9 · ac79ff9
1 parent 0bf10b0
commit ac79ff9
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 21 deletions.
diff --git a/homeassistant/components/cover/template.py b/homeassistant/components/cover/template.py
@@ -278,55 +278,59 @@ def should_poll(self):
     async def async_open_cover(self, **kwargs):
         """Move the cover up."""
         if self._open_script:
-            await self._open_script.async_run()
+            await self._open_script.async_run(context=self._context)
         elif self._position_script:
-            await self._position_script.async_run({"position": 100})
+            await self._position_script.async_run(
+                {"position": 100}, context=self._context)
         if self._optimistic:
             self._position = 100
             self.async_schedule_update_ha_state()
 
     async def async_close_cover(self, **kwargs):
         """Move the cover down."""
         if self._close_script:
-            await self._close_script.async_run()
+            await self._close_script.async_run(context=self._context)
         elif self._position_script:
-            await self._position_script.async_run({"position": 0})
+            await self._position_script.async_run(
+                {"position": 0}, context=self._context)
         if self._optimistic:
             self._position = 0
             self.async_schedule_update_ha_state()
 
     async def async_stop_cover(self, **kwargs):
         """Fire the stop action."""
         if self._stop_script:
-            await self._stop_script.async_run()
+            await self._stop_script.async_run(context=self._context)
 
     async def async_set_cover_position(self, **kwargs):
         """Set cover position."""
         self._position = kwargs[ATTR_POSITION]
         await self._position_script.async_run(
-            {"position": self._position})
+            {"position": self._position}, context=self._context)
         if self._optimistic:
             self.async_schedule_update_ha_state()
 
     async def async_open_cover_tilt(self, **kwargs):
         """Tilt the cover open."""
         self._tilt_value = 100
-        await self._tilt_script.async_run({"tilt": self._tilt_value})
+        await self._tilt_script.async_run(
+            {"tilt": self._tilt_value}, context=self._context)
         if self._tilt_optimistic:
             self.async_schedule_update_ha_state()
 
     async def async_close_cover_tilt(self, **kwargs):
         """Tilt the cover closed."""
         self._tilt_value = 0
         await self._tilt_script.async_run(
-            {"tilt": self._tilt_value})
+            {"tilt": self._tilt_value}, context=self._context)
         if self._tilt_optimistic:
             self.async_schedule_update_ha_state()
 
     async def async_set_cover_tilt_position(self, **kwargs):
         """Move the cover tilt to a specific position."""
         self._tilt_value = kwargs[ATTR_TILT_POSITION]
-        await self._tilt_script.async_run({"tilt": self._tilt_value})
+        await self._tilt_script.async_run(
+            {"tilt": self._tilt_value}, context=self._context)
         if self._tilt_optimistic:
             self.async_schedule_update_ha_state()
 

diff --git a/homeassistant/components/fan/template.py b/homeassistant/components/fan/template.py
@@ -224,7 +224,7 @@ def should_poll(self):
     # pylint: disable=arguments-differ
     async def async_turn_on(self, speed: str = None) -> None:
         """Turn on the fan."""
-        await self._on_script.async_run()
+        await self._on_script.async_run(context=self._context)
         self._state = STATE_ON
 
         if speed is not None:
@@ -233,7 +233,7 @@ async def async_turn_on(self, speed: str = None) -> None:
     # pylint: disable=arguments-differ
     async def async_turn_off(self) -> None:
         """Turn off the fan."""
-        await self._off_script.async_run()
+        await self._off_script.async_run(context=self._context)
         self._state = STATE_OFF
 
     async def async_set_speed(self, speed: str) -> None:
@@ -243,7 +243,8 @@ async def async_set_speed(self, speed: str) -> None:
 
         if speed in self._speed_list:
             self._speed = speed
-            await self._set_speed_script.async_run({ATTR_SPEED: speed})
+            await self._set_speed_script.async_run(
+                {ATTR_SPEED: speed}, context=self._context)
         else:
             _LOGGER.error(
                 'Received invalid speed: %s. Expected: %s.',
@@ -257,7 +258,7 @@ async def async_oscillate(self, oscillating: bool) -> None:
         if oscillating in _VALID_OSC:
             self._oscillating = oscillating
             await self._set_oscillating_script.async_run(
-                {ATTR_OSCILLATING: oscillating})
+                {ATTR_OSCILLATING: oscillating}, context=self._context)
         else:
             _LOGGER.error(
                 'Received invalid oscillating value: %s. Expected: %s.',
@@ -271,7 +272,7 @@ async def async_set_direction(self, direction: str) -> None:
         if direction in _VALID_DIRECTIONS:
             self._direction = direction
             await self._set_direction_script.async_run(
-                {ATTR_DIRECTION: direction})
+                {ATTR_DIRECTION: direction}, context=self._context)
         else:
             _LOGGER.error(
                 'Received invalid direction: %s. Expected: %s.',

diff --git a/homeassistant/components/light/template.py b/homeassistant/components/light/template.py
@@ -215,8 +215,8 @@ async def async_turn_on(self, **kwargs):
             optimistic_set = True
 
         if ATTR_BRIGHTNESS in kwargs and self._level_script:
-            self.hass.async_create_task(self._level_script.async_run(
-                {"brightness": kwargs[ATTR_BRIGHTNESS]}))
+            await self._level_script.async_run(
+                {"brightness": kwargs[ATTR_BRIGHTNESS]}, context=self._context)
         else:
             await self._on_script.async_run()
 
@@ -225,7 +225,7 @@ async def async_turn_on(self, **kwargs):
 
     async def async_turn_off(self, **kwargs):
         """Turn the light off."""
-        await self._off_script.async_run()
+        await self._off_script.async_run(context=self._context)
         if self._template is None:
             self._state = False
             self.async_schedule_update_ha_state()

diff --git a/homeassistant/components/lock/template.py b/homeassistant/components/lock/template.py
@@ -131,11 +131,11 @@ async def async_lock(self, **kwargs):
         if self._optimistic:
             self._state = True
             self.async_schedule_update_ha_state()
-        await self._command_lock.async_run()
+        await self._command_lock.async_run(context=self._context)
 
     async def async_unlock(self, **kwargs):
         """Unlock the device."""
         if self._optimistic:
             self._state = False
             self.async_schedule_update_ha_state()
-        await self._command_unlock.async_run()
+        await self._command_unlock.async_run(context=self._context)
diff --git a/homeassistant/components/switch/template.py b/homeassistant/components/switch/template.py
@@ -151,11 +151,11 @@ def entity_picture(self):
 
     async def async_turn_on(self, **kwargs):
         """Fire the on action."""
-        await self._on_script.async_run()
+        await self._on_script.async_run(context=self._context)
 
     async def async_turn_off(self, **kwargs):
         """Fire the off action."""
-        await self._off_script.async_run()
+        await self._off_script.async_run(context=self._context)
 
     async def async_update(self):
         """Update the state from the template."""