Merge PR basnijholt#1460: Fix transient Zigbee off-state cancelling adaptation

Author: Florian Horner

custom_components/adaptive_lighting/adaptation_utils.py

@@ -98,7 +98,7 @@ def _split_service_call_data(service_data: ServiceData) -> list[ServiceData]:
         split_data = {
             attribute: service_data[attribute]
             for attribute in attributes
-            if service_data.get(attribute)
+            if service_data.get(attribute) is not None
         }
         if split_data:
             service_datas.append(common_data | split_data)

custom_components/adaptive_lighting/switch.py

@@ -2462,7 +2462,7 @@ async def on(eid: str, event: Event) -> None:
                 elif state.state == STATE_OFF:  # is turning on
                     await on(eid, event)
 
-    async def state_changed_event_listener(
+    async def state_changed_event_listener(  # noqa: PLR0912
         self,
         event: Event[EventStateChangedData],
     ) -> None:
@@ -2539,12 +2539,24 @@ async def state_changed_event_listener(
         if old_on and new_off:
             # Tracks 'on' → 'off' state changes
             self.on_to_off_event[entity_id] = event
-            self.reset(entity_id)
-            _LOGGER.debug(
-                "Detected an 'on' → 'off' event for '%s' with context.id='%s'",
-                entity_id,
-                event.context.id,
-            )
+            if self.is_proactively_adapting(event.context.id):
+                # A transient 'off' state reported by the device during a
+                # proactive turn-on adaptation (e.g., Zigbee devices that
+                # briefly report 'off' mid-transition). Do not cancel the
+                # in-flight adaptation task — just record the event.
+                _LOGGER.debug(
+                    "Detected an 'on' → 'off' event for '%s' with context.id='%s'"
+                    " during proactive adaptation, skipping reset",
+                    entity_id,
+                    event.context.id,
+                )
+            else:
+                self.reset(entity_id)
+                _LOGGER.debug(
+                    "Detected an 'on' → 'off' event for '%s' with context.id='%s'",
+                    entity_id,
+                    event.context.id,
+                )
         elif old_off and new_on:
             # Tracks 'off' → 'on' state changes
             self.off_to_on_event[entity_id] = event
@@ -2761,14 +2773,6 @@ async def just_turned_off(  # noqa: PLR0911
             )
             return False
 
-        if off_to_on_event.context.id == on_to_off_event.context.id:
-            _LOGGER.debug(
-                "just_turned_off: 'on' → 'off' state change has the same context.id as the"
-                " 'off' → 'on' state change for '%s'. This is probably a false positive.",
-                entity_id,
-            )
-            return True
-
         id_on_to_off = on_to_off_event.context.id
 
         turn_off_event = self.turn_off_event.get(entity_id)
@@ -2777,6 +2781,10 @@ async def just_turned_off(  # noqa: PLR0911
         else:
             transition = None
 
+        # Check if the off→on was triggered by a real turn_on service call
+        # BEFORE the context-equality check. This prevents false positives
+        # where a Zigbee device briefly reports 'off' during a turn_on
+        # transition, causing both events to share the same context ID.
         if self._off_to_on_state_event_is_from_turn_on(entity_id, off_to_on_event):
             is_toggle = off_to_on_event == self.toggle_event.get(entity_id)
             from_service = "light.toggle" if is_toggle else "light.turn_on"
@@ -2786,6 +2794,21 @@ async def just_turned_off(  # noqa: PLR0911
             )
             return False
 
+        if (
+            off_to_on_event.context.id == on_to_off_event.context.id
+            and turn_off_event is not None
+            and turn_off_event.context.id == on_to_off_event.context.id
+        ):
+            # Context IDs match AND a real turn_off service call was made with
+            # the same context. This is the legitimate case: a light still
+            # transitioning off that briefly polls as 'on'. Safe to cancel.
+            _LOGGER.debug(
+                "just_turned_off: 'on' → 'off' state change has the same context.id as the"
+                " 'off' → 'on' state change for '%s', confirmed by turn_off event.",
+                entity_id,
+            )
+            return True
+
         if (
             turn_off_event is not None
             and id_on_to_off == turn_off_event.context.id