Replace cluster handlers with entity attributes

pyproject.toml

@@ -99,6 +99,7 @@ asyncio_default_fixture_loop_scope = "function"
 target-version = "py312"
 
 [tool.ruff.lint]
+ignore-init-module-imports = false
 select = [
     "B002", # Python does not support the unary prefix increment
     "B007", # Loop control variable {name} not used within loop body

tests/conftest.py

@@ -1,14 +1,14 @@
 """Test configuration for the ZHA component."""
 
 import asyncio
-from collections.abc import Callable, Generator
+from collections.abc import Generator
 from contextlib import contextmanager
 import logging
 import os
 import reprlib
 import threading
 from types import TracebackType
-from unittest.mock import AsyncMock, MagicMock, patch
+from unittest.mock import patch
 
 import looptime
 import pytest
@@ -340,17 +340,6 @@ async def zha_gateway(
         yield gateway
 
 
-@pytest.fixture(scope="session", autouse=True)
-def disable_request_retry_delay():
-    """Disable ZHA request retrying delay to speed up failures."""
-
-    with patch(
-        "zha.zigbee.cluster_handlers.RETRYABLE_REQUEST_DECORATOR",
-        zigpy.util.retryable_request(tries=3, delay=0),
-    ):
-        yield
-
-
 @pytest.fixture(scope="session", autouse=True)
 def globally_load_quirks():
     """Load quirks automatically so that ZHA tests run deterministically in isolation.
@@ -369,24 +358,6 @@ def globally_load_quirks():
         yield
 
 
-@pytest.fixture
-def cluster_handler() -> Callable:
-    """Clueter handler mock factory fixture."""
-
-    def cluster_handler_factory(
-        name: str, cluster_id: int, endpoint_id: int = 1
-    ) -> MagicMock:
-        ch = MagicMock()
-        ch.name = name
-        ch.generic_id = f"cluster_handler_0x{cluster_id:04x}"
-        ch.id = f"{endpoint_id}:0x{cluster_id:04x}"
-        ch.async_configure = AsyncMock()
-        ch.async_initialize = AsyncMock()
-        return ch
-
-    return cluster_handler_factory
-
-
 def pytest_collection_modifyitems(config, items):
     """Add the looptime marker to all tests except the test_async.py file."""
     for item in items:

tests/data/devices/adeo-sin-4-fp-21-equ.json

@@ -1,5 +1,5 @@
 {
-  "version": 1,
+  "version": 2,
   "ieee": "ab:cd:ef:12:85:66:cc:2e",
   "nwk": "0xA2CE",
   "manufacturer": "Adeo",
@@ -294,22 +294,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "IdentifyClusterHandler",
-              "generic_id": "cluster_handler_0x0003",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 3,
-                "name": "Identify",
-                "type": "server"
-              },
-              "id": "1:0x0003",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0003",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -342,22 +326,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "OnOffClusterHandler",
-              "generic_id": "cluster_handler_0x0006",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 6,
-                "name": "On/Off",
-                "type": "server"
-              },
-              "id": "1:0x0006",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0006",
-              "status": "INITIALIZED",
-              "value_attribute": "on_off"
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -391,22 +359,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "PhillipsRemoteClusterHandler",
-              "generic_id": "cluster_handler_0xfc00",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 64512,
-                "name": "PilotWireCluster",
-                "type": "server"
-              },
-              "id": "1:0xfc00",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0xfc00",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -444,22 +396,6 @@
           "entity_registry_enabled_default": false,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "BasicClusterHandler",
-              "generic_id": "cluster_handler_0x0000",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 0,
-                "name": "Basic",
-                "type": "server"
-              },
-              "id": "1:0x0000",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0000",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -488,22 +424,6 @@
           "entity_registry_enabled_default": false,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "BasicClusterHandler",
-              "generic_id": "cluster_handler_0x0000",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 0,
-                "name": "Basic",
-                "type": "server"
-              },
-              "id": "1:0x0000",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0000",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -532,22 +452,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "MeteringClusterHandler",
-              "generic_id": "cluster_handler_0x0702",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 1794,
-                "name": "Metering",
-                "type": "server"
-              },
-              "id": "1:0x0702",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0702",
-              "status": "INITIALIZED",
-              "value_attribute": "instantaneous_demand"
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -584,22 +488,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "MeteringClusterHandler",
-              "generic_id": "cluster_handler_0x0702",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 1794,
-                "name": "Metering",
-                "type": "server"
-              },
-              "id": "1:0x0702",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0702",
-              "status": "INITIALIZED",
-              "value_attribute": "instantaneous_demand"
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -638,22 +526,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": true,
-          "cluster_handlers": [
-            {
-              "class_name": "OnOffClusterHandler",
-              "generic_id": "cluster_handler_0x0006",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 6,
-                "name": "On/Off",
-                "type": "server"
-              },
-              "id": "1:0x0006",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0006",
-              "status": "INITIALIZED",
-              "value_attribute": "on_off"
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,
@@ -682,22 +554,6 @@
           "entity_registry_enabled_default": true,
           "enabled": true,
           "primary": false,
-          "cluster_handlers": [
-            {
-              "class_name": "OtaClientClusterHandler",
-              "generic_id": "cluster_handler_0x0019_client",
-              "endpoint_id": 1,
-              "cluster": {
-                "id": 25,
-                "name": "Ota",
-                "type": "client"
-              },
-              "id": "1:0x0019_client",
-              "unique_id": "ab:cd:ef:12:85:66:cc:2e:1:0x0019_CLIENT",
-              "status": "INITIALIZED",
-              "value_attribute": null
-            }
-          ],
           "device_ieee": "ab:cd:ef:12:85:66:cc:2e",
           "endpoint_id": 1,
           "available": true,