From 0ddb79b03fb54c493c4ac172ec3b7e18f50e0a76 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:13:26 -0800
Subject: [PATCH 126/301] docs: add maksim2005UKR as a contributor for
translation (#1304)
---
.all-contributorsrc | 9 +++++++++
README.md | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index ec6f3158..a7ce44dd 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1125,6 +1125,15 @@
"contributions": [
"translation"
]
+ },
+ {
+ "login": "maksim2005UKR",
+ "name": "Горпиніч Максим Олександрович",
+ "avatar_url": "https://avatars.githubusercontent.com/u/233082001?v=4",
+ "profile": "https://github.com/maksim2005UKR",
+ "contributions": [
+ "translation"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index aa2c2338..24e0d58c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -625,6 +625,7 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
Rafael do Amaral Porciuncula
🌍 |
hhjuhl
🌍 |
B.Athish
🌍 |
+ 
Горпиніч Максим Олександрович
🌍 |
From d12394dc03b3ed3b409ec0e789e421aad97ba6a2 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:13:53 -0800
Subject: [PATCH 127/301] docs: add plageoj as a contributor for translation
(#1305)
---
.all-contributorsrc | 9 +++++++++
README.md | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index a7ce44dd..c8f2f8dd 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1134,6 +1134,15 @@
"contributions": [
"translation"
]
+ },
+ {
+ "login": "plageoj",
+ "name": "Masayuki Sugahara",
+ "avatar_url": "https://avatars.githubusercontent.com/u/10688301?v=4",
+ "profile": "https://plageoj.me",
+ "contributions": [
+ "translation"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 24e0d58c..2f1e85e4 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -626,6 +626,7 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
hhjuhl
🌍 |
B.Athish
🌍 |
Горпиніч Максим Олександрович
🌍 |
+ 
Masayuki Sugahara
🌍 |
From d7aa3439d506f96f218e933cd8287b153b41752c Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 10:14:16 -0800
Subject: [PATCH 128/301] docs: add therealmate as a contributor for
translation (#1306)
---
.all-contributorsrc | 9 +++++++++
README.md | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index c8f2f8dd..d999de5a 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1143,6 +1143,15 @@
"contributions": [
"translation"
]
+ },
+ {
+ "login": "therealmate",
+ "name": "therealmate",
+ "avatar_url": "https://avatars.githubusercontent.com/u/61843503?v=4",
+ "profile": "https://github.com/therealmate",
+ "contributions": [
+ "translation"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 2f1e85e4..faf8c51a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -627,6 +627,7 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
B.Athish
🌍 |
Горпиніч Максим Олександрович
🌍 |
Masayuki Sugahara
🌍 |
+ 
therealmate
🌍 |
From 8ff3babae25c1bbc04404f2938347092dcda5482 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)"
Date: Thu, 27 Nov 2025 19:15:06 +0100
Subject: [PATCH 129/301] Translations update from Hosted Weblate (#1228)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Translated using Weblate (Galician)
Currently translated at 50.3% (77 of 153 strings)
Translated using Weblate (Galician)
Currently translated at 49.0% (75 of 153 strings)
Translated using Weblate (Galician)
Currently translated at 46.4% (71 of 153 strings)
Co-authored-by: Hosted Weblate
Co-authored-by: Yago Raña Gayoso
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/gl/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Turkish)
Currently translated at 100.0% (153 of 153 strings)
Added translation using Weblate (Turkish)
Co-authored-by: Furkan Kaya
Co-authored-by: Hosted Weblate
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/tr/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Portuguese (Brazil))
Currently translated at 56.8% (87 of 153 strings)
Co-authored-by: Hosted Weblate
Co-authored-by: Rafael do Amaral Porciuncula
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/pt_BR/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Danish)
Currently translated at 90.1% (138 of 153 strings)
Translated using Weblate (Danish)
Currently translated at 88.8% (136 of 153 strings)
Translated using Weblate (Danish)
Currently translated at 88.8% (136 of 153 strings)
Translated using Weblate (Danish)
Currently translated at 88.8% (136 of 153 strings)
Co-authored-by: Emil Friis Osmann
Co-authored-by: Hans Henrik Juhl
Co-authored-by: Hosted Weblate
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/da/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Russian)
Currently translated at 99.3% (152 of 153 strings)
Co-authored-by: Athish Athish
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/ru/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Ukrainian)
Currently translated at 100.0% (153 of 153 strings)
Co-authored-by: Hosted Weblate
Co-authored-by: Максим Горпиніч
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/uk/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Japanese)
Currently translated at 48.3% (74 of 153 strings)
Co-authored-by: Hosted Weblate
Co-authored-by: M.Sugahara
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/ja/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Hungarian)
Currently translated at 100.0% (153 of 153 strings)
Co-authored-by: Hosted Weblate
Co-authored-by: therealmate
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/hu/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Slovenian)
Currently translated at 71.2% (109 of 153 strings)
Added translation using Weblate (Slovenian)
Co-authored-by: Hosted Weblate
Co-authored-by: Tim Music
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/sl/
Translation: Adaptive Lighting/Adaptive Lighting
---------
Co-authored-by: Yago Raña Gayoso
Co-authored-by: Furkan Kaya
Co-authored-by: Rafael do Amaral Porciuncula
Co-authored-by: Emil Friis Osmann
Co-authored-by: Hans Henrik Juhl
Co-authored-by: Athish Athish
Co-authored-by: Максим Горпиніч
Co-authored-by: M.Sugahara
Co-authored-by: therealmate
Co-authored-by: Tim Music
---
.../adaptive_lighting/translations/da.json | 23 +-
.../adaptive_lighting/translations/gl.json | 15 +-
.../adaptive_lighting/translations/hu.json | 2 +-
.../adaptive_lighting/translations/ja.json | 6 +-
.../adaptive_lighting/translations/pt-BR.json | 6 +-
.../adaptive_lighting/translations/ru.json | 2 +-
.../adaptive_lighting/translations/sl.json | 75 +++++++
.../adaptive_lighting/translations/tr.json | 202 ++++++++++++++++++
.../adaptive_lighting/translations/uk.json | 75 ++++++-
9 files changed, 394 insertions(+), 12 deletions(-)
create mode 100644 custom_components/adaptive_lighting/translations/sl.json
create mode 100644 custom_components/adaptive_lighting/translations/tr.json
diff --git a/custom_components/adaptive_lighting/translations/da.json b/custom_components/adaptive_lighting/translations/da.json
index f0ff8742..347c3f5c 100644
--- a/custom_components/adaptive_lighting/translations/da.json
+++ b/custom_components/adaptive_lighting/translations/da.json
@@ -40,7 +40,8 @@
"detect_non_ha_changes": "detect_non_ha_changes: Registrer alle ændringer på >10% på et lys (også udenfor HA), kræver at 'take_over_control' er slået til (kalder 'homeassistant.update_entity' hvert 'interval'!)",
"transition": "Overgangsperiode når en ændring i lyset udføres (i sekunder)",
"transition_until_sleep": "overgang_til_sove: Når aktiveret, vil adaptiv belysning behandle søvnindstillinger som minimum, og overgår til disse værdier efter solnedgang. 🌙",
- "adapt_only_on_bare_turn_on": "tilpas_kun_ved_enkelt_tænd: Når du tænder lys for første gang. Hvis indstillet til 'true', tilpasser AL kun, hvis 'lys.tænd' er kaldt uden at angive farve eller lysstyrke. ❌🌈 Dette forhindrer f.eks. tilpasning, når du aktiverer en scene. Hvis indstillet til 'false' tilpasser AL sig uanset tilstanden af farve eller lysstyrke i den oprindelige 'service_data'. Har brug for at 'take_over_control' er aktiveret. 🕵️ "
+ "adapt_only_on_bare_turn_on": "tilpas_kun_ved_enkelt_tænd: Når du tænder lys for første gang. Hvis indstillet til 'true', tilpasser AL kun, hvis 'lys.tænd' er kaldt uden at angive farve eller lysstyrke. ❌🌈 Dette forhindrer f.eks. tilpasning, når du aktiverer en scene. Hvis indstillet til 'false' tilpasser AL sig uanset tilstanden af farve eller lysstyrke i den oprindelige 'service_data'. Har brug for at 'take_over_control' er aktiveret. 🕵️",
+ "include_config_in_attributes": "include_config_in_attributes: Vis alle indstillinger som attributter for kontakten når dette er sat til »true«. 📝"
},
"data_description": {
"interval": "Frekvens til at tilpasse lysene, i sekunder. 🔄",
@@ -59,7 +60,9 @@
"sunrise_offset": "Juster solopgangstiden med en positiv eller negativ offset på få sekunder. ⏰",
"max_sunset_time": "Indstil den seneste virtuelle solnedgangstid (HH:MM:SS), hvilket giver mulighed for tidligere solnedgange. 🌇",
"sleep_color_temp": "Farvetemperatur i søvntilstand (bruges når `sleep_rgb_or_color_temp` er `color_temp`) i Kelvin. 😴",
- "brightness_mode": "Lysstyrketilstand til brug. Mulige værdier er \"default\", \"linear\" og \"tanh\" (bruger \"brightness_mode_time_dark\" og \"brightness_mode_time_light\"). 📈"
+ "brightness_mode": "Lysstyrketilstand til brug. Mulige værdier er \"default\", \"linear\" og \"tanh\" (bruger \"brightness_mode_time_dark\" og \"brightness_mode_time_light\"). 📈",
+ "send_split_delay": "Forsinkelse (ms) mellem »separate_turn_on_commands« for lyskilder som ikke understøtter simultane styrke- og farveindstillinger. ⏲️",
+ "initial_transition": "Den første overgangs varighed når lysene ændres fra »off« til »on« i sekunder. ⏲️"
}
}
},
@@ -153,12 +156,26 @@
},
"sleep_color_temp": {
"description": "Farvetemperatur i søvntilstand (bruges når `sleep_rgb_or_color_temp` er `color_temp`) i Kelvin. 😴"
+ },
+ "send_split_delay": {
+ "description": "Forsinkelse (ms) mellem »separate_turn_on_commands« for lyskilder som ikke understøtter simultane styrke- og farveindstillinger. ⏲️"
+ },
+ "detect_non_ha_changes": {
+ "description": "Opdager og stopper tilpasningen ved tilstandsændringer, som ikke er udløst af »light.turn_on«. Indstillingen »take_over_control« skal være aktiveret. 🕵️ Advarsel: ⚠️ Nogle lyskilder kan rapportere en falsk tændt-tilstand, hvilket kan medføre af lyskilden tændes når det ikke er meningen. Slå denne funktion fra, hvis du oplever dette problem."
+ },
+ "initial_transition": {
+ "description": "Den første overgangs varighed når lysene ændres fra »off« til »on« i sekunder. ⏲️"
}
},
"description": "Skift de indstillinger du ønsker i kontakten. Alle muligheder her er de samme som i konfigurationsflowet."
},
"set_manual_control": {
- "description": "Markér om et lys er 'manuelt kontrolleret'."
+ "description": "Markér om et lys er 'manuelt kontrolleret'.",
+ "fields": {
+ "lights": {
+ "description": "entity_id(er) af lys, hvis ikke specificeret, vil alle lys i kontakten være valgt. 💡"
+ }
+ }
}
}
}
diff --git a/custom_components/adaptive_lighting/translations/gl.json b/custom_components/adaptive_lighting/translations/gl.json
index 2752f95c..5a1f211c 100644
--- a/custom_components/adaptive_lighting/translations/gl.json
+++ b/custom_components/adaptive_lighting/translations/gl.json
@@ -3,7 +3,11 @@
"step": {
"init": {
"data_description": {
- "sleep_brightness": "Porcentaxe de brillo das luces en modo durmir. 😴"
+ "sleep_brightness": "Porcentaxe de brillo das luces en modo durmir. 😴",
+ "send_split_delay": "Retraso (ms) entre `separate_turn_on_commands`",
+ "sunrise_offset": "Axusta a hora do amencer cun desfasamento positivo ou negativo en segundos. ⏰",
+ "sunset_offset": "Axusta a hora da posta de sol cun desfasamento positivo ou negativo en segundos. ⏰",
+ "interval": "Frecuencia para adaptar as luces, en segundos. 🔄"
},
"title": "Configuración de Iluminación Adaptativa"
}
@@ -18,6 +22,15 @@
},
"only_once": {
"description": "Adaptar luces só cando estean acesas (`true`) ou mantelas adaptándose (`false`). 🔄"
+ },
+ "sunrise_offset": {
+ "description": "Axusta a hora do amencer cun desfasamento positivo ou negativo en segundos. ⏰"
+ },
+ "sunset_offset": {
+ "description": "Axusta a hora da posta de sol cun desfasamento positivo ou negativo en segundos. ⏰"
+ },
+ "transition": {
+ "description": "Duración da transición cando as luces cambian, en segundos. 🕑"
}
}
}
diff --git a/custom_components/adaptive_lighting/translations/hu.json b/custom_components/adaptive_lighting/translations/hu.json
index 3af17eff..d349699e 100644
--- a/custom_components/adaptive_lighting/translations/hu.json
+++ b/custom_components/adaptive_lighting/translations/hu.json
@@ -30,7 +30,7 @@
"max_brightness": "max_brightness: Maximális fényerő százalékban megadva. 💡",
"detect_non_ha_changes": "detect_non_ha_changes: `Világítás: Bekapcsolás`- szolgáltatás meghívástól eltérő állapotváltozások esetén észleli és leállítja az illesztéseket. A `take_over_control` beállítás engedélyezése szükséges. 🕵️ Vigyázat: ⚠️ Egyes lights tévesen jelezhetik a \"bekapcsolt\" állapotot, ami váratlanul bekapcsolódó lámpákhoz vezethet. Ha ilyen problémákat tapasztal, tiltsa le ezt a funkciót.",
"multi_light_intercept": "multi_light_intercept: `Világítás: Bekapcsolás` szolgáltatás hívások elfogása és adaptálása, amelyek több fényt céloznak meg. ➗⚠️ Ez azt eredményezheti, hogy egyetlen `Világítás: Bekapcsolás` szolgáltatás hívás több hívásra oszlik fel, pl. ha a lights különböző kapcsolókban vannak. Az `elfogás` engedélyezése szükséges.",
- "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Kizárólag a bekapcsoláskor érvényes. A beállítást \"igaz\"-ra állítva, az AL csak akkor végzi az illesztést, amennyiben a \"Világítás: Bekapcsolás\" szolgáltatás meghívása a szín és fényerő paraméterek megadása nélkül történik.❌🌈 Ez pl. alkalmas az illesztés felfüggesztésére egy jelenet aktiválásakor. \"Hamis\" beállítás esetén az AL elvégzi a kezdeti illesztést a szín és fényerő paraméterek meghívásától függetlenül. A használatához engedélyezve kell lennie a \"take_over_control\" beállításnak. 🕵️ ",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Kizárólag a bekapcsoláskor érvényes. A beállítást \"igaz\"-ra állítva, az AL csak akkor végzi az illesztést, amennyiben a \"Világítás: Bekapcsolás\" szolgáltatás meghívása a szín és fényerő paraméterek megadása nélkül történik.❌🌈 Ez pl. alkalmas az illesztés felfüggesztésére egy jelenet aktiválásakor. \"Hamis\" beállítás esetén az AL elvégzi a kezdeti illesztést a szín és fényerő paraméterek meghívásától függetlenül. A használatához engedélyezve kell lennie a \"take_over_control\" beállításnak. 🕵️",
"skip_redundant_commands": "skip_redundant_commands: Az olyan adaptációs parancsok küldésének kihagyása, amelyek célállapota már megegyezik a fény ismert állapotával. Minimalizálja a hálózati forgalmat, és bizonyos helyzetekben javítja az adaptációs reakciókészséget. 📉Kapcsolja ki, ha a fizikai fényállapotok nem szinkronizálódnak a HA rögzített állapotával.",
"separate_turn_on_commands": "separate_turn_on_commands: Elkülönített `Világítás: Bekapcsolás` hívásokat használ a szín és a fényerő beállításához, ami néhány világítás típusnál szükséges. 🔀",
"max_color_temp": "max_color_temp: A leghidegebb színhőmérséklet kelvinben. ❄️",
diff --git a/custom_components/adaptive_lighting/translations/ja.json b/custom_components/adaptive_lighting/translations/ja.json
index 065d8b3b..38f13d81 100644
--- a/custom_components/adaptive_lighting/translations/ja.json
+++ b/custom_components/adaptive_lighting/translations/ja.json
@@ -1,5 +1,5 @@
{
- "title": "適応型照明",
+ "title": "明るさの自動調整",
"services": {
"change_switch_settings": {
"fields": {
@@ -7,7 +7,7 @@
"description": "日の出時間を基準に秒単位で正値もしくは負値で調整する。⏰"
},
"only_once": {
- "description": "適応型照明を照明がオンになっているときのみ（`true`）それとも適応し続ける場合は（`false`）。"
+ "description": "一度だけ明るさを自動調整するには（`true`）、常に自動調整し続ける場合は（`false`）。"
},
"sunset_offset": {
"description": "日の入時間を基準に秒単位で正値もしくは負値で調整する。⏰"
@@ -35,7 +35,7 @@
"sunrise_offset": "日の出時間を基準に秒単位で正値もしくは負値で調整する。⏰",
"sunset_offset": "日の入時間を基準に秒単位で正値もしくは負値で調整する。⏰"
},
- "title": "適応型照明オプション"
+ "title": "明るさの自動調整オプション"
}
}
}
diff --git a/custom_components/adaptive_lighting/translations/pt-BR.json b/custom_components/adaptive_lighting/translations/pt-BR.json
index 43eacb01..c4fc796f 100644
--- a/custom_components/adaptive_lighting/translations/pt-BR.json
+++ b/custom_components/adaptive_lighting/translations/pt-BR.json
@@ -39,7 +39,11 @@
"sunset_time": "sunset_time: substituição manual do horário do pôr do sol, se 'Nenhum', ele usa o horário real do nascer do sol em sua localização (HH:MM:SS)",
"take_over_control": "take_over_control: Se qualquer coisa, exceto Adaptive Lighting, chamar 'light.turn_on' quando uma luz já estiver acesa, pare de adaptar essa luz até que ela (ou o interruptor) desligue -> ligue.",
"detect_non_ha_changes": "detect_non_ha_changes: detecta todas as alterações > 10% feitas nas luzes (também fora do HA), requer que 'take_over_control' seja ativado (chama 'homeassistant.update_entity' a cada 'intervalo'!)",
- "transition": "Tempo de transição ao aplicar uma mudança nas luzes (segundos)"
+ "transition": "Tempo de transição ao aplicar uma mudança nas luzes (segundos)",
+ "skip_redundant_commands": "skip_redundant_commands: Deixar de enviar comandos de adaptação cujo estado alvo já seja igual ao estado atual da luz. Minimiza o tráfego de rede e melhora a responsividade da adaptação em algumas situações. 📉Desative se os estados físicos das luzes podem ficar diferentes do estado registrado no HA.",
+ "transition_until_sleep": "transition_until_sleep: Quando ativada, a Iluminação Adaptativa considerará as configurações de sono como o valor mínimo, transicionando para esses valores após o pôr do sol. 🌙",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Ao ligar as luzes inicialmente. Se definido como `true`, a Iluminação Adaptativa se adapta somente se o comando `light.turn_on` for chamado sem especificar cor ou brilho. ❌🌈 Isso, por exemplo, impede a adaptação ao ativar uma cena. Se false, a Iluminação Adaptativa se adapta independentemente da presença de cor ou brilho nos dados iniciais do `service_data`. Precisa de `take_over_control` ativado. 🕵️",
+ "intercept": "intercept: Interceptar e adaptar os chamados `light.turn_on` para ativar a adaptação instantânea de cor e brilho. 🏎️ Desative para luzes que não suportam `light.turn_on` com cor e brilho."
}
}
},
diff --git a/custom_components/adaptive_lighting/translations/ru.json b/custom_components/adaptive_lighting/translations/ru.json
index fd4a4b55..79f3cd02 100644
--- a/custom_components/adaptive_lighting/translations/ru.json
+++ b/custom_components/adaptive_lighting/translations/ru.json
@@ -42,7 +42,7 @@
"transition": "Время перехода при применении изменения к источникам света. (секунды)",
"adapt_delay": "Время ожидания между включением света и применением адаптации. Может помочь избежать мерцания. (секунды)",
"multi_light_intercept": "multi_light_intercept: перехватывает и адаптирует вызовы `light.turn_on`, нацеленные на несколько источников света. ➗⚠️ Это может привести к разделению одного вызова `light.turn_on` на несколько вызовов, например, когда освещение включено в разные выключатели. Требуется, чтобы `перехват` был включен.",
- "adapt_only_on_bare_turn_on": "Adapt_only_on_bare_turn_on: При первоначальном включении света. Если установлено значение «true», AL адаптируется только в том случае, если «light.turn_on» вызывается без указания цвета или яркости. ❌🌈 Это, например, предотвращает адаптацию при активации сцены. Если false, AL адаптируется независимо от наличия цвета или яркости в исходных service_data. Требуется включить take_over_control. 🕵️ ",
+ "adapt_only_on_bare_turn_on": "Adapt_only_on_bare_turn_on: При первоначальном включении света. Если установлено значение «true», AL адаптируется только в том случае, если «light.turn_on» вызывается без указания цвета или яркости. ❌🌈 Это, например, предотвращает адаптацию при активации сцены. Если false, AL адаптируется независимо от наличия цвета или яркости в исходных service_data. Требуется включить take_over_control. 🕵️",
"skip_redundant_commands": "Skip_redundant_commands: Пропустить отправку команд адаптации, целевое состояние которых уже равно известному состоянию источника света. Минимизирует сетевой трафик и улучшает скорость адаптации в некоторых ситуациях. 📉Отключите, если физические состояния освещения не синхронизируются с записанным состоянием HA.",
"intercept": "intercept: перехватывать и адаптировать вызовы `light.turn_on` для обеспечения мгновенной адаптации цвета и яркости. 🏎️ Отключите источники света, которые не поддерживают `light.turn_on` с цветом и яркостью.",
"include_config_in_attributes": "include_config_in_attributes: отображать все параметры в качестве атрибутов на переключателе в Home Assistant, если установлено значение `true`. 📝",
diff --git a/custom_components/adaptive_lighting/translations/sl.json b/custom_components/adaptive_lighting/translations/sl.json
new file mode 100644
index 00000000..dc78acaa
--- /dev/null
+++ b/custom_components/adaptive_lighting/translations/sl.json
@@ -0,0 +1,75 @@
+{
+ "options": {
+ "step": {
+ "init": {
+ "data": {
+ "prefer_rgb_color": "prefer_rgb_color: Ali v primeru možnosti raje uporabiti prilagoditev RGB barve kot barvno temperaturo luči. 🌈",
+ "transition_until_sleep": "transition_until_sleep: Če je omogočeno, bo Adaptive Lighting obravnaval nastavitve spanja kot minimalne vrednosti in bo po zahodu sonca prehajal na te vrednosti. 🌙",
+ "take_over_control": "take_over_control: Onemogoči Adaptive Lighting, če drug vir pokliče \"light.turn_on\", ko so luči prižgane in se prilagajajo. Opozorilo: to ob vsakem intervalu kliče \"homeassistant.update_entity\"! 🔒",
+ "detect_non_ha_changes": "„detect_non_ha_changes: Zazna in ustavi prilagoditve za spremembe stanja, ki niso posledica \"light.turn_on\". Zahteva omogočeno \"take_over_control\". 🕵️ Pozor: ⚠️ Nekatere luči lahko nepravilno poročajo, da so prižgane, kar lahko povzroči nepričakovano vklapljanje. Onemogočite to funkcijo, če naletite na takšne težave.",
+ "lights": "lights: Seznam entity_id-jev luči za nadzor (lahko je prazen). 🌟",
+ "min_brightness": "min_brightness: Odstotek najmanjše svetlosti. 💡",
+ "max_brightness": "max_brightness: Odstotek največeje svetlosti. 💡",
+ "min_color_temp": "min_color_temp: Najtoplejša barvna temperatura v Kelvinih. 🔥",
+ "max_color_temp": "max_color_temp: Najhladnejša barvna temperatura v kelvinih. ❄️",
+ "separate_turn_on_commands": "separate_turn_on_commands: Uporabi ločene klice \"light.turn_on\" za barvo in jakost, kar je potrebno za nekatere tipe luči. 🔀",
+ "skip_redundant_commands": "skip_redundant_commands: Preskoči pošiljanje prilagoditvenih ukazov, če je ciljano stanje že enako poznanemu stanju luči. Zmanjšuje omrežni promet in izboljšuje odzivnost prilagajanja v določenih situacijah. 📉 Onemogočite, če se fizična stanja luči ne ujemajo z zabeleženim stanjem v HA.",
+ "intercept": "intercept: Prestreza in prilagaja klice \"light.turn_on\" za takojšnjo prilagoditev barve in jakosti. 🏎️ Onemogočite za luči, ki ne podpirajo \"light.turn_on\" z barvo in svetlostjo.",
+ "multi_light_intercept": "multi_light_intercept: Prestreza in prilagaja klice \"light.turn_on\", ki ciljajo več luči. ➗⚠️ To lahko privede do razdelitve enega klica \"light.turn_on\" v več klicev, npr. ko so luči na različnih stikalih. Zahteva omogočeno \"intercept\".",
+ "include_config_in_attributes": "include_config_in_attributes: Ko je nastavljeno na \"true\", prikaže vse možnosti kot atribute stikala v Home Assistantu. 📝",
+ "only_once": "only_once: Prilagodi luči samo ob vklopu (true) ali pa jih še naprej prilagajaj (false). 🔄",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Ob začetnem vklopu luči. Če je nastavljeno na \"true\", AL prilagodi samo, če je \"light.turn_on\" klic brez podanih parametrov barve ali jakosti. ❌🌈 S tem se npr. prepreči prilagajanje pri aktivaciji scene. Če je \"false\", AL prilagodi ne glede na prisotnost barve ali jakosti v začetnih \"service_data\". Zahteva omogočeno \"take_over_control\". 🕵️"
+ },
+ "data_description": {
+ "sunrise_offset": "Prilagodite čas sončnega vzhoda z pozitivnim ali negativnim zamikom v sekundah. ⏰",
+ "send_split_delay": "Zamik (ms) med \"separate_turn_on_commands\" za luči, ki ne podpirajo hkratne nastavitve jakosti in barve. ⏲️",
+ "transition": "Trajanje prehoda pri spreminjanju luči, v sekundah. 🕑",
+ "interval": "Pogostost prilagajanja luči, v sekundah. 🔄",
+ "sleep_brightness": "Odstotek svetlosti luči v načinu spanja. 😴",
+ "sleep_rgb_or_color_temp": "V načinu spanja uporabi \"rgb_color\" ali \"color_temp\". 🌙",
+ "sleep_color_temp": "Barvna temperatura v načinu spanja (uporabljena, ko je \"sleep_rgb_or_color_temp\" nastavljena na \"color_temp\") v Kelvinih. 😴",
+ "sleep_transition": "Trajanje prehoda, ko se preklopi način spanja, v sekundah. 😴",
+ "sunrise_time": "Nastavi fiksni čas (HH:MM:SS) sončnega vzhoda. 🌅",
+ "min_sunrise_time": "Nastavi najzgodnejši navidezni sončni vzhod (HH:MM:SS), dovoljuje kasnejše vzhode. 🌅",
+ "sunset_time": "Nastavite fiksni čas (HH:MM:SS) za sončni zahod. 🌇",
+ "min_sunset_time": "Nastavite najzgodnejši navidezni čas sončnega zahoda (HH:MM:SS), dovoljuje kasnejše sončne zahode. 🌇",
+ "sunset_offset": "Prilagodite čas sončnega zahoda s pozitivnim ali negativnim zamikom v sekundah. ⏰",
+ "brightness_mode_time_dark": "(Prezrto, če je \"brightness_mode='default'\") Trajanje v sekundah za postopno povečanje ali zmanjšanje svetlosti pred/po sončnem vzhodu/zahodu. 📈📉",
+ "brightness_mode_time_light": "(Prezrto, če je \"brightness_mode='default'\") Trajanje v sekundah za postopno povečanje ali zmanjšanje svetlosti po/pred sončnem vzhodu/zahodu. 📈📉",
+ "autoreset_control_seconds": "Samodejno ponastavi ročni nadzor po določenem številu sekund. Nastavite na 0, da onemogočite. ⏲️",
+ "max_sunrise_time": "Nastavi najkasnejši virtualni sončni vzhod (HH:MM:SS), dovoljuje zgodnejše vzhode. 🌅",
+ "max_sunset_time": "Nastavite najpoznejši navidezni čas sončnega zahoda (HH:MM:SS), dovoljuje zgodnejše sončne zahode. 🌇",
+ "brightness_mode": "Način upravljanja svetlosti. Možne vrednosti so \"default\", \"linear\" in \"tanh\" (uporablja \"brightness_mode_time_dark\" in \"brightness_mode_time_light\"). 📈",
+ "initial_transition": "Trajanje prvega prehoda, ko se luči prižgejo (iz \"off\" v \"on\"), v sekundah. ⏲️",
+ "sleep_rgb_color": "RGB barva v načinu spanja (uporabljena, ko je \"sleep_rgb_or_color_temp\" nastavljeno na \"rgb_color\"). 🌈"
+ },
+ "title": "Nastavitve prilagodljive osvetlitve",
+ "description": "Konfigurirajte komponento Adaptive Lighting. Imena možnosti so usklajena z nastavitvami v YAML. Če ste ta vnos definirali v YAML, tukaj ne bodo prikazane nobene možnosti. Za interaktivne grafe, ki ponazarjajo učinke parametrov, obiščite to [spletno aplikacijo](https://basnijholt.github.io/adaptive-lighting). Za dodatne podrobnosti glejte [uradno dokumentacijo](https://github.com/basnijholt/adaptive-lighting#readme)."
+ }
+ }
+ },
+ "config": {
+ "step": {
+ "user": {
+ "title": "Izberite ime za instanco Adaptive Lighting",
+ "description": "Vsaka instanca lahko vsebuje več luči!"
+ }
+ },
+ "abort": {
+ "already_configured": "Naprava je že konfigurirana"
+ }
+ },
+ "services": {
+ "change_switch_settings": {
+ "fields": {
+ "only_once": {
+ "description": "Prilagajaj luči samo kadar so prižgane (\"true\") ali konstantno jih prilagajaj (\"false\")"
+ },
+ "max_sunrise_time": {
+ "description": "Nastavite najpoznejši navidezni čas sončnega vzhoda (HH:MM:SS), dovoljuje zgodnejše sončne vzhode. 🌅"
+ }
+ }
+ }
+ },
+ "title": "Prilagodljiva osvetlitev"
+}
diff --git a/custom_components/adaptive_lighting/translations/tr.json b/custom_components/adaptive_lighting/translations/tr.json
new file mode 100644
index 00000000..3b5c2d6e
--- /dev/null
+++ b/custom_components/adaptive_lighting/translations/tr.json
@@ -0,0 +1,202 @@
+{
+ "title": "Akıllı Aydınlatma",
+ "options": {
+ "step": {
+ "init": {
+ "title": "Akıllı Aydınlatma seçenekleri",
+ "data": {
+ "adapt_only_on_bare_turn_on": "Işıklar açıldığında geçerlidir. `true` olarak ayarlanırsa, eklenti yalnızca `light.turn_on` işlemi renk veya parlaklık belirtilmeden çağrıldığında uyarlama yapar (örneğin sahne etkinleştirmelerinde uyarlama yapılmaz). ❌🌈\n`false` olarak ayarlanırsa, renk veya parlaklık belirtilmiş olsa bile uyarlama yapılır. Bu ayarın çalışması için `take_over_control` etkin olmalıdır. 🕵️",
+ "detect_non_ha_changes": "`detect_non_ha_changes`: `light.turn_on` dışındaki durum değişikliklerini algılar ve uyarlamayı durdurur. Bu ayarın çalışması için `take_over_control` etkin olmalıdır. 🕵️\nDikkat: ⚠️ Bazı ışıklar yanlışlıkla “açık” durumunu bildirebilir, bu da ışıkların beklenmedik şekilde açılmasına yol açabilir. Böyle bir durumla karşılaşırsanız bu özelliği devre dışı bırakın.",
+ "include_config_in_attributes": "`include_config_in_attributes`: `true` olarak ayarlandığında, tüm seçenekleri Home Assistant’ta anahtarın attribute’ları olarak gösterir. 📝",
+ "intercept": "`intercept`: `light.turn_on` çağrılarını yakalar ve renk ile parlaklığın anında uyarlanmasını sağlar. 🏎️ Renk ve parlaklığı desteklemeyen ışıklar için devre dışı bırakın.",
+ "lights": "`lights`: Kontrol edilecek ışıkların entity_id listesi (boş bırakılabilir). 🌟",
+ "max_brightness": "`max_brightness`: Maksimum parlaklık yüzdesi. 💡",
+ "max_color_temp": "`max_color_temp`: En düşük renk sıcaklığı (Kelvin cinsinden). ❄️",
+ "min_brightness": "min_brightness: Minimum parlaklık yüzdesi.💡",
+ "min_color_temp": "`min_color_temp`: En yüksek (sıcak) renk sıcaklığı (Kelvin cinsinden). 🔥",
+ "multi_light_intercept": "`multi_light_intercept`: Birden fazla ışığı hedefleyen `light.turn_on` çağrılarını yakalar ve uyarlama yapar. ➗⚠️ Bu, örneğin ışıklar farklı anahtarlardaysa tek bir `light.turn_on` çağrısının birden fazla çağrıya bölünmesine yol açabilir. `intercept` etkin olmalıdır.",
+ "only_once": "`only_once`: Işıkları yalnızca açıldıklarında mı uyarlasın (`true`), yoksa sürekli uyarlamaya devam mı etsin (`false`). 🔄",
+ "prefer_rgb_color": "`prefer_rgb_color`: Mümkünse ışık renk sıcaklığı yerine RGB renk ayarını tercih edip etmeyeceğini belirler. 🌈",
+ "separate_turn_on_commands": "`separate_turn_on_commands`: Renk ve parlaklık için ayrı `light.turn_on` çağrıları kullanır; bazı ışık türleri için gereklidir. 🔀",
+ "skip_redundant_commands": "`skip_redundant_commands`: Hedef durumu ışığın bilinen durumu ile aynı olan uyarlama komutlarını atlar. Ağ trafiğini azaltır ve bazı durumlarda uyarlamanın yanıt hızını artırır. 📉 \nFiziksel ışık durumları HA’daki kaydedilen durumla senkronize değilse devre dışı bırakın.",
+ "take_over_control": "`take_over_control`: Işıklar açıkken ve uyarlanırken başka bir kaynaktan `light.turn_on` çağrılırsa Adaptive Lighting’i devre dışı bırakır. Dikkat: Bu işlem her `interval` süresinde `homeassistant.update_entity` çağrısı yapar! 🔒",
+ "transition_until_sleep": "`transition_until_sleep`: Etkinleştirildiğinde, Adaptive Lighting uyku ayarlarını minimum değer olarak kabul eder ve gün batımından sonra bu değerlere geçiş yapar. 🌙"
+ },
+ "data_description": {
+ "sunrise_offset": "Gün doğumu saatini, saniye cinsinden pozitif veya negatif bir kaydırma ile ayarlayın. ⏰",
+ "sunset_offset": "Gün batımı saatini, saniye cinsinden pozitif veya negatif bir kaydırma ile ayarlayın. ⏰",
+ "autoreset_control_seconds": "Manuel kontrolü belirtilen saniye sonunda otomatik olarak sıfırlar. Devre dışı bırakmak için 0 olarak ayarlayın. ⏲️",
+ "brightness_mode": "Kullanılacak parlaklık modunu belirtir. Olası değerler: `default`, `linear` ve `tanh` (`brightness_mode_time_dark` ve `brightness_mode_time_light` ayarlarını kullanır). 📈",
+ "sleep_brightness": "Uyku modundayken ışıkların parlaklık yüzdesi 😴",
+ "sleep_color_temp": "Uyku modunda renk sıcaklığı ( `sleep_rgb_or_color_temp` `color_temp` olarak ayarlandığında kullanılır) Kelvin cinsinden. 😴",
+ "send_split_delay": "Parlaklık ve renk ayarını aynı anda desteklemeyen ışıklar için `separate_turn_on_commands` arasındaki gecikme (ms). ⏲️",
+ "initial_transition": "Işıklar `off` durumundan `on` durumuna geçerken ilk geçişin süresi (saniye cinsinden). ⏲️",
+ "transition": "Işıklar değişirken geçiş süresi (saniye cinsinden). 🕑",
+ "sleep_transition": "“Uyku modu” açılıp kapatıldığında geçiş süresi (saniye cinsinden). 😴",
+ "interval": "Işıkların uyarlanma sıklığı (saniye cinsinden). 🔄",
+ "brightness_mode_time_light": "(`brightness_mode='default'` ise göz ardı edilir) Gün doğumu/gün batımı öncesi/sonrası parlaklığı kademeli olarak artırma/azaltma süresi (saniye cinsinden). 📈📉",
+ "brightness_mode_time_dark": "(`brightness_mode='default'` ise göz ardı edilir) Gün doğumu/gün batımı öncesi/sonrası parlaklığı kademeli olarak artırma/azaltma süresi (saniye cinsinden). 📈📉",
+ "sleep_rgb_color": "Uyku modunda RGB renk ( `sleep_rgb_or_color_temp` \"rgb_color\" olarak ayarlandığında kullanılır). 🌈",
+ "sunrise_time": "Gün doğumu için sabit bir saat (SS:DD:YY) belirleyin. 🌅",
+ "sunset_time": "Gün batımı için sabit bir saat (SS:DD:YY) belirleyin. 🌇",
+ "min_sunrise_time": "En erken sanal gün doğumu saatini (SS:DD:YY) belirleyin; daha geç gün doğumlarına izin verir. 🌅",
+ "min_sunset_time": "En erken sanal gün batımı saatini (SS:DD:YY) belirleyin; daha geç gün batımlarına izin verir. 🌇",
+ "max_sunrise_time": "En geç sanal gün doğumu saatini (SS:DD:YY) belirleyin; daha erken gün doğumlarına izin verir. 🌅",
+ "max_sunset_time": "En geç sanal gün batımı saatini (SS:DD:YY) belirleyin; daha erken gün batımlarına izin verir. 🌇",
+ "sleep_rgb_or_color_temp": "Uyku modunda `\"rgb_color\"` veya `\"color_temp\"` kullanın. 🌙",
+ "adapt_delay": "Işık açıldıktan sonra Adaptive Lighting’in değişiklikleri uygulamasına kadar bekleme süresi (saniye cinsinden). Titremeyi önlemeye yardımcı olabilir. ⏲️"
+ },
+ "description": "Bir Adaptive Lighting bileşenini yapılandırın. Seçenek adları YAML ayarlarıyla uyumludur. Eğer bu girdiyi YAML’da tanımladıysanız, burada seçenekler görünmez. \nParametrelerin etkilerini gösteren etkileşimli grafikler için [bu web uygulamasını](https://basnijholt.github.io/adaptive-lighting) ziyaret edebilirsiniz. Daha fazla bilgi için [resmi dokümantasyona](https://github.com/basnijholt/adaptive-lighting#readme) bakın."
+ }
+ },
+ "error": {
+ "option_error": "Geçersiz seçenek",
+ "entity_missing": "Seçilen bir veya birden fazla ışık entity’si Home Assistant’ta bulunamadı."
+ }
+ },
+ "services": {
+ "change_switch_settings": {
+ "fields": {
+ "only_once": {
+ "description": "Işıkları yalnızca açıkken (`true`) uyarla, veya sürekli olarak uyarlamaya devam et (`false`).🔄"
+ },
+ "sunrise_offset": {
+ "description": "Gün doğumu saatini, saniye cinsinden pozitif veya negatif bir kaydırma ile ayarlayın. ⏰"
+ },
+ "sunset_offset": {
+ "description": "Gün batımı saatini, saniye cinsinden pozitif veya negatif bir kaydırma ile ayarlayın. ⏰"
+ },
+ "autoreset_control_seconds": {
+ "description": "Manuel kontrolü belirtilen saniye sonunda otomatik olarak sıfırlar. Devre dışı bırakmak için 0 olarak ayarlayın. ⏲️"
+ },
+ "sleep_brightness": {
+ "description": "Uyku modundayken ışıkların parlaklık yüzdesi 😴"
+ },
+ "max_color_temp": {
+ "description": "Kelvin cinsinden en düşük renk sıcaklığı. ❄️"
+ },
+ "sleep_color_temp": {
+ "description": "Uyku modunda renk sıcaklığı ( `sleep_rgb_or_color_temp` `color_temp` olarak ayarlandığında kullanılır) Kelvin cinsinden. 😴"
+ },
+ "send_split_delay": {
+ "description": "Parlaklık ve renk ayarını aynı anda desteklemeyen ışıklar için `separate_turn_on_commands` arasındaki gecikme (ms). ⏲️"
+ },
+ "detect_non_ha_changes": {
+ "description": "`light.turn_on` dışındaki durum değişikliklerini algılar ve uyarlamayı durdurur. Bu ayarın çalışması için `take_over_control` etkin olmalıdır. 🕵️ \nDikkat: ⚠️ Bazı ışıklar yanlışlıkla “açık” durumunu bildirebilir, bu da ışıkların beklenmedik şekilde açılmasına neden olabilir. Böyle bir durumda bu özelliği devre dışı bırakın."
+ },
+ "take_over_control": {
+ "description": "Işıklar açıkken ve uyarlanırken başka bir kaynaktan `light.turn_on` çağrılırsa Adaptive Lighting’i devre dışı bırakır. Dikkat: Bu işlem her `interval` süresinde `homeassistant.update_entity` çağrısı yapar! 🔒"
+ },
+ "initial_transition": {
+ "description": "Işıklar `off` durumundan `on` durumuna geçerken ilk geçişin süresi (saniye cinsinden). ⏲️"
+ },
+ "transition": {
+ "description": "Işıklar değişirken geçiş süresi (saniye cinsinden). 🕑"
+ },
+ "sleep_transition": {
+ "description": "“Uyku modu” açılıp kapatıldığında geçiş süresi (saniye cinsinden). 😴"
+ },
+ "entity_id": {
+ "description": "Anahtarın Entity ID’si. 📝"
+ },
+ "max_brightness": {
+ "description": "Maksimum parlaklık yüzdesi.💡"
+ },
+ "min_brightness": {
+ "description": "Minimum parlaklık yüzdesi.💡"
+ },
+ "sleep_rgb_color": {
+ "description": "Uyku modunda RGB renk ( `sleep_rgb_or_color_temp` \"rgb_color\" olarak ayarlandığında kullanılır). 🌈"
+ },
+ "sunrise_time": {
+ "description": "Gün doğumu için sabit bir saat (SS:DD:YY) belirleyin. 🌅"
+ },
+ "sunset_time": {
+ "description": "Gün batımı için sabit bir saat (SS:DD:YY) belirleyin. 🌇"
+ },
+ "use_defaults": {
+ "description": "Bu servis çağrısında belirtilmeyen varsayılan değerleri ayarlar. Seçenekler: \n- `current` (varsayılan, mevcut değerleri korur) \n- `factory` (belgelendirilmiş varsayılanlara sıfırlar) \n- `configuration` (anahtar yapılandırma varsayılanlarına döner) ⚙️"
+ },
+ "min_sunset_time": {
+ "description": "En erken sanal gün batımı saatini (SS:DD:YY) belirleyin; daha geç gün batımlarına izin verir. 🌇"
+ },
+ "max_sunrise_time": {
+ "description": "En geç sanal gün doğumu saatini (SS:DD:YY) belirleyin; daha erken gün doğumlarına izin verir. 🌅"
+ },
+ "include_config_in_attributes": {
+ "description": "`true` olarak ayarlandığında, tüm seçenekleri Home Assistant’ta anahtarın attribute’ları olarak gösterir. 📝"
+ },
+ "sleep_rgb_or_color_temp": {
+ "description": "Uyku modunda `\"rgb_color\"` veya `\"color_temp\"` kullanın. 🌙"
+ },
+ "separate_turn_on_commands": {
+ "description": "Renk ve parlaklık için ayrı `light.turn_on` çağrıları kullanın; bazı ışık türleri için gereklidir. 🔀"
+ },
+ "min_color_temp": {
+ "description": "En yüksek (sıcak) renk sıcaklığı (Kelvin cinsinden). 🔥"
+ },
+ "prefer_rgb_color": {
+ "description": "Mümkün olduğunda ışık renk sıcaklığı yerine RGB renk ayarını tercih edip etmeyeceğini belirler. 🌈"
+ },
+ "turn_on_lights": {
+ "description": "Şu anda kapalı olan ışıkların açılıp açılmayacağını belirler. 🔆"
+ },
+ "adapt_delay": {
+ "description": "Işık açıldıktan sonra Adaptive Lighting’in değişiklikleri uygulamasına kadar bekleme süresi (saniye cinsinden). Titremeyi önlemeye yardımcı olabilir. ⏲️"
+ }
+ },
+ "description": "Anahtardaki tüm ayarları dilediğiniz gibi değiştirebilirsiniz. Buradaki seçeneklerin hepsi, yapılandırma akışındakilerle aynıdır."
+ },
+ "apply": {
+ "fields": {
+ "lights": {
+ "description": "Ayarları bir veya birden fazla ışığa uygula.💡"
+ },
+ "transition": {
+ "description": "Işıklar değişirken geçiş süresi (saniye cinsinden). 🕑"
+ },
+ "entity_id": {
+ "description": "Uygulanacak ayarların bulunduğu anahtarın `entity_id`’si. 📝"
+ },
+ "adapt_brightness": {
+ "description": "Işığın parlaklığının uyarlanıp uyarlanmayacağını belirler. 🌞"
+ },
+ "adapt_color": {
+ "description": "Destekleyen ışıklarda rengin uyarlanıp uyarlanmayacağını belirler. 🌈"
+ },
+ "prefer_rgb_color": {
+ "description": "Mümkün olduğunda ışık renk sıcaklığı yerine RGB renk ayarını tercih edip etmeyeceğini belirler. 🌈"
+ },
+ "turn_on_lights": {
+ "description": "Şu anda kapalı olan ışıkların açılıp açılmayacağını belirler. 🔆"
+ }
+ },
+ "description": "Şu anki Akıllı Işıklandırma ayarlarını ışıklara uygular."
+ },
+ "set_manual_control": {
+ "fields": {
+ "lights": {
+ "description": "Işıkların entity_id(leri). Belirtilmezse, anahtardaki tüm ışıklar seçilir. 💡"
+ },
+ "entity_id": {
+ "description": "Işığın “manuel olarak kontrol edildiğini” işaretlemek veya kaldırmak için kullanılacak anahtarın `entity_id`’si. 📝"
+ },
+ "manual_control": {
+ "description": "Işığı “manuel kontrol” listesinden eklemek (`true`) veya çıkarmak (`false`) için kullanılır. 🔒"
+ }
+ },
+ "description": "Bir ışığın 'manuel olarak kontrol' edilip edilmediğini işaretleyin."
+ }
+ },
+ "config": {
+ "step": {
+ "user": {
+ "title": "Akıllı ışıklandırma örneği için bir ad seçin.",
+ "description": "Her örnek birden fazla ışık içerebilir!"
+ }
+ },
+ "abort": {
+ "already_configured": "Bu cihaz zaten ayarlanmış."
+ }
+ }
+}
diff --git a/custom_components/adaptive_lighting/translations/uk.json b/custom_components/adaptive_lighting/translations/uk.json
index ee12b0e9..749271d5 100644
--- a/custom_components/adaptive_lighting/translations/uk.json
+++ b/custom_components/adaptive_lighting/translations/uk.json
@@ -42,7 +42,9 @@
"adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: На початку вмикання світла. Якщо `true`, освітлення адаптується лише якщо `light.turn_on` викликано без вказання кольору чи яскравості. ❌🌈 Це, наприклад, запобігає адаптації, коли сцена активується. Якщо `false`, освітлення адаптується незалежно від наявності кольору чи яскравості у початковому `service_data`. Потребує ввімкнення `take_over_control`. 🕵️",
"transition_until_sleep": "transition_until_sleep: Коли активовано, адаптивне освітлення буде ставитись до налаштування сну як мінімум, переходячи до цих значень після заходу сонця. 🌙",
"intercept": "intercept: Перехоплювати та адаптувати виклики увімкнення світла (`light.turn_on`), щоб увімкнути миттєву адаптацію кольору та яскравості. 🏎️ Вимкніть для світла, що не підтримує увімкнення світла (`light.turn_on`) з кольором та яскравістю.",
- "include_config_in_attributes": "Включити конфігурацію в атрибути (`include_config_in_attributes`): Показувати всі опції як атрибути на перемикачі в Home Assistant, якщо встановлено значення `true`. 📝"
+ "include_config_in_attributes": "Включити конфігурацію в атрибути (`include_config_in_attributes`): Показувати всі опції як атрибути на перемикачі в Home Assistant, якщо встановлено значення `true`. 📝",
+ "multi_light_intercept": "multi_light_intercept: Перехоплення та адаптація викликів `light.turn_on`, які спрямовані на кілька світильників. ➗⚠️ Це може призвести до розділення одного виклику `light.turn_on` на кілька викликів, наприклад, коли світильники підключені до різних вимикачів. Потрібно ввімкнути `intercept`.",
+ "skip_redundant_commands": "skip_redundant_commands: Пропускати надсилання команд адаптації, цільовий стан яких вже дорівнює відомому стану освітлення. Мінімізує мережевий трафік і покращує швидкість реагування адаптації в деяких ситуаціях. 📉Вимкнути, якщо фізичний стан освітлення не синхронізується із записаним станом HA."
},
"data_description": {
"sunrise_offset": "Змінити час сходу сонця на +/- секунд. ⏰",
@@ -57,7 +59,16 @@
"interval": "Частота адаптації освітлення, у секундах. 🔄",
"sleep_brightness": "Відсоток яскравості світла в режимі сну. 😴",
"sleep_color_temp": "Колірна температура в режимі сну (використовується, коли `sleep_rgb_or_color_temp` має значення `color_temp`) у Кельвінах. 😴",
- "sleep_transition": "Тривалість переходу, коли режим сну \"sleep mode\" увімкнено, у секундах. 😴"
+ "sleep_transition": "Тривалість переходу, коли режим сну \"sleep mode\" увімкнено, у секундах. 😴",
+ "sleep_rgb_color": "Колір RGB у режимі сну (використовується, коли `sleep_rgb_or_color_temp` має значення \"rgb_color\"). 🌈",
+ "sunrise_time": "Встановіть фіксований час (ГГ:ХХ:СС) для сходу сонця. 🌅",
+ "sunset_time": "Встановіть фіксований час (ГГ:ХХ:СС) для заходу сонця. 🌇",
+ "min_sunrise_time": "Встановіть найраніший час віртуального сходу сонця (ГГ:ХХ:СС), враховуючи пізніші сходи. 🌅",
+ "min_sunset_time": "Встановіть найраніший час віртуального заходу сонця (ГГ:ХХ:СС), враховуючи пізніші заходи сонця. 🌇",
+ "max_sunrise_time": "Встановіть найпізніший час віртуального сходу сонця (ГГ:ХХ:СС), враховуючи більш ранні сходи сонця. 🌅",
+ "max_sunset_time": "Встановіть найновіший час віртуального заходу сонця (ГГ:ХХ:СС), враховуючи більш ранні заходи сонця. 🌇",
+ "sleep_rgb_or_color_temp": "Використовуйте `\"rgb_color\"` або `\"color_temp\"` у режимі сну. 🌙",
+ "adapt_delay": "Час очікування (секунди) між увімкненням світла та застосуванням змін системою адаптивного освітлення. Може допомогти уникнути мерехтіння. ⏲️"
}
}
},
@@ -75,6 +86,21 @@
},
"transition": {
"description": "Тривалість переходу, коли світло змінюється, у секундах. 🕑"
+ },
+ "entity_id": {
+ "description": "`entity_id` перемикача з налаштуваннями, які потрібно застосувати. 📝"
+ },
+ "adapt_brightness": {
+ "description": "Чи потрібно адаптувати яскравість світла. 🌞"
+ },
+ "adapt_color": {
+ "description": "Чи адаптувати колір допоміжних ламп. 🌈"
+ },
+ "prefer_rgb_color": {
+ "description": "Чи надавати перевагу налаштуванню кольору RGB над температурою кольору світла, коли це можливо. 🌈"
+ },
+ "turn_on_lights": {
+ "description": "Чи вмикати світло, яке наразі вимкнене. 🔆"
}
}
},
@@ -127,6 +153,45 @@
},
"transition": {
"description": "Тривалість переходу, коли світло змінюється, у секундах. 🕑"
+ },
+ "sleep_rgb_color": {
+ "description": "Колір RGB у режимі сну (використовується, коли `sleep_rgb_or_color_temp` має значення \"rgb_color\"). 🌈"
+ },
+ "sunrise_time": {
+ "description": "Встановіть фіксований час (ГГ:ХХ:СС) для сходу сонця. 🌅"
+ },
+ "sunset_time": {
+ "description": "Встановіть фіксований час (ГГ:ХХ:СС) для заходу сонця. 🌇"
+ },
+ "use_defaults": {
+ "description": "Встановлює значення за замовчуванням, не вказані в цьому виклику служби. Параметри: «current» (за замовчуванням, зберігає поточні значення), «factory» (скидає до задокументованих значень за замовчуванням) або «configuration» (повертає до значень за замовчуванням конфігурації комутатора). ⚙️"
+ },
+ "min_sunset_time": {
+ "description": "Встановіть найраніший час віртуального заходу сонця (ГГ:ХХ:СС), враховуючи пізніші заходи сонця. 🌇"
+ },
+ "max_sunrise_time": {
+ "description": "Встановіть найпізніший час віртуального сходу сонця (ГГ:ХХ:СС), враховуючи більш ранні сходи сонця. 🌅"
+ },
+ "include_config_in_attributes": {
+ "description": "Показувати всі опції як атрибути перемикача в Домашньому помічнику, якщо встановлено значення `true`. 📝"
+ },
+ "sleep_rgb_or_color_temp": {
+ "description": "Використовуйте `\"rgb_color\"` або `\"color_temp\"` у режимі сну. 🌙"
+ },
+ "separate_turn_on_commands": {
+ "description": "Використовуйте окремі виклики `light.turn_on` для кольору та яскравості, що необхідно для деяких типів освітлення. 🔀"
+ },
+ "adapt_delay": {
+ "description": "Час очікування (секунди) між увімкненням світла та застосуванням змін системою адаптивного освітлення. Може допомогти уникнути мерехтіння. ⏲️"
+ },
+ "min_color_temp": {
+ "description": "Найтепліша колірна температура в Кельвінах. 🔥"
+ },
+ "prefer_rgb_color": {
+ "description": "Чи надавати перевагу налаштуванню кольору RGB над температурою кольору світла, коли це можливо. 🌈"
+ },
+ "turn_on_lights": {
+ "description": "Чи вмикати світло, яке наразі вимкнене. 🔆"
}
},
"description": "Змініть будь-які налаштування, які ви бажаєте, у цьому перемикачі. Усі опції тут такі ж, як і в поточному конфігураційному файлі."
@@ -136,6 +201,12 @@
"fields": {
"lights": {
"description": "Ідентифікатор(и) світла (entity_id(s) of lights). Якщо не вказано, вибираються всі лампи у перемикачі. 💡"
+ },
+ "entity_id": {
+ "description": "`entity_id` перемикача, в якому потрібно (зняти) позначку світла як `керованого вручну`. 📝"
+ },
+ "manual_control": {
+ "description": "Додавати (\"true\") чи видаляти (\"false\") світло зі списку \"manual_control\". 🔒"
}
}
}
From d95f0d4bc6be05030e4eb271e6969f04b9633fc5 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Thu, 27 Nov 2025 10:52:11 -0800
Subject: [PATCH 130/301] Fix xfail and skipped tests to properly pass (#1307)
---
tests/test_config_flow.py | 33 +++++++++++++++++++--------------
tests/test_switch.py | 14 +++++++++-----
2 files changed, 28 insertions(+), 19 deletions(-)
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
index 0b9609d3..02ed6d42 100644
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -1,6 +1,5 @@
"""Test Adaptive Lighting config flow."""
-import pytest
from homeassistant.components.adaptive_lighting.const import (
CONF_SUNRISE_TIME,
CONF_SUNSET_TIME,
@@ -115,14 +114,13 @@ async def test_import_twice(hass):
)
-# TODO: Fix, broken for all supported versions
-# But in ≤2024.5 it gives homeassistant.config_entries.UnknownEntry: cd69dbda65bd3f86e9a32d974cdfa23f
-# and ≥2024.6 it times out
-# NOTE: Just skip this test for now, currently (2025-06-15) I cannot figure out
-# what this test is even testing.
-async def test_changing_options_when_using_yaml(hass):
- """Test changing options when using YAML."""
- pytest.skip(reason="TODO: Fix, broken for all supported versions")
+async def test_options_flow_for_yaml_import(hass):
+ """Test that options flow for YAML-imported entries shows empty form.
+
+ When a config entry is imported from YAML (source=SOURCE_IMPORT),
+ the options flow should show an empty form since the user should
+ modify the YAML configuration directly, not through the UI.
+ """
entry = MockConfigEntry(
domain=DOMAIN,
title=DEFAULT_NAME,
@@ -132,11 +130,18 @@ async def test_changing_options_when_using_yaml(hass):
)
entry.add_to_hass(hass)
- await hass.block_till_done()
+ # For YAML imports, the switch setup requires the unique_id to be in
+ # hass.data[DOMAIN]["__yaml__"], otherwise it deletes the entry.
+ # This simulates what async_step_import does.
+ hass.data.setdefault(DOMAIN, {}).setdefault("__yaml__", set()).add(entry.unique_id)
+
await hass.config_entries.async_setup(entry.entry_id)
+ await hass.async_block_till_done()
result = await hass.config_entries.options.async_init(entry.entry_id)
- result = await hass.config_entries.options.async_configure(
- result["flow_id"],
- user_input={},
- )
+
+ # For YAML imports, the options flow shows an empty form (data_schema=None)
+ # This is intentional - users should modify YAML, not UI
+ assert result["type"] == FlowResultType.FORM
+ assert result["step_id"] == "init"
+ assert result.get("data_schema") is None
diff --git a/tests/test_switch.py b/tests/test_switch.py
index 5011ebc6..e85cecb9 100644
--- a/tests/test_switch.py
+++ b/tests/test_switch.py
@@ -1296,13 +1296,17 @@ async def test_restore_off_state(hass, state):
assert not _switch.is_on
-@pytest.mark.xfail(reason="Offset is larger than half a day")
async def test_offset_too_large(hass):
- """Test that update fails when the offset is too large."""
+ """Test that update fails when the sunrise offset is too large.
+
+ A 12-hour offset causes sun events to be out of order (e.g., sunrise after sunset),
+ which makes the adaptive lighting algorithm fail with a ValueError.
+ """
_, switch = await setup_switch(hass, {CONF_SUNRISE_OFFSET: 3600 * 12})
- await switch._update_attrs_and_maybe_adapt_lights(
- context=switch.create_context("test"),
- )
+ with pytest.raises(ValueError, match="sun events.*not in the expected order"):
+ await switch._update_attrs_and_maybe_adapt_lights(
+ context=switch.create_context("test"),
+ )
await hass.async_block_till_done()
From a982acb384d9df70be279a568d5bc4384455c67a Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Thu, 27 Nov 2025 12:00:47 -0800
Subject: [PATCH 131/301] Stop pinning mypy-dev versions since old releases get
deleted from PyPI (#1308)
---
scripts/setup-dependencies | 27 +++++++--------------------
1 file changed, 7 insertions(+), 20 deletions(-)
diff --git a/scripts/setup-dependencies b/scripts/setup-dependencies
index 92a41411..f462335d 100755
--- a/scripts/setup-dependencies
+++ b/scripts/setup-dependencies
@@ -2,29 +2,16 @@
set -ex
cd "$(dirname "$0")/.."
-if grep -q 'mypy-dev==1.14.0a3' core/requirements_test.txt; then
- # mypy-dev==1.14.0a3 seems to not be available anymore, HA 2024.12 is affected
- sed -i 's/mypy-dev==1.14.0a3/mypy-dev==1.14.0a7/' core/requirements_test.txt
-fi
-if grep -q 'mypy-dev==1.16.0a1' core/requirements_test.txt; then
- # mypy-dev==1.16.0a1 seems to not be available anymore, HA 2025.2 is affected
- sed -i 's/mypy-dev==1.16.0a1/mypy-dev==1.16.0a9/' core/requirements_test.txt
-fi
-if grep -q 'mypy-dev==1.16.0a3' core/requirements_test.txt; then
- # mypy-dev==1.16.0a3 seems to not be available anymore, HA 2025.3 is affected
- sed -i 's/mypy-dev==1.16.0a3/mypy-dev==1.16.0a9/' core/requirements_test.txt
-fi
-if grep -q 'mypy-dev==1.16.0a7' core/requirements_test.txt; then
- # mypy-dev==1.16.0a7 seems to not be available anymore, HA 2025.4 is affected
- sed -i 's/mypy-dev==1.16.0a7/mypy-dev==1.16.0a9/' core/requirements_test.txt
-fi
-if grep -q 'mypy-dev==1.16.0a8' core/requirements_test.txt; then
- # mypy-dev==1.16.0a8 seems to not be available anymore, HA 2025.5 and 2025.6 is affected
- sed -i 's/mypy-dev==1.16.0a8/mypy-dev==1.16.0a9/' core/requirements_test.txt
-fi
+# Remove mypy-dev from requirements_test.txt since the maintainer deletes old versions from PyPI.
+# We'll install the latest version separately below.
+# See: https://github.com/cdce8p/mypy-dev/issues/62
+sed -i '/^mypy-dev/d' core/requirements_test.txt
uv pip install -r core/requirements.txt
uv pip install -r core/requirements_test.txt
uv pip install -e core/
uv pip install ulid-transform # this is in Adaptive-lighting's manifest.json
uv pip install $(python test_dependencies.py)
+
+# Install the latest mypy-dev (not pinned since old versions get deleted from PyPI)
+uv pip install --upgrade mypy-dev
From 19d30430bbab26828511d48c42e9cc87b21dd902 Mon Sep 17 00:00:00 2001
From: Dobby
Date: Thu, 27 Nov 2025 21:01:05 +0100
Subject: [PATCH 132/301] Friendly names (#1258)
---
.../adaptive_lighting/__init__.py | 18 ++--
.../adaptive_lighting/_docs_helpers.py | 21 ++---
.../adaptive_lighting/adaptation_utils.py | 3 +-
.../adaptive_lighting/color_and_brightness.py | 6 +-
.../adaptive_lighting/config_flow.py | 35 +++++---
custom_components/adaptive_lighting/const.py | 33 +++----
.../adaptive_lighting/hass_utils.py | 16 +++-
.../adaptive_lighting/helpers.py | 13 +++
custom_components/adaptive_lighting/switch.py | 85 ++++++++++---------
9 files changed, 140 insertions(+), 90 deletions(-)
diff --git a/custom_components/adaptive_lighting/__init__.py b/custom_components/adaptive_lighting/__init__.py
index 0c8bad80..44151c84 100644
--- a/custom_components/adaptive_lighting/__init__.py
+++ b/custom_components/adaptive_lighting/__init__.py
@@ -7,7 +7,7 @@ import homeassistant.helpers.config_validation as cv
import voluptuous as vol
from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
from homeassistant.const import CONF_SOURCE
-from homeassistant.core import HomeAssistant
+from homeassistant.core import Event, HomeAssistant
from .const import (
_DOMAIN_SCHEMA,
@@ -22,7 +22,7 @@ _LOGGER = logging.getLogger(__name__)
PLATFORMS = ["switch"]
-def _all_unique_names(value):
+def _all_unique_names(value: list[dict[str, Any]]) -> list[dict[str, Any]]:
"""Validate that all entities have a unique profile name."""
hosts = [device[CONF_NAME] for device in value]
schema = vol.Schema(vol.Unique())
@@ -36,12 +36,16 @@ CONFIG_SCHEMA = vol.Schema(
)
-async def reload_configuration_yaml(event: dict, hass: HomeAssistant): # noqa: ARG001
+async def reload_configuration_yaml(event: Event) -> None:
"""Reload configuration.yaml."""
- await hass.services.async_call("homeassistant", "check_config", {})
+ hass: HomeAssistant | None = event.data.get("hass")
+ if hass is not None:
+ await hass.services.async_call("homeassistant", "check_config", {})
+ else:
+ _LOGGER.error("HomeAssistant instance not found in event data.")
-async def async_setup(hass: HomeAssistant, config: dict[str, Any]):
+async def async_setup(hass: HomeAssistant, config: dict[str, Any]) -> bool:
"""Import integration from config."""
if DOMAIN in config:
for entry in config[DOMAIN]:
@@ -55,7 +59,7 @@ async def async_setup(hass: HomeAssistant, config: dict[str, Any]):
return True
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
+async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
"""Set up the component."""
data = hass.data.setdefault(DOMAIN, {})
@@ -70,7 +74,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
return True
-async def async_update_options(hass: HomeAssistant, config_entry: ConfigEntry):
+async def async_update_options(hass: HomeAssistant, config_entry: ConfigEntry) -> None:
"""Update options."""
await hass.config_entries.async_reload(config_entry.entry_id)
diff --git a/custom_components/adaptive_lighting/_docs_helpers.py b/custom_components/adaptive_lighting/_docs_helpers.py
index 49899395..afbb9d66 100644
--- a/custom_components/adaptive_lighting/_docs_helpers.py
+++ b/custom_components/adaptive_lighting/_docs_helpers.py
@@ -15,7 +15,7 @@ from .const import (
)
-def _format_voluptuous_instance(instance):
+def _format_voluptuous_instance(instance: vol.All) -> str:
coerce_type = None
min_val = None
max_val = None
@@ -56,8 +56,8 @@ def _type_to_str(type_: Any) -> str: # noqa: PLR0911
raise ValueError(msg)
-def generate_config_markdown_table():
- rows = []
+def generate_config_markdown_table() -> str:
+ rows: list[dict[str, str]] = []
for k, default, type_ in VALIDATION_TUPLES:
description = DOCS[k]
row = {
@@ -73,7 +73,7 @@ def generate_config_markdown_table():
def _schema_to_dict(schema: vol.Schema) -> dict[str, tuple[Any, Any]]:
- result = {}
+ result: dict[str, tuple[Any, Any]] = {}
for key, value in schema.schema.items():
if isinstance(key, vol.Optional):
default_value = key.default
@@ -82,11 +82,12 @@ def _schema_to_dict(schema: vol.Schema) -> dict[str, tuple[Any, Any]]:
def _generate_service_markdown_table(
- schema: vol.Schema,
+ schema: dict[str, tuple[Any, Any]] | vol.Schema,
alternative_docs: dict[str, str] | None = None,
-):
- rows = []
- for k, (default, type_) in _schema_to_dict(schema).items():
+) -> str:
+ schema_dict = _schema_to_dict(schema) if isinstance(schema, vol.Schema) else schema
+ rows: list[dict[str, str]] = []
+ for k, (default, type_) in schema_dict.items():
if alternative_docs is not None and k in alternative_docs:
description = alternative_docs[k]
else:
@@ -103,11 +104,11 @@ def _generate_service_markdown_table(
return df.to_markdown(index=False)
-def generate_apply_markdown_table():
+def generate_apply_markdown_table() -> str:
return _generate_service_markdown_table(apply_service_schema(), DOCS_APPLY)
-def generate_set_manual_control_markdown_table():
+def generate_set_manual_control_markdown_table() -> str:
return _generate_service_markdown_table(
SET_MANUAL_CONTROL_SCHEMA,
DOCS_MANUAL_CONTROL,
diff --git a/custom_components/adaptive_lighting/adaptation_utils.py b/custom_components/adaptive_lighting/adaptation_utils.py
index 2c339223..14c28ae8 100644
--- a/custom_components/adaptive_lighting/adaptation_utils.py
+++ b/custom_components/adaptive_lighting/adaptation_utils.py
@@ -84,10 +84,11 @@ def _remove_redundant_attributes(
Removes all attributes from service call data whose values are already present
in the target entity's state.
"""
+ attributes: dict[str, Any] = dict(state.attributes)
return {
k: v
for k, v in service_data.items()
- if k not in state.attributes or v != state.attributes[k]
+ if k not in attributes or v != attributes[k]
}
diff --git a/custom_components/adaptive_lighting/color_and_brightness.py b/custom_components/adaptive_lighting/color_and_brightness.py
index 2fd93e67..34da23c6 100644
--- a/custom_components/adaptive_lighting/color_and_brightness.py
+++ b/custom_components/adaptive_lighting/color_and_brightness.py
@@ -375,8 +375,8 @@ class SunLightSettings:
def get_settings(
self,
- is_sleep,
- transition,
+ is_sleep: bool,
+ transition: float | None,
) -> dict[str, float | int | tuple[float, float] | tuple[float, float, float]]:
"""Get all light settings.
@@ -507,7 +507,7 @@ def lerp_color_hsv(
return cast("tuple[int, int, int]", rgb)
-def lerp(x, x1, x2, y1, y2):
+def lerp(x: float, x1: float, x2: float, y1: float, y2: float) -> float:
"""Linearly interpolate between two values."""
return y1 + (x - x1) * (y2 - y1) / (x2 - x1)
diff --git a/custom_components/adaptive_lighting/config_flow.py b/custom_components/adaptive_lighting/config_flow.py
index 00214fdb..d1799888 100644
--- a/custom_components/adaptive_lighting/config_flow.py
+++ b/custom_components/adaptive_lighting/config_flow.py
@@ -16,6 +16,7 @@ from .const import ( # pylint: disable=unused-import
NONE_STR,
VALIDATION_TUPLES,
)
+from .helpers import get_friendly_name
from .switch import _supported_features, validate
_LOGGER = logging.getLogger(__name__)
@@ -26,9 +27,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
VERSION = 1
- async def async_step_user(self, user_input=None):
+ async def async_step_user(self, user_input: dict[str, Any] | None = None):
"""Handle the initial step."""
- errors = {}
+ errors: dict[str, str] = {}
if user_input is not None:
await self.async_set_unique_id(user_input[CONF_NAME])
@@ -41,8 +42,11 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
errors=errors,
)
- async def async_step_import(self, user_input: dict[str, Any]):
+ async def async_step_import(self, user_input: dict[str, Any] | None = None):
"""Handle configuration by YAML file."""
+ if user_input is None:
+ return self.async_abort(reason="no_data")
+
await self.async_set_unique_id(user_input[CONF_NAME])
# Keep a list of switches that are configured via YAML
data = self.hass.data.setdefault(DOMAIN, {})
@@ -57,7 +61,9 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
- def async_get_options_flow(config_entry):
+ def async_get_options_flow(
+ config_entry: config_entries.ConfigEntry,
+ ) -> "OptionsFlowHandler":
"""Get the options flow for this handler."""
if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
# https://github.com/home-assistant/core/pull/129651
@@ -65,7 +71,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
return OptionsFlowHandler(config_entry)
-def validate_options(user_input, errors):
+def validate_options(user_input: dict[str, Any], errors: dict[str, str]) -> None:
"""Validate the options in the OptionsFlow.
This is an extra validation step because the validators
@@ -85,7 +91,7 @@ def validate_options(user_input, errors):
class OptionsFlowHandler(config_entries.OptionsFlow):
"""Handle a option flow for Adaptive Lighting."""
- def __init__(self, *args, **kwargs) -> None:
+ def __init__(self, *args: Any, **kwargs: Any) -> None:
"""Initialize options flow."""
if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
super().__init__(*args, **kwargs)
@@ -93,7 +99,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
else:
self.config_entry = args[0]
- async def async_step_init(self, user_input=None):
+ async def async_step_init(self, user_input: dict[str, Any] | None = None):
"""Handle options flow."""
conf = self.config_entry
data = validate(conf)
@@ -105,11 +111,12 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
if not errors:
return self.async_create_entry(title="", data=user_input)
- all_lights = [
- light
+ all_lights_with_names = {
+ light: get_friendly_name(self.hass, light)
for light in self.hass.states.async_entity_ids("light")
if _supported_features(self.hass, light)
- ]
+ }
+ all_lights = list(all_lights_with_names.keys())
for configured_light in data[CONF_LIGHTS]:
if configured_light not in all_lights:
errors = {CONF_LIGHTS: "entity_missing"}
@@ -119,7 +126,13 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
configured_light,
)
all_lights.append(configured_light)
- to_replace = {CONF_LIGHTS: cv.multi_select(sorted(all_lights))}
+ all_lights_with_names[configured_light] = configured_light
+
+ light_options = {
+ entity_id: f"{name} ({entity_id})"
+ for entity_id, name in all_lights_with_names.items()
+ }
+ to_replace = {CONF_LIGHTS: cv.multi_select(light_options)}
options_schema = {}
for name, default, validation in VALIDATION_TUPLES:
diff --git a/custom_components/adaptive_lighting/const.py b/custom_components/adaptive_lighting/const.py
index 3fc9c5d4..f7c3620b 100644
--- a/custom_components/adaptive_lighting/const.py
+++ b/custom_components/adaptive_lighting/const.py
@@ -1,5 +1,8 @@
"""Constants for the Adaptive Lighting integration."""
+from datetime import timedelta
+from typing import Any
+
import homeassistant.helpers.config_validation as cv
import voluptuous as vol
from homeassistant.components.light import VALID_TRANSITION
@@ -291,13 +294,13 @@ DOCS_APPLY = {
}
-def int_between(min_int, max_int):
+def int_between(min_int: int, max_int: int) -> vol.All:
"""Return an integer between 'min_int' and 'max_int'."""
return vol.All(vol.Coerce(int), vol.Range(min=min_int, max=max_int))
-VALIDATION_TUPLES = [
- (CONF_LIGHTS, DEFAULT_LIGHTS, cv.entity_ids),
+VALIDATION_TUPLES: list[tuple[str, Any, Any]] = [
+ (CONF_LIGHTS, DEFAULT_LIGHTS, cv.entity_ids), # type: ignore[arg-type]
(CONF_INTERVAL, DEFAULT_INTERVAL, cv.positive_int),
(CONF_TRANSITION, DEFAULT_TRANSITION, VALID_TRANSITION),
(CONF_INITIAL_TRANSITION, DEFAULT_INITIAL_TRANSITION, VALID_TRANSITION),
@@ -310,7 +313,7 @@ VALIDATION_TUPLES = [
(
CONF_SLEEP_RGB_OR_COLOR_TEMP,
DEFAULT_SLEEP_RGB_OR_COLOR_TEMP,
- selector.SelectSelector(
+ selector.SelectSelector( # type: ignore[arg-type]
selector.SelectSelectorConfig(
options=["color_temp", "rgb_color"],
multiple=False,
@@ -322,7 +325,7 @@ VALIDATION_TUPLES = [
(
CONF_SLEEP_RGB_COLOR,
DEFAULT_SLEEP_RGB_COLOR,
- selector.ColorRGBSelector(selector.ColorRGBSelectorConfig()),
+ selector.ColorRGBSelector(selector.ColorRGBSelectorConfig()), # type: ignore[arg-type]
),
(CONF_SLEEP_TRANSITION, DEFAULT_SLEEP_TRANSITION, VALID_TRANSITION),
(CONF_ADAPT_UNTIL_SLEEP, DEFAULT_ADAPT_UNTIL_SLEEP, bool),
@@ -337,7 +340,7 @@ VALIDATION_TUPLES = [
(
CONF_BRIGHTNESS_MODE,
DEFAULT_BRIGHTNESS_MODE,
- selector.SelectSelector(
+ selector.SelectSelector( # type: ignore[arg-type]
selector.SelectSelectorConfig(
options=["default", "linear", "tanh"],
multiple=False,
@@ -370,7 +373,7 @@ VALIDATION_TUPLES = [
]
-def timedelta_as_int(value):
+def timedelta_as_int(value: timedelta) -> float:
"""Convert a `datetime.timedelta` object to an integer.
This integer can be serialized to json but a timedelta cannot.
@@ -380,7 +383,7 @@ def timedelta_as_int(value):
# conf_option: (validator, coerce) tuples
# these validators cannot be serialized but can be serialized when coerced by coerce.
-EXTRA_VALIDATION = {
+EXTRA_VALIDATION: dict[str, tuple[Any, Any]] = {
CONF_INTERVAL: (cv.time_period, timedelta_as_int),
CONF_SUNRISE_OFFSET: (cv.time_period, timedelta_as_int),
CONF_SUNRISE_TIME: (cv.time, str),
@@ -395,7 +398,7 @@ EXTRA_VALIDATION = {
}
-def maybe_coerce(key, validation):
+def maybe_coerce(key: str, validation: Any) -> vol.All | Any:
"""Coerce the validation into a json serializable type."""
validation, coerce = EXTRA_VALIDATION.get(key, (validation, None))
if coerce is not None:
@@ -403,7 +406,7 @@ def maybe_coerce(key, validation):
return validation
-def replace_none_str(value, replace_with=None):
+def replace_none_str(value: Any, replace_with: Any | None = None) -> Any:
"""Replace "None" -> replace_with."""
return value if value != NONE_STR else replace_with
@@ -421,12 +424,12 @@ _DOMAIN_SCHEMA = vol.Schema(
)
-def apply_service_schema(initial_transition: int = 1):
+def apply_service_schema(initial_transition: int = 1) -> vol.Schema:
"""Return the schema for the apply service."""
return vol.Schema(
{
- vol.Optional(CONF_ENTITY_ID): cv.entity_ids,
- vol.Optional(CONF_LIGHTS, default=[]): cv.entity_ids,
+ vol.Optional(CONF_ENTITY_ID): cv.entity_ids, # type: ignore[arg-type]
+ vol.Optional(CONF_LIGHTS, default=[]): cv.entity_ids, # type: ignore[arg-type]
vol.Optional(
CONF_TRANSITION,
default=initial_transition,
@@ -441,8 +444,8 @@ def apply_service_schema(initial_transition: int = 1):
SET_MANUAL_CONTROL_SCHEMA = vol.Schema(
{
- vol.Optional(CONF_ENTITY_ID): cv.entity_ids,
- vol.Optional(CONF_LIGHTS, default=[]): cv.entity_ids,
+ vol.Optional(CONF_ENTITY_ID): cv.entity_ids, # type: ignore[arg-type]
+ vol.Optional(CONF_LIGHTS, default=[]): cv.entity_ids, # type: ignore[arg-type]
vol.Optional(CONF_MANUAL_CONTROL, default=True): cv.boolean,
},
)
diff --git a/custom_components/adaptive_lighting/hass_utils.py b/custom_components/adaptive_lighting/hass_utils.py
index 21ea67b3..550ae350 100644
--- a/custom_components/adaptive_lighting/hass_utils.py
+++ b/custom_components/adaptive_lighting/hass_utils.py
@@ -47,7 +47,7 @@ def setup_service_call_interceptor(
# This is necessary to replace a registered service handler with our
# proxy handler to intercept calls.
registered_services = (
- hass.services._services # pylint: disable=protected-access
+ hass.services._services # pylint: disable=protected-access # type: ignore[attr-defined]
)
except AttributeError as error:
msg = (
@@ -68,7 +68,9 @@ def setup_service_call_interceptor(
data = dict(call.data)
# Call interceptor
- await intercept_func(call, data)
+ result = intercept_func(call, data)
+ if result is not None:
+ await result
# Convert data back to read-only
call.data = ReadOnlyDict(data)
@@ -79,7 +81,13 @@ def setup_service_call_interceptor(
call.data,
)
# Call original service handler with processed data
- await existing_service.job.target(call)
+ import asyncio
+
+ target = existing_service.job.target
+ if asyncio.iscoroutinefunction(target):
+ await target(call)
+ else:
+ target(call)
hass.services.async_register(
domain,
@@ -88,7 +96,7 @@ def setup_service_call_interceptor(
existing_service.schema,
)
- def remove():
+ def remove() -> None:
# Remove the interceptor by reinstalling the original service handler
hass.services.async_register(
domain,
diff --git a/custom_components/adaptive_lighting/helpers.py b/custom_components/adaptive_lighting/helpers.py
index fa3af6ef..df2abb95 100644
--- a/custom_components/adaptive_lighting/helpers.py
+++ b/custom_components/adaptive_lighting/helpers.py
@@ -4,6 +4,10 @@ from __future__ import annotations
import base64
import math
+from typing import TYPE_CHECKING, Any
+
+if TYPE_CHECKING:
+ from homeassistant.core import HomeAssistant
def clamp(value: float, minimum: float, maximum: float) -> float:
@@ -83,3 +87,12 @@ def color_difference_redmean(
green_term = 4 * delta_g**2
blue_term = (2 + (255 - r_hat) / 256) * delta_b**2
return math.sqrt(red_term + green_term + blue_term)
+
+
+def get_friendly_name(hass: HomeAssistant, entity_id: str) -> str:
+ """Retrieve the friendly name of an entity."""
+ state = hass.states.get(entity_id)
+ if state and hasattr(state, "attributes"):
+ attributes: dict[str, Any] = dict(getattr(state, "attributes", {}))
+ return attributes.get("friendly_name", entity_id)
+ return entity_id
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 59b98a0c..dbb72ea1 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -232,7 +232,7 @@ def _switches_with_lights(
"""Get all switches that control at least one of the lights passed."""
config_entries = hass.config_entries.async_entries(DOMAIN)
data = hass.data[DOMAIN]
- switches = []
+ switches: list[AdaptiveSwitch] = []
all_check_lights = (
_expand_light_groups(hass, lights) if expand_light_groups else set(lights)
)
@@ -369,7 +369,7 @@ def _fire_manual_control_event(
switch: AdaptiveSwitch,
light: str,
context: Context,
-):
+) -> None:
"""Fire an event that 'light' is marked as manual_control."""
hass = switch.hass
_LOGGER.debug(
@@ -389,7 +389,7 @@ async def async_setup_entry( # noqa: PLR0915
hass: HomeAssistant,
config_entry: ConfigEntry,
async_add_entities: AddEntitiesCallback,
-):
+) -> None:
"""Set up the AdaptiveLighting switch."""
assert hass is not None
data = hass.data[DOMAIN]
@@ -456,7 +456,7 @@ async def async_setup_entry( # noqa: PLR0915
)
@callback
- async def handle_apply(service_call: ServiceCall):
+ async def handle_apply(service_call: ServiceCall) -> None:
"""Handle the entity service apply."""
data = service_call.data
_LOGGER.debug(
@@ -488,7 +488,7 @@ async def async_setup_entry( # noqa: PLR0915
)
@callback
- async def handle_set_manual_control(service_call: ServiceCall):
+ async def handle_set_manual_control(service_call: ServiceCall) -> None:
"""Set or unset lights as 'manually controlled'."""
data = service_call.data
_LOGGER.debug(
@@ -583,7 +583,7 @@ def validate(
return data
-def _is_state_event(event: Event, from_or_to_state: Iterable[str]):
+def _is_state_event(event: Event, from_or_to_state: Iterable[str]) -> bool:
"""Match state event when either 'from_state' or 'to_state' matches."""
return (
(old_state := event.data.get("old_state")) is not None
@@ -598,7 +598,7 @@ def _expand_light_groups(
hass: HomeAssistant,
lights: list[str],
) -> list[str]:
- all_lights = set()
+ all_lights: set[str] = set()
manager = hass.data[DOMAIN][ATTR_ADAPTIVE_LIGHTING_MANAGER]
for light in lights:
state = hass.states.get(light)
@@ -625,15 +625,15 @@ def _is_light_group(state: State) -> bool:
def _supported_features(hass: HomeAssistant, light: str) -> set[str]:
state = hass.states.get(light)
assert state is not None
- supported_features = state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
+ supported_features = int(state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)) # type: ignore[arg-type]
assert isinstance(supported_features, int)
- supported = set()
+ supported: set[str] = set()
if supported_features & LightEntityFeature.TRANSITION:
supported.add("transition")
- supported_color_modes = state.attributes.get(ATTR_SUPPORTED_COLOR_MODES, set())
+ supported_color_modes = state.attributes.get(ATTR_SUPPORTED_COLOR_MODES, set()) # type: ignore[arg-type]
color_modes = {
ColorMode.RGB,
ColorMode.RGBW,
@@ -838,7 +838,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
def __init__(
self,
- hass,
+ hass: HomeAssistant,
config_entry: ConfigEntry,
manager: AdaptiveLightingManager,
sleep_mode_switch: SimpleSwitch,
@@ -892,7 +892,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
self,
data: dict[str, Any],
defaults: dict[str, Any] | None = None,
- ):
+ ) -> None:
# Only pass settings users can change during runtime
data = validate(
config_entry=None,
@@ -984,12 +984,12 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
)
@property
- def name(self):
+ def name(self) -> str:
"""Return the name of the device if any."""
return f"Adaptive Lighting: {self._name}"
@property
- def unique_id(self):
+ def unique_id(self) -> str:
"""Return the unique ID of entity."""
return self._name
@@ -1026,11 +1026,11 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
self._state = False
assert not self.remove_listeners
- async def async_will_remove_from_hass(self):
+ async def async_will_remove_from_hass(self) -> None:
"""Remove the listeners upon removing the component."""
self._remove_listeners()
- def _expand_light_groups(self, hass=None) -> None:
+ def _expand_light_groups(self, hass: HomeAssistant | None = None) -> None:
hass = hass or self.hass
all_lights = _expand_light_groups(hass, self.lights)
self.manager.lights.update(all_lights)
@@ -1187,7 +1187,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
force=True,
)
- async def async_turn_off(self, **kwargs) -> None: # noqa: ARG002
+ async def async_turn_off(self, **kwargs: Any) -> None: # noqa: ARG002
"""Turn off adaptive lighting."""
if not self.is_on:
return
@@ -1195,7 +1195,10 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
self._remove_listeners()
self.manager.reset(*self.lights)
- async def _async_update_at_interval_action(self, now=None) -> None: # noqa: ARG002
+ async def _async_update_at_interval_action(
+ self,
+ now: Any = None, # noqa: ARG002
+ ) -> None:
"""Update the attributes and maybe adapt the lights."""
await self._update_attrs_and_maybe_adapt_lights(
context=self.create_context("interval"),
@@ -1328,7 +1331,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
await self.execute_cancellable_adaptation_calls(data)
- async def _execute_adaptation_calls(self, data: AdaptationData):
+ async def _execute_adaptation_calls(self, data: AdaptationData) -> None:
"""Executes a sequence of adaptation service calls for the given service datas."""
for index in range(data.max_length):
is_first_call = index == 0
@@ -1379,7 +1382,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
async def execute_cancellable_adaptation_calls(
self,
data: AdaptationData,
- ):
+ ) -> None:
"""Executes a cancellable sequence of adaptation service calls for the given service datas.
Wraps the sequence of service calls in a task that can be cancelled from elsewhere, e.g.,
@@ -1635,12 +1638,12 @@ class SimpleSwitch(SwitchEntity, RestoreEntity):
self._initial_state = initial_state
@property
- def name(self):
+ def name(self) -> str:
"""Return the name of the device if any."""
return self._name
@property
- def unique_id(self):
+ def unique_id(self) -> str:
"""Return the unique ID of entity."""
return self._unique_id
@@ -1676,12 +1679,12 @@ class SimpleSwitch(SwitchEntity, RestoreEntity):
else:
await self.async_turn_off()
- async def async_turn_on(self, **kwargs) -> None: # noqa: ARG002
+ async def async_turn_on(self, **kwargs: Any) -> None: # noqa: ARG002
"""Turn on adaptive lighting sleep mode."""
_LOGGER.debug("%s: Turning on", self._name)
self._state = True
- async def async_turn_off(self, **kwargs) -> None: # noqa: ARG002
+ async def async_turn_off(self, **kwargs: Any) -> None: # noqa: ARG002
"""Turn off adaptive lighting sleep mode."""
_LOGGER.debug("%s: Turning off", self._name)
self._state = False
@@ -1769,7 +1772,7 @@ class AdaptiveLightingManager:
exc_info=True,
)
- def disable(self):
+ def disable(self) -> None:
"""Disable the listener by removing all subscribed handlers."""
for remove in self.listener_removers:
remove()
@@ -1991,7 +1994,7 @@ class AdaptiveLightingManager:
skipped,
)
- def modify_service_data(service_data, entity_ids):
+ def modify_service_data(service_data, entity_ids) -> dict[str, Any]:
"""Modify the service data to contain the entity IDs."""
service_data.pop(ATTR_ENTITY_ID, None)
service_data.pop(ATTR_AREA_ID, None)
@@ -2169,7 +2172,7 @@ class AdaptiveLightingManager:
light,
)
- async def reset():
+ async def reset() -> None:
# Called when the timer expires, doesn't need to do anything
_LOGGER.debug(
"Transition finished for light %s",
@@ -2178,7 +2181,11 @@ class AdaptiveLightingManager:
self._handle_timer(light, self.transition_timers, last_transition, reset)
- def set_auto_reset_manual_control_times(self, lights: list[str], time: float):
+ def set_auto_reset_manual_control_times(
+ self,
+ lights: list[str],
+ time: float,
+ ) -> None:
"""Set the time after which the lights are automatically reset."""
if time == 0:
return
@@ -2201,7 +2208,7 @@ class AdaptiveLightingManager:
self.manual_control[light] = True
delay = self.auto_reset_manual_control_times.get(light)
- async def reset():
+ async def reset() -> None:
_LOGGER.debug(
"Auto resetting 'manual_control' status of '%s' because"
" it was not manually controlled for %s seconds.",
@@ -2227,7 +2234,7 @@ class AdaptiveLightingManager:
self,
light_id: str,
which: Literal["color", "brightness", "both"] = "both",
- ):
+ ) -> None:
"""Cancel ongoing adaptation service calls for a specific light entity."""
brightness_task = self.adaptation_tasks_brightness.get(light_id)
color_task = self.adaptation_tasks_color.get(light_id)
@@ -2256,7 +2263,7 @@ class AdaptiveLightingManager:
# color_task might be the same as brightness_task
color_task.cancel()
- def reset(self, *lights, reset_manual_control: bool = True) -> None:
+ def reset(self, *lights: str, reset_manual_control: bool = True) -> None:
"""Reset the 'manual_control' status of the lights."""
for light in lights:
if reset_manual_control:
@@ -2306,11 +2313,11 @@ class AdaptiveLightingManager:
if not any(eid in self.lights for eid in entity_ids):
return
- def off(eid: str, event: Event):
+ def off(eid: str, event: Event) -> None:
self.turn_off_event[eid] = event
self.reset(eid)
- def on(eid: str, event: Event):
+ def on(eid: str, event: Event) -> None:
task = self.sleep_tasks.get(eid)
if task is not None:
task.cancel()
@@ -2735,14 +2742,14 @@ class AdaptiveLightingManager:
class _AsyncSingleShotTimer:
- def __init__(self, delay, callback) -> None:
+ def __init__(self, delay: float, callback: Callable[[], None | Any]) -> None:
"""Initialize the timer."""
self.delay = delay
self.callback = callback
self.task = None
self.start_time: datetime.datetime | None = None
- async def _run(self):
+ async def _run(self) -> None:
"""Run the timer. Don't call this directly, use start() instead."""
await asyncio.sleep(self.delay)
if self.callback:
@@ -2751,11 +2758,11 @@ class _AsyncSingleShotTimer:
else:
self.callback()
- def is_running(self):
+ def is_running(self) -> bool:
"""Return whether the timer is running."""
return self.task is not None and not self.task.done()
- def start(self):
+ def start(self) -> None:
"""Start the timer."""
if self.task is not None and not self.task.done():
self.task.cancel()
@@ -2765,13 +2772,13 @@ class _AsyncSingleShotTimer:
self.start_time = dt_util.utcnow()
self.task = asyncio.create_task(self._run())
- def cancel(self):
+ def cancel(self) -> None:
"""Cancel the timer."""
if self.task:
self.task.cancel()
self.callback = None
- def remaining_time(self):
+ def remaining_time(self) -> float:
"""Return the remaining time before the timer expires."""
if self.start_time is not None:
elapsed_time = (dt_util.utcnow() - self.start_time).total_seconds()
From bba7bb8350952446e0bbe2d9c474818004404b2d Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 20:01:33 +0000
Subject: [PATCH 133/301] docs: update README.md
---
README.md | 5 ++++-
1 file changed, 4 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index faf8c51a..27d79686 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -629,6 +629,9 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
Masayuki Sugahara
🌍 |
therealmate
🌍 |
+
+ 
Dobby
💻 |
+
From 2391d995393c90ba0079d87679c5910f65ceedd0 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Thu, 27 Nov 2025 20:01:34 +0000
Subject: [PATCH 134/301] docs: update .all-contributorsrc
---
.all-contributorsrc | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index d999de5a..21c19107 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1152,6 +1152,15 @@
"contributions": [
"translation"
]
+ },
+ {
+ "login": "dobby5",
+ "name": "Dobby",
+ "avatar_url": "https://avatars.githubusercontent.com/u/1346316?v=4",
+ "profile": "https://github.com/dobby5",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
From 1968e1a9a697a1713022dabf28f65d347d4d5417 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Thu, 27 Nov 2025 12:42:20 -0800
Subject: [PATCH 135/301] Bump to v1.28.0 (#1310)
---
custom_components/adaptive_lighting/manifest.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/manifest.json b/custom_components/adaptive_lighting/manifest.json
index 856abfe8..1d1e431a 100644
--- a/custom_components/adaptive_lighting/manifest.json
+++ b/custom_components/adaptive_lighting/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "calculated",
"issue_tracker": "https://github.com/basnijholt/adaptive-lighting/issues",
"requirements": ["ulid-transform"],
- "version": "1.27.0"
+ "version": "1.28.0"
}
From 80fb93b9f6e457b56d2cee548f2061956212e041 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Fri, 28 Nov 2025 16:43:52 -0800
Subject: [PATCH 136/301] Fix propcache dependency (revert to functools)
(#1314)
---
.../adaptive_lighting/color_and_brightness.py | 3 +--
webapp/color_and_brightness.py | 19 +++++++++----------
2 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/custom_components/adaptive_lighting/color_and_brightness.py b/custom_components/adaptive_lighting/color_and_brightness.py
index 34da23c6..caee67c2 100644
--- a/custom_components/adaptive_lighting/color_and_brightness.py
+++ b/custom_components/adaptive_lighting/color_and_brightness.py
@@ -9,7 +9,7 @@ import logging
import math
from dataclasses import dataclass
from datetime import UTC, timedelta
-from functools import partial
+from functools import cached_property, partial
from typing import TYPE_CHECKING, Any, Literal, cast
from homeassistant.util.color import (
@@ -17,7 +17,6 @@ from homeassistant.util.color import (
color_temperature_to_rgb,
color_xy_to_hs,
)
-from propcache.api import cached_property
if TYPE_CHECKING:
import astral.location
diff --git a/webapp/color_and_brightness.py b/webapp/color_and_brightness.py
index 849c2373..d636c674 100644
--- a/webapp/color_and_brightness.py
+++ b/webapp/color_and_brightness.py
@@ -8,7 +8,7 @@ import datetime
import logging
import math
from dataclasses import dataclass
-from datetime import timedelta
+from datetime import UTC, timedelta
from functools import cached_property, partial
from typing import TYPE_CHECKING, Any, Literal, cast
@@ -19,7 +19,7 @@ from homeassistant_util_color import (
)
if TYPE_CHECKING:
- import astral
+ import astral.location
# Same as homeassistant.const.SUN_EVENT_SUNRISE and homeassistant.const.SUN_EVENT_SUNSET
# We re-define them here to not depend on homeassistant in this file.
@@ -32,7 +32,6 @@ SUN_EVENT_MIDNIGHT = "solar_midnight"
_ORDER = (SUN_EVENT_SUNRISE, SUN_EVENT_NOON, SUN_EVENT_SUNSET, SUN_EVENT_MIDNIGHT)
_ALLOWED_ORDERS = {_ORDER[i:] + _ORDER[:i] for i in range(len(_ORDER))}
-UTC = datetime.timezone.utc
utcnow: partial[datetime.datetime] = partial(datetime.datetime.now, UTC)
utcnow.__doc__ = "Get now in UTC time."
@@ -44,7 +43,7 @@ class SunEvents:
"""Track the state of the sun and associated light settings."""
name: str
- astral_location: astral.Location
+ astral_location: astral.location.Location
sunrise_time: datetime.time | None
min_sunrise_time: datetime.time | None
max_sunrise_time: datetime.time | None
@@ -198,7 +197,7 @@ class SunLightSettings:
"""Track the state of the sun and associated light settings."""
name: str
- astral_location: astral.Location
+ astral_location: astral.location.Location
adapt_until_sleep: bool
max_brightness: int
max_color_temp: int
@@ -296,7 +295,7 @@ class SunLightSettings:
)
return clamp(brightness, self.min_brightness, self.max_brightness)
- def brightness_pct(self, dt: datetime.datetime, is_sleep: bool) -> float:
+ def brightness_pct(self, dt: datetime.datetime, is_sleep: bool) -> float | None:
"""Calculate the brightness in %."""
if is_sleep:
return self.sleep_brightness
@@ -331,7 +330,7 @@ class SunLightSettings:
) -> dict[str, Any]:
"""Calculate the brightness and color."""
sun_position = self.sun.sun_position(dt)
- rgb_color: tuple[float, float, float]
+ rgb_color: tuple[int, int, int]
# Variable `force_rgb_color` is needed for RGB color after sunset (if enabled)
force_rgb_color = False
brightness_pct = self.brightness_pct(dt, is_sleep)
@@ -375,8 +374,8 @@ class SunLightSettings:
def get_settings(
self,
- is_sleep,
- transition,
+ is_sleep: bool,
+ transition: float | None,
) -> dict[str, float | int | tuple[float, float] | tuple[float, float, float]]:
"""Get all light settings.
@@ -507,7 +506,7 @@ def lerp_color_hsv(
return cast("tuple[int, int, int]", rgb)
-def lerp(x, x1, x2, y1, y2):
+def lerp(x: float, x1: float, x2: float, y1: float, y2: float) -> float:
"""Linearly interpolate between two values."""
return y1 + (x - x1) * (y2 - y1) / (x2 - x1)
From 894d0025cdc83b61e0798dd87ca3d208a14781e2 Mon Sep 17 00:00:00 2001
From: lenucksi
Date: Sun, 30 Nov 2025 17:06:21 +0100
Subject: [PATCH 137/301] fix(ci): add branch filter to TOC generator workflow
(#1320)
---
.github/workflows/toc.yaml | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/.github/workflows/toc.yaml b/.github/workflows/toc.yaml
index 28dac912..a2665757 100644
--- a/.github/workflows/toc.yaml
+++ b/.github/workflows/toc.yaml
@@ -1,4 +1,6 @@
-on: push
+on:
+ push:
+ branches: [main]
name: TOC Generator
jobs:
generateTOC:
From cc25a504011c09aed81e278fbc2200baba8149af Mon Sep 17 00:00:00 2001
From: Lenucksi
Date: Sun, 30 Nov 2025 10:49:12 +0100
Subject: [PATCH 138/301] ci: add automated weekly test matrix updates
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Add automation to keep the pytest test matrix up-to-date with latest
Home Assistant Core releases:
1. **Weekly Automation**: New workflow updates test matrix automatically
2. **Version Fetcher**: Python script queries GitHub API for latest HA Core releases
3. **PR Creation**: Automatically creates PRs when new versions are available
## Benefits
- No more manual updates when new HA Core versions are released
- Automatic tracking of new HA Core releases
- Reduces maintenance burden
## Background
This builds on commit a982acb which fixed mypy-dev pinning. While upstream
now installs latest mypy-dev automatically, the test matrix versions still
need manual updates. This automation solves that remaining manual task.
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude
---
.github/workflows/update-test-matrix.yaml | 59 +++++++++
scripts/update-test-matrix.py | 147 ++++++++++++++++++++++
2 files changed, 206 insertions(+)
create mode 100644 .github/workflows/update-test-matrix.yaml
create mode 100755 scripts/update-test-matrix.py
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
new file mode 100644
index 00000000..658a5c4e
--- /dev/null
+++ b/.github/workflows/update-test-matrix.yaml
@@ -0,0 +1,59 @@
+name: Update Test Matrix
+
+on:
+ schedule:
+ # Run weekly on Monday at 9:00 UTC
+ - cron: "0 9 * * 1"
+ workflow_dispatch: # Allow manual trigger
+
+permissions:
+ contents: write
+ pull-requests: write
+
+jobs:
+ update-matrix:
+ name: Update HA Core versions in test matrix
+ runs-on: ubuntu-latest
+ steps:
+ - name: Check out code
+ uses: actions/checkout@v4
+
+ - name: Set up Python
+ uses: actions/setup-python@v5
+ with:
+ python-version: "3.12"
+
+ - name: Update test matrix
+ run: python scripts/update-test-matrix.py
+
+ - name: Check for changes
+ id: changes
+ run: |
+ if git diff --quiet .github/workflows/pytest.yaml; then
+ echo "changed=false" >> $GITHUB_OUTPUT
+ else
+ echo "changed=true" >> $GITHUB_OUTPUT
+ echo "Detected changes:"
+ git diff .github/workflows/pytest.yaml
+ fi
+
+ - name: Create Pull Request
+ if: steps.changes.outputs.changed == 'true'
+ uses: peter-evans/create-pull-request@v7
+ with:
+ token: ${{ secrets.GITHUB_TOKEN }}
+ commit-message: "ci: update HA Core test matrix versions"
+ title: "ci: Update Home Assistant Core test matrix"
+ body: |
+ This PR automatically updates the pytest workflow to test against the latest Home Assistant Core versions.
+
+ ## Changes
+ - Updated HA Core versions in the test matrix to include latest patch releases
+
+ ---
+ 🤖 Generated automatically by the update-test-matrix workflow
+ branch: update-test-matrix
+ delete-branch: true
+ labels: |
+ automation
+ ci
diff --git a/scripts/update-test-matrix.py b/scripts/update-test-matrix.py
new file mode 100755
index 00000000..1d06d992
--- /dev/null
+++ b/scripts/update-test-matrix.py
@@ -0,0 +1,147 @@
+#!/usr/bin/env python3
+"""Update the pytest workflow matrix with latest HA Core versions.
+
+This script fetches the latest Home Assistant Core release versions from GitHub
+and updates the pytest workflow matrix to test against them.
+
+Usage:
+ python scripts/update-test-matrix.py
+"""
+
+from __future__ import annotations
+
+import json
+import re
+import urllib.request
+from pathlib import Path
+
+# Minimum HA Core version to include in the test matrix
+# This should be the oldest version we want to support
+MIN_VERSION = (2024, 12)
+
+
+def get_ha_core_versions() -> list[str]:
+ """Fetch latest stable HA Core versions from GitHub API."""
+ all_tags = []
+ page = 1
+
+ # Paginate through all tags to ensure we get older versions too
+ while True:
+ url = f"https://api.github.com/repos/home-assistant/core/tags?per_page=100&page={page}"
+ with urllib.request.urlopen(url) as response: # noqa: S310
+ tags = json.loads(response.read().decode())
+
+ if not tags:
+ break
+
+ all_tags.extend(tags)
+
+ # Check if we've gone far enough back
+ # Stop if we've found versions older than our minimum
+ oldest_in_page = None
+ for t in tags:
+ if re.match(r"^\d+\.\d+\.\d+$", t["name"]):
+ parts = t["name"].split(".")
+ year, month = int(parts[0]), int(parts[1])
+ if oldest_in_page is None or (year, month) < oldest_in_page:
+ oldest_in_page = (year, month)
+
+ if oldest_in_page and oldest_in_page < MIN_VERSION:
+ break
+
+ page += 1
+ if page > 10: # Safety limit
+ break
+
+ # Filter to stable releases only (no beta/rc)
+ stable_pattern = re.compile(r"^\d+\.\d+\.\d+$")
+ versions = [t["name"] for t in all_tags if stable_pattern.match(t["name"])]
+
+ # Group by minor version and get latest patch for each
+ latest: dict[str, str] = {}
+ for version in versions:
+ parts = version.split(".")
+ year, month = int(parts[0]), int(parts[1])
+ # Only include versions >= MIN_VERSION
+ if (year, month) >= MIN_VERSION:
+ minor_key = f"{parts[0]}.{parts[1]}"
+ # Keep the one with highest patch number
+ if minor_key not in latest:
+ latest[minor_key] = version
+ else:
+ current_patch = int(latest[minor_key].split(".")[2])
+ new_patch = int(parts[2])
+ if new_patch > current_patch:
+ latest[minor_key] = version
+
+ # Sort by version
+ return sorted(latest.values(), key=lambda v: [int(x) for x in v.split(".")])
+
+
+def get_python_version(ha_version: str) -> str:
+ """Determine Python version based on HA Core version."""
+ parts = ha_version.split(".")
+ year, month = int(parts[0]), int(parts[1])
+ # 2024.x and 2025.1 use Python 3.12, 2025.2+ use Python 3.13
+ if year == 2024 or (year == 2025 and month == 1):
+ return "3.12"
+ return "3.13"
+
+
+def generate_matrix_yaml(versions: list[str]) -> str:
+ """Generate the YAML matrix include block."""
+ lines = []
+ for version in versions:
+ python_ver = get_python_version(version)
+ lines.append(f' - core-version: "{version}"')
+ lines.append(f' python-version: "{python_ver}"')
+ # Add dev version
+ lines.append(' - core-version: "dev"')
+ lines.append(' python-version: "3.13"')
+ return "\n".join(lines)
+
+
+def update_workflow_file(workflow_path: Path, new_matrix: str) -> bool:
+ """Update the workflow file with new matrix. Returns True if changed."""
+ content = workflow_path.read_text()
+
+ # Pattern to match the matrix include block
+ # Matches from "include:" to just before " steps:"
+ pattern = re.compile(
+ r"( include:\n)(.*?)( steps:)",
+ re.DOTALL,
+ )
+
+ def replacer(match: re.Match) -> str:
+ return f"{match.group(1)}{new_matrix}\n{match.group(3)}"
+
+ new_content = pattern.sub(replacer, content)
+
+ if new_content == content:
+ return False
+
+ workflow_path.write_text(new_content)
+ return True
+
+
+def main() -> None:
+ """Main entry point."""
+ print("Fetching latest HA Core versions...") # noqa: T201
+ versions = get_ha_core_versions()
+ print(f"Found {len(versions)} versions: {', '.join(versions)}") # noqa: T201
+
+ print("\nGenerating matrix...") # noqa: T201
+ matrix = generate_matrix_yaml(versions)
+ print(matrix) # noqa: T201
+
+ workflow_path = Path(__file__).parent.parent / ".github/workflows/pytest.yaml"
+ print(f"\nUpdating {workflow_path}...") # noqa: T201
+
+ if update_workflow_file(workflow_path, matrix):
+ print("Workflow updated successfully!") # noqa: T201
+ else:
+ print("No changes needed.") # noqa: T201
+
+
+if __name__ == "__main__":
+ main()
From 7a5ad22c627176a8687e1ed2f4da50d89452868b Mon Sep 17 00:00:00 2001
From: lenucksi
Date: Sun, 30 Nov 2025 17:14:27 +0100
Subject: [PATCH 139/301] fix(devcontainer): install uv and add venv cleanup
(#1317)
---
scripts/setup-devcontainer | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/scripts/setup-devcontainer b/scripts/setup-devcontainer
index f16c2cbd..fb5bf472 100755
--- a/scripts/setup-devcontainer
+++ b/scripts/setup-devcontainer
@@ -10,9 +10,12 @@ fi
pip install \
colorlog \
pip \
- ruff
+ ruff \
+ uv
-uv venv --python 3.13
+pip cache purge
+
+uv venv --clear --python 3.13
./scripts/setup-dependencies
./scripts/setup-symlinks
uv run pre-commit install-hooks
From fb6e96c87892fe5553b4da6afce3424a92637558 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 30 Nov 2025 08:16:05 -0800
Subject: [PATCH 140/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20actions/c?=
=?UTF-8?q?heckout=20action=20to=20v6=20(#1324)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/update-test-matrix.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
index 658a5c4e..26c63469 100644
--- a/.github/workflows/update-test-matrix.yaml
+++ b/.github/workflows/update-test-matrix.yaml
@@ -16,7 +16,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Check out code
- uses: actions/checkout@v4
+ uses: actions/checkout@v6
- name: Set up Python
uses: actions/setup-python@v5
From 1be701994b9994fd86e4cff170001ea7922d83c7 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 30 Nov 2025 08:16:24 -0800
Subject: [PATCH 141/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Pin=20python=20to?=
=?UTF-8?q?=203.12.12=20(#1323)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.github/workflows/update-test-matrix.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
index 26c63469..9d154c27 100644
--- a/.github/workflows/update-test-matrix.yaml
+++ b/.github/workflows/update-test-matrix.yaml
@@ -21,7 +21,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v5
with:
- python-version: "3.12"
+ python-version: "3.12.12"
- name: Update test matrix
run: python scripts/update-test-matrix.py
From f04c91b54b043f725d3340d2ab00bbaa495a16a9 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Sun, 30 Nov 2025 08:18:36 -0800
Subject: [PATCH 142/301] docs: add lenucksi as a contributor for code (#1325)
---
.all-contributorsrc | 9 +++++++++
README.md | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 21c19107..00513fec 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1161,6 +1161,15 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "lenucksi",
+ "name": "lenucksi",
+ "avatar_url": "https://avatars.githubusercontent.com/u/2451899?v=4",
+ "profile": "https://github.com/lenucksi",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 27d79686..f01db63a 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -631,6 +631,7 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
Dobby
💻 |
+ 
lenucksi
💻 |
From 077e086424d9e189e3bbbc7d70813caa8c29e997 Mon Sep 17 00:00:00 2001
From: lenucksi
Date: Sun, 30 Nov 2025 17:22:57 +0100
Subject: [PATCH 143/301] fix(ci): correct branch name and path in
update-readme workflow (#1321)
---
.github/workflows/update-readme.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/update-readme.yml
index 7cdb8e24..fb8fa6f4 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/update-readme.yml
@@ -3,11 +3,11 @@ name: Update README.md, strings.json, and services.yaml
on:
push:
branches:
- - master
+ - main
paths:
- "README.md"
- "custom_components/adaptive_lighting/const.py"
- - "github/workflows/update-readme.yml"
+ - ".github/workflows/update-readme.yml"
pull_request:
jobs:
From 2f03e00dc685dce73426f001af213cab693b925f Mon Sep 17 00:00:00 2001
From: "Weblate (bot)"
Date: Mon, 1 Dec 2025 07:53:52 +0100
Subject: [PATCH 144/301] Translated using Weblate (Danish) (#1326)
Currently translated at 94.1% (144 of 153 strings)
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/da/
Translation: Adaptive Lighting/Adaptive Lighting
Co-authored-by: Hans Henrik Juhl
---
.../adaptive_lighting/translations/da.json | 10 ++++++++--
1 file changed, 8 insertions(+), 2 deletions(-)
diff --git a/custom_components/adaptive_lighting/translations/da.json b/custom_components/adaptive_lighting/translations/da.json
index 347c3f5c..f89bd614 100644
--- a/custom_components/adaptive_lighting/translations/da.json
+++ b/custom_components/adaptive_lighting/translations/da.json
@@ -41,7 +41,10 @@
"transition": "Overgangsperiode når en ændring i lyset udføres (i sekunder)",
"transition_until_sleep": "overgang_til_sove: Når aktiveret, vil adaptiv belysning behandle søvnindstillinger som minimum, og overgår til disse værdier efter solnedgang. 🌙",
"adapt_only_on_bare_turn_on": "tilpas_kun_ved_enkelt_tænd: Når du tænder lys for første gang. Hvis indstillet til 'true', tilpasser AL kun, hvis 'lys.tænd' er kaldt uden at angive farve eller lysstyrke. ❌🌈 Dette forhindrer f.eks. tilpasning, når du aktiverer en scene. Hvis indstillet til 'false' tilpasser AL sig uanset tilstanden af farve eller lysstyrke i den oprindelige 'service_data'. Har brug for at 'take_over_control' er aktiveret. 🕵️",
- "include_config_in_attributes": "include_config_in_attributes: Vis alle indstillinger som attributter for kontakten når dette er sat til »true«. 📝"
+ "include_config_in_attributes": "include_config_in_attributes: Vis alle indstillinger som attributter for kontakten når dette er sat til »true«. 📝",
+ "skip_redundant_commands": "skip_redundant_commands: Undlad at sende tilpasningskommando, hvis lampens kendte tilstand allerede er lig den ønskede tilstand. Mindsker mængden af netværkstrafik og forbedrer tilpasningens responsivitet i visse situationer. 📉 Slå fra, hvis lampens faktiske tilstand kommer ud af takt med den tilstand, som HA rapporterer.",
+ "intercept": "intercept: Indfang og tilpas »light.turn_on«-kald for at muliggøre øjeblikkelig farve- og lysstyrketilpasning. 🏎️ Slå fra for lyskilder, som ikke understøtter »light.turn_on« med farve og lysstyrke.",
+ "multi_light_intercept": "multi_light_intercept: Indfang og tilpas »light.turn_on«-kald til mere end en enkelt lyskilde. ➗⚠️ Dette kan bevirke at et enkelt »light.turn_on«-kald deles op i flere, f.eks. hvis lyskilderne er forbundet til forskellige kontakter. Forudsætter at »intercept« er slået til."
},
"data_description": {
"interval": "Frekvens til at tilpasse lysene, i sekunder. 🔄",
@@ -62,7 +65,10 @@
"sleep_color_temp": "Farvetemperatur i søvntilstand (bruges når `sleep_rgb_or_color_temp` er `color_temp`) i Kelvin. 😴",
"brightness_mode": "Lysstyrketilstand til brug. Mulige værdier er \"default\", \"linear\" og \"tanh\" (bruger \"brightness_mode_time_dark\" og \"brightness_mode_time_light\"). 📈",
"send_split_delay": "Forsinkelse (ms) mellem »separate_turn_on_commands« for lyskilder som ikke understøtter simultane styrke- og farveindstillinger. ⏲️",
- "initial_transition": "Den første overgangs varighed når lysene ændres fra »off« til »on« i sekunder. ⏲️"
+ "initial_transition": "Den første overgangs varighed når lysene ændres fra »off« til »on« i sekunder. ⏲️",
+ "sleep_rgb_color": "RGB-farve i søvntilstand (anvendes når »sleep_rgb_or_color_temp« er sat til »rgb_color«). 🌈",
+ "brightness_mode_time_dark": "(Ignoreres hvis »brightness_mode='default'«) Varigheden i sekunder for tilpasningen af lysstyrken ved solopgang eller -nedgang. 📈📉",
+ "brightness_mode_time_light": "(Ignoreres hvis »brightness_mode='default'«) Varigheden i sekunder for tilpasningen af lysstyrken ved solopgang eller -nedgang. 📈📉"
}
}
},
From 886c77bcc23fd955bf4cda6ddb010259fda58a41 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Sun, 30 Nov 2025 22:54:08 -0800
Subject: [PATCH 145/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20actions/s?=
=?UTF-8?q?etup-python=20action=20to=20v6=20(#1327)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/update-test-matrix.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
index 9d154c27..8a0e88e9 100644
--- a/.github/workflows/update-test-matrix.yaml
+++ b/.github/workflows/update-test-matrix.yaml
@@ -19,7 +19,7 @@ jobs:
uses: actions/checkout@v6
- name: Set up Python
- uses: actions/setup-python@v5
+ uses: actions/setup-python@v6
with:
python-version: "3.12.12"
From 4aeb50bfe346f53a444f86de24304dcf79ffecc9 Mon Sep 17 00:00:00 2001
From: edgimar
Date: Fri, 5 Dec 2025 07:15:24 -0500
Subject: [PATCH 146/301] feat: add option to duplicate existing lighting
instance (#1329)
* feat: add option to duplicate existing lighting instance
A menu step in the config flow was added that allows a user to create a
new instance or duplicate the options of an existing one.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Add type annotation, tests, and translations for duplicate feature
- Add type annotation for source_options class attribute
- Add menu step translations to en.json
- Add tests for menu display, new instance creation, and duplication
* Simplify source_options access with class-level default
---------
Co-authored-by: Bas Nijholt
---
.../adaptive_lighting/config_flow.py | 37 ++++++-
.../adaptive_lighting/strings.json | 7 ++
.../adaptive_lighting/translations/en.json | 7 ++
tests/test_config_flow.py | 102 ++++++++++++++++++
4 files changed, 152 insertions(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/config_flow.py b/custom_components/adaptive_lighting/config_flow.py
index d1799888..12f1f65e 100644
--- a/custom_components/adaptive_lighting/config_flow.py
+++ b/custom_components/adaptive_lighting/config_flow.py
@@ -27,14 +27,49 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
VERSION = 1
+ source_options: dict[str, Any] | None = None
+
async def async_step_user(self, user_input: dict[str, Any] | None = None):
"""Handle the initial step."""
+ if user_input is None and self._async_current_entries():
+ return await self.async_step_menu()
+ return await self.async_step_wait_for_name(user_input)
+
+ async def async_step_menu(self, user_input: dict[str, Any] | None = None):
+ """Handle the menu step."""
+ if user_input is not None:
+ if user_input["action"] != "new":
+ entry_id = user_input["action"]
+ entry = self.hass.config_entries.async_get_entry(entry_id)
+ if entry:
+ self.source_options = dict(entry.options)
+ return await self.async_step_wait_for_name()
+
+ entries = self._async_current_entries()
+ options = {"new": "Create new instance"}
+ for entry in entries:
+ options[entry.entry_id] = f"Duplicate '{entry.title}'"
+
+ return self.async_show_form(
+ step_id="menu",
+ data_schema=vol.Schema(
+ {vol.Required("action", default="new"): vol.In(options)},
+ ),
+ )
+
+ async def async_step_wait_for_name(self, user_input: dict[str, Any] | None = None):
+ """Handle the name step."""
errors: dict[str, str] = {}
if user_input is not None:
await self.async_set_unique_id(user_input[CONF_NAME])
self._abort_if_unique_id_configured()
- return self.async_create_entry(title=user_input[CONF_NAME], data=user_input)
+ options = self.source_options
+ return self.async_create_entry(
+ title=user_input[CONF_NAME],
+ data=user_input,
+ options=options,
+ )
return self.async_show_form(
step_id="user",
diff --git a/custom_components/adaptive_lighting/strings.json b/custom_components/adaptive_lighting/strings.json
index a2724f6b..1a9ba06c 100644
--- a/custom_components/adaptive_lighting/strings.json
+++ b/custom_components/adaptive_lighting/strings.json
@@ -7,6 +7,13 @@
"data": {
"name": "Name"
}
+ },
+ "menu": {
+ "title": "Create or Duplicate",
+ "description": "Do you want to create a new instance or duplicate an existing one?",
+ "data": {
+ "action": "Action"
+ }
}
},
"abort": {
diff --git a/custom_components/adaptive_lighting/translations/en.json b/custom_components/adaptive_lighting/translations/en.json
index 9991d232..fcb2ed8b 100644
--- a/custom_components/adaptive_lighting/translations/en.json
+++ b/custom_components/adaptive_lighting/translations/en.json
@@ -8,6 +8,13 @@
"data": {
"name": "Name"
}
+ },
+ "menu": {
+ "title": "Create or Duplicate",
+ "description": "Do you want to create a new instance or duplicate an existing one?",
+ "data": {
+ "action": "Action"
+ }
}
},
"abort": {
diff --git a/tests/test_config_flow.py b/tests/test_config_flow.py
index 02ed6d42..8a09265e 100644
--- a/tests/test_config_flow.py
+++ b/tests/test_config_flow.py
@@ -145,3 +145,105 @@ async def test_options_flow_for_yaml_import(hass):
assert result["type"] == FlowResultType.FORM
assert result["step_id"] == "init"
assert result.get("data_schema") is None
+
+
+async def test_menu_shown_when_entries_exist(hass):
+ """Test that menu step is shown when existing entries exist."""
+ # Create an existing entry
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ title="existing",
+ data={CONF_NAME: "existing"},
+ options={"min_brightness": 10},
+ )
+ entry.add_to_hass(hass)
+
+ # Start a new config flow - should show menu
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": "user"},
+ )
+
+ assert result["type"] == FlowResultType.FORM
+ assert result["step_id"] == "menu"
+
+
+async def test_menu_create_new_instance(hass):
+ """Test creating a new instance through the menu."""
+ # Create an existing entry
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ title="existing",
+ data={CONF_NAME: "existing"},
+ options={"min_brightness": 10},
+ )
+ entry.add_to_hass(hass)
+
+ # Start config flow - shows menu
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": "user"},
+ )
+ assert result["step_id"] == "menu"
+
+ # Choose to create new instance
+ result = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={"action": "new"},
+ )
+
+ # Should show name form
+ assert result["type"] == FlowResultType.FORM
+ assert result["step_id"] == "user"
+
+ # Enter name
+ result = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={CONF_NAME: "new instance"},
+ )
+
+ assert result["type"] == FlowResultType.CREATE_ENTRY
+ assert result["title"] == "new instance"
+ # New instance should have no options (not duplicated)
+ assert result["options"] == {}
+
+
+async def test_menu_duplicate_instance(hass):
+ """Test duplicating an existing instance through the menu."""
+ # Create an existing entry with custom options
+ source_options = {"min_brightness": 20, "max_brightness": 80}
+ entry = MockConfigEntry(
+ domain=DOMAIN,
+ title="source",
+ data={CONF_NAME: "source"},
+ options=source_options,
+ )
+ entry.add_to_hass(hass)
+
+ # Start config flow - shows menu
+ result = await hass.config_entries.flow.async_init(
+ DOMAIN,
+ context={"source": "user"},
+ )
+ assert result["step_id"] == "menu"
+
+ # Choose to duplicate existing entry
+ result = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={"action": entry.entry_id},
+ )
+
+ # Should show name form
+ assert result["type"] == FlowResultType.FORM
+ assert result["step_id"] == "user"
+
+ # Enter name for duplicated instance
+ result = await hass.config_entries.flow.async_configure(
+ result["flow_id"],
+ user_input={CONF_NAME: "duplicated"},
+ )
+
+ assert result["type"] == FlowResultType.CREATE_ENTRY
+ assert result["title"] == "duplicated"
+ # Duplicated instance should have copied options
+ assert result["options"] == source_options
From ea623ce6040e0de068d8bb91da375aa60c85cd11 Mon Sep 17 00:00:00 2001
From: "allcontributors[bot]"
<46447321+allcontributors[bot]@users.noreply.github.com>
Date: Fri, 5 Dec 2025 04:15:38 -0800
Subject: [PATCH 147/301] docs: add edgimar as a contributor for code (#1330)
* docs: update README.md
* docs: update .all-contributorsrc
---------
Co-authored-by: allcontributors[bot] <46447321+allcontributors[bot]@users.noreply.github.com>
---
.all-contributorsrc | 9 +++++++++
README.md | 3 ++-
2 files changed, 11 insertions(+), 1 deletion(-)
diff --git a/.all-contributorsrc b/.all-contributorsrc
index 00513fec..9a04d160 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -1170,6 +1170,15 @@
"contributions": [
"code"
]
+ },
+ {
+ "login": "edgimar",
+ "name": "edgimar",
+ "avatar_url": "https://avatars.githubusercontent.com/u/393850?v=4",
+ "profile": "https://gitlab.com/edgimar",
+ "contributions": [
+ "code"
+ ]
}
],
"contributorsPerLine": 7,
diff --git a/README.md b/README.md
index f01db63a..6102c85c 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
[](https://github.com/hacs/integration)
-[](#contributors-)
+[](#contributors-)
# 🌞 Adaptive Lighting: Enhance Your Home's Atmosphere with Smart, Sun-Synchronized Lighting 🌙
@@ -632,6 +632,7 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
Dobby
💻 |
lenucksi
💻 |
+ 
edgimar
💻 |
From ef15d5cd48a263afd0d3bf4aac46748f4489d6cb Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:31:05 -0800
Subject: [PATCH 148/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20peter-eva?=
=?UTF-8?q?ns/create-pull-request=20action=20to=20v8=20(#1334)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/update-test-matrix.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
index 8a0e88e9..af1c5dce 100644
--- a/.github/workflows/update-test-matrix.yaml
+++ b/.github/workflows/update-test-matrix.yaml
@@ -39,7 +39,7 @@ jobs:
- name: Create Pull Request
if: steps.changes.outputs.changed == 'true'
- uses: peter-evans/create-pull-request@v7
+ uses: peter-evans/create-pull-request@v8
with:
token: ${{ secrets.GITHUB_TOKEN }}
commit-message: "ci: update HA Core test matrix versions"
From 97ecbb17a0ff896d84ed0576e3319a3083d49ac0 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:31:17 -0800
Subject: [PATCH 149/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20actions/c?=
=?UTF-8?q?heckout=20action=20to=20v6.0.1=20(#1328)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/hassfest.yaml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/hassfest.yaml b/.github/workflows/hassfest.yaml
index 69f93e15..58a152e4 100644
--- a/.github/workflows/hassfest.yaml
+++ b/.github/workflows/hassfest.yaml
@@ -11,5 +11,5 @@ jobs:
validate_hassfest:
runs-on: "ubuntu-latest"
steps:
- - uses: "actions/checkout@v6.0.0"
+ - uses: "actions/checkout@v6.0.1"
- uses: home-assistant/actions/hassfest@master
From 37ef65586d2c6bcaa176c40d5f45ddc6c88a4dc6 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Tue, 9 Dec 2025 23:31:41 -0800
Subject: [PATCH 150/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20python=20?=
=?UTF-8?q?to=20v3.14.2=20(#1251)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/deploy-webapp.yml | 2 +-
.github/workflows/update-test-matrix.yaml | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/deploy-webapp.yml b/.github/workflows/deploy-webapp.yml
index 698d8fec..0a76e3ac 100644
--- a/.github/workflows/deploy-webapp.yml
+++ b/.github/workflows/deploy-webapp.yml
@@ -35,7 +35,7 @@ jobs:
- name: Set Up Python
uses: actions/setup-python@v6
with:
- python-version: 3.13.5
+ python-version: 3.14.2
- name: Install Dependencies
run: |
diff --git a/.github/workflows/update-test-matrix.yaml b/.github/workflows/update-test-matrix.yaml
index af1c5dce..5f948a67 100644
--- a/.github/workflows/update-test-matrix.yaml
+++ b/.github/workflows/update-test-matrix.yaml
@@ -21,7 +21,7 @@ jobs:
- name: Set up Python
uses: actions/setup-python@v6
with:
- python-version: "3.12.12"
+ python-version: "3.14.2"
- name: Update test matrix
run: python scripts/update-test-matrix.py
From 0180fa4a937cede4c86eef344358ede83f81f337 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Tue, 9 Dec 2025 23:51:17 -0800
Subject: [PATCH 151/301] feat: use EntitySelector for light entity selection
with search support (#1335)
Replace cv.multi_select with HA's EntitySelector for the lights field
in the options flow. This provides:
- Built-in search/typing to find entities faster
- Better UX with HA's native entity picker
- Improved handling of renamed entities
Closes #1208
---
.../adaptive_lighting/config_flow.py | 26 ++++++++-----------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/custom_components/adaptive_lighting/config_flow.py b/custom_components/adaptive_lighting/config_flow.py
index 12f1f65e..5e21e67b 100644
--- a/custom_components/adaptive_lighting/config_flow.py
+++ b/custom_components/adaptive_lighting/config_flow.py
@@ -3,11 +3,11 @@
import logging
from typing import Any
-import homeassistant.helpers.config_validation as cv
import voluptuous as vol
from homeassistant import config_entries
from homeassistant.const import CONF_NAME, MAJOR_VERSION, MINOR_VERSION
from homeassistant.core import callback
+from homeassistant.helpers.selector import EntitySelector, EntitySelectorConfig
from .const import ( # pylint: disable=unused-import
CONF_LIGHTS,
@@ -16,8 +16,7 @@ from .const import ( # pylint: disable=unused-import
NONE_STR,
VALIDATION_TUPLES,
)
-from .helpers import get_friendly_name
-from .switch import _supported_features, validate
+from .switch import validate
_LOGGER = logging.getLogger(__name__)
@@ -146,12 +145,8 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
if not errors:
return self.async_create_entry(title="", data=user_input)
- all_lights_with_names = {
- light: get_friendly_name(self.hass, light)
- for light in self.hass.states.async_entity_ids("light")
- if _supported_features(self.hass, light)
- }
- all_lights = list(all_lights_with_names.keys())
+ # Validate that all configured lights still exist
+ all_lights = set(self.hass.states.async_entity_ids("light"))
for configured_light in data[CONF_LIGHTS]:
if configured_light not in all_lights:
errors = {CONF_LIGHTS: "entity_missing"}
@@ -160,14 +155,15 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
data[CONF_NAME],
configured_light,
)
- all_lights.append(configured_light)
- all_lights_with_names[configured_light] = configured_light
- light_options = {
- entity_id: f"{name} ({entity_id})"
- for entity_id, name in all_lights_with_names.items()
+ to_replace = {
+ CONF_LIGHTS: EntitySelector(
+ EntitySelectorConfig(
+ domain="light",
+ multiple=True,
+ ),
+ ),
}
- to_replace = {CONF_LIGHTS: cv.multi_select(light_options)}
options_schema = {}
for name, default, validation in VALIDATION_TUPLES:
From dc61bd191cf6be25361b3d24902ea721481fb17f Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Tue, 9 Dec 2025 23:58:19 -0800
Subject: [PATCH 152/301] Bump to v1.29.0
---
custom_components/adaptive_lighting/manifest.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/manifest.json b/custom_components/adaptive_lighting/manifest.json
index 1d1e431a..97d79950 100644
--- a/custom_components/adaptive_lighting/manifest.json
+++ b/custom_components/adaptive_lighting/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "calculated",
"issue_tracker": "https://github.com/basnijholt/adaptive-lighting/issues",
"requirements": ["ulid-transform"],
- "version": "1.28.0"
+ "version": "1.29.0"
}
From 94b91a0ddca39989383c486691d0d971451403ca Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Fri, 12 Dec 2025 13:05:01 -0800
Subject: [PATCH 153/301] fix: use correct entity and context in service
interceptor (#1349)
---
custom_components/adaptive_lighting/switch.py | 19 ++-
tests/test_switch.py | 142 ++++++++++++++++++
2 files changed, 157 insertions(+), 4 deletions(-)
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index dbb72ea1..2d667d97 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -1746,6 +1746,7 @@ class AdaptiveLightingManager:
]
self._proactively_adapting_contexts: dict[str, str] = {}
+ self._context_cnt: int = 0
try:
self.listener_removers.append(
@@ -1809,6 +1810,16 @@ class AdaptiveLightingManager:
for key in keys:
self._proactively_adapting_contexts.pop(key)
+ def create_context(
+ self,
+ which: str = "default",
+ parent: Context | None = None,
+ ) -> Context:
+ """Create a context that identifies this integration."""
+ context = create_context("manager", which, self._context_cnt, parent=parent)
+ self._context_cnt += 1
+ return context
+
def _separate_entity_ids(
self,
entity_ids: list[str],
@@ -2047,7 +2058,7 @@ class AdaptiveLightingManager:
assert set(skipped) == set(entity_ids)
return # The call will be intercepted with the original data
# Call light turn_on service for skipped entities
- context = switch.create_context("skipped")
+ context = self.create_context("skipped")
_LOGGER.debug(
"(5) _service_interceptor_turn_on_handler: calling `light.turn_on` with skipped='%s', service_data: '%s', context='%s'",
skipped,
@@ -2081,11 +2092,11 @@ class AdaptiveLightingManager:
# `state_changed_event_listener`, however, this function is called
# before that one.
self.reset(*entity_ids, reset_manual_control=False)
- for entity_id in entity_ids:
- self.clear_proactively_adapting(entity_id)
+ for eid in entity_ids:
+ self.clear_proactively_adapting(eid)
adaptation_data = await switch.prepare_adaptation_data(
- entity_id,
+ entity_ids[0],
transition,
)
if adaptation_data is None:
diff --git a/tests/test_switch.py b/tests/test_switch.py
index e85cecb9..372fdd66 100644
--- a/tests/test_switch.py
+++ b/tests/test_switch.py
@@ -71,6 +71,7 @@ from homeassistant.components.adaptive_lighting.switch import (
create_context,
is_our_context,
is_our_context_id,
+ short_hash,
)
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
@@ -2462,3 +2463,144 @@ def test_attributes_have_changed_light_mode_switch():
new_attributes={ATTR_BRIGHTNESS: 128, ATTR_COLOR_TEMP_KELVIN: 4000},
**kwargs_no_adapt,
), "RGB → color_temp should not be detected when adapt_color=False"
+
+
+# Regression tests for bugs found in PR #1348 by @protyposis
+# See: https://github.com/basnijholt/adaptive-lighting/pull/1348
+
+
+async def test_multi_light_intercept_prepares_adaptation_for_first_entity(hass):
+ """Test that adaptation data is prepared for the first entity, not the last.
+
+ Regression test for a bug where `entity_id` from a for-loop was used after
+ the loop ended, causing `prepare_adaptation_data` to be called with only
+ the last entity's ID instead of the first.
+
+ In `_service_interceptor_turn_on_single_light_handler`:
+ ```python
+ for entity_id in entity_ids:
+ self.clear_proactively_adapting(entity_id)
+
+ adaptation_data = await switch.prepare_adaptation_data(
+ entity_id, # BUG: This uses the last entity_id from the loop!
+ transition,
+ )
+ ```
+
+ The adaptation data should be prepared for the first entity in the list since
+ that's the one whose service call is being intercepted and modified.
+
+ See: https://github.com/basnijholt/adaptive-lighting/pull/1348
+ """
+ switch, _ = await setup_lights_and_switch(hass, {CONF_INTERCEPT: True}, True)
+
+ # Turn off all lights first
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_OFF,
+ {ATTR_ENTITY_ID: [ENTITY_LIGHT_1, ENTITY_LIGHT_2, ENTITY_LIGHT_3]},
+ blocking=True,
+ )
+ await hass.async_block_till_done()
+
+ # Mock prepare_adaptation_data to track which entity_id it's called with
+ original_prepare = switch.prepare_adaptation_data
+ called_with_entities = []
+
+ async def mock_prepare_adaptation_data(light, *args, **kwargs):
+ called_with_entities.append(light)
+ return await original_prepare(light, *args, **kwargs)
+
+ switch.prepare_adaptation_data = mock_prepare_adaptation_data
+
+ _mock_sun_light_settings(
+ switch,
+ {
+ ATTR_BRIGHTNESS_PCT: 67,
+ ATTR_COLOR_TEMP_KELVIN: 3448,
+ "force_rgb_color": False,
+ },
+ )
+
+ # Turn on multiple lights at once - this triggers the interceptor
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_ON,
+ {ATTR_ENTITY_ID: [ENTITY_LIGHT_1, ENTITY_LIGHT_2]},
+ blocking=True,
+ )
+ await hass.async_block_till_done()
+
+ # The bug causes prepare_adaptation_data to be called with the LAST entity
+ # (ENTITY_LIGHT_2) instead of the FIRST entity (ENTITY_LIGHT_1)
+ assert len(called_with_entities) >= 1, "prepare_adaptation_data should be called"
+
+ # The first call should be for ENTITY_LIGHT_1 (the first entity in the list)
+ # since the intercepted service call will apply to all entities in entity_ids
+ # BUG: Currently this fails because entity_id is ENTITY_LIGHT_2 (the last one)
+ assert called_with_entities[0] == ENTITY_LIGHT_1, (
+ f"prepare_adaptation_data should be called with the first entity "
+ f"({ENTITY_LIGHT_1}), but was called with {called_with_entities[0]}. "
+ f"This indicates the bug where the last entity from the for-loop is used."
+ )
+
+
+async def test_skipped_lights_context_not_from_arbitrary_switch(hass):
+ """Test that context for skipped lights uses manager, not an arbitrary switch.
+
+ Regression test for a bug where the context for skipped lights was created
+ using `switch.create_context("skipped")` where `switch` was from the last
+ iteration of a for-loop, which had no relationship to the skipped lights.
+
+ The fix uses `self.create_context("skipped")` on the AdaptiveLightingManager
+ instead, which uses "manager" as the context name.
+
+ See: https://github.com/basnijholt/adaptive-lighting/pull/1348
+ """
+ # Setup two switches with different lights
+ lights, switch1, switch2 = await setup_proactive_multiple_lights_two_switches(hass)
+
+ # Turn on all three lights at once:
+ # - ENTITY_LIGHT_1 is in switch1
+ # - ENTITY_LIGHT_2 is in switch2
+ # - ENTITY_LIGHT_3 is not in any switch (will be skipped)
+ events = await _turn_on_and_track_event_contexts(
+ hass,
+ "test_skipped_context",
+ lights,
+ return_full_events=True,
+ )
+
+ # Find the skipped event (contains ":skpp:" in context)
+ skipped_events = [e for e in events if ":skpp:" in e.context.id]
+ assert (
+ len(skipped_events) == 1
+ ), f"Expected 1 skipped event, got {len(skipped_events)}"
+
+ skipped_event = skipped_events[0]
+ skipped_context_id = skipped_event.context.id
+
+ # Extract the name_hash from the context
+ # Context format: {timestamp}:{al}:{name_hash}:{which_short}:{index}
+ context_parts = skipped_context_id.split(":")
+ assert len(context_parts) >= 4, f"Unexpected context format: {skipped_context_id}"
+
+ # The context should still be recognized as ours
+ assert is_our_context_id(skipped_context_id), "Skipped context should be recognized"
+ assert is_our_context_id(
+ skipped_context_id,
+ "skipped",
+ ), "Skipped context should have 'skipped' marker"
+
+ # Verify the skipped lights are the ones not in any switch
+ assert skipped_event.data["service_data"][ATTR_ENTITY_ID] == [ENTITY_LIGHT_3]
+
+ # After the fix, the context should use "manager" as the name, not a switch name.
+ # The name_hash is the 3rd segment (index 2) in the context ID.
+ name_hash_in_context = context_parts[2]
+ expected_manager_hash = short_hash("manager")
+ assert name_hash_in_context == expected_manager_hash, (
+ f"Skipped context should use 'manager' hash ({expected_manager_hash}), "
+ f"but got {name_hash_in_context}. This indicates the context is still "
+ f"being created from an arbitrary switch instead of the manager."
+ )
From ce7dadebddf4ef8f2d7b82aed82c12acfe3374c9 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Fri, 12 Dec 2025 13:29:46 -0800
Subject: [PATCH 154/301] ci: workaround aiodns/pycares compatibility issue
(#1351)
Upgrade aiodns after installing dependencies to fix compatibility
issue with pycares.
See: https://github.com/aio-libs/aiodns/issues/214
---
scripts/setup-dependencies | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/scripts/setup-dependencies b/scripts/setup-dependencies
index f462335d..7722c58d 100755
--- a/scripts/setup-dependencies
+++ b/scripts/setup-dependencies
@@ -15,3 +15,7 @@ uv pip install $(python test_dependencies.py)
# Install the latest mypy-dev (not pinned since old versions get deleted from PyPI)
uv pip install --upgrade mypy-dev
+
+# Workaround for aiodns/pycares compatibility issue
+# See: https://github.com/aio-libs/aiodns/issues/214
+uv pip install --upgrade aiodns
From 5886eee04cecb30a0951ced38e53ce8edaaa50eb Mon Sep 17 00:00:00 2001
From: Mario Guggenberger
Date: Fri, 12 Dec 2025 22:37:42 +0100
Subject: [PATCH 155/301] Code cleanup (#1348)
---
.../adaptive_lighting/__init__.py | 2 +-
.../adaptive_lighting/color_and_brightness.py | 76 ++++---
.../adaptive_lighting/config_flow.py | 21 +-
custom_components/adaptive_lighting/switch.py | 192 +++++++++---------
tests/test_color_and_brightness.py | 11 +-
5 files changed, 155 insertions(+), 147 deletions(-)
diff --git a/custom_components/adaptive_lighting/__init__.py b/custom_components/adaptive_lighting/__init__.py
index 44151c84..8e61e93b 100644
--- a/custom_components/adaptive_lighting/__init__.py
+++ b/custom_components/adaptive_lighting/__init__.py
@@ -10,7 +10,7 @@ from homeassistant.const import CONF_SOURCE
from homeassistant.core import Event, HomeAssistant
from .const import (
- _DOMAIN_SCHEMA,
+ _DOMAIN_SCHEMA, # pyright: ignore[reportPrivateUsage]
ATTR_ADAPTIVE_LIGHTING_MANAGER,
CONF_NAME,
DOMAIN,
diff --git a/custom_components/adaptive_lighting/color_and_brightness.py b/custom_components/adaptive_lighting/color_and_brightness.py
index caee67c2..f3ae3efe 100644
--- a/custom_components/adaptive_lighting/color_and_brightness.py
+++ b/custom_components/adaptive_lighting/color_and_brightness.py
@@ -9,6 +9,7 @@ import logging
import math
from dataclasses import dataclass
from datetime import UTC, timedelta
+from enum import Enum
from functools import cached_property, partial
from typing import TYPE_CHECKING, Any, Literal, cast
@@ -21,15 +22,19 @@ from homeassistant.util.color import (
if TYPE_CHECKING:
import astral.location
-# Same as homeassistant.const.SUN_EVENT_SUNRISE and homeassistant.const.SUN_EVENT_SUNSET
-# We re-define them here to not depend on homeassistant in this file.
-SUN_EVENT_SUNRISE = "sunrise"
-SUN_EVENT_SUNSET = "sunset"
-SUN_EVENT_NOON = "solar_noon"
-SUN_EVENT_MIDNIGHT = "solar_midnight"
+class SunEvent(str, Enum):
+ """A set of sun events that happen during a day."""
-_ORDER = (SUN_EVENT_SUNRISE, SUN_EVENT_NOON, SUN_EVENT_SUNSET, SUN_EVENT_MIDNIGHT)
+ # Same as homeassistant.const.SUN_EVENT_SUNRISE and homeassistant.const.SUN_EVENT_SUNSET
+ # We re-define them here to not depend on homeassistant in this file.
+ SUNRISE = "sunrise"
+ SUNSET = "sunset"
+ NOON = "solar_noon"
+ MIDNIGHT = "solar_midnight"
+
+
+_ORDER = (SunEvent.SUNRISE, SunEvent.NOON, SunEvent.SUNSET, SunEvent.MIDNIGHT)
_ALLOWED_ORDERS = {_ORDER[i:] + _ORDER[:i] for i in range(len(_ORDER))}
utcnow: partial[datetime.datetime] = partial(datetime.datetime.now, UTC)
@@ -126,21 +131,21 @@ class SunEvents:
noon = midnight + timedelta(hours=12) * (1 if midnight.hour < 12 else -1)
return noon, midnight
- def sun_events(self, dt: datetime.datetime) -> list[tuple[str, float]]:
+ def sun_events(self, dt: datetime.datetime) -> list[tuple[SunEvent, float]]:
"""Get the four sun event's timestamps at 'dt'."""
sunrise = self.sunrise(dt)
sunset = self.sunset(dt)
solar_noon, solar_midnight = self.noon_and_midnight(dt, sunset, sunrise)
- events = [
- (SUN_EVENT_SUNRISE, sunrise.timestamp()),
- (SUN_EVENT_SUNSET, sunset.timestamp()),
- (SUN_EVENT_NOON, solar_noon.timestamp()),
- (SUN_EVENT_MIDNIGHT, solar_midnight.timestamp()),
+ events: list[tuple[SunEvent, float]] = [
+ (SunEvent.SUNRISE, sunrise.timestamp()),
+ (SunEvent.SUNSET, sunset.timestamp()),
+ (SunEvent.NOON, solar_noon.timestamp()),
+ (SunEvent.MIDNIGHT, solar_midnight.timestamp()),
]
self._validate_sun_event_order(events)
return events
- def _validate_sun_event_order(self, events: list[tuple[str, float]]) -> None:
+ def _validate_sun_event_order(self, events: list[tuple[SunEvent, float]]) -> None:
"""Check if the sun events are in the expected order."""
events = sorted(events, key=lambda x: x[1])
events_names, _ = zip(*events, strict=True)
@@ -154,7 +159,10 @@ class SunEvents:
_LOGGER.error(msg)
raise ValueError(msg)
- def prev_and_next_events(self, dt: datetime.datetime) -> list[tuple[str, float]]:
+ def prev_and_next_events(
+ self,
+ dt: datetime.datetime,
+ ) -> list[tuple[SunEvent, float]]:
"""Get the previous and next sun event."""
events = [
event
@@ -171,23 +179,26 @@ class SunEvents:
(_, prev_ts), (next_event, next_ts) = self.prev_and_next_events(dt)
h, x = (
(prev_ts, next_ts)
- if next_event in (SUN_EVENT_SUNSET, SUN_EVENT_SUNRISE)
+ if next_event in (SunEvent.SUNSET, SunEvent.SUNRISE)
else (next_ts, prev_ts)
)
# k = -1 between sunset and sunrise (sun below horizon)
# k = 1 between sunrise and sunset (sun above horizon)
- k = 1 if next_event in (SUN_EVENT_SUNSET, SUN_EVENT_NOON) else -1
+ k = 1 if next_event in (SunEvent.SUNSET, SunEvent.NOON) else -1
return k * (1 - ((target_ts - h) / (h - x)) ** 2)
- def closest_event(self, dt: datetime.datetime) -> tuple[str, float]:
+ def closest_event(
+ self,
+ dt: datetime.datetime,
+ ) -> tuple[Literal[SunEvent.SUNRISE, SunEvent.SUNSET], float]:
"""Get the closest sunset or sunrise event."""
(prev_event, prev_ts), (next_event, next_ts) = self.prev_and_next_events(dt)
- if SUN_EVENT_SUNRISE in (prev_event, next_event):
- ts_event = prev_ts if prev_event == SUN_EVENT_SUNRISE else next_ts
- return SUN_EVENT_SUNRISE, ts_event
- if SUN_EVENT_SUNSET in (prev_event, next_event):
- ts_event = prev_ts if prev_event == SUN_EVENT_SUNSET else next_ts
- return SUN_EVENT_SUNSET, ts_event
+ if SunEvent.SUNRISE in (prev_event, next_event):
+ ts_event = prev_ts if prev_event == SunEvent.SUNRISE else next_ts
+ return SunEvent.SUNRISE, ts_event
+ if SunEvent.SUNSET in (prev_event, next_event):
+ ts_event = prev_ts if prev_event == SunEvent.SUNSET else next_ts
+ return SunEvent.SUNSET, ts_event
msg = "No sunrise or sunset event found."
raise ValueError(msg)
@@ -249,7 +260,7 @@ class SunLightSettings:
event, ts_event = self.sun.closest_event(dt)
dark = self.brightness_mode_time_dark.total_seconds()
light = self.brightness_mode_time_light.total_seconds()
- if event == SUN_EVENT_SUNRISE:
+ if event == SunEvent.SUNRISE:
brightness = scaled_tanh(
dt.timestamp() - ts_event,
x1=-dark,
@@ -259,7 +270,7 @@ class SunLightSettings:
y_min=self.min_brightness,
y_max=self.max_brightness,
)
- elif event == SUN_EVENT_SUNSET:
+ elif event == SunEvent.SUNSET:
brightness = scaled_tanh(
dt.timestamp() - ts_event,
x1=-light, # shifted timestamp for the start of sunset
@@ -269,6 +280,9 @@ class SunLightSettings:
y_min=self.min_brightness,
y_max=self.max_brightness,
)
+ else:
+ msg = "Unsupported sun event"
+ raise ValueError(msg)
return clamp(brightness, self.min_brightness, self.max_brightness)
def _brightness_pct_linear(self, dt: datetime.datetime) -> float:
@@ -277,7 +291,7 @@ class SunLightSettings:
# at ts_event + dt_end, brightness == end_brightness
dark = self.brightness_mode_time_dark.total_seconds()
light = self.brightness_mode_time_light.total_seconds()
- if event == SUN_EVENT_SUNRISE:
+ if event == SunEvent.SUNRISE:
brightness = lerp(
dt.timestamp() - ts_event,
x1=-dark,
@@ -285,7 +299,7 @@ class SunLightSettings:
y1=self.min_brightness,
y2=self.max_brightness,
)
- elif event == SUN_EVENT_SUNSET:
+ elif event == SunEvent.SUNSET:
brightness = lerp(
dt.timestamp() - ts_event,
x1=-light,
@@ -293,6 +307,9 @@ class SunLightSettings:
y1=self.max_brightness,
y2=self.min_brightness,
)
+ else:
+ msg = "Unsupported sun event"
+ raise ValueError(msg)
return clamp(brightness, self.min_brightness, self.max_brightness)
def brightness_pct(self, dt: datetime.datetime, is_sleep: bool) -> float | None:
@@ -356,7 +373,8 @@ class SunLightSettings:
force_rgb_color = True
else:
color_temp_kelvin = self.color_temp_kelvin(sun_position)
- rgb_color = color_temperature_to_rgb(color_temp_kelvin)
+ r, g, b = color_temperature_to_rgb(color_temp_kelvin)
+ rgb_color = (round(r), round(g), round(b))
# backwards compatibility for versions < 1.3.1 - see #403
color_temp_mired: float = math.floor(1000000 / color_temp_kelvin)
xy_color: tuple[float, float] = color_RGB_to_xy(*rgb_color)
diff --git a/custom_components/adaptive_lighting/config_flow.py b/custom_components/adaptive_lighting/config_flow.py
index 5e21e67b..5b0dd13c 100644
--- a/custom_components/adaptive_lighting/config_flow.py
+++ b/custom_components/adaptive_lighting/config_flow.py
@@ -5,7 +5,7 @@ from typing import Any
import voluptuous as vol
from homeassistant import config_entries
-from homeassistant.const import CONF_NAME, MAJOR_VERSION, MINOR_VERSION
+from homeassistant.const import CONF_NAME
from homeassistant.core import callback
from homeassistant.helpers.selector import EntitySelector, EntitySelectorConfig
@@ -96,13 +96,10 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
@staticmethod
@callback
def async_get_options_flow(
- config_entry: config_entries.ConfigEntry,
+ config_entry: config_entries.ConfigEntry, # noqa: ARG004
) -> "OptionsFlowHandler":
"""Get the options flow for this handler."""
- if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
- # https://github.com/home-assistant/core/pull/129651
- return OptionsFlowHandler()
- return OptionsFlowHandler(config_entry)
+ return OptionsFlowHandler()
def validate_options(user_input: dict[str, Any], errors: dict[str, str]) -> None:
@@ -125,21 +122,13 @@ def validate_options(user_input: dict[str, Any], errors: dict[str, str]) -> None
class OptionsFlowHandler(config_entries.OptionsFlow):
"""Handle a option flow for Adaptive Lighting."""
- def __init__(self, *args: Any, **kwargs: Any) -> None:
- """Initialize options flow."""
- if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 12):
- super().__init__(*args, **kwargs)
- # https://github.com/home-assistant/core/pull/129651
- else:
- self.config_entry = args[0]
-
async def async_step_init(self, user_input: dict[str, Any] | None = None):
"""Handle options flow."""
conf = self.config_entry
data = validate(conf)
if conf.source == config_entries.SOURCE_IMPORT:
return self.async_show_form(step_id="init", data_schema=None)
- errors = {}
+ errors: dict[str, str] = {}
if user_input is not None:
validate_options(user_input, errors)
if not errors:
@@ -156,7 +145,7 @@ class OptionsFlowHandler(config_entries.OptionsFlow):
configured_light,
)
- to_replace = {
+ to_replace: dict[str, Any] = {
CONF_LIGHTS: EntitySelector(
EntitySelectorConfig(
domain="light",
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 2d667d97..9217e8d9 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -44,8 +44,6 @@ from homeassistant.const import (
EVENT_CALL_SERVICE,
EVENT_HOMEASSISTANT_STARTED,
EVENT_STATE_CHANGED,
- MAJOR_VERSION,
- MINOR_VERSION,
SERVICE_TOGGLE,
SERVICE_TURN_OFF,
SERVICE_TURN_ON,
@@ -62,14 +60,10 @@ from homeassistant.core import (
callback,
)
from homeassistant.helpers import entity_platform, entity_registry
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
from homeassistant.helpers.entity_component import async_update_entity
-
-if [MAJOR_VERSION, MINOR_VERSION] < [2023, 9]:
- from homeassistant.helpers.entity import DeviceInfo
-else:
- from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.device_registry import DeviceEntryType
from homeassistant.helpers.event import (
+ EventStateChangedData,
async_track_state_change_event,
async_track_time_interval,
)
@@ -166,6 +160,7 @@ if TYPE_CHECKING:
from homeassistant.config_entries import ConfigEntry
from homeassistant.helpers.entity_platform import AddEntitiesCallback
+ from homeassistant.helpers.typing import NoEventData, VolDictType
_LOGGER = logging.getLogger(__name__)
@@ -228,11 +223,11 @@ def _switches_with_lights(
hass: HomeAssistant,
lights: list[str],
expand_light_groups: bool = True,
-) -> list[AdaptiveSwitch]:
+) -> AdaptiveSwitches:
"""Get all switches that control at least one of the lights passed."""
config_entries = hass.config_entries.async_entries(DOMAIN)
data = hass.data[DOMAIN]
- switches: list[AdaptiveSwitch] = []
+ switches: AdaptiveSwitches = []
all_check_lights = (
_expand_light_groups(hass, lights) if expand_light_groups else set(lights)
)
@@ -285,7 +280,7 @@ def _switch_with_lights(
def _switches_from_service_call(
hass: HomeAssistant,
service_call: ServiceCall,
-) -> list[AdaptiveSwitch]:
+) -> AdaptiveSwitches:
data = service_call.data
lights = data[CONF_LIGHTS]
switch_entity_ids: list[str] | None = data.get("entity_id")
@@ -307,7 +302,7 @@ def _switches_from_service_call(
f" Invalid service data received: {service_call.data}"
)
raise ValueError(msg)
- switches = []
+ switches: AdaptiveSwitches = []
ent_reg = entity_registry.async_get(hass)
for entity_id in switch_entity_ids:
ent_entry = ent_reg.async_get(entity_id)
@@ -536,7 +531,7 @@ async def async_setup_entry( # noqa: PLR0915
schema=SET_MANUAL_CONTROL_SCHEMA,
)
- args = {vol.Optional(CONF_USE_DEFAULTS, default="current"): cv.string}
+ args: VolDictType = {vol.Optional(CONF_USE_DEFAULTS, default="current"): cv.string}
# Modifying these after init isn't possible
skip = (CONF_INTERVAL, CONF_NAME, CONF_LIGHTS)
for k, _, valid in VALIDATION_TUPLES:
@@ -583,7 +578,10 @@ def validate(
return data
-def _is_state_event(event: Event, from_or_to_state: Iterable[str]) -> bool:
+def _is_state_event(
+ event: Event[EventStateChangedData],
+ from_or_to_state: Iterable[str],
+) -> bool:
"""Match state event when either 'from_state' or 'to_state' matches."""
return (
(old_state := event.data.get("old_state")) is not None
@@ -625,7 +623,9 @@ def _is_light_group(state: State) -> bool:
def _supported_features(hass: HomeAssistant, light: str) -> set[str]:
state = hass.states.get(light)
assert state is not None
- supported_features = int(state.attributes.get(ATTR_SUPPORTED_FEATURES, 0)) # type: ignore[arg-type]
+ supported_features = int(
+ state.attributes.get(ATTR_SUPPORTED_FEATURES, 0),
+ ) # type: ignore[arg-type]
assert isinstance(supported_features, int)
supported: set[str] = set()
@@ -633,7 +633,10 @@ def _supported_features(hass: HomeAssistant, light: str) -> set[str]:
if supported_features & LightEntityFeature.TRANSITION:
supported.add("transition")
- supported_color_modes = state.attributes.get(ATTR_SUPPORTED_COLOR_MODES, set()) # type: ignore[arg-type]
+ supported_color_modes = state.attributes.get(
+ ATTR_SUPPORTED_COLOR_MODES,
+ set(),
+ ) # type: ignore[arg-type]
color_modes = {
ColorMode.RGB,
ColorMode.RGBW,
@@ -920,7 +923,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
self._only_once = data[CONF_ONLY_ONCE]
self._prefer_rgb_color = data[CONF_PREFER_RGB_COLOR]
self._separate_turn_on_commands = data[CONF_SEPARATE_TURN_ON_COMMANDS]
- self._transition = data[CONF_TRANSITION]
+ self._transition: int = data[CONF_TRANSITION]
self._adapt_delay = data[CONF_ADAPT_DELAY]
self._send_split_delay = data[CONF_SEND_SPLIT_DELAY]
self._take_over_control = data[CONF_TAKE_OVER_CONTROL]
@@ -1040,29 +1043,12 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
)
self.lights = list(all_lights)
- async def _setup_listeners(self, _=None) -> None:
+ async def _setup_listeners(self, _: Event[NoEventData] | None = None) -> None:
_LOGGER.debug("%s: Called '_setup_listeners'", self._name)
if not self.is_on or not self.hass.is_running:
_LOGGER.debug("%s: Cancelled '_setup_listeners'", self._name)
return
- while not all(
- sw._state is not None
- for sw in [
- self.sleep_mode_switch,
- self.adapt_brightness_switch,
- self.adapt_color_switch,
- ]
- ):
- # Waits until `async_added_to_hass` is done, which in SimpleSwitch
- # is when `_state` is set to `True` or `False`.
- # Fixes first issue in https://github.com/basnijholt/adaptive-lighting/issues/682
- _LOGGER.debug(
- "%s: Waiting for simple switches to be initialized",
- self._name,
- )
- await asyncio.sleep(0.1)
-
assert not self.remove_listeners
self._update_time_interval_listener()
@@ -1449,7 +1435,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
if force:
filtered_lights = on_lights
else:
- filtered_lights = []
+ filtered_lights: list[str] = []
for light in on_lights:
# Don't adapt lights that haven't finished prior transitions.
timer = self.manager.transition_timers.get(light)
@@ -1486,7 +1472,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
adapt_color = self.adapt_color_switch.is_on
assert isinstance(adapt_brightness, bool)
assert isinstance(adapt_color, bool)
- tasks = []
+ tasks: list[asyncio.Task[None]] = []
for light in filtered_lights:
manually_controlled = (
self._take_over_control
@@ -1541,7 +1527,11 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
if tasks:
await asyncio.gather(*tasks)
- async def _respond_to_off_to_on_event(self, entity_id: str, event: Event) -> None:
+ async def _respond_to_off_to_on_event(
+ self,
+ entity_id: str,
+ event: Event[EventStateChangedData],
+ ) -> None:
assert not self.manager.is_proactively_adapting(event.context.id)
from_turn_on = self.manager._off_to_on_state_event_is_from_turn_on(
entity_id,
@@ -1597,7 +1587,10 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
force=True,
)
- async def _sleep_mode_switch_state_event_action(self, event: Event) -> None:
+ async def _sleep_mode_switch_state_event_action(
+ self,
+ event: Event[EventStateChangedData],
+ ) -> None:
if not _is_state_event(event, (STATE_ON, STATE_OFF)):
_LOGGER.debug("%s: Ignoring sleep event %s", self._name, event)
return
@@ -1690,6 +1683,10 @@ class SimpleSwitch(SwitchEntity, RestoreEntity):
self._state = False
+type AdaptiveSwitches = list[AdaptiveSwitch]
+type AdaptiveSwitchMap = dict[AdaptiveSwitch, list[str]]
+
+
class AdaptiveLightingManager:
"""Track 'light.turn_off' and 'light.turn_on' service calls."""
@@ -1706,11 +1703,11 @@ class AdaptiveLightingManager:
# Tracks 'light.toggle' service calls
self.toggle_event: dict[str, Event] = {}
# Tracks 'on' → 'off' state changes
- self.on_to_off_event: dict[str, Event] = {}
+ self.on_to_off_event: dict[str, Event[EventStateChangedData]] = {}
# Tracks 'off' → 'on' state changes
- self.off_to_on_event: dict[str, Event] = {}
+ self.off_to_on_event: dict[str, Event[EventStateChangedData]] = {}
# Keep 'asyncio.sleep' tasks that can be cancelled by 'light.turn_on' events
- self.sleep_tasks: dict[str, asyncio.Task] = {}
+ self.sleep_tasks: dict[str, asyncio.Task[None]] = {}
# Locks that prevent light adjusting when waiting for a light to 'turn_off'
self.turn_off_locks: dict[str, asyncio.Lock] = {}
# Tracks which lights are manually controlled
@@ -1720,8 +1717,8 @@ class AdaptiveLightingManager:
# Track last 'service_data' to 'light.turn_on' resulting from this integration
self.last_service_data: dict[str, dict[str, Any]] = {}
# Track ongoing split adaptations to be able to cancel them
- self.adaptation_tasks_brightness: dict[str, asyncio.Task] = {}
- self.adaptation_tasks_color: dict[str, asyncio.Task] = {}
+ self.adaptation_tasks_brightness: dict[str, asyncio.Task[None]] = {}
+ self.adaptation_tasks_color: dict[str, asyncio.Task[None]] = {}
# Track auto reset of manual_control
self.auto_reset_manual_control_timers: dict[str, _AsyncSingleShotTimer] = {}
@@ -1731,7 +1728,7 @@ class AdaptiveLightingManager:
self.transition_timers: dict[str, _AsyncSingleShotTimer] = {}
# Track _execute_cancellable_adaptation_calls tasks
- self.adaptation_tasks = set()
+ self.adaptation_tasks: set[asyncio.Task[None]] = set()
# Setup listeners and its callbacks to remove them later
self.listener_removers = [
@@ -1823,15 +1820,11 @@ class AdaptiveLightingManager:
def _separate_entity_ids(
self,
entity_ids: list[str],
- data,
- ) -> tuple[list[str], list[str]]:
+ data: ServiceData,
+ ) -> tuple[AdaptiveSwitchMap, list[str]]:
# Create a mapping from switch to entity IDs
- # AdaptiveSwitch.name → entity_ids mapping
- switch_to_eids: dict[str, list[str]] = {}
- # AdaptiveSwitch.name → AdaptiveSwitch mapping
- switch_name_mapping: dict[str, AdaptiveSwitch] = {}
- # Note: In HA≥2023.5, AdaptiveSwitch is hashable, so we can
- # use dict[AdaptiveSwitch, list[str]]
+ # AdaptiveSwitch → entity_ids mapping
+ switch_to_eids: AdaptiveSwitchMap = {}
skipped: list[str] = []
for entity_id in entity_ids:
try:
@@ -1855,7 +1848,7 @@ class AdaptiveLightingManager:
not switch.is_on
or not switch._intercept
# Never adapt on light groups, because HA will make a separate light.turn_on
- or _is_light_group(self.hass.states.get(entity_id))
+ or ((e := self.hass.states.get(entity_id)) and _is_light_group(e))
# Prevent adaptation of TURN_ON calls when light is already on,
# and of TOGGLE calls when toggling off.
or self.hass.states.is_state(entity_id, STATE_ON)
@@ -1881,19 +1874,17 @@ class AdaptiveLightingManager:
)
skipped.append(entity_id)
else:
- switch_to_eids.setdefault(switch.name, []).append(entity_id)
- switch_name_mapping[switch.name] = switch
- return switch_to_eids, switch_name_mapping, skipped
+ switch_to_eids.setdefault(switch, []).append(entity_id)
+ return switch_to_eids, skipped
def _correct_for_multi_light_intercept(
self,
- entity_ids,
- switch_to_eids,
- switch_name_mapping,
- skipped,
+ entity_ids: list[str],
+ switch_to_eids: AdaptiveSwitchMap,
+ skipped: list[str],
):
# Check for `multi_light_intercept: true/false`
- mli = [sw._multi_light_intercept for sw in switch_name_mapping.values()]
+ mli = [sw._multi_light_intercept for sw in switch_to_eids]
more_than_one_switch = len(switch_to_eids) > 1
single_switch_with_multiple_lights = (
len(switch_to_eids) == 1 and len(next(iter(switch_to_eids.values()))) > 1
@@ -1919,7 +1910,7 @@ class AdaptiveLightingManager:
)
skipped = entity_ids
switch_to_eids = {}
- return switch_to_eids, switch_name_mapping, skipped
+ return switch_to_eids, skipped
async def _service_interceptor_turn_on_handler(
self,
@@ -1984,19 +1975,17 @@ class AdaptiveLightingManager:
# we skip them and rely on the followup call that HA will make
# with the expanded entity IDs.
- switch_to_eids, switch_name_mapping, skipped = self._separate_entity_ids(
+ switch_to_eids, skipped = self._separate_entity_ids(
entity_ids,
service_data,
)
(
switch_to_eids,
- switch_name_mapping,
skipped,
) = self._correct_for_multi_light_intercept(
entity_ids,
switch_to_eids,
- switch_name_mapping,
skipped,
)
_LOGGER.debug(
@@ -2005,7 +1994,10 @@ class AdaptiveLightingManager:
skipped,
)
- def modify_service_data(service_data, entity_ids) -> dict[str, Any]:
+ def modify_service_data(
+ service_data: ServiceData,
+ entity_ids: list[str],
+ ) -> dict[str, Any]:
"""Modify the service data to contain the entity IDs."""
service_data.pop(ATTR_ENTITY_ID, None)
service_data.pop(ATTR_AREA_ID, None)
@@ -2014,8 +2006,7 @@ class AdaptiveLightingManager:
# Intercept the call for first switch and call _adapt_light for the rest
has_intercepted = False # Can only intercept a turn_on call once
- for adaptive_switch_name, _entity_ids in switch_to_eids.items():
- switch = switch_name_mapping[adaptive_switch_name]
+ for switch, _entity_ids in switch_to_eids.items():
transition = service_data[CONF_PARAMS].get(
ATTR_TRANSITION,
switch.initial_transition,
@@ -2289,8 +2280,8 @@ class AdaptiveLightingManager:
if ATTR_ENTITY_ID in service_data:
return cv.ensure_list_csv(service_data[ATTR_ENTITY_ID])
if ATTR_AREA_ID in service_data:
- entity_ids = []
- area_ids = cv.ensure_list_csv(service_data[ATTR_AREA_ID])
+ entity_ids: list[str] = []
+ area_ids: list[str] = cv.ensure_list_csv(service_data[ATTR_AREA_ID])
for area_id in area_ids:
area_entity_ids = area_entities(self.hass, area_id)
eids = [
@@ -2369,14 +2360,18 @@ class AdaptiveLightingManager:
event.context.id,
)
for eid in entity_ids:
- state = self.hass.states.get(eid).state
+ state = self.hass.states.get(eid)
+ assert state
self.toggle_event[eid] = event
- if state == STATE_ON: # is turning off
+ if state.state == STATE_ON: # is turning off
off(eid, event)
- elif state == STATE_OFF: # is turning on
+ elif state.state == STATE_OFF: # is turning on
on(eid, event)
- async def state_changed_event_listener(self, event: Event) -> None:
+ async def state_changed_event_listener(
+ self,
+ event: Event[EventStateChangedData],
+ ) -> None:
"""Track 'state_changed' events."""
entity_id = event.data.get(ATTR_ENTITY_ID, "")
if entity_id not in self.lights:
@@ -2385,17 +2380,29 @@ class AdaptiveLightingManager:
old_state = event.data.get("old_state")
new_state = event.data.get("new_state")
- new_on = new_state is not None and new_state.state == STATE_ON
- new_off = new_state is not None and new_state.state == STATE_OFF
- old_on = old_state is not None and old_state.state == STATE_ON
- old_off = old_state is not None and old_state.state == STATE_OFF
+ new_on = (
+ new_state if new_state is not None and new_state.state == STATE_ON else None
+ )
+ new_off = (
+ new_state
+ if new_state is not None and new_state.state == STATE_OFF
+ else None
+ )
+ old_on = (
+ old_state if old_state is not None and old_state.state == STATE_ON else None
+ )
+ old_off = (
+ old_state
+ if old_state is not None and old_state.state == STATE_OFF
+ else None
+ )
if new_on:
_LOGGER.debug(
"Detected a '%s' 'state_changed' event: '%s' with context.id='%s'",
entity_id,
- new_state.attributes,
- new_state.context.id,
+ new_on.attributes,
+ new_on.context.id,
)
# It is possible to have multiple state change events with the same context.
# This can happen because a `turn_on.light(brightness_pct=100, transition=30)`
@@ -2411,29 +2418,29 @@ class AdaptiveLightingManager:
last_state: list[State] | None = self.our_last_state_on_change.get(
entity_id,
)
- if is_our_context(new_state.context):
+ if is_our_context(new_on.context):
if (
last_state is not None
- and last_state[0].context.id == new_state.context.id
+ and last_state[0].context.id == new_on.context.id
):
_LOGGER.debug(
"AdaptiveLightingManager: State change event of '%s' is already"
" in 'self.our_last_state_on_change' (%s)"
" adding this state also",
entity_id,
- new_state.context.id,
+ new_on.context.id,
)
- self.our_last_state_on_change[entity_id].append(new_state)
+ self.our_last_state_on_change[entity_id].append(new_on)
else:
_LOGGER.debug(
"AdaptiveLightingManager: New adapt '%s' found for %s",
- new_state,
+ new_on,
entity_id,
)
- self.our_last_state_on_change[entity_id] = [new_state]
+ self.our_last_state_on_change[entity_id] = [new_on]
self.start_transition_timer(entity_id)
elif last_state is not None:
- self.our_last_state_on_change[entity_id].append(new_state)
+ self.our_last_state_on_change[entity_id].append(new_on)
if old_on and new_off:
# Tracks 'on' → 'off' state changes
@@ -2583,7 +2590,7 @@ class AdaptiveLightingManager:
def _off_to_on_state_event_is_from_turn_on(
self,
entity_id: str,
- off_to_on_event: Event,
+ off_to_on_event: Event[EventStateChangedData],
) -> bool:
# Adaptive Lighting should never turn on lights itself
if is_our_context(off_to_on_event.context) and not is_our_context(
@@ -2601,11 +2608,7 @@ class AdaptiveLightingManager:
)
turn_on_event: Event | None = self.turn_on_event.get(entity_id)
id_off_to_on = off_to_on_event.context.id
- return (
- turn_on_event is not None
- and id_off_to_on is not None
- and id_off_to_on == turn_on_event.context.id
- )
+ return turn_on_event is not None and id_off_to_on == turn_on_event.context.id
async def just_turned_off( # noqa: PLR0911
self,
@@ -2662,7 +2665,6 @@ class AdaptiveLightingManager:
if (
turn_off_event is not None
and id_on_to_off == turn_off_event.context.id
- and id_on_to_off is not None
and transition is not None # 'turn_off' is called with transition=...
):
# State change 'on' → 'off' and 'light.turn_off(..., transition=...)' come
diff --git a/tests/test_color_and_brightness.py b/tests/test_color_and_brightness.py
index 6c76175f..cc3e8c4d 100644
--- a/tests/test_color_and_brightness.py
+++ b/tests/test_color_and_brightness.py
@@ -5,8 +5,7 @@ import pytest
from astral import LocationInfo
from astral.location import Location
from homeassistant.components.adaptive_lighting.color_and_brightness import (
- SUN_EVENT_NOON,
- SUN_EVENT_SUNRISE,
+ SunEvent,
SunEvents,
)
@@ -167,7 +166,7 @@ def test_sun_events(tzinfo_and_location):
date = dt.datetime(2022, 1, 1)
events = sun_events.sun_events(date)
assert len(events) == 4
- assert (SUN_EVENT_SUNRISE, location.sunrise(date).timestamp()) in events
+ assert (SunEvent.SUNRISE, location.sunrise(date).timestamp()) in events
def test_prev_and_next_events(tzinfo_and_location):
@@ -186,8 +185,8 @@ def test_prev_and_next_events(tzinfo_and_location):
datetime = dt.datetime(2022, 1, 1, 10, 0)
after_sunrise = sun_events.sunrise(datetime.date()) + dt.timedelta(hours=1)
prev_event, next_event = sun_events.prev_and_next_events(after_sunrise)
- assert prev_event[0] == SUN_EVENT_SUNRISE
- assert next_event[0] == SUN_EVENT_NOON
+ assert prev_event[0] == SunEvent.SUNRISE
+ assert next_event[0] == SunEvent.NOON
def test_closest_event(tzinfo_and_location):
@@ -206,5 +205,5 @@ def test_closest_event(tzinfo_and_location):
datetime = dt.datetime(2022, 1, 1, 6, 0)
sunrise = sun_events.sunrise(datetime.date())
event_name, ts = sun_events.closest_event(sunrise)
- assert event_name == SUN_EVENT_SUNRISE
+ assert event_name == SunEvent.SUNRISE
assert ts == location.sunrise(sunrise.date()).timestamp()
From 79973fb71d4e23c19014561e2502d2f4ff8e87f3 Mon Sep 17 00:00:00 2001
From: Mario Guggenberger
Date: Fri, 12 Dec 2025 22:38:35 +0100
Subject: [PATCH 156/301] chore(devcontainer): fix Pylance resolution of HA
core modules (#1343)
---
.vscode/settings.json | 3 +++
1 file changed, 3 insertions(+)
diff --git a/.vscode/settings.json b/.vscode/settings.json
index e59dc709..5cb46e1a 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -16,5 +16,8 @@
"-p",
"no:sugar",
"core/tests/components/adaptive_lighting"
+ ],
+ "python.analysis.extraPaths": [
+ "${workspaceFolder}/core"
]
}
From 9c7a95f696a6fe61290e2f7f7a28f2e3479f1117 Mon Sep 17 00:00:00 2001
From: lenucksi
Date: Fri, 12 Dec 2025 22:49:45 +0100
Subject: [PATCH 157/301] fix(ci): fix broken Docker workflow and modernize
(#1318)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* fix(ci): fix broken Docker workflow and modernize
## Critical Bug Fixes
1. **Fix broken push condition** (CRITICAL):
- Old: `push: ${{ github.ref == 'refs/heads/master' }}`
- Problem: Branch renamed to `main`, so images NEVER pushed
- New: `push: ${{ github.event_name != 'pull_request' }}`
- Result: Docker images will actually be published again
2. **Add missing checkout step**:
- Build was failing because source code wasn't checked out
- Required for Docker build context
## Modernization Improvements
3. **Migrate to GitHub Container Registry (GHCR)**:
- Old: DockerHub with `DOCKERHUB_USERNAME` and `DOCKERHUB_TOKEN` secrets
- New: GHCR with built-in `GITHUB_TOKEN`
- Benefits: No external account required, better integration
4. **Add semantic versioning**:
- Automatically tags releases: `v1.2.3`, `v1.2`, `v1`, `latest`
- Supports version tags (v*), branches, and PRs
- Uses docker/metadata-action for automatic tagging
5. **Add GitHub Actions caching**:
- Uses `type=gha` cache for faster builds
- Reduces build times and GitHub Actions minutes
6. **Security: Digest pinning**:
- All actions pinned to commit SHAs
- Prevents supply chain attacks via tag manipulation
- Follows security best practices
7. **Add explicit permissions**:
- Minimal required permissions (contents: read, packages: write)
- Follows principle of least privilege
8. **Add workflow triggers**:
- Tags (v*) for releases
- Pull requests for testing
- Manual dispatch for on-demand builds
## Testing
- Workflow syntax validated
- Push logic tested with different event types
- Compatible with existing Docker build process
🤖 Generated with [Claude Code](https://claude.com/claude-code)
Co-Authored-By: Claude
* refactor(ci): simplify docker workflow
- Use version tags instead of SHA pins for readability
- Remove verbose step names (action names are self-documenting)
- Compact YAML formatting
- Fix actions/checkout to v4 (v6 doesn't exist)
---------
Co-authored-by: Bas Nijholt
---
.github/workflows/docker-build.yml | 58 +++++++++++++++++++-----------
1 file changed, 38 insertions(+), 20 deletions(-)
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 3e088e96..7c1909f8 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -1,32 +1,50 @@
-name: docker
+name: Docker
on:
push:
- branches:
- - "main"
+ branches: [main]
+ tags: ['v*']
+ pull_request:
+ workflow_dispatch:
+
+env:
+ REGISTRY: ghcr.io
+ IMAGE_NAME: ${{ github.repository }}
jobs:
- docker:
+ build:
runs-on: ubuntu-latest
+ permissions:
+ contents: read
+ packages: write
strategy:
matrix:
- platform:
- - linux/amd64
- - linux/arm64
+ platform: [linux/amd64, linux/arm64]
steps:
- - name: Set up QEMU
- uses: docker/setup-qemu-action@v3
- - name: Set up Docker Buildx
- uses: docker/setup-buildx-action@v3
- - name: Login to Docker Hub
- uses: docker/login-action@v3
+ - uses: actions/checkout@v4
+ - uses: docker/setup-qemu-action@v3
+ - uses: docker/setup-buildx-action@v3
+ - uses: docker/login-action@v3
with:
- username: ${{ secrets.DOCKERHUB_USERNAME }}
- password: ${{ secrets.DOCKERHUB_TOKEN }}
- - name: Build and push
- uses: docker/build-push-action@v6
+ registry: ${{ env.REGISTRY }}
+ username: ${{ github.actor }}
+ password: ${{ secrets.GITHUB_TOKEN }}
+ - id: meta
+ uses: docker/metadata-action@v5
with:
- # Only push on the master branch
- push: ${{ github.ref == 'refs/heads/master' }}
+ images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
+ tags: |
+ type=ref,event=branch
+ type=ref,event=pr
+ type=semver,pattern={{version}}
+ type=semver,pattern={{major}}.{{minor}}
+ type=raw,value=latest,enable={{is_default_branch}}
+ - uses: docker/build-push-action@v6
+ with:
+ context: .
platforms: ${{ matrix.platform }}
- tags: ${{ secrets.DOCKERHUB_USERNAME }}/adaptive-lighting:latest
+ push: ${{ github.event_name != 'pull_request' }}
+ tags: ${{ steps.meta.outputs.tags }}
+ labels: ${{ steps.meta.outputs.labels }}
+ cache-from: type=gha
+ cache-to: type=gha,mode=max
From 828f73d4815f60401d2652dd3960323c27f408f3 Mon Sep 17 00:00:00 2001
From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com>
Date: Fri, 12 Dec 2025 13:59:40 -0800
Subject: [PATCH 158/301] =?UTF-8?q?=E2=AC=86=EF=B8=8F=20Update=20actions/c?=
=?UTF-8?q?heckout=20action=20to=20v6=20(#1352)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com>
---
.github/workflows/docker-build.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/docker-build.yml b/.github/workflows/docker-build.yml
index 7c1909f8..edea4bb5 100644
--- a/.github/workflows/docker-build.yml
+++ b/.github/workflows/docker-build.yml
@@ -21,7 +21,7 @@ jobs:
matrix:
platform: [linux/amd64, linux/arm64]
steps:
- - uses: actions/checkout@v4
+ - uses: actions/checkout@v6
- uses: docker/setup-qemu-action@v3
- uses: docker/setup-buildx-action@v3
- uses: docker/login-action@v3
From 2f599d6e1b4ef932780bb958713c89c36eff7af7 Mon Sep 17 00:00:00 2001
From: "Weblate (bot)"
Date: Fri, 12 Dec 2025 23:00:30 +0100
Subject: [PATCH 159/301] Translations update from Hosted Weblate (#1331)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* Translated using Weblate (German)
Currently translated at 100.0% (156 of 156 strings)
Co-authored-by: Anton
Co-authored-by: Hosted Weblate
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/de/
Translation: Adaptive Lighting/Adaptive Lighting
* Translated using Weblate (Catalan)
Currently translated at 100.0% (156 of 156 strings)
Co-authored-by: Enric Pagès i Gassull
Translate-URL: https://hosted.weblate.org/projects/adaptive-lighting/adaptive-lighting/ca/
Translation: Adaptive Lighting/Adaptive Lighting
---------
Co-authored-by: Anton
Co-authored-by: Enric Pagès i Gassull
---
custom_components/adaptive_lighting/translations/ca.json | 7 +++++++
custom_components/adaptive_lighting/translations/de.json | 9 ++++++++-
2 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/translations/ca.json b/custom_components/adaptive_lighting/translations/ca.json
index 3b3a9b36..48f409d2 100644
--- a/custom_components/adaptive_lighting/translations/ca.json
+++ b/custom_components/adaptive_lighting/translations/ca.json
@@ -193,6 +193,13 @@
"user": {
"title": "Tria un nom per a la instància d'Adaptive Lighting",
"description": "Cada instància pot contenir múltiples llums!"
+ },
+ "menu": {
+ "title": "Crear o Duplicar",
+ "description": "Vols crear una nova instància, o duplicar-ne una d'existent?",
+ "data": {
+ "action": "Acció"
+ }
}
},
"abort": {
diff --git a/custom_components/adaptive_lighting/translations/de.json b/custom_components/adaptive_lighting/translations/de.json
index acd2de22..c5a0f0e2 100644
--- a/custom_components/adaptive_lighting/translations/de.json
+++ b/custom_components/adaptive_lighting/translations/de.json
@@ -8,6 +8,13 @@
"data": {
"name": "Name"
}
+ },
+ "menu": {
+ "title": "Erstellen oder Duplizieren",
+ "description": "Möchtest du eine neue Instanz erstellen oder eine existierende duplizieren?",
+ "data": {
+ "action": "Aktion"
+ }
}
},
"abort": {
@@ -47,7 +54,7 @@
"transition": "transition, Wechselzeit in Sekunden",
"adapt_delay": "adapt_delay: Wartezeit (in Sekunden) zwischen Anschalten des Licht und der Anpassung durch Adaptive Lights. Kann Flackern vermeiden.",
"skip_redundant_commands": "skip_redundant_commands: Überspringt das Senden von Anpassungsbefehlen, deren Zielzustand bereits mit dem bekannten Zustand der Leuchte übereinstimmt. Minimiert den Netzwerkverkehr und verbessert die Anpassungsreaktion in einigen Situationen. 📉 Deaktivieren, falls der physikalische Zustand der Lichter nicht mehr mit dem Zustand in HA übereinstimmt.",
- "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Beim ersten Einschalten des Lichts. Wenn auf `true` gesetzt, passt AL das Licht nur an, wenn `light.turn_on` ohne eine Angabe von Farbe oder Helligkeit aufgerufen wird. ❌🌈 Dies verhindert z.B. die Anpassung durch AL beim Aktivieren einer Szene. Wenn auf \"false\" gesetzt, passt AL das licht unabhängig von der Angabe von Farbe oder Helligkeit in den ursprünglichen `service_data` an. Benötigt das `take_over_control` aktiviert ist. 🕵️ ",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: Beim ersten Einschalten des Lichts. Wenn auf `true` gesetzt, passt AL das Licht nur an, wenn `light.turn_on` ohne eine Angabe von Farbe oder Helligkeit aufgerufen wird. ❌🌈 Dies verhindert z.B. die Anpassung durch AL beim Aktivieren einer Szene. Wenn auf \"false\" gesetzt, passt AL das licht unabhängig von der Angabe von Farbe oder Helligkeit in den ursprünglichen `service_data` an. Benötigt das `take_over_control` aktiviert ist. 🕵️",
"include_config_in_attributes": "include_config_in_attributes: Alle Optionen als Attribute auf dem Schalter im Home Assistant anzeigen, wenn auf `true` gesetzt. 📝",
"multi_light_intercept": "multi_light_intercept: Abfangen und Anpassen von `light.turn_on`-Aufrufen, die auf mehrere Lichter aufrufen. ➗⚠️ Dies kann dazu führen, dass ein einzelner `light.turn_on`-Aufruf in mehrere Aufrufe aufgeteilt wird, z.B. wenn Lichter in verschiedenen Schaltern sind. Erfordert, dass `intercept` aktiviert ist.",
"transition_until_sleep": "transition_until_sleep: Wenn diese Option aktiviert ist, behandelt die adaptive Beleuchtung die Schlafeinstellungen als Minimum und geht nach Sonnenuntergang zu diesen Werten über. 🌙",
From f84ee445b70112c19da08c3dcfafa9ff4da75c06 Mon Sep 17 00:00:00 2001
From: Mario Guggenberger
Date: Tue, 23 Dec 2025 07:55:16 +0100
Subject: [PATCH 160/301] Individual manual control of brightness and color
(#1356)
* refactor: introduce light control parameter enum
* refactor: replace manual control flag with parameter enum
* test: update deprecated color temp attribute
* build: set execution bits on task scripts
* feat: individual manual control of brightness and color
* test: add tests for individual manual control evaluation
* fix: sequential manual changes not always detected
If multiple attributes of a light were changed within an interval, only the last change was detected because the check in the interval only used the latest event. For example, if there was a brightness change and a following color change, only the color attribute was detected as manually controlled. To fix this, the manual control attribute flags are now set directly from the event handler so that all events are processed.
* fix: invalid service description
* docs: fix missing space in config description
* refactor: pluralize multivalued bitmask enum name
---
README.md | 91 ++--
.../adaptive_lighting/_docs_helpers.py | 2 +
.../adaptive_lighting/adaptation_utils.py | 122 ++++-
custom_components/adaptive_lighting/const.py | 50 +-
.../adaptive_lighting/services.yaml | 15 +-
.../adaptive_lighting/strings.json | 16 +-
custom_components/adaptive_lighting/switch.py | 453 +++++++++++-------
.../adaptive_lighting/translations/en.json | 16 +-
scripts/develop | 0
scripts/lint | 0
tests/test_adaptation_utils.py | 142 ++++++
tests/test_switch.py | 232 +++++++--
12 files changed, 846 insertions(+), 293 deletions(-)
mode change 100644 => 100755 scripts/develop
mode change 100644 => 100755 scripts/lint
diff --git a/README.md b/README.md
index 6102c85c..6f5a3715 100644
--- a/README.md
+++ b/README.md
@@ -105,46 +105,47 @@ The YAML and frontend configuration methods support all of the options listed be
-| Variable name | Description | Default | Type |
-|:-------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:---------------------------------------|
-| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
-| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
-| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
-| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
-| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
-| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
-| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
-| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
-| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
-| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
-| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
-| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
-| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
-| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
-| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
-| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
-| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
-| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
-| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
-| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
-| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
-| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
-| `brightness_mode_time_dark` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉 | `900` | `int` |
-| `brightness_mode_time_light` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉. | `3600` | `int` |
-| `take_over_control` | Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒 | `True` | `bool` |
-| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues. | `False` | `bool` |
-| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
-| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
-| `adapt_only_on_bare_turn_on` | When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️ | `False` | `bool` |
-| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
-| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
-| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
-| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
-| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
-| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
-| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
+| Variable name | Description | Default | Type |
+|:-------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:----------------------------------------|
+| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
+| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
+| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
+| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
+| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
+| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
+| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
+| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
+| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
+| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
+| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
+| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
+| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
+| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
+| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
+| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
+| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
+| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
+| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
+| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
+| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
+| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
+| `brightness_mode_time_dark` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉 | `900` | `int` |
+| `brightness_mode_time_light` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉. | `3600` | `int` |
+| `take_over_control` | Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒 | `True` | `bool` |
+| `take_over_control_mode` | The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed. | `pause_all` | one of `['pause_all', 'pause_changed']` |
+| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues. | `False` | `bool` |
+| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
+| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
+| `adapt_only_on_bare_turn_on` | When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️ | `False` | `bool` |
+| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
+| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
+| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
+| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
+| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
+| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
+| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
@@ -210,11 +211,11 @@ adaptive_lighting:
-| Service data attribute | Description | Required | Type |
-|:-------------------------|:-----------------------------------------------------------------------------------------------|:-----------|:---------------------|
-| `entity_id` | The `entity_id` of the switch in which to (un)mark the light as being `manually controlled`. 📝 | ✅ | list of `entity_id`s |
-| `lights` | entity_id(s) of lights, if not specified, all lights in the switch are selected. 💡 | ❌ | list of `entity_id`s |
-| `manual_control` | Whether to add ("true") or remove ("false") the light from the "manual_control" list. 🔒 | ❌ | bool |
+| Service data attribute | Description | Required | Type |
+|:-------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------|:-----------------------------------------|
+| `entity_id` | The `entity_id` of the switch in which to (un)mark the light as being `manually controlled`. 📝 | ✅ | list of `entity_id`s |
+| `lights` | entity_id(s) of lights, if not specified, all lights in the switch are selected. 💡 | ❌ | list of `entity_id`s |
+| `manual_control` | Whether to add ("true") or remove ("false") all adapted attributes of the light from the "manual_control" list, or the name of an attribute for selective addition. 🔒 | ❌ | bool or one of `['brightness', 'color']` |
#### `adaptive_lighting.change_switch_settings`
diff --git a/custom_components/adaptive_lighting/_docs_helpers.py b/custom_components/adaptive_lighting/_docs_helpers.py
index afbb9d66..0c4ed45d 100644
--- a/custom_components/adaptive_lighting/_docs_helpers.py
+++ b/custom_components/adaptive_lighting/_docs_helpers.py
@@ -46,6 +46,8 @@ def _type_to_str(type_: Any) -> str: # noqa: PLR0911
return "bool"
if isinstance(type_, vol.All):
return _format_voluptuous_instance(type_)
+ if isinstance(type_, vol.Any):
+ return " or ".join(_type_to_str(t) for t in type_.validators)
if isinstance(type_, vol.In):
return f"one of `{type_.container}`"
if isinstance(type_, selector.SelectSelector):
diff --git a/custom_components/adaptive_lighting/adaptation_utils.py b/custom_components/adaptive_lighting/adaptation_utils.py
index 14c28ae8..26acd92b 100644
--- a/custom_components/adaptive_lighting/adaptation_utils.py
+++ b/custom_components/adaptive_lighting/adaptation_utils.py
@@ -3,7 +3,8 @@
import logging
from collections.abc import AsyncGenerator
from dataclasses import dataclass
-from typing import Any, Literal
+from enum import IntFlag, auto
+from typing import Any
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
@@ -12,6 +13,8 @@ from homeassistant.components.light import (
ATTR_BRIGHTNESS_STEP_PCT,
ATTR_COLOR_NAME,
ATTR_COLOR_TEMP_KELVIN,
+ ATTR_EFFECT,
+ ATTR_FLASH,
ATTR_HS_COLOR,
ATTR_RGB_COLOR,
ATTR_RGBW_COLOR,
@@ -45,6 +48,41 @@ BRIGHTNESS_ATTRS = {
ServiceData = dict[str, Any]
+class LightControlAttributes(IntFlag):
+ """Attributes of lights that the adaptation engine can control."""
+
+ NONE = 0
+ BRIGHTNESS = auto()
+ COLOR = auto()
+
+ ALL = BRIGHTNESS | COLOR
+
+ def __str__(self) -> str:
+ """Return a string representation of the attributes."""
+ if self == LightControlAttributes.NONE:
+ return "NONE"
+
+ return "|".join(
+ member.name
+ for member in type(self)
+ if member is not LightControlAttributes.NONE
+ and member in self
+ and member.name is not None
+ )
+
+ def has_any(self) -> bool:
+ """Determine whether any attribute is selected."""
+ return self != LightControlAttributes.NONE
+
+ def has_none(self) -> bool:
+ """Determine whether no attribute is selected."""
+ return self == LightControlAttributes.NONE
+
+ def has_all(self) -> bool:
+ """Determine whether all attributes are selected."""
+ return (self & LightControlAttributes.ALL) == LightControlAttributes.ALL
+
+
def _split_service_call_data(service_data: ServiceData) -> list[ServiceData]:
"""Splits the service data by the adapted attributes.
@@ -145,7 +183,7 @@ class AdaptationData:
service_call_datas: AsyncGenerator[ServiceData]
force: bool
max_length: int
- which: Literal["brightness", "color", "both"]
+ attributes: LightControlAttributes
initial_sleep: bool = False
async def next_service_call_data(self) -> ServiceData | None:
@@ -161,7 +199,7 @@ class AdaptationData:
f"sleep_time={self.sleep_time}, "
f"force={self.force}, "
f"max_length={self.max_length}, "
- f"which={self.which}, "
+ f"attributes={self.attributes}, "
f"initial_sleep={self.initial_sleep}"
")"
)
@@ -171,20 +209,25 @@ class NoColorOrBrightnessInServiceDataError(Exception):
"""Exception raised when no color or brightness attributes are found in service data."""
-def _identify_lighting_type(
+def _identify_light_control_attributes(
service_data: ServiceData,
-) -> Literal["brightness", "color", "both"]:
+) -> LightControlAttributes:
"""Extract the 'which' attribute from the service data."""
has_brightness = ATTR_BRIGHTNESS in service_data
has_color = any(attr in service_data for attr in COLOR_ATTRS)
- if has_brightness and has_color:
- return "both"
+
+ parameters = LightControlAttributes.NONE
+
if has_brightness:
- return "brightness"
+ parameters |= LightControlAttributes.BRIGHTNESS
if has_color:
- return "color"
- msg = f"Invalid service_data, no brightness or color attributes found: {service_data=}"
- raise NoColorOrBrightnessInServiceDataError(msg)
+ parameters |= LightControlAttributes.COLOR
+
+ if parameters == LightControlAttributes.NONE:
+ msg = f"Invalid service_data, no brightness or color attributes found: {service_data=}"
+ raise NoColorOrBrightnessInServiceDataError(msg)
+
+ return parameters
def prepare_adaptation_data(
@@ -220,7 +263,7 @@ def prepare_adaptation_data(
filter_by_state,
)
- lighting_type = _identify_lighting_type(service_data)
+ attributes = _identify_light_control_attributes(service_data)
return AdaptationData(
entity_id=entity_id,
@@ -229,5 +272,58 @@ def prepare_adaptation_data(
service_call_datas=service_data_iterator,
force=force,
max_length=service_datas_length,
- which=lighting_type,
+ attributes=attributes,
)
+
+
+def manual_control_event_attribute_to_flags(
+ manual_control_attribute: bool | str,
+) -> LightControlAttributes:
+ """Convert manual control event data to light control attributes."""
+ if isinstance(manual_control_attribute, bool) and manual_control_attribute:
+ return LightControlAttributes.ALL
+ if manual_control_attribute == "brightness":
+ return LightControlAttributes.BRIGHTNESS
+ if manual_control_attribute == "color":
+ return LightControlAttributes.COLOR
+ return LightControlAttributes.NONE
+
+
+def has_brightness_attribute(
+ service_data: ServiceData,
+) -> bool:
+ """Determine whether the service data contains brightness attributes."""
+ return any(attr in BRIGHTNESS_ATTRS for attr in service_data)
+
+
+def has_color_attribute(
+ service_data: ServiceData,
+) -> bool:
+ """Determine whether the service data contains color attributes."""
+ return any(attr in COLOR_ATTRS for attr in service_data)
+
+
+def has_effect_attribute(
+ service_data: ServiceData,
+) -> bool:
+ """Determine whether the service data contains effect attributes."""
+ return ATTR_FLASH in service_data or ATTR_EFFECT in service_data
+
+
+def get_light_control_attributes(
+ service_data: ServiceData,
+) -> LightControlAttributes:
+ """Get the light control attributes affected by the service call data."""
+ parameters = LightControlAttributes.NONE
+
+ if has_brightness_attribute(service_data):
+ parameters |= LightControlAttributes.BRIGHTNESS
+
+ if has_color_attribute(service_data):
+ parameters |= LightControlAttributes.COLOR
+
+ if has_effect_attribute(service_data):
+ parameters |= LightControlAttributes.BRIGHTNESS
+ parameters |= LightControlAttributes.COLOR
+
+ return parameters
diff --git a/custom_components/adaptive_lighting/const.py b/custom_components/adaptive_lighting/const.py
index f7c3620b..37a9ba8b 100644
--- a/custom_components/adaptive_lighting/const.py
+++ b/custom_components/adaptive_lighting/const.py
@@ -1,6 +1,7 @@
"""Constants for the Adaptive Lighting integration."""
from datetime import timedelta
+from enum import Enum
from typing import Any
import homeassistant.helpers.config_validation as cv
@@ -16,6 +17,14 @@ ICON_SLEEP = "mdi:sleep"
DOMAIN = "adaptive_lighting"
+
+class TakeOverControlMode(Enum):
+ """Modes for pausing adaptation when control of a light is taken over externally."""
+
+ PAUSE_ALL = "pause_all"
+ PAUSE_CHANGED = "pause_changed"
+
+
DOCS = {CONF_ENTITY_ID: "Entity ID of the switch. 📝"}
@@ -34,6 +43,7 @@ DOCS[CONF_DETECT_NON_HA_CHANGES] = (
"Needs `take_over_control` enabled. 🕵️ "
"Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result "
"in lights turning on unexpectedly. "
+ "Note that this calls `homeassistant.update_entity` every `interval`! "
"Disable this feature if you encounter such issues."
)
@@ -188,9 +198,19 @@ DOCS[CONF_BRIGHTNESS_MODE_TIME_LIGHT] = (
CONF_TAKE_OVER_CONTROL, DEFAULT_TAKE_OVER_CONTROL = "take_over_control", True
DOCS[CONF_TAKE_OVER_CONTROL] = (
- "Disable Adaptive Lighting if another source calls `light.turn_on` while lights "
- "are on and being adapted. Note that this calls `homeassistant.update_entity` "
- "every `interval`! 🔒"
+ "Pause adaptation of individual lights and hand over (manual) control to other sources that "
+ "issue `light.turn_on` calls for lights that are on. 🔒"
+)
+
+CONF_TAKE_OVER_CONTROL_MODE, DEFAULT_TAKE_OVER_CONTROL_MODE = (
+ "take_over_control_mode",
+ TakeOverControlMode.PAUSE_ALL.value,
+)
+DOCS[CONF_TAKE_OVER_CONTROL_MODE] = (
+ "The adaptation pausing mode when other sources change brightness and/or color of lights. "
+ "`pause_all` always pauses both brightness and color adaptation. "
+ "`pause_changed` pauses the adaptation of only the changed attributes and continues adapting "
+ "unchanged attributes, e.g., continues color adaptation when only brightness was changed."
)
CONF_TRANSITION, DEFAULT_TRANSITION = "transition", 45
@@ -284,8 +304,9 @@ DOCS_MANUAL_CONTROL = {
"light as being `manually controlled`. 📝",
CONF_LIGHTS: "entity_id(s) of lights, if not specified, all lights in the "
"switch are selected. 💡",
- CONF_MANUAL_CONTROL: 'Whether to add ("true") or remove ("false") the '
- 'light from the "manual_control" list. 🔒',
+ CONF_MANUAL_CONTROL: 'Whether to add ("true") or remove ("false") all '
+ 'adapted attributes of the light from the "manual_control" list, or the '
+ "name of an attribute for selective addition. 🔒",
}
DOCS_APPLY = {
@@ -351,6 +372,20 @@ VALIDATION_TUPLES: list[tuple[str, Any, Any]] = [
(CONF_BRIGHTNESS_MODE_TIME_DARK, DEFAULT_BRIGHTNESS_MODE_TIME_DARK, int),
(CONF_BRIGHTNESS_MODE_TIME_LIGHT, DEFAULT_BRIGHTNESS_MODE_TIME_LIGHT, int),
(CONF_TAKE_OVER_CONTROL, DEFAULT_TAKE_OVER_CONTROL, bool),
+ (
+ CONF_TAKE_OVER_CONTROL_MODE,
+ DEFAULT_TAKE_OVER_CONTROL_MODE,
+ selector.SelectSelector( # type: ignore[arg-type]
+ selector.SelectSelectorConfig(
+ options=[
+ TakeOverControlMode.PAUSE_ALL.value,
+ TakeOverControlMode.PAUSE_CHANGED.value,
+ ],
+ multiple=False,
+ mode=selector.SelectSelectorMode.DROPDOWN,
+ ),
+ ),
+ ),
(CONF_DETECT_NON_HA_CHANGES, DEFAULT_DETECT_NON_HA_CHANGES, bool),
(
CONF_AUTORESET_CONTROL,
@@ -446,6 +481,9 @@ SET_MANUAL_CONTROL_SCHEMA = vol.Schema(
{
vol.Optional(CONF_ENTITY_ID): cv.entity_ids, # type: ignore[arg-type]
vol.Optional(CONF_LIGHTS, default=[]): cv.entity_ids, # type: ignore[arg-type]
- vol.Optional(CONF_MANUAL_CONTROL, default=True): cv.boolean,
+ vol.Optional(CONF_MANUAL_CONTROL, default=True): vol.Any(
+ cv.boolean,
+ vol.In(["brightness", "color"]),
+ ),
},
)
diff --git a/custom_components/adaptive_lighting/services.yaml b/custom_components/adaptive_lighting/services.yaml
index 4b79f88c..09979bac 100644
--- a/custom_components/adaptive_lighting/services.yaml
+++ b/custom_components/adaptive_lighting/services.yaml
@@ -57,7 +57,7 @@ set_manual_control:
domain: light
multiple: true
manual_control:
- description: Whether to add ("true") or remove ("false") the light from the "manual_control" list. 🔒
+ description: Whether to add ("true") or remove ("false") all adapted attributes of the light from the "manual_control" list, or the name of an attribute for selective addition. 🔒
example: true
default: true
selector:
@@ -220,13 +220,22 @@ change_switch_settings:
selector:
time: null
take_over_control:
- description: Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒
+ description: Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒
required: false
example: true
selector:
boolean: null
+ take_over_control_mode:
+ description: The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed.
+ required: false
+ example: pause_changed
+ selector:
+ select:
+ options:
+ - pause_all
+ - pause_changed
detect_non_ha_changes:
- description: 'Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an ''on'' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues.'
+ description: 'Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an ''on'' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.'
required: false
example: false
selector:
diff --git a/custom_components/adaptive_lighting/strings.json b/custom_components/adaptive_lighting/strings.json
index 1a9ba06c..6985a94e 100644
--- a/custom_components/adaptive_lighting/strings.json
+++ b/custom_components/adaptive_lighting/strings.json
@@ -52,8 +52,9 @@
"brightness_mode": "brightness_mode",
"brightness_mode_time_dark": "brightness_mode_time_dark",
"brightness_mode_time_light": "brightness_mode_time_light",
- "take_over_control": "take_over_control: Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒",
- "detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues.",
+ "take_over_control": "take_over_control: Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒",
+ "take_over_control_mode": "take_over_control_mode",
+ "detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"autoreset_control_seconds": "autoreset_control_seconds",
"only_once": "only_once: Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄",
"adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
@@ -85,6 +86,7 @@
"brightness_mode": "Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈",
"brightness_mode_time_dark": "(Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉",
"brightness_mode_time_light": "(Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉.",
+ "take_over_control_mode": "The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed.",
"autoreset_control_seconds": "Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️",
"send_split_delay": "Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️",
"adapt_delay": "Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️"
@@ -144,7 +146,7 @@
"name": "lights"
},
"manual_control": {
- "description": "Whether to add (\"true\") or remove (\"false\") the light from the \"manual_control\" list. 🔒",
+ "description": "Whether to add (\"true\") or remove (\"false\") all adapted attributes of the light from the \"manual_control\" list, or the name of an attribute for selective addition. 🔒",
"name": "manual_control"
}
}
@@ -250,11 +252,15 @@
"name": "min_sunset_time"
},
"take_over_control": {
- "description": "Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒",
+ "description": "Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒",
"name": "take_over_control"
},
+ "take_over_control_mode": {
+ "description": "The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed.",
+ "name": "take_over_control_mode"
+ },
"detect_non_ha_changes": {
- "description": "Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues.",
+ "description": "Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"name": "detect_non_ha_changes"
},
"transition": {
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 9217e8d9..3ded833e 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -8,7 +8,7 @@ import logging
import zoneinfo
from copy import deepcopy
from datetime import timedelta
-from typing import TYPE_CHECKING, Any, Literal
+from typing import TYPE_CHECKING, Any
import homeassistant.helpers.config_validation as cv
import homeassistant.util.dt as dt_util
@@ -17,8 +17,6 @@ import voluptuous as vol
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
ATTR_COLOR_TEMP_KELVIN,
- ATTR_EFFECT,
- ATTR_FLASH,
ATTR_RGB_COLOR,
ATTR_SUPPORTED_COLOR_MODES,
ATTR_TRANSITION,
@@ -76,10 +74,12 @@ from homeassistant.util.color import (
)
from .adaptation_utils import (
- BRIGHTNESS_ATTRS,
- COLOR_ATTRS,
AdaptationData,
+ LightControlAttributes,
ServiceData,
+ get_light_control_attributes,
+ has_effect_attribute,
+ manual_control_event_attribute_to_flags,
prepare_adaptation_data,
)
from .color_and_brightness import SunLightSettings
@@ -127,6 +127,7 @@ from .const import (
CONF_SUNSET_OFFSET,
CONF_SUNSET_TIME,
CONF_TAKE_OVER_CONTROL,
+ CONF_TAKE_OVER_CONTROL_MODE,
CONF_TRANSITION,
CONF_TURN_ON_LIGHTS,
CONF_USE_DEFAULTS,
@@ -143,6 +144,7 @@ from .const import (
SLEEP_MODE_SWITCH,
TURNING_OFF_DELAY,
VALIDATION_TUPLES,
+ TakeOverControlMode,
apply_service_schema,
replace_none_str,
)
@@ -359,27 +361,6 @@ async def handle_change_switch_settings(
)
-@callback
-def _fire_manual_control_event(
- switch: AdaptiveSwitch,
- light: str,
- context: Context,
-) -> None:
- """Fire an event that 'light' is marked as manual_control."""
- hass = switch.hass
- _LOGGER.debug(
- "'adaptive_lighting.manual_control' event fired for %s for light %s",
- switch.entity_id,
- light,
- )
- switch.manager.mark_as_manual_control(light)
- hass.bus.async_fire(
- f"{DOMAIN}.manual_control",
- {ATTR_ENTITY_ID: light, SWITCH_DOMAIN: switch.entity_id},
- context=context,
- )
-
-
async def async_setup_entry( # noqa: PLR0915
hass: HomeAssistant,
config_entry: ConfigEntry,
@@ -497,9 +478,21 @@ async def async_setup_entry( # noqa: PLR0915
all_lights = switch.lights
else:
all_lights = _expand_light_groups(hass, lights)
- if service_call.data[CONF_MANUAL_CONTROL]:
+
+ manual_attributes = manual_control_event_attribute_to_flags(
+ service_call.data[CONF_MANUAL_CONTROL],
+ )
+
+ if manual_attributes:
for light in all_lights:
- _fire_manual_control_event(switch, light, service_call.context)
+ switch.manager.set_manual_control_attributes(
+ light,
+ manual_attributes,
+ )
+ switch.fire_manual_control_event(
+ light,
+ service_call.context,
+ )
else:
switch.manager.reset(*all_lights)
if switch.is_on:
@@ -753,36 +746,32 @@ def _attributes_have_changed(
light: str,
old_attributes: dict[str, Any],
new_attributes: dict[str, Any],
- adapt_brightness: bool,
- adapt_color: bool,
context: Context,
-) -> bool:
+) -> LightControlAttributes:
# 2023-11-19: HA core no longer removes light domain attributes when off
# so we must protect for `None` here
# see https://github.com/home-assistant/core/pull/101946
+ changed_attributes = LightControlAttributes.NONE
+
# Check for color mode changes BEFORE attribute conversion
# This detects external changes like Hue scenes switching from color_temp to RGB
# See: https://github.com/basnijholt/adaptive-lighting/issues/1275
- if adapt_color and _has_color_mode_changed(
+ if _has_color_mode_changed(
light,
old_attributes,
new_attributes,
context,
):
- return True
+ changed_attributes |= LightControlAttributes.COLOR
- if adapt_color:
+ if LightControlAttributes.COLOR not in changed_attributes:
old_attributes, new_attributes = _add_missing_attributes(
old_attributes,
new_attributes,
)
- if (
- adapt_brightness
- and old_attributes.get(ATTR_BRIGHTNESS)
- and new_attributes.get(ATTR_BRIGHTNESS)
- ):
+ if old_attributes.get(ATTR_BRIGHTNESS) and new_attributes.get(ATTR_BRIGHTNESS):
last_brightness = old_attributes[ATTR_BRIGHTNESS]
current_brightness = new_attributes[ATTR_BRIGHTNESS]
if abs(current_brightness - last_brightness) > BRIGHTNESS_CHANGE:
@@ -794,10 +783,10 @@ def _attributes_have_changed(
current_brightness,
context.id,
)
- return True
+ changed_attributes |= LightControlAttributes.BRIGHTNESS
if (
- adapt_color
+ LightControlAttributes.COLOR not in changed_attributes
and old_attributes.get(ATTR_COLOR_TEMP_KELVIN)
and new_attributes.get(ATTR_COLOR_TEMP_KELVIN)
):
@@ -812,10 +801,10 @@ def _attributes_have_changed(
current_color_temp,
context.id,
)
- return True
+ changed_attributes |= LightControlAttributes.COLOR
if (
- adapt_color
+ LightControlAttributes.COLOR not in changed_attributes
and old_attributes.get(ATTR_RGB_COLOR)
and new_attributes.get(ATTR_RGB_COLOR)
):
@@ -831,9 +820,9 @@ def _attributes_have_changed(
current_rgb_color,
context.id,
)
- return True
+ changed_attributes |= LightControlAttributes.COLOR
- return False
+ return changed_attributes
class AdaptiveSwitch(SwitchEntity, RestoreEntity):
@@ -937,6 +926,9 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
self._name,
)
self._take_over_control = True
+ self._take_over_control_mode = TakeOverControlMode(
+ data[CONF_TAKE_OVER_CONTROL_MODE],
+ )
self._detect_non_ha_changes = data[CONF_DETECT_NON_HA_CHANGES]
self._adapt_only_on_bare_turn_on = data[CONF_ADAPT_ONLY_ON_BARE_TURN_ON]
self._auto_reset_manual_control_time = data[CONF_AUTORESET_CONTROL]
@@ -1203,12 +1195,19 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
context: Context | None = None,
) -> AdaptationData | None:
"""Prepare `AdaptationData` for adapting a light."""
+ adaptation_attributes = self.manager.get_adaption_control_attributes(
+ self,
+ light,
+ )
+
if transition is None:
transition = self._transition
if adapt_brightness is None:
- adapt_brightness = self.adapt_brightness_switch.is_on
+ adapt_brightness = (
+ LightControlAttributes.BRIGHTNESS in adaptation_attributes
+ )
if adapt_color is None:
- adapt_color = self.adapt_color_switch.is_on
+ adapt_color = LightControlAttributes.COLOR in adaptation_attributes
if prefer_rgb_color is None:
prefer_rgb_color = self._prefer_rgb_color
@@ -1375,7 +1374,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
to cancel an ongoing adaptation when a light is turned off.
"""
# Prevent overlap of multiple adaptation sequences
- self.manager.cancel_ongoing_adaptation_calls(data.entity_id, which=data.which)
+ self.manager.cancel_ongoing_adaptation_calls(data.entity_id)
_LOGGER.debug(
"%s: execute_cancellable_adaptation_calls with data: %s",
self._name,
@@ -1384,9 +1383,9 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
# Execute adaptation calls within a task
try:
task = asyncio.ensure_future(self._execute_adaptation_calls(data))
- if data.which in ("both", "brightness"):
+ if LightControlAttributes.BRIGHTNESS in data.attributes:
self.manager.adaptation_tasks_brightness[data.entity_id] = task
- if data.which in ("both", "color"):
+ if LightControlAttributes.COLOR in data.attributes:
self.manager.adaptation_tasks_color[data.entity_id] = task
await task
except asyncio.CancelledError:
@@ -1397,7 +1396,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
data,
)
- async def _update_attrs_and_maybe_adapt_lights( # noqa: PLR0912
+ async def _update_attrs_and_maybe_adapt_lights(
self,
*,
context: Context,
@@ -1468,49 +1467,26 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
if not filtered_lights:
return
- adapt_brightness = self.adapt_brightness_switch.is_on
- adapt_color = self.adapt_color_switch.is_on
- assert isinstance(adapt_brightness, bool)
- assert isinstance(adapt_color, bool)
tasks: list[asyncio.Task[None]] = []
for light in filtered_lights:
- manually_controlled = (
- self._take_over_control
- and self.manager.is_manually_controlled(
- self,
- light,
- force,
- adapt_brightness,
- adapt_color,
- )
+ await self.manager.update_manually_controlled_from_untracked_change(
+ self,
+ light,
+ force,
+ context,
)
- if manually_controlled:
+
+ # Performance optimization: Skip adaptation task if all attributes are
+ # manually controlled and the task wouldn't actually do anything.
+ if self.manager.get_adaption_control_attributes(self, light).has_none():
_LOGGER.debug(
- "%s: '%s' is being manually controlled, stop adapting, context.id=%s.",
+ "%s: '%s' is being manually controlled, skip adaptation, context.id=%s.",
self._name,
light,
context.id,
)
continue
- significant_change = (
- self._take_over_control
- and self._detect_non_ha_changes
- and not force
- # Note: This call updates the state of the light
- # so it might suddenly be off.
- and await self.manager.significant_change(
- self,
- light,
- adapt_brightness,
- adapt_color,
- context,
- )
- )
- if significant_change:
- _fire_manual_control_event(self, light, context)
- continue
-
_LOGGER.debug(
"%s: Calling _adapt_light from _update_attrs_and_maybe_adapt_lights:"
" '%s' with transition %s and context.id=%s",
@@ -1553,7 +1529,7 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
entity_id,
event.context.id,
)
- self.manager.mark_as_manual_control(entity_id)
+ self.manager.set_manual_control_attributes(entity_id)
return
if (
@@ -1607,6 +1583,28 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
force=True,
)
+ def fire_manual_control_event(
+ self,
+ light: str,
+ context: Context,
+ ) -> None:
+ """Fire an event that 'light' is marked as manual_control."""
+ _LOGGER.debug(
+ "'adaptive_lighting.manual_control' event fired for %s for light %s",
+ self.entity_id,
+ light,
+ )
+ manual_attributes = self.manager.get_manual_control_attributes(light)
+ self.hass.bus.async_fire(
+ f"{DOMAIN}.manual_control",
+ {
+ ATTR_ENTITY_ID: light,
+ SWITCH_DOMAIN: self.entity_id,
+ CONF_MANUAL_CONTROL: manual_attributes,
+ },
+ context=context,
+ )
+
class SimpleSwitch(SwitchEntity, RestoreEntity):
"""Representation of a Adaptive Lighting switch."""
@@ -1711,7 +1709,7 @@ class AdaptiveLightingManager:
# Locks that prevent light adjusting when waiting for a light to 'turn_off'
self.turn_off_locks: dict[str, asyncio.Lock] = {}
# Tracks which lights are manually controlled
- self.manual_control: dict[str, bool] = {}
+ self.manual_control: dict[str, LightControlAttributes] = {}
# Track 'state_changed' events of self.lights resulting from this integration
self.our_last_state_on_change: dict[str, list[State]] = {}
# Track last 'service_data' to 'light.turn_on' resulting from this integration
@@ -1954,10 +1952,7 @@ class AdaptiveLightingManager:
# were skipped by us
return
- if (
- ATTR_EFFECT in service_data[CONF_PARAMS]
- or ATTR_FLASH in service_data[CONF_PARAMS]
- ):
+ if has_effect_attribute(service_data[CONF_PARAMS]):
return
_LOGGER.debug(
@@ -2204,10 +2199,26 @@ class AdaptiveLightingManager:
)
self.auto_reset_manual_control_times[light] = time
- def mark_as_manual_control(self, light: str) -> None:
- """Mark a light as manually controlled."""
- _LOGGER.debug("Marking '%s' as manually controlled.", light)
- self.manual_control[light] = True
+ def get_manual_control_attributes(
+ self,
+ light: str,
+ ) -> LightControlAttributes:
+ """Get the attributes for a light that are manually controlled."""
+ return self.manual_control.get(light, LightControlAttributes.NONE)
+
+ def set_manual_control_attributes(
+ self,
+ light: str,
+ attributes: LightControlAttributes = LightControlAttributes.ALL,
+ ) -> None:
+ """Mark attributes of a light as manually controlled."""
+ _LOGGER.debug(
+ "Light %s: Setting manual control attributes to %s (from %s).",
+ light,
+ attributes,
+ self.manual_control[light],
+ )
+ self.manual_control[light] = attributes
delay = self.auto_reset_manual_control_times.get(light)
async def reset() -> None:
@@ -2228,35 +2239,87 @@ class AdaptiveLightingManager:
transition=switch.initial_transition,
force=True,
)
- assert not self.manual_control[light]
+ assert self.manual_control[light] == LightControlAttributes.NONE
self._handle_timer(light, self.auto_reset_manual_control_timers, delay, reset)
+ def add_manual_control_attributes(
+ self,
+ light: str,
+ attributes: LightControlAttributes,
+ ) -> None:
+ """Add attributes to the manual control status of a light."""
+ current = self.get_manual_control_attributes(light)
+ _LOGGER.debug(
+ "Light %s: Adding manual control attributes %s (current: %s).",
+ light,
+ attributes,
+ current,
+ )
+ new = current | attributes
+ self.set_manual_control_attributes(light, new)
+
+ def get_adaption_control_attributes(
+ self,
+ switch: AdaptiveSwitch,
+ light: str,
+ ) -> LightControlAttributes:
+ """Get the attributes that should be adapted for a light.
+
+ Determines the attributes that should actually be adapted from the attributes
+ marked as manually controlled, the state of adaptation switches, and the adaptation
+ configuration.
+
+ Example 1: When no attributes are marked as manually controlled and all adaptation
+ switches are on, all attributes are returned.
+
+ Example 2: When no attributes are marked as manually controlled and the brightness
+ adaptation switch is off, only the color attribute is returned.
+
+ Example 3: When only brightness is marked as manually controlled, but the configuration
+ specifies to pause all adaptations on manual change, no attributes are returned so that
+ color is also not adapted.
+ """
+ denied_adaptation_attributes = self.get_manual_control_attributes(light)
+
+ if (
+ denied_adaptation_attributes.has_any()
+ and switch._take_over_control_mode == TakeOverControlMode.PAUSE_ALL
+ ):
+ # Extend to pausing all only if there is at least one manually controlled attribute
+ denied_adaptation_attributes = LightControlAttributes.ALL
+
+ enabled_adaptation_attributes = (
+ LightControlAttributes.BRIGHTNESS
+ if switch.adapt_brightness_switch.is_on
+ else LightControlAttributes.NONE
+ ) | (
+ LightControlAttributes.COLOR
+ if switch.adapt_color_switch.is_on
+ else LightControlAttributes.NONE
+ )
+
+ return (
+ LightControlAttributes.ALL
+ & ~denied_adaptation_attributes
+ & enabled_adaptation_attributes
+ )
+
def cancel_ongoing_adaptation_calls(
self,
light_id: str,
- which: Literal["color", "brightness", "both"] = "both",
) -> None:
"""Cancel ongoing adaptation service calls for a specific light entity."""
brightness_task = self.adaptation_tasks_brightness.get(light_id)
color_task = self.adaptation_tasks_color.get(light_id)
- if (
- which in ("both", "brightness")
- and brightness_task is not None
- and not brightness_task.done()
- ):
+ if brightness_task is not None and not brightness_task.done():
_LOGGER.debug(
"Cancelled ongoing brightness adaptation calls (%s) for '%s'",
brightness_task,
light_id,
)
brightness_task.cancel()
- if (
- which in ("both", "color")
- and color_task is not None
- and color_task is not brightness_task
- and not color_task.done()
- ):
+ if color_task is not None and not color_task.done():
_LOGGER.debug(
"Cancelled ongoing color adaptation calls (%s) for '%s'",
color_task,
@@ -2269,7 +2332,11 @@ class AdaptiveLightingManager:
"""Reset the 'manual_control' status of the lights."""
for light in lights:
if reset_manual_control:
- self.manual_control[light] = False
+ _LOGGER.debug(
+ "Light %s: Clearing manual control attributes.",
+ light,
+ )
+ self.manual_control[light] = LightControlAttributes.NONE
if timer := self.auto_reset_manual_control_timers.pop(light, None):
timer.cancel()
self.our_last_state_on_change.pop(light, None)
@@ -2319,11 +2386,29 @@ class AdaptiveLightingManager:
self.turn_off_event[eid] = event
self.reset(eid)
- def on(eid: str, event: Event) -> None:
+ async def on(eid: str, event: Event) -> None:
task = self.sleep_tasks.get(eid)
if task is not None:
task.cancel()
self.turn_on_event[eid] = event
+
+ try:
+ switch = _switch_with_lights(
+ self.hass,
+ [eid],
+ expand_light_groups=False,
+ )
+ await self.update_manually_controlled_from_event(
+ switch,
+ eid,
+ force=False,
+ )
+ except NoSwitchFoundError:
+ _LOGGER.debug(
+ "No switch found for entity_id='%s' in 'on' event listener",
+ eid,
+ )
+
timer = self.auto_reset_manual_control_timers.get(eid)
if (
timer is not None
@@ -2351,7 +2436,7 @@ class AdaptiveLightingManager:
event.context.id,
)
for eid in entity_ids:
- on(eid, event)
+ await on(eid, event)
elif service == SERVICE_TOGGLE:
_LOGGER.debug(
@@ -2366,7 +2451,7 @@ class AdaptiveLightingManager:
if state.state == STATE_ON: # is turning off
off(eid, event)
elif state.state == STATE_OFF: # is turning on
- on(eid, event)
+ await on(eid, event)
async def state_changed_event_listener(
self,
@@ -2489,68 +2574,95 @@ class AdaptiveLightingManager:
event,
)
- def is_manually_controlled(
+ async def update_manually_controlled_from_event(
self,
switch: AdaptiveSwitch,
light: str,
force: bool,
- adapt_brightness: bool,
- adapt_color: bool,
- ) -> bool:
- """Check if the light has been 'on' and is now manually controlled."""
- manual_control = self.manual_control.setdefault(light, False)
- if manual_control:
- # Manually controlled until light is turned on and off
- return True
+ ) -> None:
+ """Check if the light has been manually controlled by the latest turn on event."""
+ if not switch._take_over_control:
+ return
turn_on_event = self.turn_on_event.get(light)
+
if (
- turn_on_event is not None
- and not self.is_proactively_adapting(turn_on_event.context.id)
- and not is_our_context(turn_on_event.context)
- and not force
+ turn_on_event is None
+ or self.is_proactively_adapting(turn_on_event.context.id)
+ or is_our_context(turn_on_event.context)
+ or force
):
- keys = turn_on_event.data[ATTR_SERVICE_DATA].keys()
- if (
- (adapt_color and COLOR_ATTRS.intersection(keys))
- or (adapt_brightness and BRIGHTNESS_ATTRS.intersection(keys))
- or (ATTR_FLASH in keys)
- or (ATTR_EFFECT in keys)
- ):
- # Light was already on and 'light.turn_on' was not called by
- # the adaptive_lighting integration.
- manual_control = True
- _fire_manual_control_event(switch, light, turn_on_event.context)
- _LOGGER.debug(
- "'%s' was already on and 'light.turn_on' was not called by the"
- " adaptive_lighting integration (context.id='%s'), the Adaptive"
- " Lighting will stop adapting the light until the switch or the"
- " light turns off and then on again.",
- light,
- turn_on_event.context.id,
- )
- return manual_control
+ return
+
+ turn_on_attributes = get_light_control_attributes(
+ turn_on_event.data[ATTR_SERVICE_DATA],
+ )
+
+ if not turn_on_attributes:
+ return
+
+ # Light was already on and 'light.turn_on' was not called by
+ # the adaptive_lighting integration.
+ self.add_manual_control_attributes(light, turn_on_attributes)
+ switch.fire_manual_control_event(light, turn_on_event.context)
+ _LOGGER.debug(
+ "'%s' was already on and 'light.turn_on' was not called by the"
+ " adaptive_lighting integration (context.id='%s'), the Adaptive"
+ " Lighting will stop adapting %s of the light until the switch or the"
+ " light turns off and then on again.",
+ light,
+ turn_on_event.context.id,
+ turn_on_attributes,
+ )
+
+ async def update_manually_controlled_from_untracked_change(
+ self,
+ switch: AdaptiveSwitch,
+ light: str,
+ force: bool,
+ context: Context,
+ ) -> None:
+ """Check if the light has been manually controlled from an untracked change.
+
+ An untracked change is a change that has been made outsideof HA and is
+ therefore not visible through events.
+ """
+ if not switch._take_over_control or not switch._detect_non_ha_changes or force:
+ return
+
+ # Note: This call updates the state of the light
+ # so it might suddenly be off.
+ significantly_changed_attributes = await self.significant_change(
+ switch,
+ light,
+ context,
+ )
+
+ if not significantly_changed_attributes:
+ return
+
+ self.add_manual_control_attributes(
+ light,
+ significantly_changed_attributes,
+ )
+ switch.fire_manual_control_event(light, context)
async def significant_change(
self,
switch: AdaptiveSwitch,
light: str,
- adapt_brightness: bool,
- adapt_color: bool,
context: Context, # just for logging
- ) -> bool:
+ ) -> LightControlAttributes:
"""Has the light made a significant change since last update.
This method will detect changes that were made to the light without
- calling 'light.turn_on', so outside of Home Assistant. If a change is
- detected, we mark the light as 'manually controlled' until the light
- or switch is turned 'off' and 'on' again.
+ calling 'light.turn_on', so outside of Home Assistant.
"""
assert switch._detect_non_ha_changes
last_service_data = self.last_service_data.get(light)
if last_service_data is None:
- return False
+ return LightControlAttributes.NONE
# Update state and check for a manual change not done in HA.
# Ensure HASS is correctly updating your light's state with
# light.turn_on calls if any problems arise. This
@@ -2559,33 +2671,32 @@ class AdaptiveLightingManager:
refreshed_state = self.hass.states.get(light)
assert refreshed_state is not None
- changed = _attributes_have_changed(
+ changed_attributes = _attributes_have_changed(
old_attributes=last_service_data,
new_attributes=refreshed_state.attributes,
light=light,
- adapt_brightness=adapt_brightness,
- adapt_color=adapt_color,
context=context,
)
- if changed:
+ if changed_attributes:
_LOGGER.debug(
- "%s: State attributes of '%s' changed (%s) wrt 'last_service_data' (%s) (context.id=%s)",
+ "%s: State attributes %s of '%s' changed (%s) wrt 'last_service_data' (%s) (context.id=%s)",
+ switch._name,
+ changed_attributes,
+ light,
+ refreshed_state.attributes,
+ last_service_data,
+ context.id,
+ )
+ else:
+ _LOGGER.debug(
+ "%s: State attributes of '%s' did not change (%s) wrt 'last_service_data' (%s) (context.id=%s)",
switch._name,
light,
refreshed_state.attributes,
last_service_data,
context.id,
)
- return True
- _LOGGER.debug(
- "%s: State attributes of '%s' did not change (%s) wrt 'last_service_data' (%s) (context.id=%s)",
- switch._name,
- light,
- refreshed_state.attributes,
- last_service_data,
- context.id,
- )
- return False
+ return changed_attributes
def _off_to_on_state_event_is_from_turn_on(
self,
@@ -2745,12 +2856,12 @@ class AdaptiveLightingManager:
entity_id,
service_data,
)
- if any(
- attr in service_data
- for attr in COLOR_ATTRS | BRIGHTNESS_ATTRS | {ATTR_EFFECT}
- ):
- self.mark_as_manual_control(entity_id)
+ manual_control_attributes = get_light_control_attributes(service_data)
+
+ if manual_control_attributes:
+ self.set_manual_control_attributes(entity_id, manual_control_attributes)
return True
+
return False
diff --git a/custom_components/adaptive_lighting/translations/en.json b/custom_components/adaptive_lighting/translations/en.json
index fcb2ed8b..1e5a1fb9 100644
--- a/custom_components/adaptive_lighting/translations/en.json
+++ b/custom_components/adaptive_lighting/translations/en.json
@@ -53,8 +53,9 @@
"brightness_mode": "brightness_mode",
"brightness_mode_time_dark": "brightness_mode_time_dark",
"brightness_mode_time_light": "brightness_mode_time_light",
- "take_over_control": "take_over_control: Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒",
- "detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues.",
+ "take_over_control": "take_over_control: Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒",
+ "take_over_control_mode": "take_over_control_mode",
+ "detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"autoreset_control_seconds": "autoreset_control_seconds",
"only_once": "only_once: Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄",
"adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
@@ -86,6 +87,7 @@
"brightness_mode": "Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈",
"brightness_mode_time_dark": "(Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉",
"brightness_mode_time_light": "(Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉.",
+ "take_over_control_mode": "The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed.",
"autoreset_control_seconds": "Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️",
"send_split_delay": "Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️",
"adapt_delay": "Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️"
@@ -145,7 +147,7 @@
"name": "lights"
},
"manual_control": {
- "description": "Whether to add (\"true\") or remove (\"false\") the light from the \"manual_control\" list. 🔒",
+ "description": "Whether to add (\"true\") or remove (\"false\") all adapted attributes of the light from the \"manual_control\" list, or the name of an attribute for selective addition. 🔒",
"name": "manual_control"
}
}
@@ -251,11 +253,15 @@
"name": "min_sunset_time"
},
"take_over_control": {
- "description": "Disable Adaptive Lighting if another source calls `light.turn_on` while lights are on and being adapted. Note that this calls `homeassistant.update_entity` every `interval`! 🔒",
+ "description": "Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒",
"name": "take_over_control"
},
+ "take_over_control_mode": {
+ "description": "The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed.",
+ "name": "take_over_control_mode"
+ },
"detect_non_ha_changes": {
- "description": "Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable this feature if you encounter such issues.",
+ "description": "Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"name": "detect_non_ha_changes"
},
"transition": {
diff --git a/scripts/develop b/scripts/develop
old mode 100644
new mode 100755
diff --git a/scripts/lint b/scripts/lint
old mode 100644
new mode 100755
diff --git a/tests/test_adaptation_utils.py b/tests/test_adaptation_utils.py
index 10774fa2..6caf335c 100644
--- a/tests/test_adaptation_utils.py
+++ b/tests/test_adaptation_utils.py
@@ -4,16 +4,26 @@ from unittest.mock import Mock
import pytest
from homeassistant.components.adaptive_lighting.adaptation_utils import (
+ LightControlAttributes,
ServiceData,
_create_service_call_data_iterator,
_has_relevant_service_data_attributes,
_remove_redundant_attributes,
_split_service_call_data,
+ get_light_control_attributes,
+ has_brightness_attribute,
+ has_color_attribute,
+ has_effect_attribute,
+ manual_control_event_attribute_to_flags,
prepare_adaptation_data,
)
from homeassistant.components.light import (
ATTR_BRIGHTNESS,
+ ATTR_BRIGHTNESS_PCT,
ATTR_COLOR_TEMP_KELVIN,
+ ATTR_EFFECT,
+ ATTR_FLASH,
+ ATTR_HS_COLOR,
ATTR_TRANSITION,
)
from homeassistant.const import ATTR_ENTITY_ID, STATE_ON
@@ -338,3 +348,135 @@ def fixture_hass_states_mock():
hass = Mock()
hass.states.get.return_value = Mock(attributes={ATTR_BRIGHTNESS: 10})
return hass
+
+
+@pytest.mark.parametrize(
+ ("attribute", "expected_str", "has_any", "has_none", "has_all"),
+ [
+ (LightControlAttributes.NONE, "NONE", False, True, False),
+ (LightControlAttributes.BRIGHTNESS, "BRIGHTNESS", True, False, False),
+ (LightControlAttributes.COLOR, "COLOR", True, False, False),
+ (
+ LightControlAttributes.BRIGHTNESS | LightControlAttributes.COLOR,
+ "BRIGHTNESS|COLOR",
+ True,
+ False,
+ True,
+ ),
+ (
+ LightControlAttributes.ALL,
+ "BRIGHTNESS|COLOR",
+ True,
+ False,
+ True,
+ ),
+ ],
+)
+def test_light_control_attribute_flags(
+ attribute: LightControlAttributes,
+ expected_str: str,
+ has_any: bool,
+ has_none: bool,
+ has_all: bool,
+):
+ """Test helper methods and string conversion for the light attribute flag."""
+ assert str(attribute) == expected_str
+ assert attribute.has_any() is has_any
+ assert attribute.has_none() is has_none
+ assert attribute.has_all() is has_all
+
+
+@pytest.mark.parametrize(
+ ("manual_control_attribute", "expected_flag"),
+ [
+ (True, LightControlAttributes.ALL),
+ (False, LightControlAttributes.NONE),
+ ("brightness", LightControlAttributes.BRIGHTNESS),
+ ("color", LightControlAttributes.COLOR),
+ ("unsupported", LightControlAttributes.NONE),
+ ],
+)
+def test_manual_control_event_attribute_to_flags(
+ manual_control_attribute: bool | str,
+ expected_flag: LightControlAttributes,
+):
+ """Test mapping of manual control events to attribute flags."""
+ assert (
+ manual_control_event_attribute_to_flags(manual_control_attribute)
+ == expected_flag
+ )
+
+
+@pytest.mark.parametrize(
+ ("service_data", "expected"),
+ [
+ ({ATTR_BRIGHTNESS: 125}, True),
+ ({ATTR_BRIGHTNESS_PCT: 50}, True),
+ ({ATTR_BRIGHTNESS_PCT: 50, ATTR_COLOR_TEMP_KELVIN: 3500}, True),
+ ({ATTR_BRIGHTNESS_PCT: 50, "unknown": "foo"}, True),
+ ({ATTR_COLOR_TEMP_KELVIN: 3500}, False),
+ ({}, False),
+ ],
+)
+def test_has_brightness_attribute(service_data: ServiceData, expected: bool):
+ """Test detection of brightness attributes in service data."""
+ assert has_brightness_attribute(service_data) is expected
+
+
+@pytest.mark.parametrize(
+ ("service_data", "expected"),
+ [
+ ({ATTR_HS_COLOR: (10, 20)}, True),
+ ({ATTR_COLOR_TEMP_KELVIN: 5000}, True),
+ ({ATTR_COLOR_TEMP_KELVIN: 5000, ATTR_BRIGHTNESS: 125}, True),
+ ({ATTR_COLOR_TEMP_KELVIN: 5000, "unknown": "foo"}, True),
+ ({ATTR_BRIGHTNESS: 125}, False),
+ ({}, False),
+ ],
+)
+def test_has_color_attribute(service_data: ServiceData, expected: bool):
+ """Test detection of color attributes in service data."""
+ assert has_color_attribute(service_data) is expected
+
+
+@pytest.mark.parametrize(
+ ("service_data", "expected"),
+ [
+ ({ATTR_EFFECT: "colorloop"}, True),
+ ({ATTR_FLASH: "short"}, True),
+ ({ATTR_EFFECT: "colorloop", ATTR_FLASH: "short"}, True),
+ ({ATTR_EFFECT: "colorloop", "unknown": "foo"}, True),
+ ({}, False),
+ ],
+)
+def test_has_effect_attribute(service_data: ServiceData, expected: bool):
+ """Test detection of effect attributes in service data."""
+ assert has_effect_attribute(service_data) is expected
+
+
+@pytest.mark.parametrize(
+ ("service_data", "expected_flags"),
+ [
+ ({ATTR_BRIGHTNESS: 1}, LightControlAttributes.BRIGHTNESS),
+ ({ATTR_HS_COLOR: (1, 2)}, LightControlAttributes.COLOR),
+ (
+ {ATTR_BRIGHTNESS: 1, ATTR_HS_COLOR: (1, 2)},
+ LightControlAttributes.BRIGHTNESS | LightControlAttributes.COLOR,
+ ),
+ (
+ {ATTR_EFFECT: "colorloop"},
+ LightControlAttributes.BRIGHTNESS | LightControlAttributes.COLOR,
+ ),
+ (
+ {ATTR_FLASH: "short"},
+ LightControlAttributes.BRIGHTNESS | LightControlAttributes.COLOR,
+ ),
+ ({}, LightControlAttributes.NONE),
+ ],
+)
+def test_get_light_control_attributes(
+ service_data: ServiceData,
+ expected_flags: LightControlAttributes,
+):
+ """Test determination of light control attributes."""
+ assert get_light_control_attributes(service_data) == expected_flags
diff --git a/tests/test_switch.py b/tests/test_switch.py
index 372fdd66..3810bdbe 100644
--- a/tests/test_switch.py
+++ b/tests/test_switch.py
@@ -18,6 +18,7 @@ import voluptuous.error
from flaky import flaky
from homeassistant.components.adaptive_lighting.adaptation_utils import (
AdaptationData,
+ LightControlAttributes,
_create_service_call_data_iterator,
)
from homeassistant.components.adaptive_lighting.color_and_brightness import (
@@ -60,6 +61,7 @@ from homeassistant.components.adaptive_lighting.const import (
SERVICE_SET_MANUAL_CONTROL,
SLEEP_MODE_SWITCH,
UNDO_UPDATE_LISTENER,
+ TakeOverControlMode,
)
from homeassistant.components.adaptive_lighting.switch import (
CONF_INTERCEPT,
@@ -690,7 +692,7 @@ async def test_manual_control(
# Call light.turn_on for ENTITY_LIGHT_1
await turn_light(True, brightness=increased_brightness())
# Check that ENTITY_LIGHT_1 is manually controlled
- assert manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
# Test adaptive_lighting.set_manual_control
await change_manual_control(False)
# Check that ENTITY_LIGHT_1 is not manually controlled
@@ -703,11 +705,9 @@ async def test_manual_control(
assert not manual_control[ENTITY_LIGHT_1], manual_control
await turn_light(True, brightness=increased_brightness())
assert hass.states.get(ENTITY_LIGHT_1).state == STATE_ON
- if adapt_only_on_bare_turn_on:
- # Marks as manually controlled beacuse we turned it on with brightness
- assert manual_control[ENTITY_LIGHT_1], manual_control
- else:
- assert not manual_control[ENTITY_LIGHT_1], manual_control
+ assert (
+ manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
+ ), manual_control
# Check that toggling (sleep mode) switch resets manual control
for entity_id in [ENTITY_SWITCH, ENTITY_SLEEP_MODE_SWITCH]:
@@ -722,7 +722,7 @@ async def test_manual_control(
await turn_light(False)
await change_manual_control(True)
await turn_light(True)
- assert manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.ALL
# Check that when 'adapt_brightness' is off, changing the brightness
# doesn't mark it as manually controlled but changing color_temp
@@ -732,7 +732,7 @@ async def test_manual_control(
assert not manual_control[ENTITY_LIGHT_1]
await switch.adapt_brightness_switch.async_turn_off()
await turn_light(True, brightness=increased_brightness())
- assert not manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
mired_range = (light.min_color_temp_kelvin, light.max_color_temp_kelvin)
kelvin_range = (
color_temperature_mired_to_kelvin(mired_range[1]),
@@ -743,7 +743,7 @@ async def test_manual_control(
True,
color_temp_kelvin=(light._attr_color_temp + 100) % ptp_kelvin,
)
- assert manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.ALL
await switch.adapt_brightness_switch.async_turn_on() # turn on again
# Check that when 'adapt_color' is off, changing the color
@@ -753,10 +753,10 @@ async def test_manual_control(
await turn_light(True)
assert not manual_control[ENTITY_LIGHT_1]
await switch.adapt_color_switch.async_turn_off()
- await turn_light(True, color_temp=increased_color_temp())
- assert not manual_control[ENTITY_LIGHT_1]
+ await turn_light(True, color_temp_kelvin=increased_color_temp())
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.COLOR
await turn_light(True, brightness=increased_brightness())
- assert manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.ALL
# Check that when 'adapt_color' adapt_brightness are both off
# nothing marks it as manually controlled
@@ -765,14 +765,14 @@ async def test_manual_control(
await switch.adapt_color_switch.async_turn_off()
await switch.adapt_brightness_switch.async_turn_off()
assert not manual_control[ENTITY_LIGHT_1]
- await turn_light(True, color_temp=increased_color_temp())
+ await turn_light(True, color_temp_kelvin=increased_color_temp())
await turn_light(True, brightness=increased_brightness())
await turn_light(
True,
- color_temp=increased_color_temp(),
+ color_temp_kelvin=increased_color_temp(),
brightness=increased_brightness(),
)
- assert not manual_control[ENTITY_LIGHT_1]
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.ALL
# Turn switches on again
await switch.adapt_color_switch.async_turn_on()
await switch.adapt_brightness_switch.async_turn_on()
@@ -800,6 +800,22 @@ async def test_manual_control(
assert hass.states.get(ENTITY_LIGHT_1).state == STATE_ON
assert not manual_control[ENTITY_LIGHT_1]
+ # Check that manual control `True` sets all attributes
+ await change_manual_control(False)
+ assert not manual_control[ENTITY_LIGHT_1]
+ await change_manual_control(True)
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.ALL
+
+ # Check that manual control `False` unsets all attributes
+ await change_manual_control(False)
+ assert not manual_control[ENTITY_LIGHT_1]
+
+ # Check that manual control attributes can be selectively set
+ await change_manual_control("brightness")
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
+ await change_manual_control("color")
+ assert manual_control[ENTITY_LIGHT_1] == LightControlAttributes.COLOR
+
@flaky(max_runs=3, min_passes=1)
async def test_auto_reset_manual_control(hass):
@@ -833,7 +849,7 @@ async def test_auto_reset_manual_control(hass):
_LOGGER.debug("Start test auto reset manual control")
await turn_light(True, brightness=1)
await turn_light(True, brightness=10)
- assert manual_control[light.entity_id]
+ assert manual_control[light.entity_id] == LightControlAttributes.BRIGHTNESS
assert (
switch.extra_state_attributes["autoreset_time_remaining"][light.entity_id] > 0
)
@@ -856,6 +872,143 @@ async def test_auto_reset_manual_control(hass):
assert not manual_control[light.entity_id]
+async def test_adaptation_attribute_selection(hass):
+ """Test the 'manual control' tracking."""
+ switch, (light, *_) = await setup_lights_and_switch(hass)
+
+ # Assert default settings
+ assert switch._take_over_control
+ assert switch._take_over_control_mode == TakeOverControlMode.PAUSE_ALL
+
+ # Check that PAUSE_ALL leads to adaptation of all attributes when none are manually controlled
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.ALL
+ )
+
+ # Check that PAUSE_ALL leads to no adaptation when a single attribute is manually controlled
+ switch.manager.add_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.BRIGHTNESS,
+ )
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.BRIGHTNESS
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+
+ # Check that PAUSE_ALL leads to no adaptation when all attributes are manually controlled
+ switch.manager.add_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.COLOR,
+ )
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.ALL
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+
+ switch._take_over_control_mode = TakeOverControlMode.PAUSE_CHANGED
+ switch.manager.set_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.NONE,
+ )
+
+ # Check that PAUSE_CHANGED leads to adaptation of all attributes when none are manually controlled
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.ALL
+ )
+
+ # Check that PAUSE_CHANGED leads to adaptation of the remaining non-manual attributes
+ switch.manager.add_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.BRIGHTNESS,
+ )
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.BRIGHTNESS
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.COLOR
+ )
+
+ # Check that PAUSE_CHANGED leads to no adaptation when all attributes are manually controlled
+ switch.manager.add_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.COLOR,
+ )
+ assert (
+ switch.manager.get_manual_control_attributes(ENTITY_LIGHT_1)
+ == LightControlAttributes.ALL
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+
+ await switch.adapt_brightness_switch.async_turn_off()
+
+ # Check that with adapt_brightness off and PAUSE_CHANGED, only color is adapted when none are manually controlled
+ switch._take_over_control_mode = TakeOverControlMode.PAUSE_CHANGED
+ switch.manager.set_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.NONE,
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.COLOR
+ )
+
+ # Check that with adapt_brightness off and PAUSE_CHANGED, nothing is adapted when color is manually controlled
+ switch._take_over_control_mode = TakeOverControlMode.PAUSE_CHANGED
+ switch.manager.set_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.COLOR,
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+
+ # Check that with adapt_brightness off and PAUSE_ALL, only color is adapted when none are manually controlled
+ switch._take_over_control_mode = TakeOverControlMode.PAUSE_ALL
+ switch.manager.set_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.NONE,
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.COLOR
+ )
+
+ # Check that with adapt_brightness off and PAUSE_ALL, nothing is adapted when color is manually controlled
+ switch._take_over_control_mode = TakeOverControlMode.PAUSE_ALL
+ switch.manager.set_manual_control_attributes(
+ ENTITY_LIGHT_1,
+ LightControlAttributes.COLOR,
+ )
+ assert (
+ switch.manager.get_adaption_control_attributes(switch, ENTITY_LIGHT_1)
+ == LightControlAttributes.NONE
+ )
+
+
async def test_apply_service(hass):
"""Test adaptive_lighting.apply service."""
switch, (_, _, light) = await setup_lights_and_switch(hass)
@@ -994,8 +1147,6 @@ def test_attributes_have_changed():
}
kwargs = {
"light": "light.test",
- "adapt_brightness": True,
- "adapt_color": True,
"context": Context(),
}
assert not _attributes_have_changed(
@@ -1229,9 +1380,15 @@ async def test_state_change_handlers(hass):
await turn_light(True, brightness=40)
await turn_light(True, brightness=20)
await update(force=False)
- assert switch.manager.manual_control[ENTITY_LIGHT_1]
+ assert (
+ switch.manager.manual_control[ENTITY_LIGHT_1]
+ == LightControlAttributes.BRIGHTNESS
+ )
await update(force=True)
- assert switch.manager.manual_control[ENTITY_LIGHT_1]
+ assert (
+ switch.manager.manual_control[ENTITY_LIGHT_1]
+ == LightControlAttributes.BRIGHTNESS
+ )
# turn light off then on should reset manual control.
await turn_light(False)
@@ -1245,7 +1402,10 @@ async def test_state_change_handlers(hass):
await update(force=False)
assert switch.manager.last_service_data.get(ENTITY_LIGHT_1) is not None
assert switch.manager.our_last_state_on_change.get(ENTITY_LIGHT_1) is not None
- assert switch.manager.manual_control[ENTITY_LIGHT_1]
+ assert (
+ switch.manager.manual_control[ENTITY_LIGHT_1]
+ == LightControlAttributes.BRIGHTNESS
+ )
def test_is_our_context():
@@ -1345,7 +1505,7 @@ async def test_separate_turn_on_commands(hass, separate_turn_on_commands):
# check whether the brightness and color_temp change.
context = switch.create_context("test") # needs to be passed to update method
brightness = light.brightness
- color_temp = light.color_temp
+ color_temp = light.color_temp_kelvin
await switch.sleep_mode_switch.async_turn_on()
await switch._update_attrs_and_maybe_adapt_lights(context=context)
await hass.async_block_till_done()
@@ -1353,7 +1513,7 @@ async def test_separate_turn_on_commands(hass, separate_turn_on_commands):
# TODO: figure out why `light.brightness` is not updating
attrs = hass.states.get(light.entity_id).attributes
sleep_brightness = attrs["brightness"]
- sleep_color_temp = attrs["color_temp"]
+ sleep_color_temp = attrs["color_temp_kelvin"]
assert sleep_brightness != brightness
assert sleep_color_temp != color_temp
@@ -1364,7 +1524,7 @@ async def test_separate_turn_on_commands(hass, separate_turn_on_commands):
attrs = hass.states.get(light.entity_id).attributes
brightness = attrs["brightness"]
- color_temp = attrs["color_temp"]
+ color_temp = attrs["color_temp_kelvin"]
assert sleep_brightness != brightness
assert sleep_color_temp != color_temp
@@ -1538,7 +1698,7 @@ async def test_cancellable_service_calls_task(hass):
_create_service_call_data_iterator(hass, [service_data], False),
force=False,
max_length=1,
- which="both",
+ attributes=LightControlAttributes.ALL,
)
await switch.execute_cancellable_adaptation_calls(adaptation_data)
@@ -1948,7 +2108,7 @@ async def test_two_switches_for_single_light(hass):
assert light1.is_on
await turn_light(True, brightness=increased_brightness())
- await turn_light(True, color_temp=increased_color_temp())
+ await turn_light(True, color_temp_kelvin=increased_color_temp())
attrs = hass.states.get(light1.entity_id).attributes
before_brightness = attrs[ATTR_BRIGHTNESS]
@@ -2381,12 +2541,9 @@ def test_attributes_have_changed_light_mode_switch():
context = Context()
base_kwargs = {
"light": "light.test",
- "adapt_brightness": True,
"context": context,
}
-
- # Test 1: adapt_color=True - all mode changes should be detected
- kwargs_adapt_color = {**base_kwargs, "adapt_color": True}
+ kwargs_adapt_color = base_kwargs
# color_temp → RGB
assert _attributes_have_changed(
@@ -2449,21 +2606,6 @@ def test_attributes_have_changed_light_mode_switch():
**kwargs_adapt_color,
), "Same XY should not be detected as change"
- # Test 2: adapt_color=False - mode changes should NOT be detected
- kwargs_no_adapt = {**base_kwargs, "adapt_color": False}
-
- assert not _attributes_have_changed(
- old_attributes={ATTR_BRIGHTNESS: 128, ATTR_COLOR_TEMP_KELVIN: 4000},
- new_attributes={ATTR_BRIGHTNESS: 128, ATTR_RGB_COLOR: (255, 0, 0)},
- **kwargs_no_adapt,
- ), "Mode change should not be detected when adapt_color=False"
-
- assert not _attributes_have_changed(
- old_attributes={ATTR_BRIGHTNESS: 128, ATTR_RGB_COLOR: (255, 0, 0)},
- new_attributes={ATTR_BRIGHTNESS: 128, ATTR_COLOR_TEMP_KELVIN: 4000},
- **kwargs_no_adapt,
- ), "RGB → color_temp should not be detected when adapt_color=False"
-
# Regression tests for bugs found in PR #1348 by @protyposis
# See: https://github.com/basnijholt/adaptive-lighting/pull/1348
From f95093e1dc5d8ae91551b2ba7451cd5df147eeb6 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Mon, 5 Jan 2026 12:43:07 -0800
Subject: [PATCH 161/301] Bump to v1.30.0
---
custom_components/adaptive_lighting/manifest.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/manifest.json b/custom_components/adaptive_lighting/manifest.json
index 97d79950..27762b19 100644
--- a/custom_components/adaptive_lighting/manifest.json
+++ b/custom_components/adaptive_lighting/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "calculated",
"issue_tracker": "https://github.com/basnijholt/adaptive-lighting/issues",
"requirements": ["ulid-transform"],
- "version": "1.29.0"
+ "version": "1.30.0"
}
From 49f9da14fe29cd0d8f5c0a812e7460e7baa91519 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Sun, 11 Jan 2026 21:57:52 +0100
Subject: [PATCH 162/301] docs: clarify Docker test setup requirements (#1383)
---
Dockerfile | 6 ++++--
tests/README.md | 18 +++++++++++++++++-
2 files changed, 21 insertions(+), 3 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index c4d9c695..353a0748 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,8 +1,10 @@
# See tests/README.md for instructions on how to run the tests.
# tl;dr:
-# Run the following command in the adaptive-lighting repo folder to run the tests:
-# docker run -v $(pwd):/app basnijholt/adaptive-lighting:latest
+# 1. Clone HA core into ./core: git clone --depth 1 https://github.com/home-assistant/core.git core
+# 2. Setup symlinks: ./scripts/setup-symlinks
+# 3. Run tests (mount entire repo, not individual dirs, or symlinks break):
+# docker run -v $(pwd):/app basnijholt/adaptive-lighting:latest
# Optionally build the image yourself with:
# docker build -t basnijholt/adaptive-lighting:latest .
diff --git a/tests/README.md b/tests/README.md
index a5b60839..3ccec21c 100644
--- a/tests/README.md
+++ b/tests/README.md
@@ -3,7 +3,23 @@
To run the tests, check out the [CI configuration](../.github/workflows/pytest.yml) to see how they are executed in the CI pipeline.
Alternatively, you can use the provided Docker image to run the tests locally or run them with VS Code directly in the dev container.
-To run the tests using the Docker image, navigate to the `adaptive-lighting` repo folder and execute the following command:
+## Prerequisites
+
+Before running tests with Docker, you need a local Home Assistant core checkout with symlinks:
+
+```bash
+# Clone HA core (one-time setup)
+git clone --depth 1 https://github.com/home-assistant/core.git core
+
+# Setup symlinks (one-time setup)
+./scripts/setup-symlinks
+```
+
+## Running tests with Docker
+
+Navigate to the `adaptive-lighting` repo folder and execute the following command.
+
+**Important:** Mount the entire repo (`-v $(pwd):/app`), not individual directories, or the symlinks will break.
Linux / MacOS / Windows PowerShell:
```bash
From e61a0186164aee57bf40baa7ed0e0d21a713f1d1 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Mon, 12 Jan 2026 13:40:55 +0100
Subject: [PATCH 163/301] Fix regression: lights not adapting when turned on by
automation (#1380)
## Summary
- Fixes regression in v1.30.0 where lights turned on by automations were incorrectly marked as "manually controlled"
- Makes `adapt_only_on_bare_turn_on` respect individual attribute tracking from #1356
## Root Cause
PR #1356 added a call to `update_manually_controlled_from_event()` in the `turn_on_off_event_listener.on()` handler for ALL `light.turn_on` events, including when turning a light on from OFF state.
When an automation turns on a light with brightness/color attributes, this incorrectly marked the light as "manually controlled", preventing Adaptive Lighting from adapting it.
## Fix
1. Only call `update_manually_controlled_from_event()` when the light was **already ON** before the turn_on event. Turning on from OFF is handled by `_respond_to_off_to_on_event()`.
2. Make `adapt_only_on_bare_turn_on` respect `take_over_control_mode`:
- With `PAUSE_CHANGED`: Only pause adaptation of specified attributes, continue adapting unspecified ones
- With `PAUSE_ALL`: Pause all adaptation (existing behavior)
## Expected Behavior After Fix
| Scenario | `adapt_only_on_bare_turn_on` | `take_over_control_mode` | Result |
|----------|------------------------------|--------------------------|--------|
| Turn on from OFF with brightness | `false` | Either | NOT manually controlled |
| Turn on from OFF with brightness | `true` | `PAUSE_ALL` | All adaptation paused |
| Turn on from OFF with brightness | `true` | `PAUSE_CHANGED` | Only brightness paused, color adapts |
| Turn on from OFF without attributes | Either | Either | NOT manually controlled |
| Change brightness while ON | Either | Either | Brightness manually controlled |
## Test plan
- [x] Turn on light via automation with brightness/color (`adapt_only_on_bare_turn_on=false`) - should adapt
- [x] Turn on light via scene (`adapt_only_on_bare_turn_on=true`, `PAUSE_ALL`) - should pause all adaptation
- [x] Turn on light with brightness only (`adapt_only_on_bare_turn_on=true`, `PAUSE_CHANGED`) - should adapt color
- [x] Both intercept=True and intercept=False paths tested for consistency
- [x] CI tests pass
Fixes #1378
Co-authored-by: Mario Guggenberger
---
README.md | 82 ++++-----
custom_components/adaptive_lighting/const.py | 2 +-
.../adaptive_lighting/strings.json | 2 +-
custom_components/adaptive_lighting/switch.py | 52 +++---
.../adaptive_lighting/translations/en.json | 2 +-
tests/test_switch.py | 168 ++++++++++++++++++
6 files changed, 244 insertions(+), 64 deletions(-)
diff --git a/README.md b/README.md
index 6f5a3715..7a7ee9d9 100644
--- a/README.md
+++ b/README.md
@@ -105,47 +105,47 @@ The YAML and frontend configuration methods support all of the options listed be
-| Variable name | Description | Default | Type |
-|:-------------------------------|:-------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:----------------------------------------|
-| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
-| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
-| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
-| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
-| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
-| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
-| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
-| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
-| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
-| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
-| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
-| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
-| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
-| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
-| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
-| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
-| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
-| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
-| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
-| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
-| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
-| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
-| `brightness_mode_time_dark` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉 | `900` | `int` |
-| `brightness_mode_time_light` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉. | `3600` | `int` |
-| `take_over_control` | Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒 | `True` | `bool` |
-| `take_over_control_mode` | The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed. | `pause_all` | one of `['pause_all', 'pause_changed']` |
-| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues. | `False` | `bool` |
-| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
-| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
-| `adapt_only_on_bare_turn_on` | When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️ | `False` | `bool` |
-| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
-| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
-| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
-| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
-| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
-| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
-| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
+| Variable name | Description | Default | Type |
+|:-------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:----------------------------------------|
+| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
+| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
+| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
+| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
+| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
+| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
+| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
+| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
+| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
+| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
+| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
+| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
+| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
+| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
+| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
+| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
+| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
+| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
+| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
+| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
+| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
+| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
+| `brightness_mode_time_dark` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉 | `900` | `int` |
+| `brightness_mode_time_light` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉. | `3600` | `int` |
+| `take_over_control` | Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒 | `True` | `bool` |
+| `take_over_control_mode` | The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed. | `pause_all` | one of `['pause_all', 'pause_changed']` |
+| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues. | `False` | `bool` |
+| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
+| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
+| `adapt_only_on_bare_turn_on` | When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene and marks the light as manually controlled. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️ | `False` | `bool` |
+| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
+| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
+| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
+| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
+| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
+| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
+| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
diff --git a/custom_components/adaptive_lighting/const.py b/custom_components/adaptive_lighting/const.py
index 37a9ba8b..502318f0 100644
--- a/custom_components/adaptive_lighting/const.py
+++ b/custom_components/adaptive_lighting/const.py
@@ -95,7 +95,7 @@ CONF_ADAPT_ONLY_ON_BARE_TURN_ON, DEFAULT_ADAPT_ONLY_ON_BARE_TURN_ON = (
DOCS[CONF_ADAPT_ONLY_ON_BARE_TURN_ON] = (
"When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is "
"invoked without specifying color or brightness. ❌🌈 "
- "This e.g., prevents adaptation when activating a scene. "
+ "This e.g., prevents adaptation when activating a scene and marks the light as manually controlled. "
"If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. "
"Needs `take_over_control` enabled. 🕵️"
)
diff --git a/custom_components/adaptive_lighting/strings.json b/custom_components/adaptive_lighting/strings.json
index 6985a94e..4b18ea06 100644
--- a/custom_components/adaptive_lighting/strings.json
+++ b/custom_components/adaptive_lighting/strings.json
@@ -57,7 +57,7 @@
"detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"autoreset_control_seconds": "autoreset_control_seconds",
"only_once": "only_once: Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄",
- "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene and marks the light as manually controlled. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
"separate_turn_on_commands": "separate_turn_on_commands: Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀",
"send_split_delay": "send_split_delay",
"adapt_delay": "adapt_delay",
diff --git a/custom_components/adaptive_lighting/switch.py b/custom_components/adaptive_lighting/switch.py
index 3ded833e..3923e056 100644
--- a/custom_components/adaptive_lighting/switch.py
+++ b/custom_components/adaptive_lighting/switch.py
@@ -1545,13 +1545,13 @@ class AdaptiveSwitch(SwitchEntity, RestoreEntity):
service_data,
):
_LOGGER.debug(
- "Skipping responding to 'off' → 'on' event for '%s' with context.id='%s' because"
- " we only adapt on bare `light.turn_on` events and not on service_data: '%s'",
+ "Marked attributes from service_data as manually controlled for '%s' "
+ "with context.id='%s'. Continuing to adapt remaining attributes. "
+ "service_data: '%s'",
entity_id,
event.context.id,
service_data,
)
- return
if self._adapt_delay > 0:
await asyncio.sleep(self._adapt_delay)
@@ -2216,7 +2216,7 @@ class AdaptiveLightingManager:
"Light %s: Setting manual control attributes to %s (from %s).",
light,
attributes,
- self.manual_control[light],
+ self.get_manual_control_attributes(light),
)
self.manual_control[light] = attributes
delay = self.auto_reset_manual_control_times.get(light)
@@ -2392,22 +2392,28 @@ class AdaptiveLightingManager:
task.cancel()
self.turn_on_event[eid] = event
- try:
- switch = _switch_with_lights(
- self.hass,
- [eid],
- expand_light_groups=False,
- )
- await self.update_manually_controlled_from_event(
- switch,
- eid,
- force=False,
- )
- except NoSwitchFoundError:
- _LOGGER.debug(
- "No switch found for entity_id='%s' in 'on' event listener",
- eid,
- )
+ # Only check for manual control via this path if the light was already ON.
+ # Turning on from OFF is handled separately in _respond_to_off_to_on_event,
+ # where adapt_only_on_bare_turn_on can mark lights as manually controlled.
+ # Fix for https://github.com/basnijholt/adaptive-lighting/issues/1378
+ state = self.hass.states.get(eid)
+ if state is not None and state.state == STATE_ON:
+ try:
+ switch = _switch_with_lights(
+ self.hass,
+ [eid],
+ expand_light_groups=False,
+ )
+ await self.update_manually_controlled_from_event(
+ switch,
+ eid,
+ force=False,
+ )
+ except NoSwitchFoundError:
+ _LOGGER.debug(
+ "No switch found for entity_id='%s' in 'on' event listener",
+ eid,
+ )
timer = self.auto_reset_manual_control_timers.get(eid)
if (
@@ -2851,6 +2857,12 @@ class AdaptiveLightingManager:
entity_id: str,
service_data: ServiceData,
) -> bool:
+ """Mark light as manually controlled if turn_on call has brightness/color attributes.
+
+ This is used by adapt_only_on_bare_turn_on to mark lights as manually controlled
+ when they are turned on with specific attributes (e.g., from a scene).
+ This ensures scenes persist and AL doesn't override them.
+ """
_LOGGER.debug(
"_mark_manual_control_if_non_bare_turn_on: entity_id='%s', service_data='%s'",
entity_id,
diff --git a/custom_components/adaptive_lighting/translations/en.json b/custom_components/adaptive_lighting/translations/en.json
index 1e5a1fb9..e39898fd 100644
--- a/custom_components/adaptive_lighting/translations/en.json
+++ b/custom_components/adaptive_lighting/translations/en.json
@@ -58,7 +58,7 @@
"detect_non_ha_changes": "detect_non_ha_changes: Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues.",
"autoreset_control_seconds": "autoreset_control_seconds",
"only_once": "only_once: Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄",
- "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
+ "adapt_only_on_bare_turn_on": "adapt_only_on_bare_turn_on: When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene and marks the light as manually controlled. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️",
"separate_turn_on_commands": "separate_turn_on_commands: Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀",
"send_split_delay": "send_split_delay",
"adapt_delay": "adapt_delay",
diff --git a/tests/test_switch.py b/tests/test_switch.py
index 3810bdbe..5ba3cb60 100644
--- a/tests/test_switch.py
+++ b/tests/test_switch.py
@@ -47,6 +47,7 @@ from homeassistant.components.adaptive_lighting.const import (
CONF_SUNRISE_TIME,
CONF_SUNSET_TIME,
CONF_TAKE_OVER_CONTROL,
+ CONF_TAKE_OVER_CONTROL_MODE,
CONF_TRANSITION,
CONF_TURN_ON_LIGHTS,
CONF_USE_DEFAULTS,
@@ -705,6 +706,21 @@ async def test_manual_control(
assert not manual_control[ENTITY_LIGHT_1], manual_control
await turn_light(True, brightness=increased_brightness())
assert hass.states.get(ENTITY_LIGHT_1).state == STATE_ON
+ # Turning on from OFF with brightness:
+ # - With adapt_only_on_bare_turn_on=True: SHOULD mark as manually controlled (to preserve scenes)
+ # - With adapt_only_on_bare_turn_on=False: should NOT mark (fix for issue #1378)
+ if adapt_only_on_bare_turn_on:
+ assert (
+ manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
+ ), manual_control
+ else:
+ assert not manual_control[ENTITY_LIGHT_1], manual_control
+ # Reset for next test
+ await turn_light(False)
+ await turn_light(True)
+ assert not manual_control[ENTITY_LIGHT_1], manual_control
+ # Now change brightness while ON - this should always be manual control
+ await turn_light(True, brightness=increased_brightness())
assert (
manual_control[ENTITY_LIGHT_1] == LightControlAttributes.BRIGHTNESS
), manual_control
@@ -2746,3 +2762,155 @@ async def test_skipped_lights_context_not_from_arbitrary_switch(hass):
f"but got {name_hash_in_context}. This indicates the context is still "
f"being created from an arbitrary switch instead of the manager."
)
+
+
+async def test_automation_turn_on_from_off_not_marked_as_manual_control(hass):
+ """Test that turning on a light from OFF via automation is not marked as manual control.
+
+ Regression test for https://github.com/basnijholt/adaptive-lighting/issues/1378
+
+ When an automation turns on a light from OFF state with brightness/color attributes,
+ the light should NOT be marked as manually controlled. Adaptive Lighting should
+ adapt the light normally.
+
+ The bug in v1.30.0 was that `update_manually_controlled_from_event` was called for
+ ALL `light.turn_on` events, not just when the light was already ON. This caused
+ lights turned on by automations to be incorrectly marked as "manually controlled".
+ """
+ switch, _ = await setup_lights_and_switch(
+ hass,
+ {
+ CONF_TAKE_OVER_CONTROL: True,
+ CONF_DETECT_NON_HA_CHANGES: False,
+ },
+ )
+
+ # Ensure light is OFF
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_OFF,
+ {ATTR_ENTITY_ID: ENTITY_LIGHT_1},
+ blocking=True,
+ )
+ await hass.async_block_till_done()
+ assert hass.states.get(ENTITY_LIGHT_1).state == STATE_OFF
+
+ # Verify light is not manually controlled
+ assert not switch.manager.manual_control.get(
+ ENTITY_LIGHT_1,
+ ), "Light should not be manually controlled before test"
+
+ # Simulate an automation turning on the light with brightness
+ # This is an external call (not from AL) with brightness attribute
+ external_context = Context(id="automation_context_12345")
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_ON,
+ {
+ ATTR_ENTITY_ID: ENTITY_LIGHT_1,
+ ATTR_BRIGHTNESS: 255,
+ },
+ blocking=True,
+ context=external_context,
+ )
+ await hass.async_block_till_done()
+
+ # The light should be ON
+ assert hass.states.get(ENTITY_LIGHT_1).state == STATE_ON
+
+ # CRITICAL: The light should NOT be marked as manually controlled!
+ # The bug in v1.30.0 would incorrectly mark this as manual control because
+ # the turn_on had a brightness attribute.
+ manual_control_attrs = switch.manager.manual_control.get(ENTITY_LIGHT_1)
+ assert not manual_control_attrs, (
+ f"Bug confirmed: Light was incorrectly marked as manually controlled "
+ f"(attributes: {manual_control_attrs}) when turned on from OFF state. "
+ f"Lights turned on from OFF by automations should NOT be marked as "
+ f"manually controlled - only lights that were already ON and then had "
+ f"their brightness/color changed externally should be marked as such."
+ )
+
+
+@pytest.mark.parametrize("intercept", [True, False])
+async def test_adapt_only_on_bare_turn_on_respects_pause_changed_mode(hass, intercept):
+ """Test that adapt_only_on_bare_turn_on respects take_over_control_mode=PAUSE_CHANGED.
+
+ When adapt_only_on_bare_turn_on=True and take_over_control_mode=PAUSE_CHANGED,
+ turning on a light from OFF with only brightness should:
+ 1. Mark ONLY brightness as manually controlled (not all attributes)
+ 2. Continue adapting color (since only brightness was specified)
+
+ This test verifies the integration of #1356 (individual attribute tracking)
+ with adapt_only_on_bare_turn_on. Prior to the fix, the code would return early
+ after marking attributes as manually controlled, skipping all adaptation
+ including unspecified attributes like color.
+
+ The test is parameterized with intercept=True/False to verify consistency
+ between the intercept path and the reactive (event-based) path.
+ """
+ switch, _ = await setup_lights_and_switch(
+ hass,
+ {
+ CONF_TAKE_OVER_CONTROL: True,
+ CONF_TAKE_OVER_CONTROL_MODE: TakeOverControlMode.PAUSE_CHANGED.value,
+ CONF_ADAPT_ONLY_ON_BARE_TURN_ON: True,
+ CONF_DETECT_NON_HA_CHANGES: False,
+ CONF_INTERCEPT: intercept,
+ },
+ )
+
+ # Verify settings
+ assert switch._take_over_control
+ assert switch._take_over_control_mode == TakeOverControlMode.PAUSE_CHANGED
+ assert switch._adapt_only_on_bare_turn_on
+
+ # Ensure light is OFF
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_OFF,
+ {ATTR_ENTITY_ID: ENTITY_LIGHT_1},
+ blocking=True,
+ )
+ await hass.async_block_till_done()
+ assert hass.states.get(ENTITY_LIGHT_1).state == STATE_OFF
+
+ # Clear any prior service data
+ switch.manager.last_service_data.pop(ENTITY_LIGHT_1, None)
+
+ # Turn on light from OFF with only brightness (simulating a scene or automation)
+ external_context = Context(id="scene_turn_on_with_brightness")
+ await hass.services.async_call(
+ LIGHT_DOMAIN,
+ SERVICE_TURN_ON,
+ {
+ ATTR_ENTITY_ID: ENTITY_LIGHT_1,
+ ATTR_BRIGHTNESS: 200, # Only brightness specified
+ },
+ blocking=True,
+ context=external_context,
+ )
+ await hass.async_block_till_done()
+
+ # Light should be ON
+ assert hass.states.get(ENTITY_LIGHT_1).state == STATE_ON
+
+ # 1. Verify that ONLY brightness is marked as manually controlled
+ manual_control_attrs = switch.manager.manual_control.get(ENTITY_LIGHT_1)
+ assert manual_control_attrs == LightControlAttributes.BRIGHTNESS, (
+ f"Expected only BRIGHTNESS to be marked as manually controlled, "
+ f"but got: {manual_control_attrs}. With adapt_only_on_bare_turn_on=True, "
+ f"only the attributes specified in the turn_on call should be marked."
+ )
+
+ # 2. Verify that color WAS adapted (last_service_data should have color_temp)
+ last_service_data = switch.manager.last_service_data.get(ENTITY_LIGHT_1)
+ assert last_service_data is not None, (
+ "Bug: last_service_data is None, meaning adaptation was skipped entirely. "
+ "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, (
+ 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."
+ )
From e0f812d406ffa8ec9309ef2d1bfd27529c67c4ec Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Mon, 12 Jan 2026 13:46:19 +0100
Subject: [PATCH 164/301] Bump to v1.30.1 (#1384)
---
custom_components/adaptive_lighting/manifest.json | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/custom_components/adaptive_lighting/manifest.json b/custom_components/adaptive_lighting/manifest.json
index 27762b19..fc854221 100644
--- a/custom_components/adaptive_lighting/manifest.json
+++ b/custom_components/adaptive_lighting/manifest.json
@@ -8,5 +8,5 @@
"iot_class": "calculated",
"issue_tracker": "https://github.com/basnijholt/adaptive-lighting/issues",
"requirements": ["ulid-transform"],
- "version": "1.30.0"
+ "version": "1.30.1"
}
From cbbcabdd1f2ad27dfd9cb6a3007f51306faa60c4 Mon Sep 17 00:00:00 2001
From: Bas Nijholt
Date: Mon, 12 Jan 2026 23:39:57 +0100
Subject: [PATCH 165/301] Add documentation site with Zensical framework
(#1385)
* Add documentation site with Zensical framework
Create comprehensive documentation site for adaptive-lighting.nijho.lt:
- Add zensical.toml configuration with Material theme (amber/orange)
- Create docs_gen.py module for extracting README sections via markers
- Add section markers to README.md for content reuse
- Create documentation pages:
- index.md: Home with features overview
- getting-started.md: Installation and quick setup
- configuration.md: Auto-generated config options table
- services.md: Auto-generated service documentation
- automation-examples.md: Real-world automation recipes
- troubleshooting.md: Common issues and solutions
- see-also.md: External resources and links
- advanced/brightness-modes.md: Brightness mode deep dive
- advanced/manual-control.md: Manual control system docs
- advanced/sleep-mode.md: Sleep mode configuration
- Add GitHub Actions workflow for building and deploying to Pages
- Add custom CSS with sun-themed styling
- Add CNAME for custom domain
Uses markdown-code-runner to auto-generate content from code schemas
and extract README sections for single-source documentation.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Remove duplicated content from docs, make pages thin wrappers
- troubleshooting.md: Remove manually written "Additional Tips" section
- automation-examples.md: Remove duplicate "Additional Examples" section
- configuration.md: Remove duplicate "Option Categories" tables
- sleep-mode.md: Simplify to reference main config, remove duplicate examples
- docs_gen.py: Remove unused get_troubleshooting() and get_sleep_mode_intro()
This reduces duplication risk by keeping README as single source of truth.
Docs pages now primarily pull content via markdown-code-runner.
* [pre-commit.ci] auto fixes from pre-commit.com hooks
for more information, see https://pre-commit.ci
* Integrate webapp (simulator) into docs workflow
- Merge deploy-webapp.yml into docs.yml workflow
- Build simulator and place at /simulator/ subdirectory
- Update docs links to use relative paths to simulator
- Remove separate deploy-webapp.yml to avoid conflicts
The combined workflow now:
1. Builds docs with zensical
2. Builds webapp with shinylive
3. Copies webapp to site/simulator/
4. Deploys everything to GitHub Pages
Simulator will be at adaptive-lighting.nijho.lt/simulator/
* Fix pre-commit and CI issues
- Add site_name to zensical.toml (required by MkDocs)
- Fix RET504 in docs_gen.py (unnecessary assignment before return)
- Remove docs/run_markdown_code_runner.py (lint issues, not needed for CI)
* Fix _docs_helpers.py import error in CI
- Add try/except for relative vs absolute imports in _docs_helpers.py
- Remove silent error handling in docs workflow (fail on error)
The relative import fails when markdown-code-runner executes the code
directly via sys.path.insert. The fallback to absolute import fixes this.
* Temporarily enable deployment from feature branch
* Add tabulate dependency for pandas to_markdown()
* Fix theme configuration for proper light/dark mode
- Restructure zensical.toml to match working agent-cli config
- Add three-way palette toggle (system/light/dark)
- Use proper [project.theme] structure
- Simplify extra.css to not override theme colors
- Add Inter font for text, JetBrains Mono for code
* Add Plausible analytics and fix homepage navigation
- Add custom analytics override for plausible.nijho.lt tracking
- Remove hide:navigation from index.md to show menu on homepage
* Remove temporary feature branch deployment settings
Revert to main-only deployment for docs workflow before merging.
* Revert "Remove temporary feature branch deployment settings"
This reverts commit c56869483760051599234b820b3cf44de128901f.
* Add markdown-gfm-admonition for GitHub-style admonitions
The zensical build was failing silently because gfm_admonition extension
was not installed. Add the dependency to pyproject.toml and docs workflow.
* Use uv sync for documentation dependencies
Switch from manual pip installs to uv sync with pyproject.toml for cleaner
dependency management and reproducible builds.
* Fix markdown rendering inside details blocks
Enable md_in_html extension and add markdown="1" attribute to
tags so markdown content inside them is properly rendered.
* Remove emojis from manually written documentation
Keep emojis in auto-generated content from README, but remove from
manually maintained docs in favor of clean text and Material icons.
* Enable attr_list extension for button styling
* Improve pyproject.toml and use GitHub-style admonitions
- Add accurate project metadata (version, authors, classifiers, URLs)
- Organize dependency groups: docs, dev, test
- Add tool configs for ruff, mypy, pytest
- Convert MkDocs-style admonitions (!!! tip) to GitHub-style (> [!TIP])
- Use docs group in CI workflow
* Add homeassistant and ulid-transform as runtime dependencies
Remove speculative test dependencies since tests run inside HA core.
* Simplify docs_gen.py - remove wrapper functions
Use readme_section() directly in docs instead of 10 one-liner wrappers.
Changed default strip_heading to True since that's the common case.
* Populate empty OUTPUT sections with markdown-code-runner
* Add markdown-code-runner workflow for auto-updating docs
- Add docs/run_markdown_code_runner.py script to process all docs
- Add GitHub workflow to run on push/PR and auto-commit changes
* Exclude README.md from markdown-code-runner workflow
README.md contains code blocks that import from
homeassistant.components.adaptive_lighting, which only exists
when running inside Home Assistant core, not in a regular venv.
* Update auto-generated docs
* Use editable install for markdown-code-runner workflow
- Add setuptools.packages.find config pointing to custom_components
- Remove sys.path.insert manipulation from all docs files
- Update imports to use adaptive_lighting.* package paths
- Install package with `uv pip install -e .` in workflow
- Remove deprecated license classifier (PEP 639)
* Consolidate markdown-code-runner into single workflow
- Remove separate markdown-code-runner.yml workflow
- Update update-readme.yml to handle all markdown files (docs + README)
- Rename workflow to "Update auto-generated content"
- Update README imports to use adaptive_lighting package path
* Rename workflow to markdown-code-runner
* Remove accidentally committed files
* Remove redundant markdown-code-runner from docs workflow
* Fix: use uv pip install instead of uv add in CI
* Add webapp deps (astral, shinylive) to docs group
* Remove unused install_dependencies action
* Update to latest action versions (uv@v5, upload-pages-artifact@v4)
* Remove try/except import fallback in _docs_helpers.py
* Restore install_dependencies action (used by pytest)
* Simplify docs workflow: run on all pushes/PRs
* Simplify mcr workflow paths; revert install_dependencies to main
* Remove redundant cp+sed for webapp (file already in repo)
* Fix mcr push: pull --rebase before push
* Fix mcr: checkout PR branch instead of detached HEAD
* Update auto-generated content
* Switch from setuptools to hatch build system
Replace [tool.setuptools.packages.find] with [tool.hatch.build.targets.wheel]
for hatchling compatibility.
* Update auto-generated content
* Move homeassistant deps to docs group
This is a HA custom component, not a pip package. The homeassistant
dependency is only needed for docs building, not as a project dependency.
* Update auto-generated content
* Remove PyPI-only metadata from pyproject.toml
* Remove arbitrary version constraints from dependency groups
* Update auto-generated content
* Remove unused troubleshooting section markers from README
* Remove temporary feature branch settings from docs workflow
* Use GitHub admonition syntax for warning in change_switch_settings section
* Update auto-generated content
---
.github/workflows/deploy-webapp.yml | 63 -
.github/workflows/docs.yml | 64 +
...te-readme.yml => markdown-code-runner.yml} | 40 +-
README.md | 146 +-
.../adaptive_lighting/docs_gen.py | 84 +
docs/CNAME | 1 +
docs/advanced/brightness-modes.md | 124 +
docs/advanced/manual-control.md | 162 +
docs/advanced/sleep-mode.md | 43 +
docs/assets/logo.png | Bin 0 -> 17642 bytes
docs/assets/stylesheets/extra.css | 46 +
docs/automation-examples.md | 115 +
docs/configuration.md | 150 +
docs/getting-started.md | 117 +
docs/index.md | 85 +
.../integrations/analytics/custom.html | 6 +
docs/run_markdown_code_runner.py | 71 +
docs/see-also.md | 73 +
docs/services.md | 203 +
docs/troubleshooting.md | 106 +
pyproject.toml | 66 +
uv.lock | 6079 +++++++++++++++++
zensical.toml | 117 +
23 files changed, 7816 insertions(+), 145 deletions(-)
delete mode 100644 .github/workflows/deploy-webapp.yml
create mode 100644 .github/workflows/docs.yml
rename .github/workflows/{update-readme.yml => markdown-code-runner.yml} (50%)
create mode 100644 custom_components/adaptive_lighting/docs_gen.py
create mode 100644 docs/CNAME
create mode 100644 docs/advanced/brightness-modes.md
create mode 100644 docs/advanced/manual-control.md
create mode 100644 docs/advanced/sleep-mode.md
create mode 100644 docs/assets/logo.png
create mode 100644 docs/assets/stylesheets/extra.css
create mode 100644 docs/automation-examples.md
create mode 100644 docs/configuration.md
create mode 100644 docs/getting-started.md
create mode 100644 docs/index.md
create mode 100644 docs/overrides/partials/integrations/analytics/custom.html
create mode 100755 docs/run_markdown_code_runner.py
create mode 100644 docs/see-also.md
create mode 100644 docs/services.md
create mode 100644 docs/troubleshooting.md
create mode 100644 pyproject.toml
create mode 100644 uv.lock
create mode 100644 zensical.toml
diff --git a/.github/workflows/deploy-webapp.yml b/.github/workflows/deploy-webapp.yml
deleted file mode 100644
index 0a76e3ac..00000000
--- a/.github/workflows/deploy-webapp.yml
+++ /dev/null
@@ -1,63 +0,0 @@
-# Simple workflow for deploying WebAssembly app to GitHub Pages
-name: Deploy WebAssembly app to Pages
-
-on:
- # Runs on pushes targeting the default branch
- push:
- branches: ["main"]
-
- # Allows you to run this workflow manually from the Actions tab
- workflow_dispatch:
-
-# Sets permissions of the GITHUB_TOKEN to allow deployment to GitHub Pages
-permissions:
- contents: read
- pages: write
- id-token: write
-
-# Allow only one concurrent deployment, skipping runs queued between the run in-progress and latest queued.
-# However, do NOT cancel in-progress runs as we want to allow these production deployments to complete.
-concurrency:
- group: "pages"
- cancel-in-progress: false
-
-jobs:
- # Single deploy job since we're just deploying
- deploy:
- environment:
- name: github-pages
- url: ${{ steps.deployment.outputs.page_url }}
- runs-on: ubuntu-latest
- steps:
- - name: Checkout
- uses: actions/checkout@v6
-
- - name: Set Up Python
- uses: actions/setup-python@v6
- with:
- python-version: 3.14.2
-
- - name: Install Dependencies
- run: |
- pip install -r webapp/requirements.txt
- pip install shinylive
-
- - name: Build the WebAssembly app
- run: |
- set -ex
- cp custom_components/adaptive_lighting/color_and_brightness.py webapp/color_and_brightness.py
- sed -i 's/homeassistant.util.color/homeassistant_util_color/g' "webapp/color_and_brightness.py"
- shinylive export webapp site
-
- - name: Setup Pages
- uses: actions/configure-pages@v5
-
- - name: Upload artifact
- uses: actions/upload-pages-artifact@v4
- with:
- # Upload the 'site' directory, where your app has been built
- path: "site"
-
- - name: Deploy to GitHub Pages
- id: deployment
- uses: actions/deploy-pages@v4
diff --git a/.github/workflows/docs.yml b/.github/workflows/docs.yml
new file mode 100644
index 00000000..7b62b15c
--- /dev/null
+++ b/.github/workflows/docs.yml
@@ -0,0 +1,64 @@
+name: Documentation
+
+on:
+ push:
+ branches: [main]
+ pull_request:
+ workflow_dispatch:
+
+permissions:
+ contents: read
+ pages: write
+ id-token: write
+
+concurrency:
+ group: "pages"
+ cancel-in-progress: false
+
+jobs:
+ build:
+ runs-on: ubuntu-latest
+ steps:
+ - name: Checkout repository
+ uses: actions/checkout@v4
+
+ - name: Set up Python
+ uses: actions/setup-python@v5
+ with:
+ python-version: '3.12'
+
+ - name: Install uv
+ uses: astral-sh/setup-uv@v5
+
+ - name: Install dependencies
+ run: uv sync --group docs
+
+ - name: Build documentation
+ run: uv run zensical build
+
+ - name: Build webapp (simulator)
+ run: uv run shinylive export webapp webapp-site
+
+ - name: Integrate webapp into docs
+ run: |
+ # Copy webapp into docs site at /simulator/
+ mkdir -p site/simulator
+ cp -r webapp-site/* site/simulator/
+ echo "Webapp integrated at site/simulator/"
+
+ - name: Upload artifact
+ uses: actions/upload-pages-artifact@v4
+ with:
+ path: ./site
+
+ deploy:
+ if: github.ref == 'refs/heads/main' && github.event_name != 'pull_request'
+ environment:
+ name: github-pages
+ url: ${{ steps.deployment.outputs.page_url }}
+ runs-on: ubuntu-latest
+ needs: build
+ steps:
+ - name: Deploy to GitHub Pages
+ id: deployment
+ uses: actions/deploy-pages@v4
diff --git a/.github/workflows/update-readme.yml b/.github/workflows/markdown-code-runner.yml
similarity index 50%
rename from .github/workflows/update-readme.yml
rename to .github/workflows/markdown-code-runner.yml
index fb8fa6f4..884cfa71 100644
--- a/.github/workflows/update-readme.yml
+++ b/.github/workflows/markdown-code-runner.yml
@@ -1,33 +1,34 @@
-name: Update README.md, strings.json, and services.yaml
+name: markdown-code-runner
on:
push:
branches:
- main
- paths:
- - "README.md"
- - "custom_components/adaptive_lighting/const.py"
- - ".github/workflows/update-readme.yml"
pull_request:
jobs:
- update_readme:
+ markdown-code-runner:
runs-on: ubuntu-latest
steps:
- name: Check out code from GitHub
- uses: actions/checkout@v6
+ uses: actions/checkout@v4
+ with:
+ ref: ${{ github.head_ref }}
+ fetch-depth: 0
- - name: Install Home Assistant
- uses: ./.github/workflows/install_dependencies
+ - name: Set up Python
+ uses: actions/setup-python@v5
with:
python-version: "3.13"
- - name: Install markdown-code-runner and README code dependencies
- run: |
- uv pip install markdown-code-runner==2.1.0 pandas tabulate
+ - name: Install uv
+ uses: astral-sh/setup-uv@v5
- name: Run markdown-code-runner
- run: uv run markdown-code-runner --verbose README.md
+ run: |
+ uv sync --group docs
+ uv pip install -e .
+ uv run python docs/run_markdown_code_runner.py
- name: Run update services.yaml
run: uv run python .github/update-services.py
@@ -35,23 +36,22 @@ jobs:
- name: Run update strings.json
run: uv run python .github/update-strings.py
- - name: Commit updated README.md, strings.json, and services.yaml
+ - name: Commit updated files
id: commit
run: |
git add -u .
git config --local user.email "github-actions[bot]@users.noreply.github.com"
git config --local user.name "github-actions[bot]"
if git diff --quiet && git diff --staged --quiet; then
- echo "No changes in README.md, strings.json, and services.yaml, skipping commit."
+ echo "No changes, skipping commit."
echo "commit_status=skipped" >> $GITHUB_ENV
else
- git commit -m "Update README.md, strings.json, and services.yaml"
+ git commit -m "Update auto-generated content"
echo "commit_status=committed" >> $GITHUB_ENV
fi
- name: Push changes
if: env.commit_status == 'committed'
- uses: ad-m/github-push-action@master
- with:
- github_token: ${{ secrets.GITHUB_TOKEN }}
- branch: ${{ github.head_ref }}
+ run: |
+ git pull --rebase
+ git push
diff --git a/README.md b/README.md
index 7a7ee9d9..23bb93f1 100644
--- a/README.md
+++ b/README.md
@@ -24,6 +24,7 @@ https://github.com/basnijholt/adaptive-lighting/assets/6897215/68908f7d-fbf1-499
[[ToC](#books-table-of-contents)]
+
## :bulb: Features
When initially turning on a light that is controlled by Adaptive Lighting, the `light.turn_on` service call is intercepted, and the light's brightness and color are automatically adjusted based on the sun's position.
@@ -35,7 +36,9 @@ Adaptive Lighting provides four switches (using "living_room" as an example comp
- `switch.adaptive_lighting_sleep_mode_living_room`: Activate "sleep mode" 😴 and set custom sleep_brightness and sleep_color_temp.
- `switch.adaptive_lighting_adapt_brightness_living_room`: Enable or disable brightness adaptation 🔆 for supported lights.
- `switch.adaptive_lighting_adapt_color_living_room`: Enable or disable color adaptation 🌈 for supported lights.
+
+
### :control_knobs: Regain Manual Control
Adaptive Lighting is designed to automatically detect when you or another source (e.g., automation) manually changes light settings 🕹️.
@@ -46,6 +49,7 @@ Additionally, enabling `detect_non_ha_changes` allows Adaptive Lighting to detec
The `adaptive_lighting.manual_control` event is fired when a light is marked as "manually controlled," allowing for integration with automations 🤖.
> ⚠️ **_Caution: Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable `detect_non_ha_changes` if you encounter such issues._**
+
## :books: Table of Contents
@@ -99,56 +103,57 @@ All of the configuration options are listed below, along with their default valu
The YAML and frontend configuration methods support all of the options listed below.
-
-
+
+
-| Variable name | Description | Default | Type |
-|:-------------------------------|:--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:----------------------------------------|
-| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
-| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
-| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
-| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
-| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
-| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
-| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
-| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
-| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
-| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
-| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
-| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
-| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
-| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
-| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
-| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
-| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
-| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
-| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
-| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
-| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
-| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
-| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
+| Variable name | Description | Default | Type |
+|:-------------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------|:---------------|:----------------------------------------|
+| `lights` | List of light entity_ids to be controlled (may be empty). 🌟 | `[]` | list of `entity_id`s |
+| `interval` | Frequency to adapt the lights, in seconds. 🔄 | `90` | `int > 0` |
+| `transition` | Duration of transition when lights change, in seconds. 🕑 | `45` | `float` 0-6553 |
+| `initial_transition` | Duration of the first transition when lights turn from `off` to `on` in seconds. ⏲️ | `1` | `float` 0-6553 |
+| `min_brightness` | Minimum brightness percentage. 💡 | `1` | `int` 1-100 |
+| `max_brightness` | Maximum brightness percentage. 💡 | `100` | `int` 1-100 |
+| `min_color_temp` | Warmest color temperature in Kelvin. 🔥 | `2000` | `int` 1000-10000 |
+| `max_color_temp` | Coldest color temperature in Kelvin. ❄️ | `5500` | `int` 1000-10000 |
+| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | `False` | `bool` |
+| `sleep_brightness` | Brightness percentage of lights in sleep mode. 😴 | `1` | `int` 1-100 |
+| `sleep_rgb_or_color_temp` | Use either `"rgb_color"` or `"color_temp"` in sleep mode. 🌙 | `color_temp` | one of `['color_temp', 'rgb_color']` |
+| `sleep_color_temp` | Color temperature in sleep mode (used when `sleep_rgb_or_color_temp` is `color_temp`) in Kelvin. 😴 | `1000` | `int` 1000-10000 |
+| `sleep_rgb_color` | RGB color in sleep mode (used when `sleep_rgb_or_color_temp` is "rgb_color"). 🌈 | `[255, 56, 0]` | RGB color |
+| `sleep_transition` | Duration of transition when "sleep mode" is toggled in seconds. 😴 | `1` | `float` 0-6553 |
+| `transition_until_sleep` | When enabled, Adaptive Lighting will treat sleep settings as the minimum, transitioning to these values after sunset. 🌙 | `False` | `bool` |
+| `sunrise_time` | Set a fixed time (HH:MM:SS) for sunrise. 🌅 | `None` | `str` |
+| `min_sunrise_time` | Set the earliest virtual sunrise time (HH:MM:SS), allowing for later sunrises. 🌅 | `None` | `str` |
+| `max_sunrise_time` | Set the latest virtual sunrise time (HH:MM:SS), allowing for earlier sunrises. 🌅 | `None` | `str` |
+| `sunrise_offset` | Adjust sunrise time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `sunset_time` | Set a fixed time (HH:MM:SS) for sunset. 🌇 | `None` | `str` |
+| `min_sunset_time` | Set the earliest virtual sunset time (HH:MM:SS), allowing for later sunsets. 🌇 | `None` | `str` |
+| `max_sunset_time` | Set the latest virtual sunset time (HH:MM:SS), allowing for earlier sunsets. 🌇 | `None` | `str` |
+| `sunset_offset` | Adjust sunset time with a positive or negative offset in seconds. ⏰ | `0` | `int` |
+| `brightness_mode` | Brightness mode to use. Possible values are `default`, `linear`, and `tanh` (uses `brightness_mode_time_dark` and `brightness_mode_time_light`). 📈 | `default` | one of `['default', 'linear', 'tanh']` |
| `brightness_mode_time_dark` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness before/after sunrise/sunset. 📈📉 | `900` | `int` |
| `brightness_mode_time_light` | (Ignored if `brightness_mode='default'`) The duration in seconds to ramp up/down the brightness after/before sunrise/sunset. 📈📉. | `3600` | `int` |
-| `take_over_control` | Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒 | `True` | `bool` |
-| `take_over_control_mode` | The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed. | `pause_all` | one of `['pause_all', 'pause_changed']` |
-| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues. | `False` | `bool` |
-| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
-| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
+| `take_over_control` | Pause adaptation of individual lights and hand over (manual) control to other sources that issue `light.turn_on` calls for lights that are on. 🔒 | `True` | `bool` |
+| `take_over_control_mode` | The adaptation pausing mode when other sources change brightness and/or color of lights. `pause_all` always pauses both brightness and color adaptation. `pause_changed` pauses the adaptation of only the changed attributes and continues adapting unchanged attributes, e.g., continues color adaptation when only brightness was changed. | `pause_all` | one of `['pause_all', 'pause_changed']` |
+| `detect_non_ha_changes` | Detects and halts adaptations for non-`light.turn_on` state changes. Needs `take_over_control` enabled. 🕵️ Caution: ⚠️ Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Note that this calls `homeassistant.update_entity` every `interval`! Disable this feature if you encounter such issues. | `False` | `bool` |
+| `autoreset_control_seconds` | Automatically reset the manual control after a number of seconds. Set to 0 to disable. ⏲️ | `0` | `int` 0-31536000 |
+| `only_once` | Adapt lights only when they are turned on (`true`) or keep adapting them (`false`). 🔄 | `False` | `bool` |
| `adapt_only_on_bare_turn_on` | When turning lights on initially. If set to `true`, AL adapts only if `light.turn_on` is invoked without specifying color or brightness. ❌🌈 This e.g., prevents adaptation when activating a scene and marks the light as manually controlled. If `false`, AL adapts regardless of the presence of color or brightness in the initial `service_data`. Needs `take_over_control` enabled. 🕵️ | `False` | `bool` |
-| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
-| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
-| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
-| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
-| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
-| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
-| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
+| `separate_turn_on_commands` | Use separate `light.turn_on` calls for color and brightness, needed for some light types. 🔀 | `False` | `bool` |
+| `send_split_delay` | Delay (ms) between `separate_turn_on_commands` for lights that don't support simultaneous brightness and color setting. ⏲️ | `0` | `int` 0-10000 |
+| `adapt_delay` | Wait time (seconds) between light turn on and Adaptive Lighting applying changes. Might help to avoid flickering. ⏲️ | `0` | `float > 0` |
+| `skip_redundant_commands` | Skip sending adaptation commands whose target state already equals the light's known state. Minimizes network traffic and improves the adaptation responsivity in some situations. 📉Disable if physical light states get out of sync with HA's recorded state. | `False` | `bool` |
+| `intercept` | Intercept and adapt `light.turn_on` calls to enabling instantaneous color and brightness adaptation. 🏎️ Disable for lights that do not support `light.turn_on` with color and brightness. | `True` | `bool` |
+| `multi_light_intercept` | Intercept and adapt `light.turn_on` calls that target multiple lights. ➗⚠️ This might result in splitting up a single `light.turn_on` call into multiple calls, e.g., when lights are in different switches. Requires `intercept` to be enabled. | `True` | `bool` |
+| `include_config_in_attributes` | Show all options as attributes on the switch in Home Assistant when set to `true`. 📝 | `False` | `bool` |
+
Full example:
```yaml
@@ -175,6 +180,7 @@ adaptive_lighting:
only_once: false
```
+
### :hammer_and_wrench: Services
@@ -183,21 +189,21 @@ adaptive_lighting:
`adaptive_lighting.apply` applies Adaptive Lighting settings to lights on demand.
-
-
+
+
-| Service data attribute | Description | Required | Type |
-|:-------------------------|:-------------------------------------------------------------------------------------|:-----------|:---------------------|
-| `entity_id` | The `entity_id` of the switch with the settings to apply. 📝 | ✅ | list of `entity_id`s |
-| `lights` | A light (or list of lights) to apply the settings to. 💡 | ❌ | list of `entity_id`s |
-| `transition` | Duration of transition when lights change, in seconds. 🕑 | ❌ | `float` 0-6553 |
-| `adapt_brightness` | Whether to adapt the brightness of the light. 🌞 | ❌ | bool |
-| `adapt_color` | Whether to adapt the color on supporting lights. 🌈 | ❌ | bool |
-| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | ❌ | bool |
-| `turn_on_lights` | Whether to turn on lights that are currently off. 🔆 | ❌ | bool |
+| Service data attribute | Description | Required | Type |
+|:-------------------------|:--------------------------------------------------------------------------------------|:-----------|:---------------------|
+| `entity_id` | The `entity_id` of the switch with the settings to apply. 📝 | ✅ | list of `entity_id`s |
+| `lights` | A light (or list of lights) to apply the settings to. 💡 | ❌ | list of `entity_id`s |
+| `transition` | Duration of transition when lights change, in seconds. 🕑 | ❌ | `float` 0-6553 |
+| `adapt_brightness` | Whether to adapt the brightness of the light. 🌞 | ❌ | bool |
+| `adapt_color` | Whether to adapt the color on supporting lights. 🌈 | ❌ | bool |
+| `prefer_rgb_color` | Whether to prefer RGB color adjustment over light color temperature when possible. 🌈 | ❌ | bool |
+| `turn_on_lights` | Whether to turn on lights that are currently off. 🔆 | ❌ | bool |
#### `adaptive_lighting.set_manual_control`
@@ -205,24 +211,27 @@ adaptive_lighting:
`adaptive_lighting.set_manual_control` can mark (or unmark) whether a light is "manually controlled", meaning that when a light has `manual_control`, the light is not adapted.
-
-
+
+
-| Service data attribute | Description | Required | Type |
-|:-------------------------|:----------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------|:-----------------------------------------|
-| `entity_id` | The `entity_id` of the switch in which to (un)mark the light as being `manually controlled`. 📝 | ✅ | list of `entity_id`s |
-| `lights` | entity_id(s) of lights, if not specified, all lights in the switch are selected. 💡 | ❌ | list of `entity_id`s |
-| `manual_control` | Whether to add ("true") or remove ("false") all adapted attributes of the light from the "manual_control" list, or the name of an attribute for selective addition. 🔒 | ❌ | bool or one of `['brightness', 'color']` |
+| Service data attribute | Description | Required | Type |
+|:-------------------------|:-----------------------------------------------------------------------------------------------------------------------------------------------------------------------|:-----------|:-----------------------------------------|
+| `entity_id` | The `entity_id` of the switch in which to (un)mark the light as being `manually controlled`. 📝 | ✅ | list of `entity_id`s |
+| `lights` | entity_id(s) of lights, if not specified, all lights in the switch are selected. 💡 | ❌ | list of `entity_id`s |
+| `manual_control` | Whether to add ("true") or remove ("false") all adapted attributes of the light from the "manual_control" list, or the name of an attribute for selective addition. 🔒 | ❌ | bool or one of `['brightness', 'color']` |
+
+
#### `adaptive_lighting.change_switch_settings`
`adaptive_lighting.change_switch_settings` (new in 1.7.0) Change any of the above configuration options of Adaptive Lighting (such as `sunrise_time` or `prefer_rgb_color`) with a service call directly from your script/automation.
-> ⚠️ **_Note: These settings will **not** be written to your config and will be reset on restart of Home Assistant! You can see the current settings in the `switch.adaptive_lighting_XXX` attributes if `include_config_in_attributes` is enabled._**
+> [!WARNING]
+> These settings will **not** be written to your config and will be reset on restart of Home Assistant! You can see the current settings in the `switch.adaptive_lighting_XXX` attributes if `include_config_in_attributes` is enabled.
| Service data attribute | Required | Description |
| --------------------------------------------------------- | -------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------ |
@@ -237,10 +246,12 @@ The following keys are disallowed:
| `lights` | You may call `adaptive_lighting.apply` with your lights or create a new config instead. |
| `name` | You can rename your switch's display name in Home Assistant's UI. |
| `interval` | The interval is used only once when the config loads. A config change and restart are required. |
+
+
## :robot: Automation examples
-
+
Reset the manual_control status of a light after an hour.
```yaml
@@ -265,7 +276,7 @@ The following keys are disallowed:
-
+
Toggle multiple Adaptive Lighting switches to "sleep mode" using an input_boolean.sleep_mode.
```yaml
@@ -336,6 +347,7 @@ iphone_carly_wakeup:
```
+
## Additional Information
@@ -345,6 +357,7 @@ Adaptive Lighting was initially inspired by @claytonjn's [hass-circadian\_lighti
## :sos: Troubleshooting
+
Encountering issues? Enable debug logging in your `configuration.yaml`:
```yaml
@@ -355,7 +368,9 @@ logger:
```
After the issue occurs, create a new issue report with the log (`/config/home-assistant.log`).
+
+
### :exclamation: Common Problems & Solutions
#### :bulb: Lights Not Responding or Turning On by Themselves
@@ -413,7 +428,9 @@ These lights are known to exhibit disadvantageous behaviour due to firmware bugs
- Ikea Tradfri bulbs/drivers (and related Ikea smart light products)
- Unsupported simultaneous transition of brightness and color: When receiving such a command, they switch the brightness instantly and only transition the color. To get smooth transitions of both brightness and color, enable `separate_turn_on_commands`.
- Unresponsiveness during color transitions: No other commands are processed during an ongoing color transition, e.g., turn-off commands are ignored and lights stay on despite being reported as off to Home Assistant. The default config with long transitions thus results in long periods of unresponsiveness. To work around this, disable transitions by setting `transition` to `0`, and increase the adaptation frequency by setting `interval` to a short time, e.g., `15` seconds, to retain the impression of smooth continuous adaptations. Keeping the `initial_transition` is recommended for a smooth fade-in (lights are usually not turned off momentarily after being turned on, in which case a short period of unresponsiveness is tolerable).
+
+
## :bar_chart: Graphs!
These graphs were generated using the values calculated by the Adaptive Lighting sensor/switch(es).
@@ -428,10 +445,12 @@ These graphs were generated using the values calculated by the Adaptive Lighting
### While using `transition_until_sleep: true`
+
+
### Custom brightness ramps using `brightness_mode` with `"linear"` and `"tanh"`
-
+
Enhance your control over brightness transitions during sunrise and sunset with brightness_mode (click here to learn more 🧠).
With Adaptive Lighting, you can set a `brightness_mode` to specify how the brightness changes during sunrise and sunset. The `brightness_mode` can be set to `"default"` ([as illustrated in other graphs above](#high_brightness-brightness)), `"linear"`, or `"tanh"`. If you choose to deviate from the `"default"` mode, you can adjust `brightness_mode_time_dark` and `brightness_mode_time_light` to further customize the lighting transitions.
@@ -454,12 +473,15 @@ Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark
> Check out the interactive webapp on https://basnijholt.github.io/adaptive-lighting/ to play with the parameters and see how the brightness changes!
+
+
## :eyes: See also
- [*Sleep better with Adaptive Lighting in Home Assistant*](https://wartner.io/sleep-better-with-adaptive-lightning-in-home-assistant/) by Florian Wartner on 2023-02-23 (blog post 📜)
- [*Automatic smart light brightness and color based on the sun*](https://www.youtube.com/watch?v=Rg3zI1Oyk3c) by Home Automation Guy on 2022-08-31 (YouTube video 📺)
- [*Adaptive Lighting Blew My Mind in Home Assistant - How to set it up*](https://www.youtube.com/watch?v=c1cnccmgl3k) by Smart Home Junkie on 2022-06-26 (YouTube video 📺)
+
## :busts_in_silhouette: Contributors
diff --git a/custom_components/adaptive_lighting/docs_gen.py b/custom_components/adaptive_lighting/docs_gen.py
new file mode 100644
index 00000000..8681da4b
--- /dev/null
+++ b/custom_components/adaptive_lighting/docs_gen.py
@@ -0,0 +1,84 @@
+"""Documentation generation utilities for Adaptive Lighting.
+
+Provides functions to extract sections from README.md and transform
+content for the documentation site. Used by markdown-code-runner
+to generate documentation pages from README content.
+"""
+
+from __future__ import annotations
+
+import re
+from pathlib import Path
+
+# Path to README relative to this module
+_MODULE_DIR = Path(__file__).parent
+README_PATH = _MODULE_DIR.parent.parent / "README.md"
+
+
+def readme_section(section_name: str, *, strip_heading: bool = True) -> str:
+ """Extract a marked section from README.md.
+
+ Sections are marked with HTML comments:
+
+ content
+
+
+ Args:
+ section_name: The name of the section to extract
+ strip_heading: If True, remove the first heading from the section
+
+ Returns:
+ The content between the section markers
+
+ Raises:
+ ValueError: If the section is not found in README.md
+
+ """
+ content = README_PATH.read_text()
+
+ start_marker = f""
+ end_marker = f""
+
+ start_idx = content.find(start_marker)
+ if start_idx == -1:
+ msg = f"Section '{section_name}' not found in README.md"
+ raise ValueError(msg)
+
+ end_idx = content.find(end_marker, start_idx)
+ if end_idx == -1:
+ msg = f"End marker for section '{section_name}' not found"
+ raise ValueError(msg)
+
+ section = content[start_idx + len(start_marker) : end_idx].strip()
+
+ if strip_heading:
+ # Remove first heading (# or ## or ###)
+ section = re.sub(r"^#{1,3}\s+[^\n]+\n+", "", section, count=1)
+
+ return _transform_readme_links(section)
+
+
+def _transform_readme_links(content: str) -> str:
+ """Transform README internal links to docs site links."""
+ # Map README anchors to doc pages
+ link_map = {
+ "#gear-configuration": "configuration.md",
+ "#memo-options": "configuration.md#all-options",
+ "#hammer_and_wrench-services": "services.md",
+ "#adaptive_lightingapply": "services.md#adaptive_lightingapply",
+ "#adaptive_lightingset_manual_control": "services.md#adaptive_lightingset_manual_control",
+ "#adaptive_lightingchange_switch_settings": "services.md#adaptive_lightingchange_switch_settings",
+ "#robot-automation-examples": "automation-examples.md",
+ "#sos-troubleshooting": "troubleshooting.md",
+ "#exclamation-common-problems--solutions": "troubleshooting.md#common-problems-solutions",
+ "#bar_chart-graphs": "advanced/brightness-modes.md#graphs",
+ "#bulb-features": "index.md#features",
+ "#control_knobs-regain-manual-control": "advanced/manual-control.md",
+ "#eyes-see-also": "see-also.md",
+ }
+
+ for old_link, new_link in link_map.items():
+ content = content.replace(f"]({old_link})", f"]({new_link})")
+
+ # Remove ToC link pattern [[ToC](#...)]
+ return re.sub(r"\[\[ToC\]\([^)]+\)\]", "", content)
diff --git a/docs/CNAME b/docs/CNAME
new file mode 100644
index 00000000..31586af9
--- /dev/null
+++ b/docs/CNAME
@@ -0,0 +1 @@
+adaptive-lighting.nijho.lt
diff --git a/docs/advanced/brightness-modes.md b/docs/advanced/brightness-modes.md
new file mode 100644
index 00000000..b735a583
--- /dev/null
+++ b/docs/advanced/brightness-modes.md
@@ -0,0 +1,124 @@
+---
+icon: lucide/trending-up
+---
+
+# Brightness Modes
+
+Enhance your control over brightness transitions during sunrise and sunset with the `brightness_mode` option.
+
+## Available Modes
+
+Adaptive Lighting supports three brightness modes:
+
+| Mode | Description |
+|------|-------------|
+| `default` | Standard behavior based on sun position |
+| `linear` | Linear ramp between min/max brightness |
+| `tanh` | Smooth S-curve using hyperbolic tangent |
+
+## Detailed Explanation
+
+
+
+
+
+
+
+
+Enhance your control over brightness transitions during sunrise and sunset with brightness_mode (click here to learn more 🧠).
+
+With Adaptive Lighting, you can set a `brightness_mode` to specify how the brightness changes during sunrise and sunset. The `brightness_mode` can be set to `"default"` ([as illustrated in other graphs above](#high_brightness-brightness)), `"linear"`, or `"tanh"`. If you choose to deviate from the `"default"` mode, you can adjust `brightness_mode_time_dark` and `brightness_mode_time_light` to further customize the lighting transitions.
+
+When `brightness_mode` is set to `"linear"`:
+
+- During **_sunset_**, the brightness begins to gradually decrease from `max_brightness` starting at `time=sunset_time - brightness_mode_time_light`, until it reaches `min_brightness` at `time=sunset_time + brightness_mode_time_dark`.
+- During **_sunrise_**, the brightness begins to gradually increase from `min_brightness` starting at `time=sunrise_time - brightness_mode_time_dark`, until it reaches `max_brightness` at `time=sunrise_time + brightness_mode_time_light`.
+
+When `brightness_mode` is set to `"tanh"`, it uses the smooth transition of a [hyperbolic tangent function](https://mathworld.wolfram.com/HyperbolicTangent.html):
+
+- During **_sunset_**, the brightness starts to decrease from 95% of `max_brightness` starting at `time=sunset_time - brightness_mode_time_light`, until it reaches 5% of `min_brightness` at `time=sunset_time + brightness_mode_time_dark`.
+- During **_sunrise_**, the brightness starts to increase from 5% of `min_brightness` starting at `time=sunrise_time - brightness_mode_time_dark`, until it reaches 95% of `max_brightness` at `time=sunrise_time + brightness_mode_time_light`.
+
+
+Notice the values of `brightness_mode_time_light` and `brightness_mode_time_dark` in the text box.
+
+
+
+
+
+> Check out the interactive webapp on https://basnijholt.github.io/adaptive-lighting/ to play with the parameters and see how the brightness changes!
+
+
+
+## Configuration Parameters
+
+When using `linear` or `tanh` modes, you can fine-tune the transition with these parameters:
+
+| Parameter | Default | Description |
+|-----------|---------|-------------|
+| `brightness_mode_time_dark` | 900 (15 min) | Duration to ramp brightness before/after sunrise/sunset |
+| `brightness_mode_time_light` | 3600 (1 hour) | Duration to ramp brightness after/before sunrise/sunset |
+
+## Example Configurations
+
+### Quick Transition (Linear)
+
+```yaml
+adaptive_lighting:
+ - name: "Quick transitions"
+ lights:
+ - light.living_room
+ brightness_mode: linear
+ brightness_mode_time_dark: 600 # 10 minutes
+ brightness_mode_time_light: 1800 # 30 minutes
+```
+
+### Smooth Transition (Tanh)
+
+```yaml
+adaptive_lighting:
+ - name: "Smooth transitions"
+ lights:
+ - light.bedroom
+ brightness_mode: tanh
+ brightness_mode_time_dark: 1200 # 20 minutes
+ brightness_mode_time_light: 3600 # 1 hour
+```
+
+## Graphs
+
+These graphs show how brightness changes throughout the day based on calculated values:
+
+
+
+
+
+
+
+These graphs were generated using the values calculated by the Adaptive Lighting sensor/switch(es).
+
+### :sunny: Sun Position
+
+
+### :thermometer: Color Temperature
+
+
+### :high_brightness: Brightness
+
+
+### While using `transition_until_sleep: true`
+
+
+
+
+## Interactive Simulator
+
+The best way to understand brightness modes is to experiment with the interactive simulator:
+
+
+
+Adjust the `brightness_mode`, `brightness_mode_time_dark`, and `brightness_mode_time_light` parameters to see how they affect the brightness curve in real-time.
diff --git a/docs/advanced/manual-control.md b/docs/advanced/manual-control.md
new file mode 100644
index 00000000..157e081e
--- /dev/null
+++ b/docs/advanced/manual-control.md
@@ -0,0 +1,162 @@
+---
+icon: lucide/hand
+---
+
+# Manual Control
+
+Adaptive Lighting is designed to work seamlessly with manual adjustments, detecting when you or another source changes light settings and pausing adaptation accordingly.
+
+## How It Works
+
+
+
+
+
+
+
+Adaptive Lighting is designed to automatically detect when you or another source (e.g., automation) manually changes light settings 🕹️.
+When this occurs, the affected light is marked as "manually controlled," and Adaptive Lighting will not make further adjustments until the light is turned off and back on or reset using the `adaptive_lighting.set_manual_control` service call.
+This feature is available when `take_over_control` is enabled.
+
+Additionally, enabling `detect_non_ha_changes` allows Adaptive Lighting to detect all state changes, including those made outside of Home Assistant, by comparing the light's state to its previously used settings.
+The `adaptive_lighting.manual_control` event is fired when a light is marked as "manually controlled," allowing for integration with automations 🤖.
+
+> ⚠️ **_Caution: Some lights might falsely indicate an 'on' state, which could result in lights turning on unexpectedly. Disable `detect_non_ha_changes` if you encounter such issues._**
+
+
+
+## Configuration Options
+
+### take_over_control
+
+When enabled (default: `true`), Adaptive Lighting detects `light.turn_on` service calls that specify brightness or color values. If such a call is detected for a light that's already on, that light is marked as "manually controlled".
+
+```yaml
+adaptive_lighting:
+ - name: "With manual control detection"
+ lights:
+ - light.living_room
+ take_over_control: true # default
+```
+
+### take_over_control_mode
+
+Controls how adaptation pauses when manual changes are detected:
+
+| Mode | Behavior |
+|------|----------|
+| `pause_all` | Pause both brightness and color adaptation (default) |
+| `pause_changed` | Only pause adaptation of the changed attribute |
+
+```yaml
+adaptive_lighting:
+ - name: "Selective pause"
+ lights:
+ - light.living_room
+ take_over_control: true
+ take_over_control_mode: pause_changed # Only pause changed attributes
+```
+
+### detect_non_ha_changes
+
+When enabled, Adaptive Lighting detects state changes made outside of Home Assistant by comparing the light's current state to its previously applied settings.
+
+> [!WARNING]
+> **Use with caution.** Some lights may falsely report an "on" state, which could result in lights turning on unexpectedly. Disable this option if you encounter such issues.
+
+```yaml
+adaptive_lighting:
+ - name: "Detect external changes"
+ lights:
+ - light.living_room
+ take_over_control: true
+ detect_non_ha_changes: true
+```
+
+### autoreset_control_seconds
+
+Automatically resets the manual control flag after a specified number of seconds. Set to `0` to disable (default).
+
+```yaml
+adaptive_lighting:
+ - name: "Auto-reset after 2 hours"
+ lights:
+ - light.living_room
+ take_over_control: true
+ autoreset_control_seconds: 7200 # 2 hours
+```
+
+### adapt_only_on_bare_turn_on
+
+When enabled, Adaptive Lighting only adapts lights when `light.turn_on` is called without specifying brightness or color. This is useful when you want scenes to work without interference.
+
+```yaml
+adaptive_lighting:
+ - name: "Respect scenes"
+ lights:
+ - light.living_room
+ take_over_control: true
+ adapt_only_on_bare_turn_on: true
+```
+
+## Checking Manual Control Status
+
+You can see which lights are marked as manually controlled by checking the switch attributes:
+
+1. Go to **Developer Tools** → **States**
+2. Find your Adaptive Lighting switch (e.g., `switch.adaptive_lighting_living_room`)
+3. Look at the `manual_control` attribute - it lists all manually controlled lights
+
+## Resetting Manual Control
+
+### Via Service Call
+
+```yaml
+service: adaptive_lighting.set_manual_control
+data:
+ entity_id: switch.adaptive_lighting_living_room
+ lights:
+ - light.floor_lamp
+ manual_control: false # Resume adaptation
+```
+
+### By Turning Light Off and On
+
+Simply turning a light off and then back on will reset its manual control status.
+
+### Via Automation
+
+See [Automation Examples](../automation-examples.md) for automation recipes that automatically reset manual control.
+
+## Events
+
+When a light is marked as manually controlled, Adaptive Lighting fires an event:
+
+**Event type:** `adaptive_lighting.manual_control`
+
+**Event data:**
+```yaml
+entity_id: light.living_room
+switch: switch.adaptive_lighting_living_room
+```
+
+You can use this event to trigger automations:
+
+```yaml
+automation:
+ - alias: "Notify on manual control"
+ trigger:
+ platform: event
+ event_type: adaptive_lighting.manual_control
+ action:
+ - service: notify.mobile_app
+ data:
+ message: "{{ trigger.event.data.entity_id }} was manually adjusted"
+```
+
+## Best Practices
+
+1. **Use Zigbee groups** when controlling multiple bulbs together - this ensures consistent manual control detection
+2. **Set reasonable autoreset times** if you want lights to eventually resume adaptation
+3. **Use `pause_changed` mode** if you only adjust brightness or color individually
+4. **Disable `detect_non_ha_changes`** if you experience unexpected light turn-ons
diff --git a/docs/advanced/sleep-mode.md b/docs/advanced/sleep-mode.md
new file mode 100644
index 00000000..40736340
--- /dev/null
+++ b/docs/advanced/sleep-mode.md
@@ -0,0 +1,43 @@
+---
+icon: lucide/moon
+---
+
+# Sleep Mode
+
+Sleep mode is a special operating mode that sets your lights to minimal brightness and very warm color, perfect for winding down at night without disrupting your circadian rhythm.
+
+## Activating Sleep Mode
+
+Each Adaptive Lighting configuration creates a sleep mode switch:
+
+```
+switch.adaptive_lighting_sleep_mode_
+```
+
+Turn it on to activate sleep mode:
+
+```yaml
+service: switch.turn_on
+target:
+ entity_id: switch.adaptive_lighting_sleep_mode_living_room
+```
+
+## Configuration Options
+
+Sleep mode is configured through the main Adaptive Lighting configuration. See the [Configuration](../configuration.md) page for the full options table. The sleep-related options are:
+
+| Option | Default | Description |
+|--------|---------|-------------|
+| `sleep_brightness` | 1 | Brightness percentage in sleep mode |
+| `sleep_rgb_or_color_temp` | `color_temp` | Use `rgb_color` or `color_temp` in sleep mode |
+| `sleep_color_temp` | 1000 | Color temperature in Kelvin for sleep mode |
+| `sleep_rgb_color` | `[255, 56, 0]` | RGB color for sleep mode |
+| `sleep_transition` | 1 | Transition duration in seconds |
+| `transition_until_sleep` | false | Gradually transition to sleep settings after sunset |
+
+## Automation Examples
+
+See [Automation Examples](../automation-examples.md) for sleep mode automation recipes, including:
+
+- Toggle sleep mode using an `input_boolean`
+- Set sunrise/sunset based on alarm time
diff --git a/docs/assets/logo.png b/docs/assets/logo.png
new file mode 100644
index 0000000000000000000000000000000000000000..d055aca3da7d8586f9872b7abcf331631629c9fc
GIT binary patch
literal 17642
zcmd^nc|6qH|NomT+0soY+bE>6Rb)vFNgA@;HYtqiW=SE6tTR!$rL0M^%`H+XlqBnr
z%9cGT+mK-_F&WDkGv@t0Z_-t{pZ|Z4pB_=X-mmvLuk%`-ujROAWnm)3FToE%kPv3?
z?)?zN3I53mE$0DWCN6%M0bh7dn3?Q`VB`;>I6Ve}WFgFM!-E$SM~Z!4*v!tBgI
zi#;0zAPJyL)Z0vsC`_%@18hE<8Ep@9!_|H}cIts95FWOitH|k28h2b$Lf0
ze|al=B=YdJja-*w;tk}lZ;a+!X1Xd`{p(~gj+{uA|6K0#bn>(7C+4J|3`)nJNT(EA
ze{w3;e^Trf&IMNW|L=!Gh|&xnWT1U4uS?UHmRu5JN2;uPY@%3Gq3Az&P{-#v+46Qr
zl?D4RHJ>6Mw*vX9VQtLpNx5Y8DL6*noL+}%(#MqZx=&f6SU9cqE?M%v)G1%els46;
z#wBmOZ6t{_l9)X4j3nJU<4up4=`^Z{7){n=KK{p+Eepx2D?^aN2@j8K_yb0_Zb-5v
z-@b8B|GH&NMBOBfvSZLz&F5w6!%ivGx2Jj=;P+nP)p{eTCdJM7yM`MpT?!*|RWcbS
z5#w#!T*s8?+(KOV@N!Pb3ewf=*c$joSh&*l9J%B5r$P$muH2x;_CEsn*J{?S+VarR+gd`
z_hO$#oImx!<(*;-#Zk%F7iCqX-r~YzC2(O*obA|O4G^Tw10LcMT(M%ReyIIi{y5td
zV{Lj=V~kzIEwM9WhUOj+_u|hex44eHpzQ&#htkaA!nuUFA@Gp**N%ys@p5vFN^ZGGSD-POM1?GIzDxeizii4FOauH09b3oes)U1e??zRQ*E5I2bA(y
z5&h@X@}f^ce$rylfX>S-;wgh?U0;(9@7BwwL5Z~(;wz|04jQDX>G=e2EaUqr!G2r*^?Tl%samvx`>Fc?M%Q!YK7l6)7Te>mc
zjma@PB;_ciFKMTmKJlR#?UNTWSP`{P&NandwVQZr9A-a#-ipJ(7-4^$vW&Dd&pwPa
zOvW8+I@g;gha;!Rx60?Vnx%xLM${i;-Amz$<+vp!20h%_&f{+P<=zZap1ubYC_*)2
zSE4bhvLgQZ?Y3m}He65GVP4T?w^jpE`7SJK#MZwo;{>IvH#Khids)C%Hg0{+9#41+
z9NO;gp>+5|Nb+)nYhV$kW79*D=~L$MEKRjy5+*01FA~?|xi2N-Doc^}H=RwjxcCwd
zbF%aP%qA#uTX7zN2&>L?1@xv;r0&o(DXbK;9mR*l7;&cIRh}&|@b2UrNzC@aiin^@
z>@mSZcy7q_CW>_s&UEgVJefb-LJpmhiZWrJianWEgF7*LPI2}u{6Y`b@Si$lWGKwD
z5vbxu1!Vn4a6Q9`bT}nW7d^1GlF09QW*@y0w;mnS9O^S7Gs~j&)tH3vaFBuEZ(Tn(
zR>LHoZ%W*)=s3Tlvr8J!_duushETr3-6>ue@lZ26oT$PNE
zBHE#7TDRby8*wsEs))FAbPaQtgqK<~N9WwR)cy4h=~Rp21uXM(h>uCd%Gm}^fW
zJ*5M^ZL82qf!MMAUD~9Szp<9mJX5^?egq2|MsGtf|wl`_Nl+j&%hN
z^q|-*m@>{0sih1>Dz&#h4R|)*NHPl=YoxFH&OI##zMPe7(Zm!}IXYELP~>!g1R(P3
z=HbK18mR;KY3!ua-wKS_C)bj(#l1BfVYyM-Ok4>jkeY&qzjPW}^2;t$h8oU!KgnlE
z=mhR>T6=TUAHUX)GKO1J_68e~X^n21;wQ6L)uj9gQ
zcBog^aKioxte9E}nPMo+wRi8q2@(8gxj)rAvzVcBj#TMLj$qYHQy+Y##mQ67=X#BW
zNNPR_%AzNGZNF143T-*nS^%rJGfV3I2CpC1A){{_vRiaZq{t+E;n3tjlDPfFs*i-@
z5J&c*;I+D~U98)m=ueH=l_-Yfq;$XWpSA9vvU^JCJVIQ{@k&r+e0uBCoi1+*E#Eb{
zzpPpReW9X?upCJu^6(Vhgi3bjH#iJVLPYmtX27Eu*eUB_k0MJk`1?^?uVPp_q{noX
zI5(!{@rrV209D@q?85Nb7|Tyy-67FTBemA4r}7Kyq*cM+I_*>LXpRh`?;=r*upiF{
zRO7_Ur;Hia-3}qof(F**zgZ(QkvJ`&`Ho(-gLz`AMSq>N(kWdNuzcmJXRe*qc`b>@
zLRcboyO6D)uEa+34B68&N#{ukA<4jV+H&A!U%C~arH%Pth0|kj5g#sztf%D-8?lS!
z;rop9xRGgCbIX=3QWKX6>EO6tvQErCb^6fTn1v}gxQl(waUDD)jlIyPhVg9b-usk#
z!HoAdTY2D`Vf|}PNab^Gf4{h2x}*Zy><8`JKJ+?zDt+{(nHaHK*H9Rre7PPnIN+UW
z!%(HNd?InzZRYGkj~17DAZeU*lsLwV1KxH3^NJIy$Ua#v-F$y0CuO|J9Wf%2_j4N?
zjfNWo^7U<*Ng)2{OKNcWfvBY&tjO!W;2^w~;unKGia!;TD8iHp%{W(K1+
zc*`Gv?#p5X3tvm|*vAC@LL#X$@)v`Jv1>XwxZYZc$Fx01nEceR!~K?Y4_s6olM
zlm3@k&9!r{?usVLC-oFF*>`K{*tHsK3S`8fhRh2}r2f=)g(U4DNt)#r0mKabEZMz2
z($o{31&+PTsQjDpnOC_9p<`WzNv?d%OA278z_nJhc^Ee{Q^km_hZC1aVpVJxI3lGBA0eu<|god*1S0U;;6>V1x!}r
zMcsw>N8);KG>;h7-zXY=UZdKMn&2Y1I&chZ^*;0JWI+bnKP)wFUy(FJ@y-=ihEG5x
z(XQWL?!Zv1?KWn#Q*iR~^W4gi-kUi`@U?R!n)uh^75o!l)>txK9Y(L&Rm%Ywl1xH{#YZ4
zcBJEVVJ5wY=w}Pu9UHbhT&)b*y*m)1mAvK=d@NdQu~12w)PWm5UZ;m(dP{;ee6+#p
zp&+1s6E5Vl5A|pgcc3Zy8u0X7Igz-@aA6SXx7RBVWm%StjH>vcP#RL34L>Pyo7VSc
zxF_!LHHFXG`~4)_k(uCaqsf?aBe7xPYF*+7xzesGL3X7dpXQk-Yoy^67OffU@lH)L
zd`Qc!tH^i1)!JJUV)*O5#XgE(*UsFSeyhK52zkS1iDTA!lBj8?pjeN|;~WpQEi>VF
zq4LGPUw&AW5!*X(&}p{6J7gGE-YA%MMJV(2*P~wJ?Zx9MDHnej0FV@R%BD+~J{6YY
z(}U*KTWQKGU|{^Y#H}w(E=yNl+D~o85A`Eu*1LWDd%R$X5q3L3*BQFSFNWuT9yn4f
zu%6*BpQQ1xT>-W!vrnAXqp&6C8=K4xLkJq#(7_vs?W=^}^H*4G)9Y}BB^I@we#%p`
zakkGrdg=(5toWx_I$ZhmtS5Z%-0IHF4!%bU(EbY*`jrRfRnEA`uI%vvkmHkxSe+ywfAx9XW!XDe2fI{NLjyTf
z&g|(r0ZhYmJf#4KXeIv98j41Uw3Q(R2g=<9(ny-ti<$*gHP6zf8s5^{ndjTv9&**d
zq(=oG?CUw(O8L<1{4{m&sb?ilIb_cBk}}omZIYs3ZU2)fyX-SPuTi{0m%~d%@th!7
z_zy)DywsdGN%HY|T$Z9sLxFuEp=6HK
zmyEXfT4aCm^Xn@aA<0~S0oSP0<6iWvKVX8si(RXZppJQ29nxo*?I)*MUZjrgxA?}J
zBvM$HFrgcb4VW1D`H=cYsEAYl
ziYwzi4gJ2Zjl9WAHC~SyPf+A}1mwEn#y*)6`%2=uIk1j6$>f~J>u{L6I)2@yDVMp{
zNrG6mrSM}wFY6P7SHWC{DD*Se9W+$EQ0x5xU$vvz4z3L$vZBZX&sZb@1}Xu8yx&b=
zs0tgsq2dqVG*MB9g=IZ4|w-9qQUBl=*v^GYtGW>&gu{8swD>Z5n{ks*fkyF$hF;wVX
zi!BLYI9qXWm5D+py^Ym_cz>2ff>IGjB$xg?gD3+?}L8T
z_ZSqQRE~3Ok@XxUY847Ewd5-`aQDb|(nO*_&*j==Jw;$2<>V1!G`1)|u$Jx>1D+E~p<{KITTNkCm4|{4Wi3N%q$?naqm-aPF0V_6(
z$81+hV<}Ym(@Q|KLtQD!31H22trbNpP5jSkP!smS8D;1e(~O$_VO
zVb@m@U;nnl8hbXcJKfKzT$iA797pru(rpbm`RCUchP&APKd*O(JbdoNTX9v?nja7qkfZ9LediP`MlP(@xiqxqtfBYYl
zWYmPbpOhFLN(>8s#llWw6lxY>!d<`}@To_=X$SQR=tUWGSdLMi!d7FYMxXitSa&)h
zntXn37teA$H$kXfOVw_}px`5}-?y4ppLl^1a!ggoZ@-?PfProi?&iVZ7}MK}K-d+4
z8@Bx=kI8MzC=V_cK!}LXzb!@c&Z};?n&2TU^2&5_1DfQ~9`Ptt*KwmOwH(lVO@UXKrA5p^9XdbyBM}q
zp{fn@@guo3qS(nf$mgs3auQ=GXYpd$kj8OP+$Ujb5<0OS}{`nM?3Eoe$Cl%
z*(Oj|mELsi=BU!h?>r4g-{>8PAZj~XA+%f+N$ifzOOQFM-tIk%-vC}+<|{qU#<>97
z_<{Kk#>c7Zvg#G|4Cj+)1o4O=
zxF-^$G5qkz*UsmJV3`nZ!q%G9RVjpjAqk@Prz+*|whSl?z2R)YXQLT1Cx$<^Z?J5)
zhSTV7rh8>TfO$D*>J()p%&d!XK0N-3-5E5UD!Oc0x#1N(PHQOqL|a!>S|v$S=FzWyqwAa|;KxIOYQ_D-0B(Nt*MpZ9(Atu|)YX!_t!u9Cu24UER>uO^<3p
z6|$0ec0LR*>^XKf@UwT$RoqsgaOqu>xy0?jsY(;q03q%79q(sE{L$hX7M#2{qLg#X
zAL43f&a2Z**k`?dI2kpg4UJE3A(coefl{s`(1w+RpTv2Wpb-Q#I<4Q(G(S->Jl{o^
zo+vCR(vvp)you_~I1DXW2@-MOSaY)Cs_p}`9X>2q;MLpb!sdeV-?I^;q3`IzAIr`*
z2fx;X1WMQ3zdw0Jf;n#R`-V>`;xLcR@3OzL2)q-JGSvIwi}5O&*2u3%7K!svz0Q#B
z2Fc9H=_3MBAc`f-C#HxKTD$F<;{^kDw7jDJa%~=gQf*Z~`@-ck;rG9W^-8pPIJbkK
z7~W|5vkKLieH>`fPoZ3ZkzTDc$Rconb>mZO6WkN!2VWqWLn#RMgTn?7T#y4xd!Ksu
z3hMx+=zM>7w*#($pc=|;(8O1MASGi1POK8WCG;1-v<`lfU(#8TvkU|I!HV&;j?HSsOE;msRxnCRwf>*^mR3^KS&Ys}piC22ogtSC}a
zkKqilGXvtYIE_eIbmx5j^Ml5?kJ?9WPh|RE0!J1Qrm~V@{q3jF2sU>cUUN2!?X9av
zg!Y#7gh9WPw8RnLaF%isc;YTa; 
