Merge branch 'release/0.0.67'

Author: dmulcahey

.gitignore

@@ -8,3 +8,4 @@ build/**/*.*
 .tox
 .idea/*
 .coverage
+.mypycache

.pre-commit-config.yaml

@@ -1,4 +1,14 @@
 repos:
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v2.31.0
+    hooks:
+      - id: pyupgrade
+
+  - repo: https://github.com/fsouza/autoflake8
+    rev: v0.3.1
+    hooks:
+      - id: autoflake8
+
   - repo: https://github.com/psf/black
     rev: 20.8b1
     hooks:
@@ -21,10 +31,11 @@ repos:
       - id: isort
 
   - repo: https://github.com/codespell-project/codespell
-    rev: v1.17.1
+    rev: v2.1.0
     hooks:
       - id: codespell
-        args:
-          - --ignore-words-list=dout,hass
-          - --skip="./.*"
-          - --quiet-level=2
+
+  - repo: https://github.com/pre-commit/mirrors-mypy
+    rev: v0.902
+    hooks:
+      - id: mypy

setup.cfg

@@ -2,6 +2,12 @@
 testpaths = tests
 norecursedirs = .git testing_config
 
+[autoflake8]
+in-place = True
+recursive = False
+expand-star-imports = False
+exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
+
 [flake8]
 exclude = .venv,.git,.tox,docs,venv,bin,lib,deps,build
 # To work with Black
@@ -53,9 +59,25 @@ warn_return_any = true
 warn_unreachable = true
 warn_unused_configs = true
 warn_unused_ignores = true
+show_error_codes = True
+show_error_context = True
+error_summary = True
+
+install_types = True
+non_interactive = True
 
 [pydocstyle]
 ignore =
     D202,
     D203,
     D213
+
+[pyupgrade]
+py37plus = True
+
+[codespell]
+exclude = setup.cfg
+ignore-words-list = hass,dout
+skip = ./.*,test/*
+quiet-level = 2
+

setup.py

@@ -2,7 +2,7 @@
 
 from setuptools import find_packages, setup
 
-VERSION = "0.0.66"
+VERSION = "0.0.67"
 
 
 def readme():

tests/test_tuya.py

@@ -61,6 +61,22 @@
 ZCL_TUYA_VALVE_AUTO_LOCK_ON = b"\t2\x01\x03\x04\x74\x01\x00\x01\x01"
 ZCL_TUYA_VALVE_BATTERY_LOW = b"\t2\x01\x03\x04\x6E\x01\x00\x01\x01"
 
+ZCL_TUYA_VALVE_ZONNSMART_TEMPERATURE = (
+    b"\tp\x01\x00\x02\x18\x02\x00\x04\x00\x00\x00\xd3"
+)
+ZCL_TUYA_VALVE_ZONNSMART_TARGET_TEMP = (
+    b"\t3\x01\x03\x05\x10\x02\x00\x04\x00\x00\x00\xcd"
+)
+ZCL_TUYA_VALVE_ZONNSMART_HOLIDAY_TEMP = (
+    b"\t3\x01\x03\x05\x20\x02\x00\x04\x00\x00\x00\xaa"
+)
+ZCL_TUYA_VALVE_ZONNSMART_TEMP_OFFSET = (
+    b"\t3\x01\x03\x05\x1b\x02\x00\x04\x00\x00\x00\x0b"
+)
+ZCL_TUYA_VALVE_ZONNSMART_MODE_MANUAL = b"\t2\x01\x03\x04\x02\x04\x00\x01\x01"
+ZCL_TUYA_VALVE_ZONNSMART_MODE_SCHEDULE = b"\t2\x01\x03\x04\x02\x04\x00\x01\x00"
+ZCL_TUYA_VALVE_ZONNSMART_HEAT_STOP = b"\t2\x01\x03\x04\x6b\x01\x00\x01\x00"
+
 ZCL_TUYA_EHEAT_TEMPERATURE = b"\tp\x02\x00\x02\x18\x02\x00\x04\x00\x00\x00\xb3"
 ZCL_TUYA_EHEAT_TARGET_TEMP = b"\t3\x01\x03\x05\x10\x02\x00\x04\x00\x00\x00\x15"
 
@@ -223,8 +239,8 @@ async def test_singleswitch_requests(zigpy_device_from_quirk, quirk):
         status = await switch_cluster.command(0x0000)
         m1.assert_called_with(
             61184,
-            1,
-            b"\x01\x01\x00\x00\x00\x01\x01\x00\x01\x00",
+            2,
+            b"\x01\x02\x00\x00\x01\x01\x01\x00\x01\x00",
             expect_reply=True,
             command_id=0,
         )
@@ -233,8 +249,8 @@ async def test_singleswitch_requests(zigpy_device_from_quirk, quirk):
         status = await switch_cluster.command(0x0001)
         m1.assert_called_with(
             61184,
-            2,
-            b"\x01\x02\x00\x00\x00\x01\x01\x00\x01\x01",
+            4,
+            b"\x01\x04\x00\x00\x03\x01\x01\x00\x01\x01",
             expect_reply=True,
             command_id=0,
         )
@@ -408,6 +424,130 @@ async def async_success(*args, **kwargs):
         assert status == foundation.Status.UNSUP_CLUSTER_COMMAND
 
 
+@pytest.mark.parametrize("quirk", (zhaquirks.tuya.ts0601_trv.ZonnsmartTV01_ZG,))
+async def test_zonnsmart_state_report(zigpy_device_from_quirk, quirk):
+    """Test thermostatic valves standard reporting from incoming commands."""
+
+    valve_dev = zigpy_device_from_quirk(quirk)
+    tuya_cluster = valve_dev.endpoints[1].tuya_manufacturer
+
+    thermostat_listener = ClusterListener(valve_dev.endpoints[1].thermostat)
+
+    frames = (
+        ZCL_TUYA_VALVE_ZONNSMART_TEMPERATURE,
+        ZCL_TUYA_VALVE_ZONNSMART_TARGET_TEMP,
+        ZCL_TUYA_VALVE_ZONNSMART_HOLIDAY_TEMP,
+        ZCL_TUYA_VALVE_ZONNSMART_TEMP_OFFSET,
+        ZCL_TUYA_VALVE_ZONNSMART_MODE_MANUAL,
+        ZCL_TUYA_VALVE_ZONNSMART_MODE_SCHEDULE,
+        ZCL_TUYA_VALVE_ZONNSMART_HEAT_STOP,
+    )
+    for frame in frames:
+        hdr, args = tuya_cluster.deserialize(frame)
+        tuya_cluster.handle_message(hdr, args)
+
+    assert len(thermostat_listener.cluster_commands) == 0
+    assert len(thermostat_listener.attribute_updates) == 11
+    assert thermostat_listener.attribute_updates[0][0] == 0x0000  # TEMP
+    assert thermostat_listener.attribute_updates[0][1] == 2110
+    assert thermostat_listener.attribute_updates[1][0] == 0x0012  # TARGET
+    assert thermostat_listener.attribute_updates[1][1] == 2050
+    assert thermostat_listener.attribute_updates[4][0] == 0x0014  # HOLIDAY
+    assert thermostat_listener.attribute_updates[4][1] == 1700
+    assert thermostat_listener.attribute_updates[5][0] == 0x0010  # OFFSET
+    assert thermostat_listener.attribute_updates[5][1] == 110
+    assert thermostat_listener.attribute_updates[6][0] == 0x0025  # MANUAL
+    assert thermostat_listener.attribute_updates[6][1] == 0
+    assert thermostat_listener.attribute_updates[7][0] == 0x4002
+    assert thermostat_listener.attribute_updates[7][1] == 1
+    assert thermostat_listener.attribute_updates[8][0] == 0x0025  # SCHEDULE
+    assert thermostat_listener.attribute_updates[8][1] == 1
+    assert thermostat_listener.attribute_updates[9][0] == 0x4002
+    assert thermostat_listener.attribute_updates[9][1] == 0
+    assert thermostat_listener.attribute_updates[10][0] == 0x001C  # HEAT ON
+    assert thermostat_listener.attribute_updates[10][1] == 4
+
+
+@pytest.mark.parametrize("quirk", (zhaquirks.tuya.ts0601_trv.ZonnsmartTV01_ZG,))
+async def test_zonnsmart_send_attribute(zigpy_device_from_quirk, quirk):
+    """Test thermostatic valve outgoing commands."""
+
+    valve_dev = zigpy_device_from_quirk(quirk)
+    tuya_cluster = valve_dev.endpoints[1].tuya_manufacturer
+    thermostat_cluster = valve_dev.endpoints[1].thermostat
+
+    async def async_success(*args, **kwargs):
+        return foundation.Status.SUCCESS
+
+    with mock.patch.object(
+        tuya_cluster.endpoint, "request", side_effect=async_success
+    ) as m1:
+
+        (status,) = await thermostat_cluster.write_attributes(
+            {
+                "occupied_heating_setpoint": 2500,
+            }
+        )
+        m1.assert_called_with(
+            61184,
+            1,
+            b"\x01\x01\x00\x00\x01\x10\x02\x00\x04\x00\x00\x00\xfa",
+            expect_reply=False,
+            command_id=0,
+        )
+        assert status == [
+            foundation.WriteAttributesStatusRecord(foundation.Status.SUCCESS)
+        ]
+
+        (status,) = await thermostat_cluster.write_attributes(
+            {
+                "operation_preset": 1,
+            }
+        )
+        m1.assert_called_with(
+            61184,
+            2,
+            b"\x01\x02\x00\x00\x02\x02\x04\x00\x01\x01",
+            expect_reply=False,
+            command_id=0,
+        )
+        assert status == [
+            foundation.WriteAttributesStatusRecord(foundation.Status.SUCCESS)
+        ]
+
+        (status,) = await thermostat_cluster.write_attributes(
+            {
+                "operation_preset": 4,  # frost protection wrapped as operation_preset
+            }
+        )
+        m1.assert_called_with(
+            61184,
+            3,
+            b"\x01\x03\x00\x00\x03\x0a\x01\x00\x01\x01",
+            expect_reply=False,
+            command_id=0,
+        )
+        assert status == [
+            foundation.WriteAttributesStatusRecord(foundation.Status.SUCCESS)
+        ]
+
+        (status,) = await thermostat_cluster.write_attributes(
+            {
+                "system_mode": 0,  # SystemMode.Off
+            }
+        )
+        m1.assert_called_with(
+            61184,
+            4,
+            b"\x01\x04\x00\x00\x04\x6b\x01\x00\x01\x01",
+            expect_reply=False,
+            command_id=0,
+        )
+        assert status == [
+            foundation.WriteAttributesStatusRecord(foundation.Status.SUCCESS)
+        ]
+
+
 @pytest.mark.parametrize("quirk", (zhaquirks.tuya.ts0601_trv.SiterwellGS361_Type1,))
 async def test_valve_state_report(zigpy_device_from_quirk, quirk):
     """Test thermostatic valves standard reporting from incoming commands."""

tests/test_tuya_dimmer.py

@@ -79,7 +79,7 @@ async def async_success(*args, **kwargs):
             61184,
             2,
             b"\x01\x02\x00\x00\x01\x03\x02\x00\x04\x00\x00\x00b",
-            expect_reply=True,
+            expect_reply=False,
             command_id=0,
         )
         assert status == [

tests/test_tuya_mcu.py

@@ -63,7 +63,9 @@ async def test_tuya_methods(zigpy_device_from_quirk, quirk):
 
     tcd_1 = TuyaClusterData(endpoint_id=2, cluster_attr="minimum_level", attr_value=25)
 
-    tcd_switch1_on = TuyaClusterData(endpoint_id=1, cluster_attr="on_off", attr_value=1)
+    tcd_switch1_on = TuyaClusterData(
+        endpoint_id=1, cluster_attr="on_off", attr_value=1, expect_reply=True
+    )
 
     result_1 = tuya_cluster.from_cluster_data(tcd_1)
     assert result_1

zhaquirks/innr/innr_sp234_plug.py

@@ -0,0 +1,107 @@
+"""Innr SP 234 plug."""
+from zigpy.profiles import zha
+from zigpy.quirks import CustomCluster, CustomDevice
+from zigpy.zcl.clusters.general import (
+    Basic,
+    GreenPowerProxy,
+    Groups,
+    Identify,
+    OnOff,
+    Ota,
+    Scenes,
+    Time,
+)
+from zigpy.zcl.clusters.homeautomation import Diagnostic, ElectricalMeasurement
+from zigpy.zcl.clusters.lightlink import LightLink
+from zigpy.zcl.clusters.smartenergy import Metering
+
+from zhaquirks.const import (
+    DEVICE_TYPE,
+    ENDPOINTS,
+    INPUT_CLUSTERS,
+    MODELS_INFO,
+    OUTPUT_CLUSTERS,
+    PROFILE_ID,
+)
+
+MANUFACTURER = "innr"
+MODEL = "SP 234"
+
+
+class ElectricalMeasurementCluster(CustomCluster, ElectricalMeasurement):
+    """Fix divisor."""
+
+    cluster_id = ElectricalMeasurement.cluster_id
+    AC_POWER_DIVISOR = 0x0605
+    _CONSTANT_ATTRIBUTES = {AC_POWER_DIVISOR: 1}
+
+
+class SP234(CustomDevice):
+    """Innr SP 234 smart plug."""
+
+    signature = {
+        ENDPOINTS: {
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT,
+                INPUT_CLUSTERS: [
+                    Basic.cluster_id,
+                    Identify.cluster_id,
+                    Groups.cluster_id,
+                    Scenes.cluster_id,
+                    OnOff.cluster_id,
+                    Metering.cluster_id,
+                    ElectricalMeasurement.cluster_id,
+                    Diagnostic.cluster_id,
+                    LightLink.cluster_id,
+                    0xFC57,
+                    0xFC82,
+                ],
+                OUTPUT_CLUSTERS: [
+                    Identify.cluster_id,
+                    Time.cluster_id,
+                    Ota.cluster_id,
+                ],
+            },
+            242: {
+                PROFILE_ID: 41440,
+                DEVICE_TYPE: 0x0061,
+                INPUT_CLUSTERS: [],
+                OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
+            },
+        },
+        MODELS_INFO: [(MANUFACTURER, MODEL)],
+    }
+
+    replacement = {
+        ENDPOINTS: {
+            1: {
+                PROFILE_ID: zha.PROFILE_ID,
+                DEVICE_TYPE: zha.DeviceType.ON_OFF_PLUG_IN_UNIT,
+                INPUT_CLUSTERS: [
+                    Basic.cluster_id,
+                    Identify.cluster_id,
+                    Groups.cluster_id,
+                    Scenes.cluster_id,
+                    OnOff.cluster_id,
+                    Metering.cluster_id,
+                    ElectricalMeasurementCluster,
+                    Diagnostic.cluster_id,
+                    LightLink.cluster_id,
+                    0xFC57,
+                    0xFC82,
+                ],
+                OUTPUT_CLUSTERS: [
+                    Identify.cluster_id,
+                    Time.cluster_id,
+                    Ota.cluster_id,
+                ],
+            },
+            242: {
+                PROFILE_ID: 41440,
+                DEVICE_TYPE: 0x0061,
+                INPUT_CLUSTERS: [],
+                OUTPUT_CLUSTERS: [GreenPowerProxy.cluster_id],
+            },
+        },
+    }