Bump homematicip to 2.0.4 (#144096)

* Bump to 2.0.2 with all necessary changes

* bump to prerelease

* add addiional tests

* Bump to homematicip 2.0.3

* do not delete device

* Setup BRAND_SWITCH_MEASURING as light

* bump to 2.0.4

* refactor test_remove_obsolete_entities

* move test

* use const from homematicip lib

homeassistant/components/homematicip_cloud/hap.py

@@ -112,6 +112,7 @@ class HomematicipHAP:
         self.config_entry = config_entry
 
         self._ws_close_requested = False
+        self._ws_connection_closed = asyncio.Event()
         self._retry_task: asyncio.Task | None = None
         self._tries = 0
         self._accesspoint_connected = True
@@ -218,6 +219,8 @@ class HomematicipHAP:
             try:
                 await self.home.get_current_state_async()
                 hmip_events = self.home.enable_events()
+                self.home.set_on_connected_handler(self.ws_connected_handler)
+                self.home.set_on_disconnected_handler(self.ws_disconnected_handler)
                 tries = 0
                 await hmip_events
             except HmipConnectionError:
@@ -267,6 +270,18 @@ class HomematicipHAP:
             "Reset connection to access point id %s", self.config_entry.unique_id
         )
 
+    async def ws_connected_handler(self) -> None:
+        """Handle websocket connected."""
+        _LOGGER.debug("WebSocket connection to HomematicIP established")
+        if self._ws_connection_closed.is_set():
+            await self.get_state()
+            self._ws_connection_closed.clear()
+
+    async def ws_disconnected_handler(self) -> None:
+        """Handle websocket disconnection."""
+        _LOGGER.warning("WebSocket connection to HomematicIP closed")
+        self._ws_connection_closed.set()
+
     async def get_hap(
         self,
         hass: HomeAssistant,
@@ -290,6 +305,7 @@ class HomematicipHAP:
             raise HmipcConnectionError from err
         home.on_update(self.async_update)
         home.on_create(self.async_create_entity)
+
         hass.loop.create_task(self.async_connect())
 
         return home

homeassistant/components/homematicip_cloud/light.py

@@ -4,16 +4,16 @@ from __future__ import annotations
 
 from typing import Any
 
-from homematicip.base.enums import OpticalSignalBehaviour, RGBColorState
+from homematicip.base.enums import DeviceType, OpticalSignalBehaviour, RGBColorState
 from homematicip.base.functionalChannels import NotificationLightChannel
 from homematicip.device import (
     BrandDimmer,
-    BrandSwitchMeasuring,
     BrandSwitchNotificationLight,
     Dimmer,
     DinRailDimmer3,
     FullFlushDimmer,
     PluggableDimmer,
+    SwitchMeasuring,
     WiredDimmer3,
 )
 from packaging.version import Version
@@ -44,9 +44,12 @@ async def async_setup_entry(
     hap = config_entry.runtime_data
     entities: list[HomematicipGenericEntity] = []
     for device in hap.home.devices:
-        if isinstance(device, BrandSwitchMeasuring):
+        if (
+            isinstance(device, SwitchMeasuring)
+            and getattr(device, "deviceType", None) == DeviceType.BRAND_SWITCH_MEASURING
+        ):
             entities.append(HomematicipLightMeasuring(hap, device))
-        elif isinstance(device, BrandSwitchNotificationLight):
+        if isinstance(device, BrandSwitchNotificationLight):
             device_version = Version(device.firmwareVersion)
             entities.append(HomematicipLight(hap, device))
 

homeassistant/components/homematicip_cloud/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/homematicip_cloud",
   "iot_class": "cloud_push",
   "loggers": ["homematicip"],
-  "requirements": ["homematicip==2.0.1.1"]
+  "requirements": ["homematicip==2.0.4"]
 }

homeassistant/components/homematicip_cloud/sensor.py

@@ -11,12 +11,10 @@ from homematicip.base.functionalChannels import (
     FunctionalChannel,
 )
 from homematicip.device import (
-    BrandSwitchMeasuring,
     EnergySensorsInterface,
     FloorTerminalBlock6,
     FloorTerminalBlock10,
     FloorTerminalBlock12,
-    FullFlushSwitchMeasuring,
     HeatingThermostat,
     HeatingThermostatCompact,
     HeatingThermostatEvo,
@@ -26,9 +24,9 @@ from homematicip.device import (
     MotionDetectorOutdoor,
     MotionDetectorPushButton,
     PassageDetector,
-    PlugableSwitchMeasuring,
     PresenceDetectorIndoor,
     RoomControlDeviceAnalog,
+    SwitchMeasuring,
     TemperatureDifferenceSensor2,
     TemperatureHumiditySensorDisplay,
     TemperatureHumiditySensorOutdoor,
@@ -143,14 +141,7 @@ async def async_setup_entry(
             ),
         ):
             entities.append(HomematicipIlluminanceSensor(hap, device))
-        if isinstance(
+        if isinstance(device, SwitchMeasuring):
-            device,
-            (
-                PlugableSwitchMeasuring,
-                BrandSwitchMeasuring,
-                FullFlushSwitchMeasuring,
-            ),
-        ):
             entities.append(HomematicipPowerSensor(hap, device))
             entities.append(HomematicipEnergySensor(hap, device))
         if isinstance(device, (WeatherSensor, WeatherSensorPlus, WeatherSensorPro)):

homeassistant/components/homematicip_cloud/switch.py

@@ -4,20 +4,19 @@ from __future__ import annotations
 
 from typing import Any
 
+from homematicip.base.enums import DeviceType
 from homematicip.device import (
     BrandSwitch2,
-    BrandSwitchMeasuring,
     DinRailSwitch,
     DinRailSwitch4,
     FullFlushInputSwitch,
-    FullFlushSwitchMeasuring,
     HeatingSwitch2,
     MultiIOBox,
     OpenCollector8Module,
     PlugableSwitch,
-    PlugableSwitchMeasuring,
     PrintedCircuitBoardSwitch2,
     PrintedCircuitBoardSwitchBattery,
+    SwitchMeasuring,
     WiredSwitch8,
 )
 from homematicip.group import ExtendedLinkedSwitchingGroup, SwitchingGroup
@@ -43,12 +42,10 @@ async def async_setup_entry(
         if isinstance(group, (ExtendedLinkedSwitchingGroup, SwitchingGroup))
     ]
     for device in hap.home.devices:
-        if isinstance(device, BrandSwitchMeasuring):
+        if (
-            # BrandSwitchMeasuring inherits PlugableSwitchMeasuring
+            isinstance(device, SwitchMeasuring)
-            # This entity is implemented in the light platform and will
+            and getattr(device, "deviceType", None) != DeviceType.BRAND_SWITCH_MEASURING
-            # not be added in the switch platform
+        ):
-            pass
-        elif isinstance(device, (PlugableSwitchMeasuring, FullFlushSwitchMeasuring)):
             entities.append(HomematicipSwitchMeasuring(hap, device))
         elif isinstance(device, WiredSwitch8):
             entities.extend(

requirements_all.txt

@@ -1170,7 +1170,7 @@ home-assistant-frontend==20250531.0
 home-assistant-intents==2025.5.28
 
 # homeassistant.components.homematicip_cloud
-homematicip==2.0.1.1
+homematicip==2.0.4
 
 # homeassistant.components.horizon
 horimote==0.4.1

requirements_test_all.txt

@@ -1016,7 +1016,7 @@ home-assistant-frontend==20250531.0
 home-assistant-intents==2025.5.28
 
 # homeassistant.components.homematicip_cloud
-homematicip==2.0.1.1
+homematicip==2.0.4
 
 # homeassistant.components.remember_the_milk
 httplib2==0.20.4

tests/components/homematicip_cloud/test_hap.py

@@ -231,3 +231,23 @@ async def test_auth_create_exception(hass: HomeAssistant, simple_mock_auth) -> N
         ),
     ):
         assert not await hmip_auth.get_auth(hass, HAPID, HAPPIN)
+
+
+async def test_get_state_after_disconnect(
+    hass: HomeAssistant, hmip_config_entry: MockConfigEntry, simple_mock_home
+) -> None:
+    """Test get state after disconnect."""
+    hass.config.components.add(DOMAIN)
+    hap = HomematicipHAP(hass, hmip_config_entry)
+    assert hap
+
+    with patch.object(hap, "get_state") as mock_get_state:
+        assert not hap._ws_connection_closed.is_set()
+
+        await hap.ws_connected_handler()
+        mock_get_state.assert_not_called()
+
+        await hap.ws_disconnected_handler()
+        assert hap._ws_connection_closed.is_set()
+        await hap.ws_connected_handler()
+        mock_get_state.assert_called_once()