remote/adaptive-lighting
1
0
Fork 0
mirror of https://github.com/basnijholt/adaptive-lighting.git synced 2026-09-11 06:14:04 +02:00
Code Issues Projects Releases Packages Wiki Activity

Normalize turn-off transitions during light recovery

Browse source
This commit is contained in:
Bas Nijholt 2026-09-08 05:06:26 -07:00
commit bd6e724030
2 changed files with 26 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

2
custom_components/adaptive_lighting/switch.py
View file

@ -2948,7 +2948,7 @@ class AdaptiveLightingManager:
turn_off = self.turn_off_event.get(entity_id)
if turn_off is None:
return False
transition = turn_off.data[ATTR_SERVICE_DATA].get(ATTR_TRANSITION)
transition = _turn_off_transition(turn_off)
elapsed = (dt_util.utcnow() - turn_off.time_fired).total_seconds()
if not 0 <= elapsed <= max(transition or 0, TURNING_OFF_DELAY):
return False

25
tests/test_switch.py
View file

@ -6922,6 +6922,31 @@ async def test_recovery_revalidates_after_delay(hass, monkeypatch, freezer, chan
await hass.async_block_till_done()
@pytest.mark.parametrize(
("transition", "window"),
[(10, 10), ("10", 10), (10000, 6553), ("10000", 6553), ("inf", 6553), (None, 5)],
)
async def test_recovery_normalizes_turn_off_transition(
hass,
cleanup,
transition,
window,
):
"""Recovery suppression ends after the light service's normalized window."""
switch, _ = await setup_lights_and_switch(hass)
manager = switch.manager
manager.turn_on_event.pop(ENTITY_LIGHT_1, None)
now = dt_util.utcnow().timestamp()
for elapsed, expected in [(window - 1, True), (window + 1, False)]:
manager.turn_off_event[ENTITY_LIGHT_1] = _turn_off_service_event(
[ENTITY_LIGHT_1],
now - elapsed,
Context(),
transition,
)
assert manager.recovery_is_during_turn_off(ENTITY_LIGHT_1) is expected
async def test_recovery_preserves_active_transition(hass, cleanup):
"""Availability does not reset a transition that still suppresses adaptation."""
switch, _ = await setup_lights_and_switch(hass, {CONF_DETECT_NON_HA_CHANGES: False})