Merge pull request #892 from canton7/bugfix/setup-new-ha-2025.8

Fix error setting up integration from fresh on HA 2025.8

Author: canton7

custom_components/foxess_modbus/entities/entity_descriptions.py

@@ -2575,7 +2575,7 @@ def _configuration_entities() -> Iterable[EntityFactory]:
     )
 
 
-ENTITIES: list[EntityFactory] = list(
+ENTITIES: list[EntityFactory] = sorted(
     itertools.chain(
         _version_entities(),
         _pv_entities(),
@@ -2586,5 +2586,6 @@ def _configuration_entities() -> Iterable[EntityFactory]:
         _configuration_entities(),
         (description for x in CHARGE_PERIODS for description in x.entity_descriptions),
         REMOTE_CONTROL_DESCRIPTION.entity_descriptions,
-    )
+    ),
+    key=lambda x: x.depends_on_other_entities,
 )

custom_components/foxess_modbus/entities/entity_factory.py

@@ -36,6 +36,11 @@ class EntityFactory(ABC, metaclass=EntityFactoryMetaclass):  # type: ignore
     def entity_type(self) -> type[Entity]:
         """Fetch the type of entity that this factory creates"""
 
+    @property
+    def depends_on_other_entities(self) -> bool:
+        """Return true if this entity depends on other entities, and so should be constructed last."""
+        return False
+
     @abstractmethod
     def create_entity_if_supported(
         self,

custom_components/foxess_modbus/entities/modbus_integration_sensor.py

@@ -44,6 +44,10 @@ class ModbusIntegrationSensorDescription(SensorEntityDescription, EntityFactory)
     def entity_type(self) -> type[Entity]:
         return SensorEntity
 
+    @property
+    def depends_on_other_entities(self) -> bool:
+        return True
+
     def create_entity_if_supported(
         self,
         controller: EntityController,

custom_components/foxess_modbus/inverter_profiles.py

@@ -177,18 +177,26 @@ def create_entities(
         self,
         entity_type: type[Entity],
         controller: EntityController,
+        filter_depends_on_other_entites: bool | None = None,
     ) -> list[Entity]:
         """Create all of the entities of the given type which support this inverter/connection combination"""
 
         result = []
 
         for entity_factory in ENTITIES:
-            if entity_factory.entity_type == entity_type:
-                entity = entity_factory.create_entity_if_supported(
-                    controller, self._get_inv(controller), self.register_type
-                )
-                if entity is not None:
-                    result.append(entity)
+            if (
+                filter_depends_on_other_entites is not None
+                and filter_depends_on_other_entites != entity_factory.depends_on_other_entities
+            ):
+                continue
+            if entity_factory.entity_type != entity_type:
+                continue
+
+            entity = entity_factory.create_entity_if_supported(
+                controller, self._get_inv(controller), self.register_type
+            )
+            if entity is not None:
+                result.append(entity)
 
         return result
 
@@ -434,11 +442,13 @@ def inverter_capacity(self, inverter_model: str) -> int:
 assert all(ConnectionType.AUX in x.connection_types for x in _INVERTER_PROFILES_LIST)
 
 
-def create_entities(entity_type: type[Entity], controller: EntityController) -> list[Entity]:
+def create_entities(
+    entity_type: type[Entity], controller: EntityController, filter_depends_on_other_entites: bool | None = None
+) -> list[Entity]:
     """Create all of the entities which support the inverter described by the given configuration object"""
 
     return inverter_connection_type_profile_from_config(controller.inverter_details).create_entities(
-        entity_type, controller
+        entity_type, controller, filter_depends_on_other_entites
     )
 
 

custom_components/foxess_modbus/sensor.py

@@ -23,4 +23,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry, async_add_d
 
     for controller in controllers:
         async_add_devices([ConnectionStatusSensor(controller)])
-        async_add_devices(create_entities(SensorEntity, controller))
+        # We have to add sensors which don't depend on other sensors, before we add the sensors which *do* depend on
+        # other sensors (like the integration sensors), otherwise HA crashes when trying to create the IntegrationSensor
+        # because it can't find the sensor it depends on. See https://github.com/nathanmarlor/foxess_modbus/issues/886
+        async_add_devices(create_entities(SensorEntity, controller, filter_depends_on_other_entites=False))
+        async_add_devices(create_entities(SensorEntity, controller, filter_depends_on_other_entites=True))

requirements.txt

@@ -1,7 +1,7 @@
-homeassistant==2025.1.1
+homeassistant==2025.8.0
 
 # Testing
-pytest-homeassistant-custom-component==0.13.202  # Matching version for 2025.1.0
+pytest-homeassistant-custom-component==0.13.269  # Matching version
 psutil-home-assistant  # Not sure why this is needed?
 fnv_hash_fast  # Or this?
 pytest-asyncio
@@ -16,6 +16,6 @@ ruff==0.9.4
 mypy==1.15.0
 
 # Typing
-homeassistant-stubs==2025.1.1 # Matching HA version
+homeassistant-stubs==2025.8.0 # Matching HA version
 types-python-slugify==8.0.0.2
 voluptuous-stubs==0.1.1

tests/test_entity_descriptions.py

@@ -41,8 +41,11 @@ async def test_creates_all_entities(hass: HomeAssistant) -> None:
                     ENTITY_ID_PREFIX: "",
                     UNIQUE_ID_PREFIX: "",
                 }
+
                 # Asserts if e.g. the ModbusAddressSpecs match
-                create_entities(entity_type, controller)
+                # We can't test IntegrationSensors (which have depends_on_other_entities=True), as HA throws up saying
+                # that the entity it depends on doesn't exist (as we're not actually creating entities).
+                create_entities(entity_type, controller, filter_depends_on_other_entites=False)
 
 
 def pytest_generate_tests(metafunc: pytest.Metafunc) -> None: