Fix duplicate unique id issue in Sensibo (#139582)

* Fix duplicate unique id issue in Sensibo

* Fixes

* Mods

homeassistant/components/sensibo/binary_sensor.py

@@ -130,9 +130,10 @@ async def async_setup_entry(
         """Handle additions of devices and sensors."""
         entities: list[SensiboMotionSensor | SensiboDeviceSensor] = []
         nonlocal added_devices
-        new_devices, remove_devices, added_devices = coordinator.get_devices(
+        new_devices, remove_devices, new_added_devices = coordinator.get_devices(
             added_devices
         )
+        added_devices = new_added_devices
 
         if LOGGER.isEnabledFor(logging.DEBUG):
             LOGGER.debug(
@@ -168,7 +169,6 @@ async def async_setup_entry(
                     device_data.model, DEVICE_SENSOR_TYPES
                 )
             )
-
             async_add_entities(entities)
 
     entry.async_on_unload(coordinator.async_add_listener(_add_remove_devices))

homeassistant/components/sensibo/button.py

@@ -46,7 +46,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

homeassistant/components/sensibo/climate.py

@@ -149,7 +149,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

homeassistant/components/sensibo/coordinator.py

@@ -56,18 +56,31 @@ class SensiboDataUpdateCoordinator(DataUpdateCoordinator[SensiboData]):
     ) -> tuple[set[str], set[str], set[str]]:
         """Addition and removal of devices."""
         data = self.data
-        motion_sensors = {
+        current_motion_sensors = {
             sensor_id
             for device_data in data.parsed.values()
             if device_data.motion_sensors
             for sensor_id in device_data.motion_sensors
         }
-        devices: set[str] = set(data.parsed)
+        current_devices: set[str] = set(data.parsed)
-        new_devices: set[str] = motion_sensors | devices - added_devices
+        LOGGER.debug(
-        remove_devices = added_devices - devices - motion_sensors
+            "Current devices: %s, moption sensors: %s",
-        added_devices = (added_devices - remove_devices) | new_devices
+            current_devices,
+            current_motion_sensors,
+        )
+        new_devices: set[str] = (
+            current_motion_sensors | current_devices
+        ) - added_devices
+        remove_devices = added_devices - current_devices - current_motion_sensors
+        new_added_devices = (added_devices - remove_devices) | new_devices
 
-        return (new_devices, remove_devices, added_devices)
+        LOGGER.debug(
+            "New devices: %s, Removed devices: %s, Added devices: %s",
+            new_devices,
+            remove_devices,
+            new_added_devices,
+        )
+        return (new_devices, remove_devices, new_added_devices)
 
     async def _async_update_data(self) -> SensiboData:
         """Fetch data from Sensibo."""

homeassistant/components/sensibo/number.py

@@ -76,7 +76,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

homeassistant/components/sensibo/select.py

@@ -115,7 +115,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

homeassistant/components/sensibo/sensor.py

@@ -253,9 +253,8 @@ async def async_setup_entry(
 
         entities: list[SensiboMotionSensor | SensiboDeviceSensor] = []
         nonlocal added_devices
-        new_devices, remove_devices, added_devices = coordinator.get_devices(
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
-            added_devices
+        added_devices = new_added_devices
-        )
 
         if new_devices:
             entities.extend(

homeassistant/components/sensibo/switch.py

@@ -89,7 +89,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

homeassistant/components/sensibo/update.py

@@ -56,7 +56,8 @@ async def async_setup_entry(
     def _add_remove_devices() -> None:
         """Handle additions of devices and sensors."""
         nonlocal added_devices
-        new_devices, _, added_devices = coordinator.get_devices(added_devices)
+        new_devices, _, new_added_devices = coordinator.get_devices(added_devices)
+        added_devices = new_added_devices
 
         if new_devices:
             async_add_entities(

tests/components/sensibo/test_coordinator.py

@@ -9,6 +9,7 @@ from unittest.mock import MagicMock
 from freezegun.api import FrozenDateTimeFactory
 from pysensibo.exceptions import AuthenticationError, SensiboError
 from pysensibo.model import SensiboData
+import pytest
 
 from homeassistant.components.climate import HVACMode
 from homeassistant.components.sensibo.const import DOMAIN
@@ -25,6 +26,7 @@ async def test_coordinator(
     mock_client: MagicMock,
     get_data: tuple[SensiboData, dict[str, Any], dict[str, Any]],
     freezer: FrozenDateTimeFactory,
+    caplog: pytest.LogCaptureFixture,
 ) -> None:
     """Test the Sensibo coordinator with errors."""
     config_entry = MockConfigEntry(
@@ -87,3 +89,5 @@ async def test_coordinator(
     mock_data.assert_called_once()
     state = hass.states.get("climate.hallway")
     assert state.state == STATE_UNAVAILABLE
+
+    assert "Platform sensibo does not generate unique IDs" not in caplog.text