Merge branch 'dev' into add-thermostat-_TZE200_viy9ihs7

Author: prairiesnpr

tests/test_tuya.py

@@ -37,9 +37,9 @@
 import zhaquirks.tuya.ts0601_electric_heating
 import zhaquirks.tuya.ts0601_motion
 import zhaquirks.tuya.ts0601_trv
-import zhaquirks.tuya.ts0601_valve
 import zhaquirks.tuya.ts601_door
 import zhaquirks.tuya.ts1201
+import zhaquirks.tuya.tuya_valve
 
 zhaquirks.setup()
 

tests/test_tuya_builder.py

@@ -1,5 +1,6 @@
 """Tests for TuyaQuirkBuilder."""
 
+import datetime
 from unittest import mock
 
 import pytest
@@ -9,10 +10,11 @@
 from zigpy.zcl import foundation
 from zigpy.zcl.clusters.general import Basic, BatterySize
 
-from tests.common import ClusterListener, wait_for_zigpy_tasks
+from tests.common import ClusterListener, MockDatetime, wait_for_zigpy_tasks
 import zhaquirks
 from zhaquirks.tuya import (
     TUYA_QUERY_DATA,
+    TUYA_SET_TIME,
     TuyaPowerConfigurationCluster,
     TuyaPowerConfigurationCluster2AAA,
 )
@@ -23,14 +25,18 @@
     TuyaIasContact,
     TuyaIasFire,
     TuyaIasGas,
+    TuyaIlluminance,
     TuyaPM25Concentration,
     TuyaQuirkBuilder,
     TuyaRelativeHumidity,
     TuyaSoilMoisture,
     TuyaTemperatureMeasurement,
-    TuyaValveWaterConsumed,
+    TuyaValveWaterConsumedNoInstDemand,
 )
 from zhaquirks.tuya.mcu import TuyaMCUCluster, TuyaOnOffNM
+from zhaquirks.tuya.tuya_sensor import NoManufTimeTuyaMCUCluster
+
+ZCL_TUYA_SET_TIME = b"\x09\x12\x24\x0d\x00"
 
 zhaquirks.setup()
 
@@ -39,7 +45,7 @@
     "method_name,attr_name,exp_class",
     [
         ("tuya_battery", "power", TuyaPowerConfigurationCluster),
-        ("tuya_metering", "smartenergy_metering", TuyaValveWaterConsumed),
+        ("tuya_metering", "smartenergy_metering", TuyaValveWaterConsumedNoInstDemand),
         ("tuya_onoff", "on_off", TuyaOnOffNM),
         ("tuya_soil_moisture", "soil_moisture", TuyaSoilMoisture),
         ("tuya_temperature", "temperature", TuyaTemperatureMeasurement),
@@ -55,6 +61,7 @@
             TuyaFormaldehydeConcentration,
         ),
         ("tuya_gas", "ias_zone", TuyaIasGas),
+        ("tuya_illuminance", "illuminance", TuyaIlluminance),
     ],
 )
 async def test_convenience_methods(device_mock, method_name, attr_name, exp_class):
@@ -140,6 +147,9 @@ class TestEnum(t.enum8):
         A = 0x00
         B = 0x01
 
+    class ModTuyaMCUCluster(TuyaMCUCluster):
+        """Modified Cluster."""
+
     entry = (
         TuyaQuirkBuilder(device_mock.manufacturer, device_mock.model, registry=registry)
         .tuya_battery(dp_id=1)
@@ -178,7 +188,7 @@ class TestEnum(t.enum8):
             fallback_name="Test enum",
         )
         .skip_configuration()
-        .add_to_registry()
+        .add_to_registry(replacement_cluster=ModTuyaMCUCluster)
     )
 
     # coverage for overridden __eq__ method
@@ -195,6 +205,7 @@ class TestEnum(t.enum8):
     assert isinstance(ep.basic, Basic)
 
     assert ep.tuya_manufacturer is not None
+    assert isinstance(ep.tuya_manufacturer, ModTuyaMCUCluster)
     assert isinstance(ep.tuya_manufacturer, TuyaMCUCluster)
 
     tuya_cluster = ep.tuya_manufacturer
@@ -303,3 +314,49 @@ async def test_tuya_spell(device_mock, read_attr_spell, data_query_spell):
             messages += 1
 
         request_mock.reset_mock()
+
+
+async def test_tuya_mcu_set_time(device_mock):
+    """Test TuyaQuirkBuilder replacement cluster, set_time requests (0x24) messages for MCU devices."""
+
+    registry = DeviceRegistry()
+
+    (
+        TuyaQuirkBuilder(device_mock.manufacturer, device_mock.model, registry=registry)
+        .tuya_battery(dp_id=1)
+        .skip_configuration()
+        .add_to_registry(replacement_cluster=NoManufTimeTuyaMCUCluster)
+    )
+
+    quirked = registry.get_device(device_mock)
+    assert isinstance(quirked, CustomDeviceV2)
+    assert quirked in registry
+
+    ep = quirked.endpoints[1]
+
+    assert not ep.tuya_manufacturer._is_manuf_specific
+    assert not ep.tuya_manufacturer.server_commands[
+        TUYA_SET_TIME
+    ].is_manufacturer_specific
+
+    # Mock datetime
+    origdatetime = datetime.datetime
+    datetime.datetime = MockDatetime
+
+    # simulate a SET_TIME message
+    hdr, args = ep.tuya_manufacturer.deserialize(ZCL_TUYA_SET_TIME)
+    assert hdr.command_id == TUYA_SET_TIME
+
+    with mock.patch.object(
+        ep.tuya_manufacturer._endpoint,
+        "request",
+        return_value=foundation.Status.SUCCESS,
+    ) as m1:
+        ep.tuya_manufacturer.handle_message(hdr, args)
+        await wait_for_zigpy_tasks()
+
+        res_hdr = foundation.ZCLHeader.deserialize(m1.await_args[1]["data"])
+        assert not res_hdr[0].manufacturer
+        assert not res_hdr[0].frame_control.is_manufacturer_specific
+
+    datetime.datetime = origdatetime  # restore datetime

tests/test_tuya_sensor.py

@@ -28,6 +28,14 @@
         ("_TZE200_bq5c8xfe", "TS0601", 100, 10, True),
         ("_TZE200_vs0skpuc", "TS0601", 100, 10, True),
         ("_TZE200_44af8vyi", "TS0601", 100, 10, True),
+        ("_TZE200_lve3dvpy", "TS0601", 100, 10, False),  # TH01Z - Temp & humid w/ clock
+        ("_TZE200_c7emyjom", "TS0601", 100, 10, False),
+        ("_TZE200_locansqn", "TS0601", 100, 10, False),
+        ("_TZE200_qrztc3ev", "TS0601", 100, 10, False),
+        ("_TZE200_snloy4rw", "TS0601", 100, 10, False),
+        ("_TZE200_eanjj2pa", "TS0601", 100, 10, False),
+        ("_TZE200_ydrdfkim", "TS0601", 100, 10, False),
+        ("_TZE284_locansqn", "TS0601", 100, 10, False),
     ],
 )
 async def test_handle_get_data(

tests/test_tuya_spells.py

@@ -22,7 +22,7 @@
     TuyaNewManufCluster,
     TuyaZBOnOffAttributeCluster,
 )
-import zhaquirks.tuya.ts0601_valve
+import zhaquirks.tuya.tuya_valve
 
 zhaquirks.setup()
 

tests/test_tuya_valve.py

@@ -173,15 +173,15 @@ async def test_giex_02_quirk(zigpy_device_from_v2_quirk, model, manuf, use_minut
         ][entity]
 
         if not use_minutes:
-            assert number_metadata.max == zhaquirks.tuya.ts0601_valve.GIEX_12HRS_AS_SEC
+            assert number_metadata.max == zhaquirks.tuya.tuya_valve.GIEX_12HRS_AS_SEC
         else:
-            assert number_metadata.max == zhaquirks.tuya.ts0601_valve.GIEX_24HRS_AS_MIN
+            assert number_metadata.max == zhaquirks.tuya.tuya_valve.GIEX_24HRS_AS_MIN
 
 
 async def test_giex_functions():
     """Test various Giex Valve functions."""
-    assert zhaquirks.tuya.ts0601_valve.giex_string_to_td("12:01:05,3") == 43265
-    assert zhaquirks.tuya.ts0601_valve.giex_string_to_ts("--:--:--") is None
+    assert zhaquirks.tuya.tuya_valve.giex_string_to_td("12:01:05,3") == 43265
+    assert zhaquirks.tuya.tuya_valve.giex_string_to_ts("--:--:--") is None
 
     class MockDatetime:
         def now(self, tz: timezone):
@@ -192,11 +192,11 @@ def strptime(self, v: str, fmt: str):
             """Mock strptime."""
             return datetime.strptime(v, fmt)
 
-    with patch("zhaquirks.tuya.ts0601_valve.datetime", MockDatetime()):
+    with patch("zhaquirks.tuya.tuya_valve.datetime", MockDatetime()):
         assert (
-            zhaquirks.tuya.ts0601_valve.giex_string_to_ts("20:12:01")
+            zhaquirks.tuya.tuya_valve.giex_string_to_ts("20:12:01")
             == datetime.fromisoformat("2024-10-02T12:10:23+04:00").timestamp()
-            + zhaquirks.tuya.ts0601_valve.UNIX_EPOCH_TO_ZCL_EPOCH
+            + zhaquirks.tuya.tuya_valve.UNIX_EPOCH_TO_ZCL_EPOCH
         )
 
 

tuya.md

@@ -70,7 +70,7 @@ Adds a battery power cluster.
 .tuya_battery(dp_id=2, battery_type=BatterySize.AA, battery_qty=4)
 ```
 
-#### tuya_metering(dp_id: int, metering_cfg: TuyaLocalCluster = TuyaValveWaterConsumed)
+#### tuya_metering(dp_id: int, metering_cfg: TuyaLocalCluster = TuyaValveWaterConsumedNoInstDemand)
 
 Adds a metering cluster.
 

zhaquirks/schneiderelectric/thermostat.py

@@ -5,6 +5,7 @@
 from zigpy.quirks import CustomCluster
 from zigpy.quirks.v2 import EntityType, QuirkBuilder
 from zigpy.quirks.v2.homeassistant import (
+    PERCENTAGE,
     EntityPlatform,
     UnitOfPower,
     UnitOfTemperature,
@@ -597,7 +598,7 @@ class AttributeDefs(CustomCluster.AttributeDefs):
         attribute_name=SEUserInterface.AttributeDefs.se_brightness.name,
         translation_key="display_brightness",
         fallback_name="Display brightness",
-        # unit="%",
+        unit=PERCENTAGE,
         min_value=0,
         max_value=100,
         step=1,
@@ -608,7 +609,7 @@ class AttributeDefs(CustomCluster.AttributeDefs):
         attribute_name=SEUserInterface.AttributeDefs.se_inactive_brightness.name,
         translation_key="display_inactive_brightness",
         fallback_name="Display inactive brightness",
-        # unit="%",
+        unit=PERCENTAGE,
         min_value=0,
         max_value=100,
         step=1,

zhaquirks/tuya/builder/__init__.py

@@ -2,6 +2,7 @@
 
 from collections.abc import Callable
 from enum import Enum
+import math
 from typing import Any, Optional
 
 from zigpy.quirks import _DEVICE_REGISTRY
@@ -18,6 +19,7 @@
     PM25,
     CarbonDioxideConcentration,
     FormaldehydeConcentration,
+    IlluminanceMeasurement,
     RelativeHumidity,
     SoilMoisture,
     TemperatureMeasurement,
@@ -115,8 +117,12 @@ class TuyaValveWaterConsumed(Metering, TuyaLocalCluster):
         Metering.AttributeDefs.metering_device_type.id: WATER_METERING,
     }
 
+
+class TuyaValveWaterConsumedNoInstDemand(TuyaValveWaterConsumed):
+    """Tuya Valve Water consumed cluster without instantaneous demand."""
+
     def __init__(self, *args, **kwargs):
-        """Init a TuyaValveWaterConsumed cluster."""
+        """Init a TuyaValveWaterConsumedNoInstDemand cluster."""
         super().__init__(*args, **kwargs)
         self.add_unsupported_attribute(Metering.AttributeDefs.instantaneous_demand.id)
 
@@ -157,6 +163,14 @@ class AttributeDefs(BaseAttributeDefs):
         )
 
 
+class TuyaIlluminance(IlluminanceMeasurement, TuyaLocalCluster):
+    """Tuya local illuminance cluster."""
+
+    _CONSTANT_ATTRIBUTES = {
+        IlluminanceMeasurement.AttributeDefs.light_sensor_type.id: IlluminanceMeasurement.LightSensorType.Photodiode
+    }
+
+
 class TuyaQuirkBuilder(QuirkBuilder):
     """Tuya QuirkBuilder."""
 
@@ -218,6 +232,24 @@ class TuyaPowerConfigurationClusterBattery(TuyaPowerConfigurationCluster):
             dp_id=dp_id, power_cfg=TuyaPowerConfigurationClusterBattery, scale=scale
         )
 
+    def tuya_illuminance(
+        self,
+        dp_id: int,
+        illuminance_cfg: TuyaLocalCluster = TuyaIlluminance,
+        converter: Optional[Callable[[Any], Any]] = (
+            lambda x: 10000 * math.log10(x) + 1 if x != 0 else 0
+        ),
+    ) -> QuirkBuilder:
+        """Add a Tuya Illuminance Configuration."""
+        self.tuya_dp(
+            dp_id,
+            illuminance_cfg.ep_attribute,
+            IlluminanceMeasurement.AttributeDefs.measured_value.name,
+            converter=converter,
+        )
+        self.adds(illuminance_cfg)
+        return self
+
     def tuya_contact(self, dp_id: int):
         """Add a Tuya IAS contact sensor."""
         self.tuya_ias(
@@ -316,7 +348,7 @@ def tuya_ias(
     def tuya_metering(
         self,
         dp_id: int,
-        metering_cfg: TuyaLocalCluster = TuyaValveWaterConsumed,
+        metering_cfg: TuyaLocalCluster = TuyaValveWaterConsumedNoInstDemand,
         scale: float = 1,
     ) -> QuirkBuilder:
         """Add a Tuya Metering Configuration."""