add apply service

custom_components/adaptive_lighting/const.py

@@ -34,6 +34,7 @@ CONF_SUNSET_OFFSET, DEFAULT_SUNSET_OFFSET = "sunset_offset", 0
 CONF_SUNSET_TIME = "sunset_time"
 CONF_TRANSITION, DEFAULT_TRANSITION = "transition", 60
 
+SERVICE_APPLY = "apply"
 UNDO_UPDATE_LISTENER = "undo_update_listener"
 NONE_STR = "None"  # TODO: use `from homeassistant.const import ENTITY_MATCH_NONE`?
 

custom_components/adaptive_lighting/services.yaml

@@ -0,0 +1,12 @@
+apply:
+  description: Applies the current Adaptive Lighting settings to lights.
+  fields:
+    entity_id:
+      description: entity_id of the Adaptive Lighting switch
+      example: switch.adaptive_lighting_default
+    lights:
+      description: entity_id(s) of lights
+      example: light.bedroom_ceiling
+    transition:
+      description: transition of the lights
+      example: 10

custom_components/adaptive_lighting/switch.py

@@ -5,7 +5,11 @@ import bisect
 import logging
 from copy import deepcopy
 from datetime import timedelta
+from functools import partial
 
+import voluptuous as vol
+
+import homeassistant.helpers.config_validation as cv
 import homeassistant.util.dt as dt_util
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS_PCT,
@@ -19,6 +23,7 @@ from homeassistant.components.light import (
     SUPPORT_COLOR,
     SUPPORT_COLOR_TEMP,
     SUPPORT_TRANSITION,
+    VALID_TRANSITION,
     is_on,
 )
 from homeassistant.components.switch import SwitchEntity
@@ -30,6 +35,7 @@ from homeassistant.const import (
     SUN_EVENT_SUNRISE,
     SUN_EVENT_SUNSET,
 )
+from homeassistant.helpers import entity_platform
 from homeassistant.helpers.event import (
     async_track_state_change,
     async_track_time_interval,
@@ -69,6 +75,7 @@ from .const import (
     EXTRA_VALIDATION,
     ICON,
     NONE_STR,
+    SERVICE_APPLY,
     SUN_EVENT_MIDNIGHT,
     SUN_EVENT_NOON,
     VALIDATION_TUPLES,
@@ -94,6 +101,18 @@ _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(seconds=10)
 
 
+async def handle_apply(entity, service_call):
+    """Handle the entity service apply."""
+    if not isinstance(entity, AdaptiveSwitch):
+        raise ValueError("Apply can only be called for a AdaptiveSwitch.")
+    _LOGGER.error(str(entity) + str(service_call))
+    await entity._adjust_lights(
+        service_call.data[CONF_LIGHTS],
+        service_call.data.get(CONF_TRANSITION),
+        force=True,
+    )
+
+
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up the AdaptiveLighting switch."""
     switch = AdaptiveSwitch(hass, config_entry)
@@ -101,6 +120,17 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
         hass.data[DOMAIN] = {}
     name = config_entry.data[CONF_NAME]
     hass.data[DOMAIN][name] = switch
+
+    # Register `apply` service
+    platform = entity_platform.current_platform.get()
+    platform.async_register_entity_service(
+        SERVICE_APPLY,
+        {
+            vol.Required(CONF_LIGHTS): cv.entity_ids,
+            vol.Optional(CONF_TRANSITION): VALID_TRANSITION,
+        },
+        handle_apply,
+    )
     async_add_entities([switch], update_before_add=True)
 
 
@@ -423,8 +453,8 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
             return False
         return True
 
-    async def _adjust_lights(self, lights, transition):
-        if not self._should_adjust():
+    async def _adjust_lights(self, lights, transition, force=False):
+        if not self._should_adjust() or not force:
             return
         tasks = [
             await self._adjust_light(light, transition)