Rework following latest fritzbox code

Author: bouwew

custom_components/plugwise/binary_sensor.py

@@ -97,13 +97,15 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseBinarySensorEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             if not (binary_sensors := device.get(BINARY_SENSORS)):
                 continue
@@ -125,7 +127,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseBinarySensorEntity(PlugwiseEntity, BinarySensorEntity):

custom_components/plugwise/button.py

@@ -35,14 +35,16 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseButtonEntity] = []
         gateway = coordinator.data.gateway
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             if device_id == gateway[GATEWAY_ID] and REBOOT in gateway:
                 for description in BUTTON_TYPES:
@@ -61,7 +63,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseButtonEntity(PlugwiseEntity, ButtonEntity):

custom_components/plugwise/climate.py

@@ -71,13 +71,15 @@ async def async_setup_entry(
     )  # pw-beta homekit emulation
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseClimateEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             if device[DEV_CLASS] in MASTER_THERMOSTATS:
                 entities.append(
@@ -91,7 +93,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseClimateEntity(PlugwiseEntity, ClimateEntity):

custom_components/plugwise/number.py

@@ -70,13 +70,15 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseNumberEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             for description in NUMBER_TYPES:
                 if description.key in device:
@@ -91,7 +93,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseNumberEntity(PlugwiseEntity, NumberEntity):

custom_components/plugwise/select.py

@@ -77,13 +77,15 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseSelectEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             for description in SELECT_TYPES:
                 if description.options_key in device:
@@ -98,7 +100,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseSelectEntity(PlugwiseEntity, SelectEntity):

custom_components/plugwise/sensor.py

@@ -462,13 +462,15 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseSensorEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             if not (sensors := device.get(SENSORS)):
                 continue
@@ -490,7 +492,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseSensorEntity(PlugwiseEntity, SensorEntity):

custom_components/plugwise/switch.py

@@ -73,13 +73,15 @@ async def async_setup_entry(
     coordinator = entry.runtime_data
 
     @callback
-    def _add_entities() -> None:
+    def _add_entities(devices: set[str] | None = None) -> None:
         """Add Entities."""
-        if not coordinator.new_devices:
+        if devices is None:
+            devices = coordinator.new_devices
+        if not devices:
             return
 
         entities: list[PlugwiseSwitchEntity] = []
-        for device_id in coordinator.new_devices:
+        for device_id in devices:
             device = coordinator.data.devices[device_id]
             if not (switches := device.get(SWITCHES)):
                 continue
@@ -95,7 +97,7 @@ def _add_entities() -> None:
 
     entry.async_on_unload(coordinator.async_add_listener(_add_entities))
 
-    _add_entities()
+    _add_entities(set(coordinator.data.devices))
 
 
 class PlugwiseSwitchEntity(PlugwiseEntity, SwitchEntity):