Silence swapped direction warning for Aqara devices (#4239)

* Silence swapped direction for Xiaomi devices

* Update test

* Bump zigpy to latest

Author: puddly

pyproject.toml

@@ -14,7 +14,7 @@ readme = "README.md"
 license = {text = "Apache-2.0"}
 requires-python = ">=3.12"
 dependencies = [
-    "zigpy>=0.82.0",
+    "zigpy>=0.82.2",
 ]
 
 [tool.setuptools.packages.find]

tests/test_xiaomi.py

@@ -2259,22 +2259,26 @@ def test_t1m_ceiling_light(zigpy_device_from_v2_quirk, endpoint):
     assert cluster_listener.attribute_updates[1][1] == LumiPowerOnStateMode.Off
 
 
-async def test_lumi_magnet_sensor_aq2_bad_direction(zigpy_device_from_quirk):
+async def test_lumi_magnet_sensor_aq2_bad_direction(zigpy_device_from_quirk, caplog):
     """Test Aqara Magnet Sensor AQ2 quirk dealing with bad ZCL command direction."""
 
     device = zigpy_device_from_quirk(zhaquirks.xiaomi.aqara.magnet_aq2.MagnetAQ2)
     listener = ClusterListener(device.endpoints[1].out_clusters[OnOff.cluster_id])
 
     # The device has a bad ZCL header and reports the incorrect direction for commands
-    device.packet_received(
-        t.ZigbeePacket(
-            profile_id=260,
-            cluster_id=6,
-            src_ep=1,
-            dst_ep=1,
-            data=t.SerializableBytes(bytes.fromhex("18930A00001001")),
+    with caplog.at_level(logging.WARNING):
+        device.packet_received(
+            t.ZigbeePacket(
+                profile_id=260,
+                cluster_id=6,
+                src_ep=1,
+                dst_ep=1,
+                data=t.SerializableBytes(bytes.fromhex("18930A00001001")),
+            )
         )
-    )
+
+    # No warning gets logged
+    assert not caplog.text
 
     # Our matching logic should be forgiving
     assert listener.attribute_updates == [(0, t.Bool.true)]

zhaquirks/xiaomi/__init__.py

@@ -130,13 +130,13 @@ def _find_zcl_cluster(
         # Aqara devices seem to be very lax with their ZCL header's `direction` field,
         # we should try "flipping" it if matching doesn't work normally.
         try:
-            return super()._find_zcl_cluster(hdr, packet)
+            return super()._find_zcl_cluster_strict(hdr, packet)
         except KeyError:
             _LOGGER.debug(
                 "Packet is coming in the wrong direction, swapping direction and trying again",
             )
 
-            return super()._find_zcl_cluster(
+            return super()._find_zcl_cluster_strict(
                 hdr.replace(
                     frame_control=hdr.frame_control.replace(
                         direction=hdr.frame_control.direction.flip()