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

fix: skipped adaptation of intercepted turn-on with attributes

Browse source
This commit is contained in:
Mario Guggenberger 2026-01-13 18:34:09 +00:00
commit 4319a6a524
No known key found for this signature in database
GPG key ID: 4BF213E6EF2D7EA1
2 changed files with 9 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

9
custom_components/adaptive_lighting/switch.py
View file

@ -1854,7 +1854,7 @@ class AdaptiveLightingManager:
is_already_on = self.hass.states.is_state(entity_id, STATE_ON)
is_manually_controlled = self.get_manual_control_attributes(
entity_id,
).has_any()
).has_all()
if (
not switch.is_on
@ -1871,6 +1871,9 @@ class AdaptiveLightingManager:
entity_id,
data[CONF_PARAMS],
)
# Skip adaptation only if all attributes are manually controlled, otherwise
# we have to assume that some attribute(s) need adaptation.
and self.get_manual_control_attributes(entity_id).has_all()
)
):
_LOGGER.debug(
@ -2082,7 +2085,8 @@ class AdaptiveLightingManager:
data: ServiceData,
):
_LOGGER.debug(
"Intercepted TURN_ON call with data %s (%s)",
"%s: Intercepted TURN_ON call with data %s (%s)",
entity_ids,
data,
call.context.id,
)
@ -2117,6 +2121,7 @@ class AdaptiveLightingManager:
# lack of a bijective mapping.)
preprocess_turn_on_alternatives(self.hass, first_service_data)
data[CONF_PARAMS].update(first_service_data)
switch.manager.last_service_data[entity_ids[0]] = first_service_data
# Schedule additional service calls for the remaining adaptation data.
# We cannot know here whether there is another call to follow (since the

3
tests/test_switch.py
View file

@ -20,6 +20,7 @@ from homeassistant.components.adaptive_lighting.adaptation_utils import (
AdaptationData,
LightControlAttributes,
_create_service_call_data_iterator,
has_color_attribute,
)
from homeassistant.components.adaptive_lighting.color_and_brightness import (
lerp_color_hsv,
@ -2947,7 +2948,7 @@ async def test_adapt_only_on_bare_turn_on_respects_pause_changed_mode(hass, inte
"With PAUSE_CHANGED mode, color should still be adapted since only brightness "
"was marked as manually controlled."
)
assert ATTR_COLOR_TEMP_KELVIN in last_service_data, (
assert has_color_attribute(last_service_data), (
f"Bug: Color was not adapted. last_service_data={last_service_data}. "
f"With take_over_control_mode=PAUSE_CHANGED and only brightness marked "
f"as manually controlled, color_temp should still be adapted."