Merge pull request #93 from c-st/fix-async

Fix startup issues

Author: c-st

custom_components/auto_areas/__init__.py

@@ -1,10 +1,13 @@
 """🤖 Auto Areas. A custom component for Home Assistant which automates your areas."""
 from __future__ import annotations
+import asyncio
 
 from homeassistant.helpers import issue_registry
 from homeassistant.config_entries import ConfigEntry, ConfigType
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
+
 
 from .auto_area import (
     AutoArea,
@@ -18,15 +21,33 @@
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Initialize AutoArea for this config entry."""
     hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = AutoArea(hass=hass, entry=entry)
 
+    auto_area = AutoArea(hass=hass, entry=entry)
+    hass.data[DOMAIN][entry.entry_id] = auto_area
+
+    # Initialize AutoArea once HA is started
+    if hass.is_running:
+        initialize(hass, entry, auto_area)
+    else:
+        hass.bus.async_listen_once(
+            EVENT_HOMEASSISTANT_STARTED,
+            lambda init: initialize(hass, entry, auto_area)
+        )
+
+    return True
+
+async def async_init(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
+    await auto_area.initialize()
+    entry.async_on_unload(entry.add_update_listener(async_reload_entry))
     hass.async_create_task(
         hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     )
-    entry.async_on_unload(entry.add_update_listener(async_reload_entry))
-
-    return True
 
+def initialize(hass: HomeAssistant, entry: ConfigEntry, auto_area: AutoArea):
+    """Initialize area after HA has started."""
+    return asyncio.run_coroutine_threadsafe(
+        async_init(hass, entry, auto_area), hass.loop
+    ).result()
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Handle removal of an entry."""

custom_components/auto_areas/auto_area.py

@@ -1,7 +1,6 @@
 """Core entity functionality."""
 from __future__ import annotations
 from homeassistant.core import HomeAssistant
-from homeassistant.const import EVENT_HOMEASSISTANT_STARTED
 
 from homeassistant.config_entries import ConfigEntry
 
@@ -38,16 +37,13 @@ def __init__(self, hass: HomeAssistant, entry: ConfigEntry) -> None:
 
         LOGGER.info('🤖 Auto Area "%s" (%s)', entry.title, entry.options)
 
-        if self.hass.is_running:
-            self.hass.async_create_task(self.initialize())
-        else:
-            self.hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_STARTED, self.initialize()
-            )
 
     async def initialize(self):
         """Subscribe to area changes and reload if necessary."""
+        LOGGER.info("%s: Initializing after HA start", self.area.name)
+
         self.auto_lights = AutoLights(self)
+        await self.auto_lights.initialize()
 
     def cleanup(self):
         """Deinitialize this area."""

custom_components/auto_areas/auto_lights.py

@@ -3,7 +3,6 @@
 from homeassistant.components.light import DOMAIN as LIGHT_DOMAIN
 from homeassistant.helpers.event import async_track_state_change
 from homeassistant.const import (
-    EVENT_HOMEASSISTANT_STARTED,
     STATE_ON,
     SERVICE_TURN_ON,
     SERVICE_TURN_OFF,
@@ -84,25 +83,6 @@ def __init__(self, auto_area) -> None:
             )
             return
 
-        if self.hass.is_running:
-            self.hass.async_create_task(self.initialize())
-        else:
-            self.hass.bus.async_listen_once(
-                EVENT_HOMEASSISTANT_STARTED, self.initialize()
-            )
-
-    def cleanup(self):
-        """Deinitialize this area."""
-        LOGGER.debug("%s: Disabling light control", self.auto_area.area.name)
-        if self.unsubscribe_sleep_mode is not None:
-            self.unsubscribe_sleep_mode()
-
-        if self.unsubscribe_presence is not None:
-            self.unsubscribe_presence()
-
-        if self.unsubscribe_illuminance is not None:
-            self.unsubscribe_illuminance()
-
     async def initialize(self):
         """Start subscribing to state changes."""
 
@@ -326,3 +306,15 @@ def get_current_illuminance(self) -> float | None:
             current_illuminance = None
 
         return current_illuminance
+
+    def cleanup(self):
+        """Deinitialize this area."""
+        LOGGER.debug("%s: Disabling light control", self.auto_area.area.name)
+        if self.unsubscribe_sleep_mode is not None:
+            self.unsubscribe_sleep_mode()
+
+        if self.unsubscribe_presence is not None:
+            self.unsubscribe_presence()
+
+        if self.unsubscribe_illuminance is not None:
+            self.unsubscribe_illuminance()

custom_components/auto_areas/binary_sensor.py

@@ -94,7 +94,7 @@ def get_presence_entities(self) -> list(str):
 
     async def async_added_to_hass(self):
         """Start tracking sensors."""
-        LOGGER.info(
+        LOGGER.debug(
             "%s: Presence detection entities %s",
             self.auto_area.area.name,
             self.presence_entities,

requirements.txt

@@ -1,4 +1,4 @@
-colorlog==6.8.2
-homeassistant==2023.2.0
+colorlog==6.7.0
+homeassistant==2023.4.0
 pip>=21.0,<24.1
 ruff==0.1.14