Avoid putting cluster handler info in base event

Author: elupus

zha/application/platforms/event.py

@@ -6,7 +6,11 @@
 from typing import TYPE_CHECKING, Any
 
 from zha.application import Platform
-from zha.application.platforms import EntityStateChangedEvent, PlatformEntity
+from zha.application.platforms import (
+    EntityStateChangedEvent,
+    PlatformEntity,
+    BaseEntity,
+)
 from zha.application.registries import PLATFORM_ENTITIES
 from zha.const import STATE_CHANGED
 from zha.zigbee.cluster_handlers.const import (
@@ -35,8 +39,8 @@ class EventDeviceClass(StrEnum):
     MOTION = "motion"
 
 
-class BaseEvent(PlatformEntity):
-    """Base representation of a ZHA fan."""
+class BaseEvent(BaseEntity):
+    """Base representation of a ZHA events."""
 
     PLATFORM = Platform.EVENT
 
@@ -45,26 +49,6 @@ class BaseEvent(PlatformEntity):
     _attr_device_class: EventDeviceClass | None = None
     _attr_primary_weight = 10
     _state: dict[str, Any] = {}
-    _cluster_handler_name: str
-    _cluster_handler: ClusterHandler
-
-    def __init__(
-        self,
-        cluster_handlers: list[ClusterHandler],
-        endpoint: Endpoint,
-        device: Device,
-        **kwargs,
-    ) -> None:
-        """Initialize the fan."""
-        super().__init__(cluster_handlers, endpoint, device, **kwargs)
-        self._cluster_handler = self.cluster_handlers[self._cluster_handler_name]
-
-    @property
-    def state(self) -> dict[str, Any]:
-        """Return the state of the select."""
-        response = super().state
-        response.update(self._state)
-        return response
 
     @functools.cached_property
     def device_class(self) -> EventDeviceClass | None:
@@ -76,6 +60,41 @@ def event_types(self) -> list[str]:
         """Return a list of possible events."""
         return self._attr_event_types
 
+    @property
+    def state(self) -> dict[str, Any]:
+        """Return the state of the select."""
+        response = super().state
+        response.update(self._state)
+        return response
+
+    def _trigger_event(self, event_type: str, event_attributes: dict[str, Any]) -> None:
+        """Handle state update from cluster handler."""
+        if event_type not in self._attr_event_types:
+            self.debug("Event type %s ignored", event_type)
+            return
+
+        self._state = {
+            "event_attributes": event_attributes,
+            "event_type": event_type,
+        }
+        self.emit(STATE_CHANGED, EntityStateChangedEvent(**self.identifiers.__dict__))
+
+
+class ClusterHandlerEvent(BaseEvent, PlatformEntity):
+    """Base representation of a ZHA events using cluster handler."""
+
+    _cluster_handler_name: str
+    _cluster_handler: ClusterHandler
+
+    def __init__(
+        self,
+        *args,
+        **kwargs,
+    ) -> None:
+        """Initialize the fan."""
+        super().__init__(*args, **kwargs)
+        self._cluster_handler = self.cluster_handlers[self._cluster_handler_name]
+
     def on_add(self) -> None:
         """Run when entity is added."""
         super().on_add()
@@ -91,19 +110,11 @@ def handle_cluster_handler_command(
         event: ClusterHandlerCommandEvent,
     ) -> None:
         """Handle state update from cluster handler."""
-        if event.event not in self._attr_event_types:
-            self.debug("Event type %s ignored", event.event)
-            return
-
-        self._state = {
-            "event_attributes": event.data,
-            "event_type": event.event,
-        }
-        self.emit(STATE_CHANGED, EntityStateChangedEvent(**self.identifiers.__dict__))
+        self._trigger_event(event.event, event.data)
 
 
 @STRICT_MATCH(cluster_handler_names=CLIENT_CLUSTER_HANDLER_LEVEL)
-class LevelControlEvent(BaseEvent, PlatformEntity):
+class LevelControlEvent(ClusterHandlerEvent):
     """Representation of a ZHA fan."""
 
     _attr_translation_key = "level_control"