fixing #375 and changes to the threshold sensor on 2024.7

Author: jseidl

custom_components/magic_areas/__init__.py

@@ -102,15 +102,11 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry):
     }
 
     # Setup platforms
-    for platform in magic_area.available_platforms():
-        _LOGGER.debug("%s: Loading platform '%s'...", magic_area.name, platform)
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, platform)
-        )
-        magic_area.loaded_platforms.append(platform)
+    await hass.config_entries.async_forward_entry_setups(
+        config_entry, magic_area.available_platforms()
+    )
 
     # Conditional reload of related meta-areas
-
     # Populate dict with all meta-areas with ID as key
     meta_areas = defaultdict()
 
@@ -157,28 +153,21 @@ async def async_update_options(hass: HomeAssistant, config_entry: ConfigEntry) -
 async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Unload a config entry."""
 
-    platforms_unloaded = []
     data = hass.data[MODULE_DATA]
     area_data = data[config_entry.entry_id]
     area = area_data[DATA_AREA_OBJECT]
 
-    for platform in area.loaded_platforms:
-        unload_ok = await hass.config_entries.async_forward_entry_unload(
-            config_entry, platform
-        )
-        platforms_unloaded.append(unload_ok)
+    await hass.config_entries.async_unload_platforms(
+        config_entry, area.available_platforms()
+    )
 
     area_data[DATA_UNDO_UPDATE_LISTENER]()
-
-    all_unloaded = all(platforms_unloaded)
-
-    if all_unloaded:
-        data.pop(config_entry.entry_id)
+    data.pop(config_entry.entry_id)
 
     if not data:
         hass.data.pop(MODULE_DATA)
 
-    return all_unloaded
+    return True
 
 
 def migrate_seconds_to_minutes(config_data: dict) -> dict:

custom_components/magic_areas/binary_sensor.py

@@ -42,14 +42,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up the Area config entry."""
 
-    add_entities_when_ready(
-        hass, async_add_entities, config_entry, add_sensors, with_hass=True
-    )
+    add_entities_when_ready(hass, async_add_entities, config_entry, add_sensors)
 
 
-def add_sensors(
-    area: MagicArea, hass: HomeAssistant, async_add_entities: AddEntitiesCallback
-) -> None:
+def add_sensors(area: MagicArea, async_add_entities: AddEntitiesCallback) -> None:
     """Add the basic sensors for the area."""
     entities = []
 
