Migrate Tuya climate (humidity) to use wrapper class (home-assistant#156575)

Author: epenet

homeassistant/components/tuya/climate.py

@@ -26,7 +26,7 @@
 from . import TuyaConfigEntry
 from .const import TUYA_DISCOVERY_NEW, DeviceCategory, DPCode, DPType
 from .entity import TuyaEntity
-from .models import IntegerTypeData, find_dpcode
+from .models import DPCodeIntegerWrapper, IntegerTypeData, find_dpcode
 from .util import get_dpcode
 
 TUYA_HVAC_TO_HA = {
@@ -41,6 +41,16 @@
 }
 
 
+class _RoundedIntegerWrapper(DPCodeIntegerWrapper):
+    """An integer that always rounds its value."""
+
+    def read_device_status(self, device: CustomerDevice) -> int | None:
+        """Read and round the device status."""
+        if (value := super().read_device_status(device)) is None:
+            return None
+        return round(value)
+
+
 @dataclass(frozen=True, kw_only=True)
 class TuyaClimateEntityDescription(ClimateEntityDescription):
     """Describe an Tuya climate entity."""
@@ -97,6 +107,12 @@ def async_discover_device(device_ids: list[str]) -> None:
                         manager,
                         CLIMATE_DESCRIPTIONS[device.category],
                         hass.config.units.temperature_unit,
+                        current_humidity_wrapper=_RoundedIntegerWrapper.find_dpcode(
+                            device, DPCode.HUMIDITY_CURRENT
+                        ),
+                        target_humidity_wrapper=_RoundedIntegerWrapper.find_dpcode(
+                            device, DPCode.HUMIDITY_SET, prefer_function=True
+                        ),
                     )
                 )
         async_add_entities(entities)
@@ -111,10 +127,8 @@ def async_discover_device(device_ids: list[str]) -> None:
 class TuyaClimateEntity(TuyaEntity, ClimateEntity):
     """Tuya Climate Device."""
 
-    _current_humidity: IntegerTypeData | None = None
     _current_temperature: IntegerTypeData | None = None
     _hvac_to_tuya: dict[str, str]
-    _set_humidity: IntegerTypeData | None = None
     _set_temperature: IntegerTypeData | None = None
     entity_description: TuyaClimateEntityDescription
     _attr_name = None
@@ -125,12 +139,17 @@ def __init__(
         device_manager: Manager,
         description: TuyaClimateEntityDescription,
         system_temperature_unit: UnitOfTemperature,
+        *,
+        current_humidity_wrapper: _RoundedIntegerWrapper | None = None,
+        target_humidity_wrapper: _RoundedIntegerWrapper | None = None,
     ) -> None:
         """Determine which values to use."""
         self._attr_target_temperature_step = 1.0
         self.entity_description = description
 
         super().__init__(device, device_manager)
+        self._current_humidity_wrapper = current_humidity_wrapper
+        self._target_humidity_wrapper = target_humidity_wrapper
 
         # If both temperature values for celsius and fahrenheit are present,
         # use whatever the device is set to, with a fallback to celsius.
@@ -227,21 +246,14 @@ def __init__(
             ]
 
         # Determine dpcode to use for setting the humidity
-        if int_type := find_dpcode(
-            self.device,
-            DPCode.HUMIDITY_SET,
-            dptype=DPType.INTEGER,
-            prefer_function=True,
-        ):
+        if target_humidity_wrapper:
             self._attr_supported_features |= ClimateEntityFeature.TARGET_HUMIDITY
-            self._set_humidity = int_type
-            self._attr_min_humidity = int(int_type.min_scaled)
-            self._attr_max_humidity = int(int_type.max_scaled)
-
-        # Determine dpcode to use for getting the current humidity
-        self._current_humidity = find_dpcode(
-            self.device, DPCode.HUMIDITY_CURRENT, dptype=DPType.INTEGER
-        )
+            self._attr_min_humidity = round(
+                target_humidity_wrapper.type_information.min_scaled
+            )
+            self._attr_max_humidity = round(
+                target_humidity_wrapper.type_information.max_scaled
+            )
 
         # Determine fan modes
         self._fan_mode_dp_code: str | None = None
@@ -303,20 +315,9 @@ def set_fan_mode(self, fan_mode: str) -> None:
 
         self._send_command([{"code": self._fan_mode_dp_code, "value": fan_mode}])
 
-    def set_humidity(self, humidity: int) -> None:
+    async def async_set_humidity(self, humidity: int) -> None:
         """Set new target humidity."""
-        if TYPE_CHECKING:
-            # guarded by ClimateEntityFeature.TARGET_HUMIDITY
-            assert self._set_humidity is not None
-
-        self._send_command(
-            [
-                {
-                    "code": self._set_humidity.dpcode,
-                    "value": self._set_humidity.scale_value_back(humidity),
-                }
-            ]
-        )
+        await self._async_send_dpcode_update(self._target_humidity_wrapper, humidity)
 
     def set_swing_mode(self, swing_mode: str) -> None:
         """Set new target swing operation."""
@@ -382,14 +383,7 @@ def current_temperature(self) -> float | None:
     @property
     def current_humidity(self) -> int | None:
         """Return the current humidity."""
-        if self._current_humidity is None:
-            return None
-
-        humidity = self.device.status.get(self._current_humidity.dpcode)
-        if humidity is None:
-            return None
-
-        return round(self._current_humidity.scale_value(humidity))
+        return self._read_wrapper(self._current_humidity_wrapper)
 
     @property
     def target_temperature(self) -> float | None:
@@ -406,14 +400,7 @@ def target_temperature(self) -> float | None:
     @property
     def target_humidity(self) -> int | None:
         """Return the humidity currently set to be reached."""
-        if self._set_humidity is None:
-            return None
-
-        humidity = self.device.status.get(self._set_humidity.dpcode)
-        if humidity is None:
-            return None
-
-        return round(self._set_humidity.scale_value(humidity))
+        return self._read_wrapper(self._target_humidity_wrapper)
 
     @property
     def hvac_mode(self) -> HVACMode: