Fix zigpy typing issues with Tuya and Aqara (zigpy#4649)

* Fix zigpy typing issues

* Fix TSN incrementing later, previously masked by an error

* Correct ZCL data type for `display_unit`

Author: puddly

tests/test_tuya_rcbo.py

@@ -256,7 +256,7 @@ async def test_report_values_rcbo(zigpy_device_from_quirk, frame, cluster, attri
         ),
         (
             [],
-            b'\x01\x04\x00\x00\x06n\x00\x00\x08\x0b"\x00\x00\x01\xf4\x00\x00',
+            b'\x01\x04\x00\x00\x05n\x00\x00\x08\x0b"\x00\x00\x01\xf4\x00\x00',
             "electrical_measurement",
             {
                 "rms_extreme_over_voltage": 2850,

zhaquirks/tuya/mcu/__init__.py

@@ -214,10 +214,6 @@ def from_cluster_data(self, data: TuyaClusterData) -> list[TuyaCommand]:
 
         tuya_commands: list[TuyaCommand] = []
         for dp, mapping in dp_mapping.items():
-            cmd_payload = TuyaCommand()
-            cmd_payload.status = 0
-            cmd_payload.tsn = self.endpoint.device.application.get_sequence()
-
             val = data.attr_value
             if mapping.dp_converter:
                 args = []
@@ -237,9 +233,15 @@ def from_cluster_data(self, data: TuyaClusterData) -> list[TuyaCommand]:
 
             dpd = TuyaDatapointData(dp, val)
             self.debug("raw: %s", dpd.data.raw)
-            cmd_payload.datapoints = t.List([dpd])
 
-            tuya_commands.append(cmd_payload)
+            tuya_commands.append(
+                TuyaCommand(
+                    status=0,
+                    tsn=self.endpoint.device.application.get_sequence(),
+                    datapoints=[dpd],
+                )
+            )
+
         return tuya_commands
 
     def tuya_mcu_command(self, cluster_data: TuyaClusterData):

zhaquirks/xiaomi/aqara/tvoc.py

@@ -8,7 +8,7 @@
 from zigpy.zcl.clusters.general import AnalogInput, Basic, Identify, Ota
 from zigpy.zcl.clusters.measurement import RelativeHumidity, TemperatureMeasurement
 from zigpy.zcl.clusters.security import IasZone
-from zigpy.zcl.foundation import BaseAttributeDefs, ZCLAttributeDef
+from zigpy.zcl.foundation import BaseAttributeDefs, DataTypeId, ZCLAttributeDef
 from zigpy.zdo.types import NodeDescriptor
 
 from zhaquirks import LocalDataCluster, PowerConfigurationCluster
@@ -71,7 +71,7 @@ async def bind(self):
         return result
 
 
-class TVOCDisplayUnit(t.enum_factory(t.uint8_t)):
+class TVOCDisplayUnit(t.enum8):
     """Display values."""
 
     mgm3_celsius = 0x00
@@ -87,7 +87,10 @@ class AttributeDefs(XiaomiAqaraE1Cluster.AttributeDefs):
         """Attribute definitions."""
 
         display_unit: Final = ZCLAttributeDef(
-            id=DISPLAY_UNIT, type=TVOCDisplayUnit, is_manufacturer_specific=True
+            id=DISPLAY_UNIT,
+            type=TVOCDisplayUnit,
+            zcl_type=DataTypeId.uint8,
+            is_manufacturer_specific=True,
         )