Merge pull request #358 from Olen/fix/registry-entry-fallback

fix: replace ConfigEntryNotReady with retry loop for device registry

Author: Olen

custom_components/plant/__init__.py

@@ -2,6 +2,7 @@
 
 from __future__ import annotations
 
+import asyncio
 import logging
 
 import voluptuous as vol
@@ -23,7 +24,6 @@
     Platform,
 )
 from homeassistant.core import HomeAssistant, ServiceCall, callback
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers import entity_registry as er
@@ -316,6 +316,10 @@ async def replace_sensor(call: ServiceCall) -> None:
     return True
 
 
+_REGISTRY_RETRY_DELAY = 1  # seconds between retries
+_REGISTRY_MAX_RETRIES = 5
+
+
 async def _plant_add_to_device_registry(
     hass: HomeAssistant,
     plant_entities: list[Entity],
@@ -328,12 +332,30 @@ async def _plant_add_to_device_registry(
     # device_id when adding the entities.
     erreg = er.async_get(hass)
     for entity in plant_entities:
-        if entity.registry_entry is None:
-            raise ConfigEntryNotReady(
-                f"Entity {entity.entity_id} not yet registered, retrying setup"
+        registry_entry = entity.registry_entry or erreg.async_get(entity.entity_id)
+        retries = 0
+        while registry_entry is None and retries < _REGISTRY_MAX_RETRIES:
+            retries += 1
+            _LOGGER.debug(
+                "Entity %s not yet in registry, retrying (%s/%s)",
+                entity.entity_id,
+                retries,
+                _REGISTRY_MAX_RETRIES,
             )
+            await asyncio.sleep(_REGISTRY_RETRY_DELAY)
+            registry_entry = entity.registry_entry or erreg.async_get(entity.entity_id)
+
+        if registry_entry is None:
+            _LOGGER.warning(
+                "Entity %s not found in registry after %s retries, "
+                "skipping device assignment",
+                entity.entity_id,
+                retries,
+            )
+            continue
+
         erreg.async_update_entity(
-            entity.registry_entry.entity_id,
+            registry_entry.entity_id,
             device_id=device_id,
             config_entry_id=entry.entry_id,
         )

custom_components/plant/manifest.json

@@ -17,5 +17,5 @@
   "requirements": [
     "async-timeout>=4.0.2"
   ],
-  "version": "2026.2.1-beta3"
+  "version": "2026.2.1-beta4"
 }

tests/test_init.py

@@ -127,33 +127,31 @@ async def test_remove_entry(
         )
         assert device_after is None
 
-    async def test_setup_entry_retries_when_registry_not_ready(
+    async def test_setup_completes_when_registry_entry_not_immediate(
         self,
         hass: HomeAssistant,
         mock_external_sensors: None,
     ) -> None:
-        """Test setup raises ConfigEntryNotReady when entity registry_entry is None."""
+        """Test setup completes gracefully when registry_entry is None initially.
+
+        The function should retry with registry lookup and give up gracefully
+        instead of blocking the entire setup with ConfigEntryNotReady.
+        """
         from tests.conftest import create_plant_config_data
 
         config_data = create_plant_config_data()
         entry = MockConfigEntry(
             domain=DOMAIN,
             data=config_data,
-            entry_id="test_registry_not_ready",
+            entry_id="test_registry_delayed",
         )
         entry.add_to_hass(hass)
 
-        with patch(
-            "custom_components.plant._plant_add_to_device_registry",
-            side_effect=__import__(
-                "homeassistant.exceptions", fromlist=["ConfigEntryNotReady"]
-            ).ConfigEntryNotReady("Entity not yet registered"),
-        ):
-            await hass.config_entries.async_setup(entry.entry_id)
-            await hass.async_block_till_done()
+        await hass.config_entries.async_setup(entry.entry_id)
+        await hass.async_block_till_done()
 
-        # Entry should be in SETUP_RETRY state
-        assert entry.state.name == "SETUP_RETRY"
+        # Setup should complete successfully (not stuck in SETUP_RETRY)
+        assert entry.state.name == "LOADED"
 
     async def test_setup_entry_no_plant_info(
         self,