@@ -59,7 +55,7 @@ def add_sensors(
     # Create extra sensors
     if area.has_feature(CONF_FEATURE_AGGREGATION):
         entities.extend(create_aggregate_sensors(area))
-        illuminance_threshold_sensor = create_illuminance_threshold(area, hass)
+        illuminance_threshold_sensor = create_illuminance_threshold(area)
         if illuminance_threshold_sensor:
             entities.append(illuminance_threshold_sensor)
 

custom_components/magic_areas/light.py

@@ -1,19 +1,28 @@
 """Platform file for Magic Area's light entities."""
 
+import asyncio
 import logging
 
 from homeassistant.components.group.light import LightGroup
-from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
+from homeassistant.components.light import (
+    ATTR_COLOR_TEMP,
+    ATTR_HS_COLOR,
+    DOMAIN as LIGHT_DOMAIN,
+    SUPPORT_COLOR,
+    SUPPORT_COLOR_TEMP,
+)
 from homeassistant.components.switch import DOMAIN as SWITCH_DOMAIN
 from homeassistant.const import (
     ATTR_ENTITY_ID,
+    ATTR_SUPPORTED_FEATURES,
     SERVICE_TURN_OFF,
     SERVICE_TURN_ON,
     STATE_OFF,
     STATE_ON,
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import async_track_state_change_event
+from homeassistant.util import color as color_util
 
 from .add_entities_when_ready import add_entities_when_ready
 from .base.entities import MagicEntity
@@ -153,6 +162,7 @@ async def async_turn_on(self, **kwargs) -> None:
 
         # Active lights
         active_lights = self._get_active_lights()
+        targeted_lights = self._entity_ids
 
         if active_lights:
             _LOGGER.debug(
@@ -161,17 +171,84 @@ async def async_turn_on(self, **kwargs) -> None:
                 str(active_lights),
             )
 
-        data[ATTR_ENTITY_ID] = active_lights if active_lights else self._entity_ids
+            targeted_lights = active_lights
 
-        # Forward call
-        await self.hass.services.async_call(
-            LIGHT_DOMAIN,
-            SERVICE_TURN_ON,
-            data,
-            blocking=True,
-            context=self._context,
+        # Split entities by supported features
+        entity_map = {SUPPORT_COLOR: [], SUPPORT_COLOR_TEMP: []}
+        for entity_id in targeted_lights:
+            state = self.hass.states.get(entity_id)
+            if not state:
+                continue
+            support = state.attributes.get(ATTR_SUPPORTED_FEATURES)
+
+            if bool(support & SUPPORT_COLOR):
+                if bool(support & SUPPORT_COLOR_TEMP):
+                    entity_map[SUPPORT_COLOR_TEMP].append(entity_id)
+                else:
+                    entity_map[SUPPORT_COLOR].append(entity_id)
+
+        no_color_support = list(
+            set(targeted_lights)
+            - set(entity_map[SUPPORT_COLOR])
+            - set(entity_map[SUPPORT_COLOR_TEMP])
         )
 
+        service_calls = []
+
+        if entity_map[SUPPORT_COLOR_TEMP]:
+            service_data = data.copy()
+            service_data[ATTR_ENTITY_ID] = entity_map[SUPPORT_COLOR_TEMP]
+            service_call = self.hass.services.async_call(
+                LIGHT_DOMAIN,
+                SERVICE_TURN_ON,
+                service_data,
+                blocking=True,
+                context=self._context,
+            )
+            service_calls.append(service_call)
+
+        if entity_map[SUPPORT_COLOR]:
+            service_data = data.copy()
+            service_data[ATTR_ENTITY_ID] = entity_map[SUPPORT_COLOR]
+
+            # Perform color_temp emulation if ATTR_COLOR_TEMP is passed
+            if ATTR_COLOR_TEMP in service_data:
+                temp_k = color_util.color_temperature_mired_to_kelvin(
+                    service_data[ATTR_COLOR_TEMP]
+                )
+                hs_color = color_util.color_temperature_to_hs(temp_k)
+                service_data[ATTR_HS_COLOR] = hs_color
+                del service_data[ATTR_COLOR_TEMP]
+
+            service_call = self.hass.services.async_call(
+                LIGHT_DOMAIN,
+                SERVICE_TURN_ON,
+                service_data,
+                blocking=True,
+                context=self._context,
+            )
+            service_calls.append(service_call)
+
+        if no_color_support:
+            service_data = data.copy()
+            service_data[ATTR_ENTITY_ID] = no_color_support
+            if ATTR_COLOR_TEMP in service_data:
+                del service_data[ATTR_COLOR_TEMP]
+            if ATTR_HS_COLOR in service_data:
+                del service_data[ATTR_HS_COLOR]
+
+            service_call = self.hass.services.async_call(
+                LIGHT_DOMAIN,
+                SERVICE_TURN_ON,
+                service_data,
+                blocking=True,
+                context=self._context,
+            )
+            service_calls.append(service_call)
+
+        # Perform calls
+        await asyncio.gather(*service_calls)
+
 
 class AreaLightGroup(MagicLightGroup):
     """Magic Light Group."""

custom_components/magic_areas/manifest.json

@@ -20,5 +20,5 @@
   "iot_class": "calculated",
   "issue_tracker": "https://github.com/jseidl/hass-magic_areas/issues",
   "requirements": [],
-  "version": "4.0.0"
+  "version": "4.0.1"
 }

custom_components/magic_areas/threshold.py

@@ -9,7 +9,6 @@
 from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
 from homeassistant.components.threshold.binary_sensor import ThresholdSensor
 from homeassistant.const import ATTR_DEVICE_CLASS
-from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import Entity
 
 from .base.entities import MagicEntity
@@ -26,7 +25,7 @@
 _LOGGER = logging.getLogger(__name__)
 
 
-def create_illuminance_threshold(area: MagicArea, hass: HomeAssistant) -> Entity:
+def create_illuminance_threshold(area: MagicArea) -> Entity:
     """Create threhsold light binary sensor based off illuminance aggregate."""
 
     if not area.has_feature(CONF_FEATURE_AGGREGATION):
@@ -65,7 +64,6 @@ def create_illuminance_threshold(area: MagicArea, hass: HomeAssistant) -> Entity
 
     threshold_sensor = AreaThresholdSensor(
         area,
-        hass=hass,
         device_class=BinarySensorDeviceClass.LIGHT,
         entity_id=illuminance_aggregate_entity_id,
         upper=illuminance_threshold,
@@ -82,7 +80,6 @@ class AreaThresholdSensor(MagicEntity, ThresholdSensor):
     def __init__(
         self,
         area: MagicArea,
-        hass: HomeAssistant,
         device_class: BinarySensorDeviceClass,
         entity_id: str,
         upper: int | None = None,
@@ -95,7 +92,6 @@ def __init__(
         )
         ThresholdSensor.__init__(
             self,
-            hass=hass,
             entity_id=entity_id,
             name=None,
             unique_id=self.unique_id,

custom_components/magic_areas/translations/nl-NL.json

@@ -267,4 +267,4 @@
       }
     }
   }
-}
+}

hacs.json

@@ -2,7 +2,7 @@
     "name": "Magic Areas",
     "filename": "magic_areas.zip",
     "hide_default_branch": true,
-    "homeassistant": "2024.5.0",
+    "homeassistant": "2024.7.0",
     "render_readme": true,
     "zip_release": true
 }

requirements.txt

@@ -1,2 +1,2 @@
-homeassistant>=2023.8.0
+homeassistant>=2024.7.0
 pip