Improve async_track_template_result callback typing

homeassistant/components/bayesian/binary_sensor.py

@@ -27,7 +27,7 @@
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConditionError, TemplateError
 from homeassistant.helpers import condition
 import homeassistant.helpers.config_validation as cv
@@ -259,14 +259,13 @@ def async_threshold_sensor_state_listener(
 
         @callback
         def _async_template_result_changed(
-            event: Event | None, updates: list[TrackTemplateResult]
+            event: EventType[EventStateChangedData] | None,
+            updates: list[TrackTemplateResult],
         ) -> None:
             track_template_result = updates.pop()
             template = track_template_result.template
             result = track_template_result.result
-            entity: str | None = (
-                None if event is None else event.data.get(CONF_ENTITY_ID)
-            )
+            entity_id = None if event is None else event.data["entity_id"]
             if isinstance(result, TemplateError):
                 _LOGGER.error(
                     "TemplateError('%s') while processing template '%s' in entity '%s'",
@@ -283,8 +282,8 @@ def _async_template_result_changed(
                 observation.observed = observed
 
                 # in some cases a template may update because of the absence of an entity
-                if entity is not None:
-                    observation.entity_id = entity
+                if entity_id is not None:
+                    observation.entity_id = entity_id
 
                 self.current_observations[observation.id] = observation
 

homeassistant/components/template/trigger.py

@@ -1,5 +1,7 @@
 """Offer template automation rules."""
+from datetime import timedelta
 import logging
+from typing import Any
 
 import voluptuous as vol
 
@@ -8,13 +10,15 @@
 from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.event import (
+    EventStateChangedData,
     TrackTemplate,
+    TrackTemplateResult,
     async_call_later,
     async_track_template_result,
 )
 from homeassistant.helpers.template import Template, result_as_boolean
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
-from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.typing import ConfigType, EventType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -59,7 +63,10 @@ async def async_attach_trigger(
         )
 
     @callback
-    def template_listener(event, updates):
+    def template_listener(
+        event: EventType[EventStateChangedData] | None,
+        updates: list[TrackTemplateResult],
+    ) -> None:
         """Listen for state changes and calls action."""
         nonlocal delay_cancel, armed
         result = updates.pop().result
@@ -88,9 +95,9 @@ def template_listener(event, updates):
         # Fire!
         armed = False
 
-        entity_id = event and event.data.get("entity_id")
-        from_s = event and event.data.get("old_state")
-        to_s = event and event.data.get("new_state")
+        entity_id = event and event.data["entity_id"]
+        from_s = event and event.data["old_state"]
+        to_s = event and event.data["new_state"]
 
         if entity_id is not None:
             description = f"{entity_id} via template"
@@ -110,7 +117,7 @@ def template_listener(event, updates):
         }
 
         @callback
-        def call_action(*_):
+        def call_action(*_: Any) -> None:
             """Call action with right context."""
             nonlocal trigger_variables
             hass.async_run_hass_job(
@@ -124,7 +131,7 @@ def call_action(*_):
             return
 
         try:
-            period = cv.positive_time_period(
+            period: timedelta = cv.positive_time_period(
                 template.render_complex(time_delta, {"trigger": template_variables})
             )
         except (exceptions.TemplateError, vol.Invalid) as ex:

homeassistant/components/universal/media_player.py

@@ -87,6 +87,7 @@
 from homeassistant.helpers.event import (
     EventStateChangedData,
     TrackTemplate,
+    TrackTemplateResult,
     async_track_state_change_event,
     async_track_template_result,
 )
@@ -192,7 +193,10 @@ def _async_on_dependency_update(
             self.async_schedule_update_ha_state(True)
 
         @callback
-        def _async_on_template_update(event, updates):
+        def _async_on_template_update(
+            event: EventType[EventStateChangedData] | None,
+            updates: list[TrackTemplateResult],
+        ) -> None:
             """Update state when template state changes."""
             for data in updates:
                 template = data.template

homeassistant/components/websocket_api/commands.py

@@ -26,6 +26,7 @@
 from homeassistant.helpers import config_validation as cv, entity, template
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import (
+    EventStateChangedData,
     TrackTemplate,
     TrackTemplateResult,
     async_track_template_result,
@@ -37,6 +38,7 @@
     json_dumps,
 )
 from homeassistant.helpers.service import async_get_all_descriptions
+from homeassistant.helpers.typing import EventType
 from homeassistant.loader import (
     Integration,
     IntegrationNotFound,
@@ -535,7 +537,8 @@ async def handle_render_template(
 
     @callback
     def _template_listener(
-        event: Event | None, updates: list[TrackTemplateResult]
+        event: EventType[EventStateChangedData] | None,
+        updates: list[TrackTemplateResult],
     ) -> None:
         nonlocal info
         track_template_result = updates.pop()

homeassistant/helpers/event.py

@@ -888,9 +888,7 @@ def __init__(
         self,
         hass: HomeAssistant,
         track_templates: Sequence[TrackTemplate],
-        action: Callable[
-            [EventType[EventStateChangedData] | None, list[TrackTemplateResult]], None
-        ],
+        action: TrackTemplateResultListener,
         has_super_template: bool = False,
     ) -> None:
         """Handle removal / refresh of tracker init."""
@@ -1209,7 +1207,7 @@ def _apply_update(
         EventType[EventStateChangedData] | None,
         list[TrackTemplateResult],
     ],
-    None,
+    Coroutine[Any, Any, None] | None,
 ]
 """Type for the listener for template results.
 

homeassistant/helpers/template_entity.py

@@ -15,7 +15,6 @@
     SensorEntity,
 )
 from homeassistant.const import (
-    ATTR_ENTITY_ID,
     ATTR_ENTITY_PICTURE,
     ATTR_FRIENDLY_NAME,
     ATTR_ICON,
@@ -33,7 +32,12 @@
 
 from . import config_validation as cv
 from .entity import Entity
-from .event import TrackTemplate, TrackTemplateResult, async_track_template_result
+from .event import (
+    EventStateChangedData,
+    TrackTemplate,
+    TrackTemplateResult,
+    async_track_template_result,
+)
 from .script import Script, _VarsType
 from .template import (
     Template,
@@ -42,7 +46,7 @@
     render_complex,
     result_as_boolean,
 )
-from .typing import ConfigType
+from .typing import ConfigType, EventType
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -327,14 +331,14 @@ def add_template_attribute(
     @callback
     def _handle_results(
         self,
-        event: Event | None,
+        event: EventType[EventStateChangedData] | None,
         updates: list[TrackTemplateResult],
     ) -> None:
         """Call back the results to the attributes."""
         if event:
             self.async_set_context(event.context)
 
-        entity_id = event and event.data.get(ATTR_ENTITY_ID)
+        entity_id = event and event.data["entity_id"]
 
         if entity_id and entity_id == self.entity_id:
             self._self_ref_update_count += 1