Merge remote-tracking branch 'origin/main' into state-in-manager

This commit is contained in:
Bas Nijholt 2023-07-31 17:52:56 -07:00
commit d5af8cfcea

View file

@ -1248,8 +1248,6 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
context = context or self.create_context("adapt_lights")
self.manager.last_service_data[light] = service_data
return prepare_adaptation_data(
self.hass,
light,
@ -1323,6 +1321,8 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
service_data,
data.context.id,
)
light = service_data[ATTR_ENTITY_ID]
self.manager.last_service_data[light] = service_data
await self.hass.services.async_call(
LIGHT_DOMAIN,
SERVICE_TURN_ON,
@ -2071,10 +2071,7 @@ class AdaptiveLightingManager:
def start_transition_timer(self, light: str) -> None:
"""Mark a light as manually controlled."""
last_service_data = self.last_service_data.get(light)
if not last_service_data:
_LOGGER.debug("This should not ever happen. Please report to the devs.")
return
last_service_data = self.last_service_data[light]
last_transition = last_service_data.get(ATTR_TRANSITION)
if not last_transition:
_LOGGER.debug(