jeans/core
jeans/core
1
0
Fork 0
mirror of https://github.com/home-assistant/core.git synced 2025-07-31 17:18:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Refactor event handlers

Browse Source
This commit is contained in:
Erik 2024-06-26 13:37:11 +02:00
parent 423f4c5bcf
commit 903054db14
1 changed files with 18 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
homeassistant/components/integration/sensor.py
View File

@ -3,10 +3,12 @@
from __future__ import annotations from __future__ import annotations
from abc import ABC, abstractmethod from abc import ABC, abstractmethod
from collections.abc import Callable
from dataclasses import dataclass from dataclasses import dataclass
from datetime import UTC, datetime, timedelta from datetime import UTC, datetime, timedelta
from decimal import Decimal, InvalidOperation from decimal import Decimal, InvalidOperation
from enum import Enum from enum import Enum
from functools import partial
import logging import logging
from typing import TYPE_CHECKING, Any, Final, Self from typing import TYPE_CHECKING, Any, Final, Self
@ -103,6 +105,8 @@ PLATFORM_SCHEMA = vol.All(
), ),
) )
type StateUpdateFunc = Callable[[datetime | None, State | None, State | None], None]
class _IntegrationMethod(ABC): class _IntegrationMethod(ABC):
@staticmethod @staticmethod
@ -428,11 +432,9 @@ class IntegrationSensor(RestoreSensor):
source_state = self.hass.states.get(self._sensor_source_id) source_state = self.hass.states.get(self._sensor_source_id)
self._schedule_max_sub_interval_exceeded_if_state_is_numeric(source_state) self._schedule_max_sub_interval_exceeded_if_state_is_numeric(source_state)
self.async_on_remove(self._cancel_max_sub_interval_exceeded_callback) self.async_on_remove(self._cancel_max_sub_interval_exceeded_callback)
handle_state_change = self._integrate_on_state_change_with_max_sub_interval handle_state_update = self._integrate_on_state_update_with_max_sub_interval
handle_state_report = self._integrate_on_state_report_with_max_sub_interval
else: else:
handle_state_change = self._integrate_on_state_change_callback handle_state_update = self._integrate_on_state_update
handle_state_report = self._integrate_on_state_report_callback
if ( if (
state := self.hass.states.get(self._source_entity) state := self.hass.states.get(self._source_entity)
@ -442,7 +444,7 @@ class IntegrationSensor(RestoreSensor):
self.async_on_remove( self.async_on_remove(
self.hass.bus.async_listen( self.hass.bus.async_listen(
EVENT_STATE_CHANGED, EVENT_STATE_CHANGED,
handle_state_change, partial(self._integrate_on_state_change_callback, handle_state_update),
event_filter=callback( event_filter=callback(
lambda event_data: event_data["entity_id"] == self._sensor_source_id lambda event_data: event_data["entity_id"] == self._sensor_source_id
), ),
@ -452,7 +454,7 @@ class IntegrationSensor(RestoreSensor):
self.async_on_remove( self.async_on_remove(
self.hass.bus.async_listen( self.hass.bus.async_listen(
EVENT_STATE_REPORTED, EVENT_STATE_REPORTED,
handle_state_report, partial(self._integrate_on_state_report_callback, handle_state_update),
event_filter=callback( event_filter=callback(
lambda event_data: event_data["entity_id"] == self._sensor_source_id lambda event_data: event_data["entity_id"] == self._sensor_source_id
), ),
@ -461,20 +463,20 @@ class IntegrationSensor(RestoreSensor):
) )
@callback @callback
def _integrate_on_state_change_with_max_sub_interval( def _integrate_on_state_change_callback(
self, event: Event[EventStateChangedData] self, handle_state_update: StateUpdateFunc, event: Event[EventStateChangedData]
) -> None: ) -> None:
"""Handle sensor state update when sub interval is configured.""" """Handle sensor state change."""
self._integrate_on_state_update_with_max_sub_interval( return handle_state_update(
None, event.data["old_state"], event.data["new_state"] None, event.data["old_state"], event.data["new_state"]
) )
@callback @callback
def _integrate_on_state_report_with_max_sub_interval( def _integrate_on_state_report_callback(
self, event: Event[EventStateReportedData] self, handle_state_update: StateUpdateFunc, event: Event[EventStateReportedData]
) -> None: ) -> None:
"""Handle sensor state report when sub interval is configured.""" """Handle sensor state report."""
self._integrate_on_state_update_with_max_sub_interval( return handle_state_update(
event.data["old_last_reported"], None, event.data["new_state"] event.data["old_last_reported"], None, event.data["new_state"]
) )
@ -492,7 +494,7 @@ class IntegrationSensor(RestoreSensor):
""" """
self._cancel_max_sub_interval_exceeded_callback() self._cancel_max_sub_interval_exceeded_callback()
try: try:
self._integrate_on_state_change(old_last_reported, old_state, new_state) self._integrate_on_state_update(old_last_reported, old_state, new_state)
self._last_integration_trigger = _IntegrationTrigger.StateEvent self._last_integration_trigger = _IntegrationTrigger.StateEvent
self._last_integration_time = datetime.now(tz=UTC) self._last_integration_time = datetime.now(tz=UTC)
finally: finally:
@ -500,25 +502,7 @@ class IntegrationSensor(RestoreSensor):
# constant with the last known state (new_state). # constant with the last known state (new_state).
self._schedule_max_sub_interval_exceeded_if_state_is_numeric(new_state) self._schedule_max_sub_interval_exceeded_if_state_is_numeric(new_state)
@callback def _integrate_on_state_update(
def _integrate_on_state_change_callback(
self, event: Event[EventStateChangedData]
) -> None:
"""Handle sensor state change."""
return self._integrate_on_state_change(
None, event.data["old_state"], event.data["new_state"]
)
@callback
def _integrate_on_state_report_callback(
self, event: Event[EventStateReportedData]
) -> None:
"""Handle sensor state report."""
return self._integrate_on_state_change(
event.data["old_last_reported"], None, event.data["new_state"]
)
def _integrate_on_state_change(
self, self,
old_last_reported: datetime | None, old_last_reported: datetime | None,
old_state: State | None, old_state: State | None,