Support fan changes in Hass 2024.8 #1462

custom_components/sonoff/fan.py

@@ -2,6 +2,7 @@
     FanEntity,
     FanEntityFeature,
 )
+from homeassistant.const import MAJOR_VERSION, MINOR_VERSION
 
 from .core.const import DOMAIN
 from .core.entity import XEntity
@@ -29,7 +30,16 @@ async def async_setup_entry(hass, config_entry, add_entities):
 class XFan(XEntity, FanEntity):
     params = {"switches", "fan"}
     _attr_speed_count = 3
-    _attr_supported_features = FanEntityFeature.SET_SPEED
+
+    # https://developers.home-assistant.io/blog/2024/07/19/fan-fanentityfeatures-turn-on_off/
+    if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 8):
+        _attr_supported_features = (
+            FanEntityFeature.SET_SPEED
+            | FanEntityFeature.TURN_OFF
+            | FanEntityFeature.TURN_ON
+        )
+    else:
+        _attr_supported_features = FanEntityFeature.SET_SPEED
 
     def __init__(self, ewelink: XRegistry, device: XDevice) -> None:
         super().__init__(ewelink, device)
@@ -166,6 +176,9 @@ async def async_set_percentage(self, percentage: int):
 
 # noinspection PyAbstractClass
 class XToggleFan(XEntity, FanEntity):
+    if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 8):
+        _attr_supported_features = FanEntityFeature.TURN_OFF | FanEntityFeature.TURN_ON
+
     @property
     def is_on(self):
         return self._attr_is_on

tests/test_backward.py

@@ -48,3 +48,34 @@ def test_2024_1_cached_properties():
     _, entities = init({"extra": {"uiid": 1256}})
     sensor: SensorEntity = next(e for e in entities)
     assert sensor.should_poll is False
+
+
+def test_2024_2_climate():
+    _, entities = init({"extra": {"uiid": 15}})
+    climate: ClimateEntity = next(e for e in entities if isinstance(e, XClimateTH))
+    if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 2):
+        assert climate.supported_features == (
+            ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+            | ClimateEntityFeature.TURN_ON
+            | ClimateEntityFeature.TURN_OFF
+        )
+    else:
+        assert (
+            climate.supported_features == ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
+        )
+
+
+def test_2024_8_fan():
+    _, entities = init({"extra": {"uiid": 34}})
+    fan: FanEntity = next(e for e in entities if isinstance(e, XFan))
+    if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 8):
+        assert fan.supported_features == (
+            FanEntityFeature.SET_SPEED
+            | FanEntityFeature.PRESET_MODE
+            | FanEntityFeature.TURN_OFF
+            | FanEntityFeature.TURN_ON
+        )
+    else:
+        assert fan.supported_features == (
+            FanEntityFeature.SET_SPEED | FanEntityFeature.PRESET_MODE
+        )

tests/test_entity.py

@@ -3,7 +3,7 @@
 from typing import Union
 
 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
-from homeassistant.components.fan import FanEntity
+from homeassistant.components.fan import FanEntity, FanEntityFeature
 from homeassistant.components.light import (
     COLOR_MODE_COLOR_TEMP,
     COLOR_MODE_RGB,
@@ -12,7 +12,12 @@
 )
 from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.components.switch import SwitchEntity
-from homeassistant.const import TEMP_FAHRENHEIT, UnitOfEnergy
+from homeassistant.const import (
+    TEMP_FAHRENHEIT,
+    UnitOfEnergy,
+    MAJOR_VERSION,
+    MINOR_VERSION,
+)
 from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC
 from homeassistant.util.unit_system import IMPERIAL_SYSTEM
 
@@ -27,7 +32,7 @@
     SIGNAL_UPDATE,
 )
 from custom_components.sonoff.cover import XCover, XCoverDualR3, XZigbeeCover, XCover91
-from custom_components.sonoff.fan import XFan
+from custom_components.sonoff.fan import XFan, XToggleFan
 from custom_components.sonoff.light import (
     UIID22_MODES,
     XDiffuserLight,
@@ -910,6 +915,20 @@ def test_device_class2():
         assert light.__class__.async_turn_on == func
 
 
+def test_device_class_fan():
+    entities = get_entitites(
+        {"extra": {"uiid": 1}}, {"devices": {DEVICEID: {"device_class": "fan"}}}
+    )
+
+    fan: FanEntity = next(e for e in entities if isinstance(e, XToggleFan))
+    if (MAJOR_VERSION, MINOR_VERSION) >= (2024, 8):
+        assert fan.supported_features == (
+            FanEntityFeature.TURN_OFF | FanEntityFeature.TURN_ON
+        )
+    else:
+        assert fan.supported_features == 0
+
+
 def test_light_group():
     entities = get_entitites(
         {