Update import for EventStateChangedData [a-h] (#114899)

homeassistant/components/alert/__init__.py

@@ -26,13 +26,12 @@ from homeassistant.const import (
     STATE_OFF,
     STATE_ON,
 )
-from homeassistant.core import Event, HassJob, HomeAssistant
+from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
 from homeassistant.exceptions import ServiceNotFound
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_point_in_time,
     async_track_state_change_event,
 )

homeassistant/components/apache_kafka/__init__.py

@@ -19,10 +19,9 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entityfilter import FILTER_SCHEMA, EntityFilter
-from homeassistant.helpers.event import EventStateChangedData
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import ssl as ssl_util
 

homeassistant/components/api/__init__.py

@@ -37,7 +37,7 @@ from homeassistant.const import (
     URL_API_TEMPLATE,
 )
 import homeassistant.core as ha
-from homeassistant.core import Event, HomeAssistant
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant
 from homeassistant.exceptions import (
     InvalidEntityFormatError,
     InvalidStateError,
@@ -46,7 +46,6 @@ from homeassistant.exceptions import (
     Unauthorized,
 )
 from homeassistant.helpers import config_validation as cv, template
-from homeassistant.helpers.event import EventStateChangedData
 from homeassistant.helpers.json import json_dumps, json_fragment
 from homeassistant.helpers.service import async_get_all_descriptions
 from homeassistant.helpers.typing import ConfigType

homeassistant/components/bayesian/binary_sensor.py

@@ -28,13 +28,12 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.exceptions import ConditionError, TemplateError
 from homeassistant.helpers import condition
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     TrackTemplate,
     TrackTemplateResult,
     TrackTemplateResultInfo,

homeassistant/components/compensation/sensor.py

@@ -18,12 +18,15 @@ from homeassistant.const import (
     CONF_UNIT_OF_MEASUREMENT,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant, State, callback
+from homeassistant.core import (
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
+    Event,
-from homeassistant.helpers.event import (
     EventStateChangedData,
-    async_track_state_change_event,
+    HomeAssistant,
+    State,
+    callback,
 )
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (

homeassistant/components/conversation/default_agent.py

@@ -41,10 +41,7 @@ from homeassistant.helpers import (
     translation,
 )
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_added_domain
-    EventStateChangedData,
-    async_track_state_added_domain,
-)
 from homeassistant.util.json import JsonObjectType, json_loads_object
 
 from .const import DEFAULT_EXPOSED_ATTRIBUTES, DOMAIN
@@ -134,7 +131,9 @@ async def async_setup_default_agent(
         async_should_expose(hass, DOMAIN, entity_id)
 
     @core.callback
-    def async_entity_state_listener(event: core.Event[EventStateChangedData]) -> None:
+    def async_entity_state_listener(
+        event: core.Event[core.EventStateChangedData],
+    ) -> None:
         """Set expose flag on new entities."""
         async_should_expose(hass, DOMAIN, event.data["entity_id"])
 

homeassistant/components/derivative/sensor.py

@@ -19,7 +19,7 @@ from homeassistant.const import (
     STATE_UNKNOWN,
     UnitOfTime,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import (
     config_validation as cv,
     device_registry as dr,
@@ -27,10 +27,7 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .const import (

homeassistant/components/dhcp/__init__.py

@@ -37,7 +37,13 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_STOP,
     STATE_HOME,
 )
-from homeassistant.core import Event, HomeAssistant, State, callback
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
 from homeassistant.data_entry_flow import BaseServiceInfo
 from homeassistant.helpers import config_validation as cv, discovery_flow
 from homeassistant.helpers.device_registry import (
@@ -48,7 +54,6 @@ from homeassistant.helpers.device_registry import (
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_state_added_domain,
     async_track_time_interval,
 )

homeassistant/components/emulated_hue/config.py

@@ -16,10 +16,16 @@ from homeassistant.components import (
     script,
 )
 from homeassistant.const import CONF_ENTITIES, CONF_TYPE
-from homeassistant.core import Event, HomeAssistant, State, callback, split_entity_id
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+    split_entity_id,
+)
 from homeassistant.helpers import storage
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_state_added_domain,
     async_track_state_removed_domain,
 )

homeassistant/components/emulated_hue/hue_api.py

@@ -65,11 +65,8 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import Event, State
+from homeassistant.core import Event, EventStateChangedData, State
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.util.json import json_loads
 from homeassistant.util.network import is_local
 

homeassistant/components/esphome/manager.py

@@ -33,16 +33,20 @@ from homeassistant.const import (
     EVENT_HOMEASSISTANT_CLOSE,
     EVENT_LOGGING_CHANGED,
 )
-from homeassistant.core import Event, HomeAssistant, ServiceCall, State, callback
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    ServiceCall,
+    State,
+    callback,
+)
 from homeassistant.exceptions import TemplateError
 from homeassistant.helpers import template
 import homeassistant.helpers.config_validation as cv
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.helpers.issue_registry import (
     IssueSeverity,
     async_create_issue,

homeassistant/components/filter/sensor.py

@@ -35,13 +35,16 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant, State, callback
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.helpers.reload import async_setup_reload_service
 from homeassistant.helpers.start import async_at_started
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType

homeassistant/components/generic_thermostat/climate.py

@@ -45,6 +45,7 @@ from homeassistant.core import (
     DOMAIN as HA_DOMAIN,
     CoreState,
     Event,
+    EventStateChangedData,
     HomeAssistant,
     State,
     callback,
@@ -54,7 +55,6 @@ from homeassistant.helpers import condition
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_state_change_event,
     async_track_time_interval,
 )

homeassistant/components/geo_location/trigger.py

@@ -11,6 +11,7 @@ from homeassistant.const import CONF_EVENT, CONF_PLATFORM, CONF_SOURCE, CONF_ZON
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HassJob,
     HomeAssistant,
     State,
@@ -18,11 +19,7 @@ from homeassistant.core import (
 )
 from homeassistant.helpers import condition, config_validation as cv
 from homeassistant.helpers.config_validation import entity_domain
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import TrackStates, async_track_state_change_filtered
-    EventStateChangedData,
-    TrackStates,
-    async_track_state_change_filtered,
-)
 from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 

homeassistant/components/group/entity.py

@@ -12,6 +12,7 @@ from homeassistant.const import ATTR_ASSUMED_STATE, ATTR_ENTITY_ID, STATE_ON
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HomeAssistant,
     State,
     callback,
@@ -20,10 +21,7 @@ from homeassistant.core import (
 from homeassistant.helpers import start
 from homeassistant.helpers.entity import Entity, async_generate_entity_id
 from homeassistant.helpers.entity_component import EntityComponent
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 
 from .const import ATTR_AUTO, ATTR_ORDER, DOMAIN, GROUP_ORDER, REG_KEY
 from .registry import GroupIntegrationRegistry

homeassistant/components/group/event.py

@@ -25,13 +25,10 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 from .entity import GroupEntity

homeassistant/components/group/media_player.py

@@ -45,13 +45,17 @@ from homeassistant.const import (
     STATE_UNAVAILABLE,
     STATE_UNKNOWN,
 )
-from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, State, callback
+from homeassistant.core import (
+    CALLBACK_TYPE,
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
 from homeassistant.helpers import config_validation as cv, entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
 KEY_ANNOUNCE = "announce"

homeassistant/components/history/websocket_api.py

@@ -24,6 +24,7 @@ from homeassistant.const import (
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HomeAssistant,
     State,
     callback,
@@ -31,7 +32,6 @@ from homeassistant.core import (
     valid_entity_id,
 )
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_point_in_utc_time,
     async_track_state_change_event,
 )

homeassistant/components/history_stats/coordinator.py

@@ -6,12 +6,15 @@ from datetime import timedelta
 import logging
 from typing import Any
 
-from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, callback
+from homeassistant.core import (
-from homeassistant.exceptions import TemplateError
+    CALLBACK_TYPE,
-from homeassistant.helpers.event import (
+    Event,
     EventStateChangedData,
-    async_track_state_change_event,
+    HomeAssistant,
+    callback,
 )
+from homeassistant.exceptions import TemplateError
+from homeassistant.helpers.event import async_track_state_change_event
 from homeassistant.helpers.start import async_at_start
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 

homeassistant/components/history_stats/data.py

@@ -6,8 +6,7 @@ from dataclasses import dataclass
 import datetime
 
 from homeassistant.components.recorder import get_instance, history
-from homeassistant.core import Event, HomeAssistant, State
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, State
-from homeassistant.helpers.event import EventStateChangedData
 from homeassistant.helpers.template import Template
 import homeassistant.util.dt as dt_util
 

homeassistant/components/homeassistant/triggers/numeric_state.py

@@ -22,6 +22,7 @@ from homeassistant.const import (
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HassJob,
     HomeAssistant,
     State,
@@ -34,7 +35,6 @@ from homeassistant.helpers import (
     template,
 )
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_same_state,
     async_track_state_change_event,
 )

homeassistant/components/homeassistant/triggers/state.py

@@ -13,6 +13,7 @@ from homeassistant.const import CONF_ATTRIBUTE, CONF_FOR, CONF_PLATFORM, MATCH_A
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HassJob,
     HomeAssistant,
     State,
@@ -24,7 +25,6 @@ from homeassistant.helpers import (
     template,
 )
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_same_state,
     async_track_state_change_event,
     process_state_match,

homeassistant/components/homeassistant/triggers/time.py

@@ -16,6 +16,7 @@ from homeassistant.const import (
 from homeassistant.core import (
     CALLBACK_TYPE,
     Event,
+    EventStateChangedData,
     HassJob,
     HomeAssistant,
     State,
@@ -23,7 +24,6 @@ from homeassistant.core import (
 )
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.event import (
-    EventStateChangedData,
     async_track_point_in_time,
     async_track_state_change_event,
     async_track_time_change,

homeassistant/components/homekit/accessories.py

@@ -45,16 +45,14 @@ from homeassistant.core import (
     CALLBACK_TYPE,
     Context,
     Event,
+    EventStateChangedData,
     HomeAssistant,
     State,
     callback as ha_callback,
     split_entity_id,
 )
 from homeassistant.helpers.dispatcher import async_dispatcher_send
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 from homeassistant.util.decorator import Registry
 
 from .const import (

homeassistant/components/homekit/type_cameras.py

@@ -17,9 +17,14 @@ from pyhap.util import callback as pyhap_callback
 from homeassistant.components import camera
 from homeassistant.components.ffmpeg import get_ffmpeg_manager
 from homeassistant.const import STATE_ON
-from homeassistant.core import Event, HomeAssistant, State, callback
+from homeassistant.core import (
-from homeassistant.helpers.event import (
+    Event,
     EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+)
+from homeassistant.helpers.event import (
     async_track_state_change_event,
     async_track_time_interval,
 )

homeassistant/components/homekit/type_covers.py

@@ -34,11 +34,8 @@ from homeassistant.const import (
     STATE_OPEN,
     STATE_OPENING,
 )
-from homeassistant.core import Event, State, callback
+from homeassistant.core import Event, EventStateChangedData, State, callback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 
 from .accessories import TYPES, HomeAccessory
 from .const import (

homeassistant/components/homekit/type_humidifiers.py

@@ -25,11 +25,8 @@ from homeassistant.const import (
     SERVICE_TURN_ON,
     STATE_ON,
 )
-from homeassistant.core import Event, State, callback
+from homeassistant.core import Event, EventStateChangedData, State, callback
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 
 from .accessories import TYPES, HomeAccessory
 from .const import (

homeassistant/components/homekit/util.py

@@ -38,9 +38,15 @@ from homeassistant.const import (
     CONF_TYPE,
     UnitOfTemperature,
 )
-from homeassistant.core import Event, HomeAssistant, State, callback, split_entity_id
+from homeassistant.core import (
+    Event,
+    EventStateChangedData,
+    HomeAssistant,
+    State,
+    callback,
+    split_entity_id,
+)
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.event import EventStateChangedData
 from homeassistant.helpers.storage import STORAGE_DIR
 from homeassistant.util.unit_conversion import TemperatureConverter
 

tests/components/esphome/test_entity.py

@@ -23,12 +23,9 @@ from homeassistant.const import (
     STATE_ON,
     STATE_UNAVAILABLE,
 )
-from homeassistant.core import Event, HomeAssistant, callback
+from homeassistant.core import Event, EventStateChangedData, HomeAssistant, callback
 from homeassistant.helpers import entity_registry as er
-from homeassistant.helpers.event import (
+from homeassistant.helpers.event import async_track_state_change_event
-    EventStateChangedData,
-    async_track_state_change_event,
-)
 
 from .conftest import MockESPHomeDevice