Fix typo in lovelace (#119523)

* zha integration: Add danfoss specific clusters and attributes; add thermostat.pi_heating_demand and thermostat_ui.keypad_lockout

* zha integration: fix Danfoss thermostat viewing direction not working because of use of bitmap8 instead of enum8

* ZHA Integration: add missing ThermostatChannelSensor

* ZHA integration: format using black

* zha integration: fix flake8 issues

* ZHA danfoss: Add MinHeatSetpointLimit, MaxHeatSetpointLimit, add reporting and read config for danfoss and keypad_lockout.

* ZHA danfoss: fix mypy complaining about type of _attr_entity_category

* ZHA danfoss: ruff fix

* fix tests

* pylint: disable-next=hass-invalid-inheritance

* fix pylint tests

* refactoring

* remove scheduled setpoint

* remove scheduled setpoint in manufacturer specific

* refactor

* fix tests

* change cluster ids

* remove custom clusters

* code quality

* match clusters in manufacturerspecific on quirk class

* fix comment

* fix match on quirk in manufacturerspecific.py

* correctly extend cluster handlers in manufacturerspecific.py and remove workaround for illegal use of attribute updated signals in climate.py

* fix style

* allow non-danfoss thermostats to work in manufacturerspecific.py

* correct order of init of parent and subclasses in manufacturerspecific.py

* improve entity names

* fix pylint

* explicitly state changing size of tuple

* ignore tuple size change error

* really ignore error

* initial

* fix tests

* match on specific name and quirk name

* don't restructure file as it is out of scope

* move back

* remove unnecessary change

* fix tests

* fix tests

* remove code duplication

* reduce code duplication

* empty line

* remove unused variable

* end file on newline

* comply with recent PRs

* correctly initialize all attributes

* comply with recent PRs

* make class variables private

* forgot one reference

* swap 2 lines for consistency

* reorder 2 lines

* fix tests

* align with recent PR

* store cluster handlers in only one place

* edit tests

* use correct device for quirk id

* change quirk id

* fix tests

* even if there is a quirk id, it doesn't have to have a specific cluster handler

* add tests

* use quirk id for manufacturer specific cluster handlers

* use quirk_ids instead of quirks_classes

* rename quirk_id

* rename quirk_id

* forgot to rename here

* rename id

* add tests

* fix tests

* fix tests

* use quirk ids from zha_quirks

* use quirk id from zha_quirks

* wrong translation

* sync changes with ZCL branch

* sync

* style

* merge error

* move bitmapSensor

* merge error

* merge error

* watch the capitals

* fix entity categories

* more decapitalization

* translate BitmapSensor

* translate all enums

* translate all enums

* don't convert camelcase to snakecase

* don't change enums at all

* remove comments

* fix bitmaps and add enum for algorithm scale factor

* improve readability if bitmapsensor

* fix capitals

* better setpoint response time

* feedback

* lowercase every enum to adhere to the translation_key standard

* remove enum state translations and use enums from quirks

* correctly capitalize OrientationEnum

* bump zha dependencies; this will have to be done in a separate PR, but this aids review

* accidentally removed enum

* tests

* comment

* Migrate reporting and ZCL attribute config out of `__init__`

* hvac.py shouldn't be changed in this pull request

* change wording comment

* I forgot I changed the size of the tuple.

---------

Co-authored-by: puddly <32534428+puddly@users.noreply.github.com>

.core_files.yaml

@@ -137,6 +137,7 @@ tests: &tests
   - tests/syrupy.py
   - tests/test_util/**
   - tests/testing_config/**
+  - tests/typing.py
   - tests/util/**
 
 other: &other

.coveragerc

@@ -1,12 +1,17 @@
+# Sorted by hassfest.
+#
+# To sort, run python3 -m script.hassfest -p coverage
+
 [run]
 source = homeassistant
 omit =
     homeassistant/__main__.py
+    homeassistant/helpers/backports/aiohttp_resolver.py
     homeassistant/helpers/signal.py
     homeassistant/scripts/__init__.py
+    homeassistant/scripts/benchmark/__init__.py
     homeassistant/scripts/check_config.py
     homeassistant/scripts/ensure_config.py
-    homeassistant/scripts/benchmark/__init__.py
     homeassistant/scripts/macos/__init__.py
 
     # omit pieces of code that rely on external devices being present
@@ -53,13 +58,18 @@ omit =
     homeassistant/components/airvisual/sensor.py
     homeassistant/components/airvisual_pro/__init__.py
     homeassistant/components/airvisual_pro/sensor.py
+    homeassistant/components/aladdin_connect/__init__.py
+    homeassistant/components/aladdin_connect/api.py
+    homeassistant/components/aladdin_connect/application_credentials.py
+    homeassistant/components/aladdin_connect/cover.py
+    homeassistant/components/aladdin_connect/sensor.py
     homeassistant/components/alarmdecoder/__init__.py
     homeassistant/components/alarmdecoder/alarm_control_panel.py
     homeassistant/components/alarmdecoder/binary_sensor.py
+    homeassistant/components/alarmdecoder/entity.py
     homeassistant/components/alarmdecoder/sensor.py
     homeassistant/components/alpha_vantage/sensor.py
     homeassistant/components/amazon_polly/*
-    homeassistant/components/ambiclimate/climate.py
     homeassistant/components/ambient_station/__init__.py
     homeassistant/components/ambient_station/binary_sensor.py
     homeassistant/components/ambient_station/entity.py
@@ -77,6 +87,10 @@ omit =
     homeassistant/components/aprilaire/climate.py
     homeassistant/components/aprilaire/coordinator.py
     homeassistant/components/aprilaire/entity.py
+    homeassistant/components/apsystems/__init__.py
+    homeassistant/components/apsystems/coordinator.py
+    homeassistant/components/apsystems/entity.py
+    homeassistant/components/apsystems/sensor.py
     homeassistant/components/aqualogic/*
     homeassistant/components/aquostv/media_player.py
     homeassistant/components/arcam_fmj/__init__.py
@@ -103,10 +117,8 @@ omit =
     homeassistant/components/aurora/sensor.py
     homeassistant/components/avea/light.py
     homeassistant/components/avion/light.py
-    homeassistant/components/azure_devops/__init__.py
-    homeassistant/components/azure_devops/sensor.py
-    homeassistant/components/azure_service_bus/*
     homeassistant/components/awair/coordinator.py
+    homeassistant/components/azure_service_bus/*
     homeassistant/components/baf/__init__.py
     homeassistant/components/baf/climate.py
     homeassistant/components/baf/entity.py
@@ -117,7 +129,6 @@ omit =
     homeassistant/components/baf/switch.py
     homeassistant/components/baidu/tts.py
     homeassistant/components/bang_olufsen/__init__.py
-    homeassistant/components/bang_olufsen/const.py
     homeassistant/components/bang_olufsen/entity.py
     homeassistant/components/bang_olufsen/media_player.py
     homeassistant/components/bang_olufsen/util.py
@@ -138,12 +149,7 @@ omit =
     homeassistant/components/bloomsky/*
     homeassistant/components/bluesound/*
     homeassistant/components/bluetooth_tracker/*
-    homeassistant/components/bmw_connected_drive/__init__.py
-    homeassistant/components/bmw_connected_drive/binary_sensor.py
-    homeassistant/components/bmw_connected_drive/coordinator.py
-    homeassistant/components/bmw_connected_drive/lock.py
     homeassistant/components/bmw_connected_drive/notify.py
-    homeassistant/components/bmw_connected_drive/sensor.py
     homeassistant/components/bosch_shc/__init__.py
     homeassistant/components/bosch_shc/binary_sensor.py
     homeassistant/components/bosch_shc/cover.py
@@ -189,9 +195,8 @@ omit =
     homeassistant/components/comelit/__init__.py
     homeassistant/components/comelit/alarm_control_panel.py
     homeassistant/components/comelit/climate.py
-    homeassistant/components/comelit/const.py
-    homeassistant/components/comelit/cover.py
     homeassistant/components/comelit/coordinator.py
+    homeassistant/components/comelit/cover.py
     homeassistant/components/comelit/humidifier.py
     homeassistant/components/comelit/light.py
     homeassistant/components/comelit/sensor.py
@@ -202,6 +207,7 @@ omit =
     homeassistant/components/control4/__init__.py
     homeassistant/components/control4/director_utils.py
     homeassistant/components/control4/light.py
+    homeassistant/components/control4/media_player.py
     homeassistant/components/coolmaster/coordinator.py
     homeassistant/components/cppm_tracker/device_tracker.py
     homeassistant/components/crownstone/__init__.py
@@ -238,8 +244,8 @@ omit =
     homeassistant/components/dominos/*
     homeassistant/components/doods/*
     homeassistant/components/doorbird/__init__.py
-    homeassistant/components/doorbird/camera.py
     homeassistant/components/doorbird/button.py
+    homeassistant/components/doorbird/camera.py
     homeassistant/components/doorbird/device.py
     homeassistant/components/doorbird/entity.py
     homeassistant/components/doorbird/util.py
@@ -250,22 +256,18 @@ omit =
     homeassistant/components/dormakaba_dkey/lock.py
     homeassistant/components/dormakaba_dkey/sensor.py
     homeassistant/components/dovado/*
-    homeassistant/components/downloader/*
-    homeassistant/components/dsmr_reader/__init__.py
-    homeassistant/components/dsmr_reader/definitions.py
-    homeassistant/components/dsmr_reader/sensor.py
+    homeassistant/components/downloader/__init__.py
     homeassistant/components/dte_energy_bridge/sensor.py
     homeassistant/components/dublin_bus_transport/sensor.py
     homeassistant/components/dunehd/__init__.py
     homeassistant/components/dunehd/media_player.py
     homeassistant/components/duotecno/__init__.py
-    homeassistant/components/duotecno/entity.py
-    homeassistant/components/duotecno/switch.py
-    homeassistant/components/duotecno/cover.py
-    homeassistant/components/duotecno/light.py
-    homeassistant/components/duotecno/climate.py
     homeassistant/components/duotecno/binary_sensor.py
-    homeassistant/components/dwd_weather_warnings/const.py
+    homeassistant/components/duotecno/climate.py
+    homeassistant/components/duotecno/cover.py
+    homeassistant/components/duotecno/entity.py
+    homeassistant/components/duotecno/light.py
+    homeassistant/components/duotecno/switch.py
     homeassistant/components/dwd_weather_warnings/coordinator.py
     homeassistant/components/dwd_weather_warnings/sensor.py
     homeassistant/components/dweet/*
@@ -304,10 +306,12 @@ omit =
     homeassistant/components/edl21/__init__.py
     homeassistant/components/edl21/sensor.py
     homeassistant/components/egardia/*
+    homeassistant/components/electrasmart/__init__.py
+    homeassistant/components/electrasmart/climate.py
     homeassistant/components/electric_kiwi/__init__.py
     homeassistant/components/electric_kiwi/api.py
-    homeassistant/components/electric_kiwi/oauth2.py
     homeassistant/components/electric_kiwi/coordinator.py
+    homeassistant/components/electric_kiwi/oauth2.py
     homeassistant/components/electric_kiwi/select.py
     homeassistant/components/eliqonline/sensor.py
     homeassistant/components/elkm1/__init__.py
@@ -320,8 +324,7 @@ omit =
     homeassistant/components/elmax/__init__.py
     homeassistant/components/elmax/alarm_control_panel.py
     homeassistant/components/elmax/binary_sensor.py
-    homeassistant/components/elmax/common.py
-    homeassistant/components/elmax/const.py
+    homeassistant/components/elmax/coordinator.py
     homeassistant/components/elmax/cover.py
     homeassistant/components/elmax/switch.py
     homeassistant/components/elv/*
@@ -355,12 +358,17 @@ omit =
     homeassistant/components/environment_canada/weather.py
     homeassistant/components/envisalink/*
     homeassistant/components/ephember/climate.py
+    homeassistant/components/epic_games_store/__init__.py
+    homeassistant/components/epic_games_store/coordinator.py
     homeassistant/components/epion/__init__.py
     homeassistant/components/epion/coordinator.py
     homeassistant/components/epion/sensor.py
     homeassistant/components/epson/__init__.py
     homeassistant/components/epson/media_player.py
-    homeassistant/components/epsonworkforce/sensor.py
+    homeassistant/components/eq3btsmart/__init__.py
+    homeassistant/components/eq3btsmart/climate.py
+    homeassistant/components/eq3btsmart/entity.py
+    homeassistant/components/eq3btsmart/models.py
     homeassistant/components/escea/__init__.py
     homeassistant/components/escea/climate.py
     homeassistant/components/escea/discovery.py
@@ -375,11 +383,11 @@ omit =
     homeassistant/components/ezviz/binary_sensor.py
     homeassistant/components/ezviz/button.py
     homeassistant/components/ezviz/camera.py
+    homeassistant/components/ezviz/coordinator.py
+    homeassistant/components/ezviz/entity.py
     homeassistant/components/ezviz/image.py
     homeassistant/components/ezviz/light.py
-    homeassistant/components/ezviz/coordinator.py
     homeassistant/components/ezviz/number.py
-    homeassistant/components/ezviz/entity.py
     homeassistant/components/ezviz/select.py
     homeassistant/components/ezviz/sensor.py
     homeassistant/components/ezviz/siren.py
@@ -450,8 +458,8 @@ omit =
     homeassistant/components/freebox/camera.py
     homeassistant/components/freebox/home_base.py
     homeassistant/components/freebox/switch.py
-    homeassistant/components/fritz/common.py
-    homeassistant/components/fritz/device_tracker.py
+    homeassistant/components/fritz/coordinator.py
+    homeassistant/components/fritz/entity.py
     homeassistant/components/fritz/services.py
     homeassistant/components/fritz/switch.py
     homeassistant/components/fritzbox_callmonitor/__init__.py
@@ -489,7 +497,6 @@ omit =
     homeassistant/components/gpsd/sensor.py
     homeassistant/components/greenwave/light.py
     homeassistant/components/growatt_server/__init__.py
-    homeassistant/components/growatt_server/const.py
     homeassistant/components/growatt_server/sensor.py
     homeassistant/components/growatt_server/sensor_types/*
     homeassistant/components/gstreamer/media_player.py
@@ -503,6 +510,7 @@ omit =
     homeassistant/components/guardian/util.py
     homeassistant/components/guardian/valve.py
     homeassistant/components/habitica/__init__.py
+    homeassistant/components/habitica/coordinator.py
     homeassistant/components/habitica/sensor.py
     homeassistant/components/harman_kardon_avr/media_player.py
     homeassistant/components/harmony/data.py
@@ -524,16 +532,13 @@ omit =
     homeassistant/components/hive/switch.py
     homeassistant/components/hive/water_heater.py
     homeassistant/components/hko/__init__.py
-    homeassistant/components/hko/weather.py
     homeassistant/components/hko/coordinator.py
+    homeassistant/components/hko/weather.py
     homeassistant/components/hlk_sw16/__init__.py
     homeassistant/components/hlk_sw16/switch.py
-    homeassistant/components/home_connect/__init__.py
-    homeassistant/components/home_connect/api.py
     homeassistant/components/home_connect/binary_sensor.py
     homeassistant/components/home_connect/entity.py
     homeassistant/components/home_connect/light.py
-    homeassistant/components/home_connect/sensor.py
     homeassistant/components/home_connect/switch.py
     homeassistant/components/homematic/__init__.py
     homeassistant/components/homematic/binary_sensor.py
@@ -545,7 +550,6 @@ omit =
     homeassistant/components/homematic/notify.py
     homeassistant/components/homematic/sensor.py
     homeassistant/components/homematic/switch.py
-    homeassistant/components/homeworks/*
     homeassistant/components/horizon/media_player.py
     homeassistant/components/hp_ilo/sensor.py
     homeassistant/components/huawei_lte/__init__.py
@@ -564,9 +568,9 @@ omit =
     homeassistant/components/hunterdouglas_powerview/sensor.py
     homeassistant/components/hunterdouglas_powerview/shade_data.py
     homeassistant/components/hunterdouglas_powerview/util.py
-    homeassistant/components/hvv_departures/__init__.py
     homeassistant/components/huum/__init__.py
     homeassistant/components/huum/climate.py
+    homeassistant/components/hvv_departures/__init__.py
     homeassistant/components/hvv_departures/binary_sensor.py
     homeassistant/components/hvv_departures/sensor.py
     homeassistant/components/ialarm/alarm_control_panel.py
@@ -586,7 +590,9 @@ omit =
     homeassistant/components/ifttt/alarm_control_panel.py
     homeassistant/components/iglo/light.py
     homeassistant/components/ihc/*
-    homeassistant/components/incomfort/*
+    homeassistant/components/incomfort/__init__.py
+    homeassistant/components/incomfort/climate.py
+    homeassistant/components/incomfort/water_heater.py
     homeassistant/components/insteon/binary_sensor.py
     homeassistant/components/insteon/climate.py
     homeassistant/components/insteon/cover.py
@@ -616,6 +622,7 @@ omit =
     homeassistant/components/irish_rail_transport/sensor.py
     homeassistant/components/iss/__init__.py
     homeassistant/components/iss/sensor.py
+    homeassistant/components/ista_ecotrend/coordinator.py
     homeassistant/components/isy994/__init__.py
     homeassistant/components/isy994/binary_sensor.py
     homeassistant/components/isy994/button.py
@@ -639,6 +646,12 @@ omit =
     homeassistant/components/izone/climate.py
     homeassistant/components/izone/discovery.py
     homeassistant/components/joaoapps_join/*
+    homeassistant/components/juicenet/__init__.py
+    homeassistant/components/juicenet/device.py
+    homeassistant/components/juicenet/entity.py
+    homeassistant/components/juicenet/number.py
+    homeassistant/components/juicenet/sensor.py
+    homeassistant/components/juicenet/switch.py
     homeassistant/components/justnimbus/coordinator.py
     homeassistant/components/justnimbus/entity.py
     homeassistant/components/justnimbus/sensor.py
@@ -653,9 +666,9 @@ omit =
     homeassistant/components/keyboard/*
     homeassistant/components/keyboard_remote/*
     homeassistant/components/keymitt_ble/__init__.py
+    homeassistant/components/keymitt_ble/coordinator.py
     homeassistant/components/keymitt_ble/entity.py
     homeassistant/components/keymitt_ble/switch.py
-    homeassistant/components/keymitt_ble/coordinator.py
     homeassistant/components/kitchen_sink/weather.py
     homeassistant/components/kiwi/lock.py
     homeassistant/components/kodi/__init__.py
@@ -666,6 +679,7 @@ omit =
     homeassistant/components/konnected/panel.py
     homeassistant/components/konnected/switch.py
     homeassistant/components/kostal_plenticore/__init__.py
+    homeassistant/components/kostal_plenticore/coordinator.py
     homeassistant/components/kostal_plenticore/helper.py
     homeassistant/components/kostal_plenticore/select.py
     homeassistant/components/kostal_plenticore/sensor.py
@@ -713,7 +727,6 @@ omit =
     homeassistant/components/lookin/sensor.py
     homeassistant/components/loqed/sensor.py
     homeassistant/components/luci/device_tracker.py
-    homeassistant/components/luftdaten/sensor.py
     homeassistant/components/lupusec/__init__.py
     homeassistant/components/lupusec/alarm_control_panel.py
     homeassistant/components/lupusec/binary_sensor.py
@@ -723,6 +736,7 @@ omit =
     homeassistant/components/lutron/binary_sensor.py
     homeassistant/components/lutron/cover.py
     homeassistant/components/lutron/entity.py
+    homeassistant/components/lutron/event.py
     homeassistant/components/lutron/fan.py
     homeassistant/components/lutron/light.py
     homeassistant/components/lutron/switch.py
@@ -738,11 +752,11 @@ omit =
     homeassistant/components/lyric/climate.py
     homeassistant/components/lyric/sensor.py
     homeassistant/components/mailgun/notify.py
-    homeassistant/components/map/*
     homeassistant/components/mastodon/notify.py
     homeassistant/components/matrix/__init__.py
     homeassistant/components/matrix/notify.py
     homeassistant/components/matter/__init__.py
+    homeassistant/components/matter/fan.py
     homeassistant/components/meater/__init__.py
     homeassistant/components/meater/sensor.py
     homeassistant/components/medcom_ble/__init__.py
@@ -767,15 +781,17 @@ omit =
     homeassistant/components/microbees/__init__.py
     homeassistant/components/microbees/api.py
     homeassistant/components/microbees/application_credentials.py
+    homeassistant/components/microbees/binary_sensor.py
     homeassistant/components/microbees/button.py
-    homeassistant/components/microbees/const.py
+    homeassistant/components/microbees/climate.py
     homeassistant/components/microbees/coordinator.py
+    homeassistant/components/microbees/cover.py
     homeassistant/components/microbees/entity.py
     homeassistant/components/microbees/light.py
     homeassistant/components/microbees/sensor.py
     homeassistant/components/microbees/switch.py
     homeassistant/components/microsoft/tts.py
-    homeassistant/components/mikrotik/hub.py
+    homeassistant/components/mikrotik/coordinator.py
     homeassistant/components/mill/climate.py
     homeassistant/components/mill/sensor.py
     homeassistant/components/minio/minio_helper.py
@@ -786,15 +802,20 @@ omit =
     homeassistant/components/mochad/switch.py
     homeassistant/components/modem_callerid/button.py
     homeassistant/components/modem_callerid/sensor.py
-    homeassistant/components/moehlenhoff_alpha2/__init__.py
-    homeassistant/components/moehlenhoff_alpha2/binary_sensor.py
     homeassistant/components/moehlenhoff_alpha2/climate.py
-    homeassistant/components/moehlenhoff_alpha2/sensor.py
+    homeassistant/components/moehlenhoff_alpha2/coordinator.py
+    homeassistant/components/monzo/__init__.py
+    homeassistant/components/monzo/api.py
     homeassistant/components/motion_blinds/__init__.py
     homeassistant/components/motion_blinds/coordinator.py
     homeassistant/components/motion_blinds/cover.py
     homeassistant/components/motion_blinds/entity.py
     homeassistant/components/motion_blinds/sensor.py
+    homeassistant/components/motionblinds_ble/__init__.py
+    homeassistant/components/motionblinds_ble/button.py
+    homeassistant/components/motionblinds_ble/cover.py
+    homeassistant/components/motionblinds_ble/entity.py
+    homeassistant/components/motionblinds_ble/select.py
     homeassistant/components/motionmount/__init__.py
     homeassistant/components/motionmount/binary_sensor.py
     homeassistant/components/motionmount/entity.py
@@ -820,8 +841,15 @@ omit =
     homeassistant/components/mysensors/switch.py
     homeassistant/components/mystrom/binary_sensor.py
     homeassistant/components/mystrom/light.py
-    homeassistant/components/mystrom/switch.py
     homeassistant/components/mystrom/sensor.py
+    homeassistant/components/mystrom/switch.py
+    homeassistant/components/myuplink/__init__.py
+    homeassistant/components/myuplink/api.py
+    homeassistant/components/myuplink/application_credentials.py
+    homeassistant/components/myuplink/coordinator.py
+    homeassistant/components/myuplink/entity.py
+    homeassistant/components/myuplink/helpers.py
+    homeassistant/components/myuplink/sensor.py
     homeassistant/components/nad/media_player.py
     homeassistant/components/nanoleaf/__init__.py
     homeassistant/components/nanoleaf/button.py
@@ -829,13 +857,13 @@ omit =
     homeassistant/components/nanoleaf/light.py
     homeassistant/components/neato/__init__.py
     homeassistant/components/neato/api.py
+    homeassistant/components/neato/button.py
     homeassistant/components/neato/camera.py
     homeassistant/components/neato/entity.py
     homeassistant/components/neato/hub.py
     homeassistant/components/neato/sensor.py
     homeassistant/components/neato/switch.py
     homeassistant/components/neato/vacuum.py
-    homeassistant/components/neato/button.py
     homeassistant/components/nederlandse_spoorwegen/sensor.py
     homeassistant/components/netdata/sensor.py
     homeassistant/components/netgear/__init__.py
@@ -882,13 +910,13 @@ omit =
     homeassistant/components/notify_events/notify.py
     homeassistant/components/notion/__init__.py
     homeassistant/components/notion/binary_sensor.py
+    homeassistant/components/notion/coordinator.py
     homeassistant/components/notion/sensor.py
     homeassistant/components/notion/util.py
     homeassistant/components/nsw_fuel_station/sensor.py
     homeassistant/components/nuki/__init__.py
-    homeassistant/components/nuki/binary_sensor.py
+    homeassistant/components/nuki/coordinator.py
     homeassistant/components/nuki/lock.py
-    homeassistant/components/nuki/sensor.py
     homeassistant/components/nx584/alarm_control_panel.py
     homeassistant/components/oasa_telematics/sensor.py
     homeassistant/components/obihai/__init__.py
@@ -901,11 +929,12 @@ omit =
     homeassistant/components/ohmconnect/sensor.py
     homeassistant/components/ombi/*
     homeassistant/components/omnilogic/__init__.py
-    homeassistant/components/omnilogic/common.py
+    homeassistant/components/omnilogic/coordinator.py
     homeassistant/components/omnilogic/sensor.py
     homeassistant/components/omnilogic/switch.py
     homeassistant/components/ondilo_ico/__init__.py
     homeassistant/components/ondilo_ico/api.py
+    homeassistant/components/ondilo_ico/coordinator.py
     homeassistant/components/ondilo_ico/sensor.py
     homeassistant/components/onkyo/media_player.py
     homeassistant/components/onvif/__init__.py
@@ -917,7 +946,6 @@ omit =
     homeassistant/components/onvif/sensor.py
     homeassistant/components/onvif/util.py
     homeassistant/components/open_meteo/weather.py
-    homeassistant/components/opencv/*
     homeassistant/components/openevse/sensor.py
     homeassistant/components/openexchangerates/__init__.py
     homeassistant/components/openexchangerates/coordinator.py
@@ -929,7 +957,6 @@ omit =
     homeassistant/components/opengarage/sensor.py
     homeassistant/components/openhardwaremonitor/sensor.py
     homeassistant/components/openhome/__init__.py
-    homeassistant/components/openhome/const.py
     homeassistant/components/openhome/media_player.py
     homeassistant/components/opensensemap/air_quality.py
     homeassistant/components/opentherm_gw/__init__.py
@@ -940,18 +967,23 @@ omit =
     homeassistant/components/openuv/binary_sensor.py
     homeassistant/components/openuv/coordinator.py
     homeassistant/components/openuv/sensor.py
+    homeassistant/components/openweathermap/__init__.py
+    homeassistant/components/openweathermap/coordinator.py
+    homeassistant/components/openweathermap/repairs.py
     homeassistant/components/openweathermap/sensor.py
-    homeassistant/components/openweathermap/weather_update_coordinator.py
+    homeassistant/components/openweathermap/weather.py
     homeassistant/components/opnsense/__init__.py
+    homeassistant/components/opnsense/device_tracker.py
     homeassistant/components/opower/__init__.py
     homeassistant/components/opower/coordinator.py
     homeassistant/components/opower/sensor.py
-    homeassistant/components/opnsense/device_tracker.py
     homeassistant/components/opple/light.py
     homeassistant/components/oru/*
     homeassistant/components/orvibo/switch.py
     homeassistant/components/osoenergy/__init__.py
-    homeassistant/components/osoenergy/const.py
+    homeassistant/components/osoenergy/binary_sensor.py
+    homeassistant/components/osoenergy/entity.py
+    homeassistant/components/osoenergy/sensor.py
     homeassistant/components/osoenergy/water_heater.py
     homeassistant/components/osramlightify/light.py
     homeassistant/components/otp/sensor.py
@@ -982,9 +1014,12 @@ omit =
     homeassistant/components/pandora/media_player.py
     homeassistant/components/pencom/switch.py
     homeassistant/components/permobil/__init__.py
+    homeassistant/components/permobil/binary_sensor.py
     homeassistant/components/permobil/coordinator.py
+    homeassistant/components/permobil/entity.py
     homeassistant/components/permobil/sensor.py
     homeassistant/components/philips_js/__init__.py
+    homeassistant/components/philips_js/coordinator.py
     homeassistant/components/philips_js/light.py
     homeassistant/components/philips_js/media_player.py
     homeassistant/components/philips_js/remote.py
@@ -993,7 +1028,6 @@ omit =
     homeassistant/components/picotts/tts.py
     homeassistant/components/pilight/base_class.py
     homeassistant/components/pilight/binary_sensor.py
-    homeassistant/components/pilight/const.py
     homeassistant/components/pilight/light.py
     homeassistant/components/pilight/switch.py
     homeassistant/components/ping/__init__.py
@@ -1012,11 +1046,6 @@ omit =
     homeassistant/components/point/alarm_control_panel.py
     homeassistant/components/point/binary_sensor.py
     homeassistant/components/point/sensor.py
-    homeassistant/components/poolsense/__init__.py
-    homeassistant/components/poolsense/binary_sensor.py
-    homeassistant/components/poolsense/coordinator.py
-    homeassistant/components/poolsense/entity.py
-    homeassistant/components/poolsense/sensor.py
     homeassistant/components/powerwall/__init__.py
     homeassistant/components/progettihwsw/__init__.py
     homeassistant/components/progettihwsw/binary_sensor.py
@@ -1043,12 +1072,12 @@ omit =
     homeassistant/components/quantum_gateway/device_tracker.py
     homeassistant/components/qvr_pro/*
     homeassistant/components/rabbitair/__init__.py
-    homeassistant/components/rabbitair/const.py
     homeassistant/components/rabbitair/coordinator.py
     homeassistant/components/rabbitair/entity.py
     homeassistant/components/rabbitair/fan.py
     homeassistant/components/rachio/__init__.py
     homeassistant/components/rachio/binary_sensor.py
+    homeassistant/components/rachio/coordinator.py
     homeassistant/components/rachio/device.py
     homeassistant/components/rachio/entity.py
     homeassistant/components/rachio/switch.py
@@ -1065,22 +1094,12 @@ omit =
     homeassistant/components/rainmachine/__init__.py
     homeassistant/components/rainmachine/binary_sensor.py
     homeassistant/components/rainmachine/button.py
+    homeassistant/components/rainmachine/coordinator.py
     homeassistant/components/rainmachine/select.py
     homeassistant/components/rainmachine/sensor.py
     homeassistant/components/rainmachine/switch.py
     homeassistant/components/rainmachine/update.py
     homeassistant/components/rainmachine/util.py
-    homeassistant/components/renson/__init__.py
-    homeassistant/components/renson/const.py
-    homeassistant/components/renson/coordinator.py
-    homeassistant/components/renson/entity.py
-    homeassistant/components/renson/sensor.py
-    homeassistant/components/renson/button.py
-    homeassistant/components/renson/fan.py
-    homeassistant/components/renson/switch.py
-    homeassistant/components/renson/binary_sensor.py
-    homeassistant/components/renson/number.py
-    homeassistant/components/renson/time.py
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/sensor.py
     homeassistant/components/recorder/repack.py
@@ -1095,6 +1114,16 @@ omit =
     homeassistant/components/rejseplanen/sensor.py
     homeassistant/components/remember_the_milk/__init__.py
     homeassistant/components/remote_rpi_gpio/*
+    homeassistant/components/renson/__init__.py
+    homeassistant/components/renson/binary_sensor.py
+    homeassistant/components/renson/button.py
+    homeassistant/components/renson/coordinator.py
+    homeassistant/components/renson/entity.py
+    homeassistant/components/renson/fan.py
+    homeassistant/components/renson/number.py
+    homeassistant/components/renson/sensor.py
+    homeassistant/components/renson/switch.py
+    homeassistant/components/renson/time.py
     homeassistant/components/reolink/binary_sensor.py
     homeassistant/components/reolink/button.py
     homeassistant/components/reolink/camera.py
@@ -1120,7 +1149,10 @@ omit =
     homeassistant/components/roborock/coordinator.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/romy/__init__.py
+    homeassistant/components/romy/binary_sensor.py
     homeassistant/components/romy/coordinator.py
+    homeassistant/components/romy/entity.py
+    homeassistant/components/romy/sensor.py
     homeassistant/components/romy/vacuum.py
     homeassistant/components/roomba/__init__.py
     homeassistant/components/roomba/binary_sensor.py
@@ -1135,18 +1167,18 @@ omit =
     homeassistant/components/roon/media_player.py
     homeassistant/components/roon/server.py
     homeassistant/components/route53/*
-    homeassistant/components/rova/sensor.py
     homeassistant/components/rpi_camera/*
     homeassistant/components/rtorrent/sensor.py
+    homeassistant/components/russound_rio/media_player.py
+    homeassistant/components/russound_rnet/media_player.py
     homeassistant/components/ruuvi_gateway/__init__.py
     homeassistant/components/ruuvi_gateway/bluetooth.py
     homeassistant/components/ruuvi_gateway/coordinator.py
-    homeassistant/components/russound_rio/media_player.py
-    homeassistant/components/russound_rnet/media_player.py
     homeassistant/components/rympro/__init__.py
     homeassistant/components/rympro/coordinator.py
     homeassistant/components/rympro/sensor.py
     homeassistant/components/sabnzbd/__init__.py
+    homeassistant/components/sabnzbd/coordinator.py
     homeassistant/components/sabnzbd/sensor.py
     homeassistant/components/saj/sensor.py
     homeassistant/components/satel_integra/*
@@ -1154,12 +1186,10 @@ omit =
     homeassistant/components/screenlogic/binary_sensor.py
     homeassistant/components/screenlogic/climate.py
     homeassistant/components/screenlogic/coordinator.py
-    homeassistant/components/screenlogic/const.py
     homeassistant/components/screenlogic/entity.py
     homeassistant/components/screenlogic/light.py
     homeassistant/components/screenlogic/number.py
     homeassistant/components/screenlogic/sensor.py
-    homeassistant/components/screenlogic/services.py
     homeassistant/components/screenlogic/switch.py
     homeassistant/components/scsgate/*
     homeassistant/components/sendgrid/notify.py
@@ -1173,7 +1203,6 @@ omit =
     homeassistant/components/serial_pm/sensor.py
     homeassistant/components/sesame/lock.py
     homeassistant/components/seven_segments/image_processing.py
-    homeassistant/components/seventeentrack/sensor.py
     homeassistant/components/shodan/sensor.py
     homeassistant/components/sia/__init__.py
     homeassistant/components/sia/alarm_control_panel.py
@@ -1213,7 +1242,6 @@ omit =
     homeassistant/components/smappee/switch.py
     homeassistant/components/smarty/*
     homeassistant/components/sms/__init__.py
-    homeassistant/components/sms/const.py
     homeassistant/components/sms/coordinator.py
     homeassistant/components/sms/gateway.py
     homeassistant/components/sms/notify.py
@@ -1230,8 +1258,8 @@ omit =
     homeassistant/components/solaredge/coordinator.py
     homeassistant/components/solaredge_local/sensor.py
     homeassistant/components/solarlog/__init__.py
-    homeassistant/components/solarlog/sensor.py
     homeassistant/components/solarlog/coordinator.py
+    homeassistant/components/solarlog/sensor.py
     homeassistant/components/solax/__init__.py
     homeassistant/components/solax/sensor.py
     homeassistant/components/soma/__init__.py
@@ -1268,13 +1296,6 @@ omit =
     homeassistant/components/squeezebox/__init__.py
     homeassistant/components/squeezebox/browse_media.py
     homeassistant/components/squeezebox/media_player.py
-    homeassistant/components/starlink/__init__.py
-    homeassistant/components/starlink/binary_sensor.py
-    homeassistant/components/starlink/button.py
-    homeassistant/components/starlink/coordinator.py
-    homeassistant/components/starlink/device_tracker.py
-    homeassistant/components/starlink/sensor.py
-    homeassistant/components/starlink/switch.py
     homeassistant/components/starline/__init__.py
     homeassistant/components/starline/account.py
     homeassistant/components/starline/binary_sensor.py
@@ -1285,6 +1306,14 @@ omit =
     homeassistant/components/starline/sensor.py
     homeassistant/components/starline/switch.py
     homeassistant/components/starlingbank/sensor.py
+    homeassistant/components/starlink/__init__.py
+    homeassistant/components/starlink/binary_sensor.py
+    homeassistant/components/starlink/button.py
+    homeassistant/components/starlink/coordinator.py
+    homeassistant/components/starlink/device_tracker.py
+    homeassistant/components/starlink/sensor.py
+    homeassistant/components/starlink/switch.py
+    homeassistant/components/starlink/time.py
     homeassistant/components/steam_online/sensor.py
     homeassistant/components/stiebel_eltron/*
     homeassistant/components/stookalert/__init__.py
@@ -1306,6 +1335,7 @@ omit =
     homeassistant/components/supla/*
     homeassistant/components/surepetcare/__init__.py
     homeassistant/components/surepetcare/binary_sensor.py
+    homeassistant/components/surepetcare/coordinator.py
     homeassistant/components/surepetcare/entity.py
     homeassistant/components/surepetcare/sensor.py
     homeassistant/components/swiss_hydrological_data/sensor.py
@@ -1328,12 +1358,13 @@ omit =
     homeassistant/components/switchbot/entity.py
     homeassistant/components/switchbot/humidifier.py
     homeassistant/components/switchbot/light.py
+    homeassistant/components/switchbot/lock.py
     homeassistant/components/switchbot/sensor.py
     homeassistant/components/switchbot/switch.py
-    homeassistant/components/switchbot/lock.py
     homeassistant/components/switchbot_cloud/climate.py
     homeassistant/components/switchbot_cloud/coordinator.py
     homeassistant/components/switchbot_cloud/entity.py
+    homeassistant/components/switchbot_cloud/sensor.py
     homeassistant/components/switchbot_cloud/switch.py
     homeassistant/components/switchmate/switch.py
     homeassistant/components/syncthing/__init__.py
@@ -1370,11 +1401,6 @@ omit =
     homeassistant/components/tado/water_heater.py
     homeassistant/components/tami4/button.py
     homeassistant/components/tank_utility/sensor.py
-    homeassistant/components/tankerkoenig/__init__.py
-    homeassistant/components/tankerkoenig/binary_sensor.py
-    homeassistant/components/tankerkoenig/coordinator.py
-    homeassistant/components/tankerkoenig/entity.py
-    homeassistant/components/tankerkoenig/sensor.py
     homeassistant/components/tapsaff/binary_sensor.py
     homeassistant/components/tautulli/__init__.py
     homeassistant/components/tautulli/coordinator.py
@@ -1397,12 +1423,11 @@ omit =
     homeassistant/components/tensorflow/image_processing.py
     homeassistant/components/tfiac/climate.py
     homeassistant/components/thermoworks_smoke/sensor.py
-    homeassistant/components/thethingsnetwork/*
     homeassistant/components/thingspeak/*
     homeassistant/components/thinkingcleaner/*
     homeassistant/components/thomson/device_tracker.py
     homeassistant/components/tibber/__init__.py
-    homeassistant/components/tibber/notify.py
+    homeassistant/components/tibber/coordinator.py
     homeassistant/components/tibber/sensor.py
     homeassistant/components/tikteck/light.py
     homeassistant/components/tile/__init__.py
@@ -1419,6 +1444,7 @@ omit =
     homeassistant/components/tolo/number.py
     homeassistant/components/tolo/select.py
     homeassistant/components/tolo/sensor.py
+    homeassistant/components/tolo/switch.py
     homeassistant/components/toon/__init__.py
     homeassistant/components/toon/binary_sensor.py
     homeassistant/components/toon/climate.py
@@ -1442,12 +1468,7 @@ omit =
     homeassistant/components/traccar_server/device_tracker.py
     homeassistant/components/traccar_server/entity.py
     homeassistant/components/traccar_server/helpers.py
-    homeassistant/components/tractive/__init__.py
-    homeassistant/components/tractive/binary_sensor.py
-    homeassistant/components/tractive/device_tracker.py
-    homeassistant/components/tractive/entity.py
-    homeassistant/components/tractive/sensor.py
-    homeassistant/components/tractive/switch.py
+    homeassistant/components/traccar_server/sensor.py
     homeassistant/components/tradfri/__init__.py
     homeassistant/components/tradfri/base_class.py
     homeassistant/components/tradfri/coordinator.py
@@ -1489,9 +1510,9 @@ omit =
     homeassistant/components/ue_smart_radio/media_player.py
     homeassistant/components/ukraine_alarm/__init__.py
     homeassistant/components/ukraine_alarm/binary_sensor.py
-    homeassistant/components/unifiled/*
     homeassistant/components/unifi_direct/__init__.py
     homeassistant/components/unifi_direct/device_tracker.py
+    homeassistant/components/unifiled/*
     homeassistant/components/upb/__init__.py
     homeassistant/components/upb/light.py
     homeassistant/components/upc_connect/*
@@ -1501,14 +1522,15 @@ omit =
     homeassistant/components/upnp/__init__.py
     homeassistant/components/upnp/device.py
     homeassistant/components/upnp/sensor.py
-    homeassistant/components/vasttrafik/sensor.py
     homeassistant/components/v2c/__init__.py
     homeassistant/components/v2c/binary_sensor.py
     homeassistant/components/v2c/coordinator.py
     homeassistant/components/v2c/entity.py
     homeassistant/components/v2c/number.py
-    homeassistant/components/v2c/sensor.py
     homeassistant/components/v2c/switch.py
+    homeassistant/components/vallox/__init__.py
+    homeassistant/components/vallox/coordinator.py
+    homeassistant/components/vasttrafik/sensor.py
     homeassistant/components/velbus/__init__.py
     homeassistant/components/velbus/binary_sensor.py
     homeassistant/components/velbus/button.py
@@ -1516,15 +1538,14 @@ omit =
     homeassistant/components/velbus/cover.py
     homeassistant/components/velbus/entity.py
     homeassistant/components/velbus/light.py
-    homeassistant/components/velbus/sensor.py
     homeassistant/components/velbus/select.py
+    homeassistant/components/velbus/sensor.py
     homeassistant/components/velbus/switch.py
     homeassistant/components/velux/__init__.py
     homeassistant/components/velux/cover.py
     homeassistant/components/velux/light.py
-    homeassistant/components/venstar/__init__.py
-    homeassistant/components/venstar/binary_sensor.py
     homeassistant/components/venstar/climate.py
+    homeassistant/components/venstar/coordinator.py
     homeassistant/components/venstar/sensor.py
     homeassistant/components/verisure/__init__.py
     homeassistant/components/verisure/alarm_control_panel.py
@@ -1535,6 +1556,7 @@ omit =
     homeassistant/components/verisure/sensor.py
     homeassistant/components/verisure/switch.py
     homeassistant/components/versasense/*
+    homeassistant/components/vesync/__init__.py
     homeassistant/components/vesync/fan.py
     homeassistant/components/vesync/light.py
     homeassistant/components/vesync/sensor.py
@@ -1557,7 +1579,6 @@ omit =
     homeassistant/components/vlc_telnet/media_player.py
     homeassistant/components/vodafone_station/__init__.py
     homeassistant/components/vodafone_station/button.py
-    homeassistant/components/vodafone_station/const.py
     homeassistant/components/vodafone_station/coordinator.py
     homeassistant/components/vodafone_station/device_tracker.py
     homeassistant/components/vodafone_station/sensor.py
@@ -1582,13 +1603,10 @@ omit =
     homeassistant/components/watttime/__init__.py
     homeassistant/components/watttime/sensor.py
     homeassistant/components/weatherflow/__init__.py
-    homeassistant/components/weatherflow/const.py
     homeassistant/components/weatherflow/sensor.py
     homeassistant/components/weatherflow_cloud/__init__.py
-    homeassistant/components/weatherflow_cloud/const.py
     homeassistant/components/weatherflow_cloud/coordinator.py
     homeassistant/components/weatherflow_cloud/weather.py
-    homeassistant/components/webmin/sensor.py
     homeassistant/components/wiffi/__init__.py
     homeassistant/components/wiffi/binary_sensor.py
     homeassistant/components/wiffi/sensor.py
@@ -1604,6 +1622,7 @@ omit =
     homeassistant/components/xbox/base_sensor.py
     homeassistant/components/xbox/binary_sensor.py
     homeassistant/components/xbox/browse_media.py
+    homeassistant/components/xbox/coordinator.py
     homeassistant/components/xbox/media_player.py
     homeassistant/components/xbox/remote.py
     homeassistant/components/xbox/sensor.py
@@ -1636,10 +1655,7 @@ omit =
     homeassistant/components/xs1/*
     homeassistant/components/yale_smart_alarm/__init__.py
     homeassistant/components/yale_smart_alarm/alarm_control_panel.py
-    homeassistant/components/yale_smart_alarm/binary_sensor.py
-    homeassistant/components/yale_smart_alarm/button.py
     homeassistant/components/yale_smart_alarm/entity.py
-    homeassistant/components/yale_smart_alarm/lock.py
     homeassistant/components/yalexs_ble/__init__.py
     homeassistant/components/yalexs_ble/binary_sensor.py
     homeassistant/components/yalexs_ble/entity.py
@@ -1671,6 +1687,7 @@ omit =
     homeassistant/components/yolink/services.py
     homeassistant/components/yolink/siren.py
     homeassistant/components/yolink/switch.py
+    homeassistant/components/yolink/valve.py
     homeassistant/components/youless/__init__.py
     homeassistant/components/youless/sensor.py
     homeassistant/components/zabbix/*
@@ -1679,16 +1696,12 @@ omit =
     homeassistant/components/zeroconf/models.py
     homeassistant/components/zeroconf/usage.py
     homeassistant/components/zestimate/sensor.py
-    homeassistant/components/zeversolar/__init__.py
-    homeassistant/components/zeversolar/coordinator.py
-    homeassistant/components/zeversolar/entity.py
-    homeassistant/components/zeversolar/sensor.py
-    homeassistant/components/zha/websocket_api.py
     homeassistant/components/zha/core/cluster_handlers/*
     homeassistant/components/zha/core/device.py
     homeassistant/components/zha/core/gateway.py
     homeassistant/components/zha/core/helpers.py
     homeassistant/components/zha/light.py
+    homeassistant/components/zha/websocket_api.py
     homeassistant/components/zhong_hong/climate.py
     homeassistant/components/ziggo_mediabox_xl/media_player.py
     homeassistant/components/zoneminder/*
@@ -1705,15 +1718,6 @@ omit =
     homeassistant/components/zwave_me/sensor.py
     homeassistant/components/zwave_me/siren.py
     homeassistant/components/zwave_me/switch.py
-    homeassistant/components/electrasmart/climate.py
-    homeassistant/components/electrasmart/__init__.py
-    homeassistant/components/myuplink/__init__.py
-    homeassistant/components/myuplink/api.py
-    homeassistant/components/myuplink/application_credentials.py
-    homeassistant/components/myuplink/coordinator.py
-    homeassistant/components/myuplink/entity.py
-    homeassistant/components/myuplink/helpers.py
-    homeassistant/components/myuplink/sensor.py
 
 
 [report]

.devcontainer/devcontainer.json

@@ -4,7 +4,12 @@
   "dockerFile": "../Dockerfile.dev",
   "postCreateCommand": "script/setup",
   "postStartCommand": "script/bootstrap",
-  "containerEnv": { "DEVCONTAINER": "1" },
+  "containerEnv": {
+    "PYTHONASYNCIODEBUG": "1"
+  },
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
   // Port 5683 udp is used by Shelly integration
   "appPort": ["8123:8123", "5683:5683/udp"],
   "runArgs": ["-e", "GIT_EDITOR=code --wait"],
@@ -17,11 +22,15 @@
         "visualstudioexptteam.vscodeintellicode",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
-        "GitHub.vscode-pull-request-github"
+        "GitHub.vscode-pull-request-github",
+        "GitHub.copilot"
       ],
       // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
       "settings": {
-        "python.pythonPath": "/usr/local/bin/python",
+        "python.experiments.optOutFrom": ["pythonTestAdapter"],
+        "python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
+        "python.pythonPath": "/home/vscode/.local/ha-venv/bin/python",
+        "python.terminal.activateEnvInCurrentTerminal": true,
         "python.testing.pytestArgs": ["--no-cov"],
         "editor.formatOnPaste": false,
         "editor.formatOnSave": true,

.git-blame-ignore-revs

@@ -0,0 +1,14 @@
+# Black
+4de97abc3aa83188666336ce0a015a5bab75bc8f
+
+# Switch formatting from black to ruff-format (#102893)
+706add4a57120a93d7b7fe40e722b00d634c76c2
+
+# Prettify json (component test fixtures) (#68892)
+053c4428a933c3c04c22642f93c93fccba3e8bfd
+
+# Prettify json (tests) (#68888)
+496d90bf00429d9d924caeb0155edc0bf54e86b9
+
+# Bump ruff to 0.3.4 (#112690)
+6bb4e7d62c60389608acf4a7d7dacd8f029307dd

.github/workflows/builder.yml

@@ -10,8 +10,10 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.12.3"
   PIP_TIMEOUT: 60
+  UV_HTTP_TIMEOUT: 60
+  UV_SYSTEM_PYTHON: "true"
 
 jobs:
   init:
@@ -25,12 +27,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -49,41 +51,29 @@ jobs:
         with:
           ignore-dev: true
 
-  build_python:
-    name: Build PyPi package
-    environment: ${{ needs.init.outputs.channel }}
-    needs: ["init", "build_base"]
-    runs-on: ubuntu-latest
-    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
-    steps:
-      - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
-
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Fail if translations files are checked in
+        run: |
+          if [ -n "$(find homeassistant/components/*/translations -type f)" ]; then
+              echo "Translations files are checked in, please remove the following files:"
+              find homeassistant/components/*/translations -type f
+              exit 1
+          fi
 
       - name: Download Translations
         run: python3 -m script.translations download
         env:
           LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
 
-      - name: Build package
+      - name: Archive translations
         shell: bash
-        run: |
-          # Remove dist, build, and homeassistant.egg-info
-          # when build locally for testing!
-          pip install twine build
-          python -m build
+        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
-      - name: Upload package
-        shell: bash
-        run: |
-          export TWINE_USERNAME="__token__"
-          export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
-
-          twine upload dist/* --skip-existing
+      - name: Upload translations
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: translations
+          path: translations.tar.gz
+          if-no-files-found: error
 
   build_base:
     name: Build ${{ matrix.arch }} base core image
@@ -95,15 +85,16 @@ jobs:
       packages: write
       id-token: write
     strategy:
+      fail-fast: false
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v3.1.2
+        uses: dawidd6/action-download-artifact@v5
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -114,7 +105,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v3.1.2
+        uses: dawidd6/action-download-artifact@v5
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/intents-package
@@ -125,17 +116,20 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Adjust nightly version
         if: needs.init.outputs.channel == 'dev'
         shell: bash
+        env:
+          UV_PRERELEASE: allow
         run: |
-          python3 -m pip install packaging tomli
-          python3 -m pip install .
-          version="$(python3 script/version_bump.py nightly)"
+          python3 -m pip install "$(grep '^uv' < requirements_test.txt)"
+          uv pip install packaging tomli
+          uv pip install .
+          python3 script/version_bump.py nightly --set-nightly-version "${{ needs.init.outputs.version }}"
 
           if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
             echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}"
@@ -147,7 +141,7 @@ jobs:
             sed -i "s|home-assistant-frontend==.*|home-assistant-frontend==${BASH_REMATCH[1]}|" \
               homeassistant/package_constraints.txt
 
-            python -m script.gen_requirements_all
+            sed -i "s|home-assistant-frontend==.*||" requirements_all.txt
           fi
 
           if [[ "$(ls home_assistant_intents*.whl)" =~ ^home_assistant_intents-(.*)-py3-none-any.whl$ ]]; then
@@ -165,7 +159,7 @@ jobs:
             sed -i "s|home-assistant-intents==.*|home-assistant-intents==${BASH_REMATCH[1]}|" \
               homeassistant/package_constraints.txt
 
-            python -m script.gen_requirements_all
+            sed -i "s|home-assistant-intents==.*||" requirements_all.txt
           fi
 
       - name: Adjustments for armhf
@@ -180,19 +174,15 @@ jobs:
           sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
-      - name: Adjustments for 64-bit
-        if: matrix.arch == 'amd64' || matrix.arch == 'aarch64'
-        run: |
-          # Some speedups are only available on 64-bit, and since
-          # we build 32bit images on 64bit hosts, we only enable
-          # the speed ups on 64bit since the wheels for 32bit
-          # are not available.
-          sed -i "s|aiohttp-zlib-ng|aiohttp-zlib-ng\[isal\]|g" requirements_all.txt
+      - name: Download translations
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: translations
 
-      - name: Download Translations
-        run: python3 -m script.translations download
-        env:
-          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
+      - name: Extract translations
+        run: |
+          tar xvf translations.tar.gz
+          rm translations.tar.gz
 
       - name: Write meta info file
         shell: bash
@@ -200,14 +190,14 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.01.0
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -216,17 +206,6 @@ jobs:
             --target /data \
             --generic ${{ needs.init.outputs.version }}
 
-      - name: Archive translations
-        shell: bash
-        run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
-
-      - name: Upload translations
-        uses: actions/upload-artifact@v3
-        with:
-          name: translations
-          path: translations.tar.gz
-          if-no-files-found: error
-
   build_machine:
     name: Build ${{ matrix.machine }} machine core image
     if: github.repository_owner == 'home-assistant'
@@ -263,7 +242,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Set build additional args
         run: |
@@ -277,14 +256,14 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.01.0
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -300,7 +279,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -336,23 +315,28 @@ jobs:
       contents: read
       packages: write
       id-token: write
+    strategy:
+      matrix:
+        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.4.0
+        uses: sigstore/cosign-installer@v3.5.0
         with:
-          cosign-release: "v2.0.2"
+          cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
-        uses: docker/login-action@v3.0.0
+        if: matrix.registry == 'docker.io/homeassistant'
+        uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.0.0
+        if: matrix.registry == 'ghcr.io/home-assistant'
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -366,41 +350,37 @@ jobs:
           function create_manifest() {
             local tag_l=${1}
             local tag_r=${2}
+            local registry=${{ matrix.registry }}
 
-            for registry in "ghcr.io/home-assistant" "docker.io/homeassistant"
-            do
+            docker manifest create "${registry}/home-assistant:${tag_l}" \
+              "${registry}/amd64-homeassistant:${tag_r}" \
+              "${registry}/i386-homeassistant:${tag_r}" \
+              "${registry}/armhf-homeassistant:${tag_r}" \
+              "${registry}/armv7-homeassistant:${tag_r}" \
+              "${registry}/aarch64-homeassistant:${tag_r}"
 
-              docker manifest create "${registry}/home-assistant:${tag_l}" \
-                "${registry}/amd64-homeassistant:${tag_r}" \
-                "${registry}/i386-homeassistant:${tag_r}" \
-                "${registry}/armhf-homeassistant:${tag_r}" \
-                "${registry}/armv7-homeassistant:${tag_r}" \
-                "${registry}/aarch64-homeassistant:${tag_r}"
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/amd64-homeassistant:${tag_r}" \
+              --os linux --arch amd64
 
-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/amd64-homeassistant:${tag_r}" \
-                --os linux --arch amd64
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/i386-homeassistant:${tag_r}" \
+              --os linux --arch 386
 
-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/i386-homeassistant:${tag_r}" \
-                --os linux --arch 386
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/armhf-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v6
 
-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/armhf-homeassistant:${tag_r}" \
-                --os linux --arch arm --variant=v6
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/armv7-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v7
 
-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/armv7-homeassistant:${tag_r}" \
-                --os linux --arch arm --variant=v7
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/aarch64-homeassistant:${tag_r}" \
+              --os linux --arch arm64 --variant=v8
 
-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/aarch64-homeassistant:${tag_r}" \
-                --os linux --arch arm64 --variant=v8
-
-              docker manifest push --purge "${registry}/home-assistant:${tag_l}"
-              cosign sign --yes "${registry}/home-assistant:${tag_l}"
-
-            done
+            docker manifest push --purge "${registry}/home-assistant:${tag_l}"
+            cosign sign --yes "${registry}/home-assistant:${tag_l}"
           }
 
           function validate_image() {
@@ -433,12 +413,14 @@ jobs:
           validate_image "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
           validate_image "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
 
-          # Upload images to dockerhub
-          push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "i386-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "armhf-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "armv7-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
+          if [[ "${{ matrix.registry }}" ==  "docker.io/homeassistant" ]]; then
+            # Upload images to dockerhub
+            push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
+            push_dockerhub "i386-homeassistant" "${{ needs.init.outputs.version }}"
+            push_dockerhub "armhf-homeassistant" "${{ needs.init.outputs.version }}"
+            push_dockerhub "armv7-homeassistant" "${{ needs.init.outputs.version }}"
+            push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
+          fi
 
           # Create version tag
           create_manifest "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
@@ -459,3 +441,44 @@ jobs:
             v="${{ needs.init.outputs.version }}"
             create_manifest "${v%.*}" "${{ needs.init.outputs.version }}"
           fi
+
+  build_python:
+    name: Build PyPi package
+    environment: ${{ needs.init.outputs.channel }}
+    needs: ["init", "build_base"]
+    runs-on: ubuntu-latest
+    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v4.1.6
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Download translations
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: translations
+
+      - name: Extract translations
+        run: |
+          tar xvf translations.tar.gz
+          rm translations.tar.gz
+
+      - name: Build package
+        shell: bash
+        run: |
+          # Remove dist, build, and homeassistant.egg-info
+          # when build locally for testing!
+          pip install twine build
+          python -m build
+
+      - name: Upload package
+        shell: bash
+        run: |
+          export TWINE_USERNAME="__token__"
+          export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
+
+          twine upload dist/* --skip-existing

.github/workflows/ci.yaml

@@ -33,12 +33,12 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 5
-  PIP_CACHE_VERSION: 4
-  MYPY_CACHE_VERSION: 7
-  HA_SHORT_VERSION: "2024.3"
-  DEFAULT_PYTHON: "3.11"
-  ALL_PYTHON_VERSIONS: "['3.11', '3.12']"
+  CACHE_VERSION: 9
+  UV_CACHE_VERSION: 1
+  MYPY_CACHE_VERSION: 8
+  HA_SHORT_VERSION: "2024.7"
+  DEFAULT_PYTHON: "3.12.3"
+  ALL_PYTHON_VERSIONS: "['3.12.3']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -56,7 +56,7 @@ env:
   # - 15.2 is the latest (as of 9 Feb 2023)
   POSTGRESQL_VERSIONS: "['postgres:12.14','postgres:15.2']"
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
-  PIP_CACHE: /tmp/pip-cache
+  UV_CACHE_DIR: /tmp/uv-cache
   SQLALCHEMY_WARN_20: 1
   PYTHONASYNCIODEBUG: 1
   HASS_CI: 1
@@ -89,21 +89,25 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
-        run: >-
-          echo "key=venv-${{ env.CACHE_VERSION }}-${{
-            hashFiles('requirements_test.txt') }}-${{
+        run: |
+          # Include HA_SHORT_VERSION to force the immediate creation
+          # of a new uv cache entry after a version bump.
+          echo "key=venv-${{ env.CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-${{
+            hashFiles('requirements_test.txt', 'requirements_test_pre_commit.txt') }}-${{
+            hashFiles('requirements.txt') }}-${{
             hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}" >> $GITHUB_OUTPUT
+            hashFiles('homeassistant/package_constraints.txt') }}-${{
+            hashFiles('script/gen_requirements_all.py') }}" >> $GITHUB_OUTPUT
       - name: Generate partial pre-commit restore key
         id: generate_pre-commit_cache_key
         run: >-
           echo "key=pre-commit-${{ env.CACHE_VERSION }}-${{
             hashFiles('.pre-commit-config.yaml') }}"  >> $GITHUB_OUTPUT
       - name: Filter for core changes
-        uses: dorny/paths-filter@v3.0.1
+        uses: dorny/paths-filter@v3.0.2
         id: core
         with:
           filters: .core_files.yaml
@@ -118,7 +122,7 @@ jobs:
           echo "Result:"
           cat .integration_paths.yaml
       - name: Filter for integration changes
-        uses: dorny/paths-filter@v3.0.1
+        uses: dorny/paths-filter@v3.0.2
         id: integrations
         with:
           filters: .integration_paths.yaml
@@ -222,16 +226,16 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: venv
           key: >-
@@ -243,10 +247,11 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install "$(cat requirements_test.txt | grep pre-commit)"
+          pip install "$(grep '^uv' < requirements_test.txt)"
+          uv pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -267,16 +272,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -285,7 +290,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -307,16 +312,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -325,7 +330,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -346,16 +351,16 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -364,7 +369,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -440,40 +445,45 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
-      - name: Generate partial pip restore key
-        id: generate-pip-key
-        run: >-
-          echo "key=pip-${{ env.PIP_CACHE_VERSION }}-${{
+      - name: Generate partial uv restore key
+        id: generate-uv-key
+        run: |
+          uv_version=$(cat requirements_test.txt | grep uv | cut -d '=' -f 3)
+          echo "version=${uv_version}" >> $GITHUB_OUTPUT
+          echo "key=uv-${{ env.UV_CACHE_VERSION }}-${uv_version}-${{
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: venv
           lookup-only: true
           key: >-
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
-      - name: Restore pip wheel cache
+      - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
-          path: ${{ env.PIP_CACHE }}
+          path: ${{ env.UV_CACHE_DIR }}
           key: >-
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            steps.generate-pip-key.outputs.key }}
+            steps.generate-uv-key.outputs.key }}
           restore-keys: |
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-pip-${{ env.PIP_CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-uv-${{
+            env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
+            env.HA_SHORT_VERSION }}-
       - name: Install additional OS dependencies
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
           sudo apt-get -y install \
             bluez \
@@ -483,6 +493,7 @@ jobs:
             libavfilter-dev \
             libavformat-dev \
             libavutil-dev \
+            libgammu-dev \
             libswresample-dev \
             libswscale-dev \
             libudev-dev
@@ -492,10 +503,13 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          PIP_CACHE_DIR=$PIP_CACHE pip install -U "pip>=21.3.1" setuptools wheel
-          PIP_CACHE_DIR=$PIP_CACHE pip install -r requirements_all.txt
-          PIP_CACHE_DIR=$PIP_CACHE pip install -r requirements_test.txt
-          pip install -e . --config-settings editable_mode=compat
+          pip install "$(grep '^uv' < requirements_test.txt)"
+          uv pip install -U "pip>=21.3.1" setuptools wheel
+          uv pip install -r requirements.txt
+          python -m script.gen_requirements_all ci
+          uv pip install -r requirements_all_pytest.txt
+          uv pip install -r requirements_test.txt
+          uv pip install -e . --config-settings editable_mode=compat
 
   hassfest:
     name: Check hassfest
@@ -508,16 +522,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -540,16 +554,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -573,16 +587,16 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -597,14 +611,14 @@ jobs:
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y --ignore-wrong-coordinator-module=y homeassistant
+          pylint --ignore-missing-annotations=y homeassistant
       - name: Run pylint (partially)
         if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y --ignore-wrong-coordinator-module=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
+          pylint --ignore-missing-annotations=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
   mypy:
     name: Check mypy
@@ -617,10 +631,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -633,7 +647,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -641,7 +655,7 @@ jobs:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@v4.0.0
+        uses: actions/cache@v4.0.2
         with:
           path: .mypy_cache
           key: >-
@@ -668,14 +682,63 @@ jobs:
           python --version
           mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
-  pytest:
+  prepare-pytest-full:
     runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && (needs.info.outputs.test_full_suite == 'true' || needs.info.outputs.tests_glob)
+      && needs.info.outputs.test_full_suite == 'true'
+    needs:
+      - info
+      - base
+    name: Split tests for full run
+    steps:
+      - name: Install additional OS dependencies
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update
+          sudo apt-get -y install \
+            bluez \
+            ffmpeg \
+            libgammu-dev
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.6
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
+      - name: Restore base Python virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v4.0.2
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
+      - name: Run split_tests.py
+        run: |
+          . venv/bin/activate
+          python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
+      - name: Upload pytest_buckets
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: pytest_buckets
+          path: pytest_buckets.txt
+          overwrite: true
+
+  pytest-full:
+    runs-on: ubuntu-22.04
+    if: |
+      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
+      && github.event.inputs.lint-only != 'true'
+      && github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.mypy-only != 'true'
+      && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
       - base
@@ -683,7 +746,9 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
+      - prepare-pytest-full
     strategy:
       fail-fast: false
       matrix:
@@ -694,21 +759,23 @@ jobs:
     steps:
       - name: Install additional OS dependencies
         run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
           sudo apt-get -y install \
             bluez \
-            ffmpeg
+            ffmpeg \
+            libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -717,22 +784,18 @@ jobs:
       - name: Register Python problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
-      - name: Install Pytest Annotation plugin
-        run: |
-          . venv/bin/activate
-          # Ideally this should be part of our dependencies
-          # However this plugin is fairly new and doesn't run correctly
-          # on a non-GitHub environment.
-          pip install pytest-github-actions-annotate-failures==0.1.3
       - name: Register pytest slow test problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
+      - name: Download pytest_buckets
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: pytest_buckets
       - name: Compile English translations
         run: |
           . venv/bin/activate
           python3 -m script.translations develop --all
-      - name: Run pytest (fully)
-        if: needs.info.outputs.test_full_suite == 'true'
+      - name: Run pytest
         timeout-minutes: 60
         id: pytest-full
         env:
@@ -753,61 +816,27 @@ jobs:
             --durations=10 \
             -n auto \
             --dist=loadfile \
-            --test-group-count ${{ needs.info.outputs.test_group_count }} \
-            --test-group=${{ matrix.group }} \
             ${cov_params[@]} \
             -o console_output_style=count \
             -p no:sugar \
-            tests \
-              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
-      - name: Run pytest (partially)
-        if: needs.info.outputs.test_full_suite == 'false'
-        timeout-minutes: 10
-        id: pytest-partial
-        shell: bash
-        env:
-          PYTHONDONTWRITEBYTECODE: 1
-        run: |
-          . venv/bin/activate
-          python --version
-          set -o pipefail
-
-          if [[ ! -f "tests/components/${{ matrix.group }}/__init__.py" ]]; then
-            echo "::error:: missing file tests/components/${{ matrix.group }}/__init__.py"
-            exit 1
-          fi
-
-          cov_params=()
-          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
-            cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
-            cov_params+=(--cov-report=xml)
-            cov_params+=(--cov-report=term-missing)
-          fi
-
-          python3 -b -X dev -m pytest \
-            -qq \
-            --timeout=9 \
-            -n auto \
-            ${cov_params[@]} \
-            -o console_output_style=count \
-            --durations=0 \
-            --durations-min=1 \
-            -p no:sugar \
-            tests/components/${{ matrix.group }} \
+            $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt) \
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
-        if: success() || failure() && (steps.pytest-full.conclusion == 'failure' || steps.pytest-partial.conclusion == 'failure')
-        uses: actions/upload-artifact@v3.1.2
+        if: success() || failure() && steps.pytest-full.conclusion == 'failure'
+        uses: actions/upload-artifact@v4.3.3
         with:
-          name: pytest-${{ github.run_number }}
+          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
+          overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
           overwrite: true
+      - name: Remove pytest_buckets
+        run: rm pytest_buckets.txt
       - name: Check dirty
         run: |
           ./script/check_dirty
@@ -835,6 +864,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -846,22 +876,23 @@ jobs:
     steps:
       - name: Install additional OS dependencies
         run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
           sudo apt-get -y install \
             bluez \
             ffmpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -870,20 +901,13 @@ jobs:
       - name: Register Python problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
-      - name: Install Pytest Annotation plugin
-        run: |
-          . venv/bin/activate
-          # Ideally this should be part of our dependencies
-          # However this plugin is fairly new and doesn't run correctly
-          # on a non-GitHub environment.
-          pip install pytest-github-actions-annotate-failures==0.1.3
       - name: Register pytest slow test problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Install SQL Python libraries
         run: |
           . venv/bin/activate
-          pip install mysqlclient sqlalchemy_utils
+          uv pip install mysqlclient sqlalchemy_utils
       - name: Compile English translations
         run: |
           . venv/bin/activate
@@ -923,13 +947,15 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.3
         with:
-          name: pytest-${{ github.run_number }}
+          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
+            steps.pytest-partial.outputs.mariadb }}
           path: pytest-*.txt
+          overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -962,6 +988,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -973,22 +1000,23 @@ jobs:
     steps:
       - name: Install additional OS dependencies
         run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
           sudo apt-get -y install \
             bluez \
             ffmpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.0.0
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -997,20 +1025,13 @@ jobs:
       - name: Register Python problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/python.json"
-      - name: Install Pytest Annotation plugin
-        run: |
-          . venv/bin/activate
-          # Ideally this should be part of our dependencies
-          # However this plugin is fairly new and doesn't run correctly
-          # on a non-GitHub environment.
-          pip install pytest-github-actions-annotate-failures==0.1.3
       - name: Register pytest slow test problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Install SQL Python libraries
         run: |
           . venv/bin/activate
-          pip install psycopg2 sqlalchemy_utils
+          uv pip install psycopg2 sqlalchemy_utils
       - name: Compile English translations
         run: |
           . venv/bin/activate
@@ -1051,13 +1072,15 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v3.1.2
+        uses: actions/upload-artifact@v4.3.3
         with:
-          name: pytest-${{ github.run_number }}
+          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
+            steps.pytest-partial.outputs.postgresql }}
           path: pytest-*.txt
+          overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1067,39 +1090,161 @@ jobs:
         run: |
           ./script/check_dirty
 
-  coverage:
-    name: Upload test coverage to Codecov
+  coverage-full:
+    name: Upload test coverage to Codecov (full suite)
     if: needs.info.outputs.skip_coverage != 'true'
     runs-on: ubuntu-22.04
     needs:
       - info
-      - pytest
+      - pytest-full
+      - pytest-postgres
+      - pytest-mariadb
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.3
+        uses: actions/download-artifact@v4.1.7
         with:
           pattern: coverage-*
-      - name: Upload coverage to Codecov (full coverage)
+      - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: Wandalen/wretry.action@v1.4.4
+        uses: codecov/codecov-action@v4.4.1
         with:
-          action: codecov/codecov-action@v3.1.3
-          with: |
-            fail_ci_if_error: true
-            flags: full-suite
-            token: ${{ env.CODECOV_TOKEN }}
-          attempt_limit: 5
-          attempt_delay: 30000
-      - name: Upload coverage to Codecov (partial coverage)
+          fail_ci_if_error: true
+          flags: full-suite
+          token: ${{ secrets.CODECOV_TOKEN }}
+
+  pytest-partial:
+    runs-on: ubuntu-22.04
+    if: |
+      (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
+      && github.event.inputs.lint-only != 'true'
+      && github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.mypy-only != 'true'
+      && needs.info.outputs.tests_glob
+      && needs.info.outputs.test_full_suite == 'false'
+    needs:
+      - info
+      - base
+      - gen-requirements-all
+      - hassfest
+      - lint-other
+      - lint-ruff
+      - lint-ruff-format
+      - mypy
+    strategy:
+      fail-fast: false
+      matrix:
+        group: ${{ fromJson(needs.info.outputs.test_groups) }}
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+    name: >-
+      Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
+    steps:
+      - name: Install additional OS dependencies
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update
+          sudo apt-get -y install \
+            bluez \
+            ffmpeg \
+            libgammu-dev
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.6
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          check-latest: true
+      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v4.0.2
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
+      - name: Register Python problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/python.json"
+      - name: Register pytest slow test problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
+      - name: Compile English translations
+        run: |
+          . venv/bin/activate
+          python3 -m script.translations develop --all
+      - name: Run pytest
+        timeout-minutes: 10
+        id: pytest-partial
+        shell: bash
+        env:
+          PYTHONDONTWRITEBYTECODE: 1
+        run: |
+          . venv/bin/activate
+          python --version
+          set -o pipefail
+
+          if [[ ! -f "tests/components/${{ matrix.group }}/__init__.py" ]]; then
+            echo "::error:: missing file tests/components/${{ matrix.group }}/__init__.py"
+            exit 1
+          fi
+
+          cov_params=()
+          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
+            cov_params+=(--cov-report=xml)
+            cov_params+=(--cov-report=term-missing)
+          fi
+
+          python3 -b -X dev -m pytest \
+            -qq \
+            --timeout=9 \
+            -n auto \
+            ${cov_params[@]} \
+            -o console_output_style=count \
+            --durations=0 \
+            --durations-min=1 \
+            -p no:sugar \
+            tests/components/${{ matrix.group }} \
+              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
+      - name: Upload pytest output
+        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
+          path: pytest-*.txt
+          overwrite: true
+      - name: Upload coverage artifact
+        if: needs.info.outputs.skip_coverage != 'true'
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
+          path: coverage.xml
+          overwrite: true
+      - name: Check dirty
+        run: |
+          ./script/check_dirty
+
+  coverage-partial:
+    name: Upload test coverage to Codecov (partial suite)
+    if: needs.info.outputs.skip_coverage != 'true'
+    runs-on: ubuntu-22.04
+    needs:
+      - info
+      - pytest-partial
+    timeout-minutes: 10
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.6
+      - name: Download all coverage artifacts
+        uses: actions/download-artifact@v4.1.7
+        with:
+          pattern: coverage-*
+      - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: Wandalen/wretry.action@v1.4.4
+        uses: codecov/codecov-action@v4.4.1
         with:
-          action: codecov/codecov-action@v3.1.3
-          with: |
-            fail_ci_if_error: true
-            token: ${{ env.CODECOV_TOKEN }}
-          attempt_limit: 5
-          attempt_delay: 30000
+          fail_ci_if_error: true
+          token: ${{ secrets.CODECOV_TOKEN }}

.github/workflows/codeql.yml

@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.24.5
+        uses: github/codeql-action/init@v3.25.8
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.24.5
+        uses: github/codeql-action/analyze@v3.25.8
         with:
           category: "/language:python"

.github/workflows/translations.yml

@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.11"
+  DEFAULT_PYTHON: "3.12.3"
 
 jobs:
   upload:
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.0.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -14,6 +14,10 @@ on:
       - "homeassistant/package_constraints.txt"
       - "requirements_all.txt"
       - "requirements.txt"
+      - "script/gen_requirements_all.py"
+
+env:
+  DEFAULT_PYTHON: "3.12.3"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name}}
@@ -28,7 +32,22 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
+
+      - name: Create Python virtual environment
+        run: |
+          python -m venv venv
+          . venv/bin/activate
+          python --version
+          pip install "$(grep '^uv' < requirements_test.txt)"
+          uv pip install -r requirements.txt
 
       - name: Get information
         id: info
@@ -63,19 +82,30 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: env_file
           path: ./.env_file
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.3.1
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
           overwrite: true
 
+      - name: Generate requirements
+        run: |
+          . venv/bin/activate
+          python -m script.gen_requirements_all ci
+
+      - name: Upload requirements_all_wheels
+        uses: actions/upload-artifact@v4.3.3
+        with:
+          name: requirements_all_wheels
+          path: ./requirements_all_wheels_*.txt
+
   core:
     name: Build Core wheels ${{ matrix.abi }} for ${{ matrix.arch }} (musllinux_1_2)
     if: github.repository_owner == 'home-assistant'
@@ -88,15 +118,15 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.3
+        uses: actions/download-artifact@v4.1.7
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.3
+        uses: actions/download-artifact@v4.1.7
         with:
           name: requirements_diff
 
@@ -126,57 +156,30 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.1
+        uses: actions/checkout@v4.1.6
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.3
+        uses: actions/download-artifact@v4.1.7
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.3
+        uses: actions/download-artifact@v4.1.7
         with:
           name: requirements_diff
 
-      - name: (Un)comment packages
-        run: |
-          requirement_files="requirements_all.txt requirements_diff.txt"
-          for requirement_file in ${requirement_files}; do
-            sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
-            sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
-            sed -i "s|# evdev|evdev|g" ${requirement_file}
-            sed -i "s|# pycups|pycups|g" ${requirement_file}
-            sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora-wifi|decora-wifi|g" ${requirement_file}
-            sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
-
-            # Some packages are not buildable on armhf anymore
-            if [ "${{ matrix.arch }}" = "armhf" ]; then
-
-              # Pandas has issues building on armhf, it is expected they
-              # will drop the platform in the near future (they consider it
-              # "flimsy" on 386). The following packages depend on pandas,
-              # so we comment them out.
-              sed -i "s|env-canada|# env-canada|g" ${requirement_file}
-              sed -i "s|noaa-coops|# noaa-coops|g" ${requirement_file}
-              sed -i "s|pyezviz|# pyezviz|g" ${requirement_file}
-              sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
-            fi
-
-            # Some speedups are only for 64-bit
-            if [ "${{ matrix.arch }}" = "amd64" ] || [ "${{ matrix.arch }}" = "aarch64" ]; then
-              sed -i "s|aiohttp-zlib-ng|aiohttp-zlib-ng\[isal\]|g" ${requirement_file}
-            fi
-
-          done
+      - name: Download requirements_all_wheels
+        uses: actions/download-artifact@v4.1.7
+        with:
+          name: requirements_all_wheels
 
       - name: Split requirements all
         run: |
-          # We split requirements all into two different files.
+          # We split requirements all into multiple files.
           # This is to prevent the build from running out of memory when
           # resolving packages on 32-bits systems (like armhf, armv7).
 
-          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all.txt requirements_all.txt
+          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
 
       - name: Create requirements for cython<3
         run: |
@@ -208,7 +211,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_old-cython.txt"
@@ -223,7 +226,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
@@ -237,7 +240,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
@@ -251,7 +254,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtac"

.gitignore

@@ -34,6 +34,7 @@ Icon
 
 # GITHUB Proposed Python stuff:
 *.py[cod]
+__pycache__
 
 # C extensions
 *.so
@@ -132,3 +133,6 @@ tmp_cache
 
 # python-language-server / Rope
 .ropeproject
+
+# Will be created from script/split_tests.py
+pytest_buckets.txt

.pre-commit-config.yaml

@@ -1,21 +1,21 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.2.1
+    rev: v0.4.8
     hooks:
       - id: ruff
         args:
           - --fix
       - id: ruff-format
-        files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.py$
+        files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.2
+    rev: v2.3.0
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=additionals,alle,alot,bund,currenty,datas,farenheit,falsy,fo,haa,hass,iif,incomfort,ines,ist,nam,nd,pres,pullrequests,resset,rime,ser,serie,te,technik,ue,unsecure,withing,zar
+          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn,pres,ser,ue
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
-        exclude_types: [csv, json]
+        exclude_types: [csv, json, html]
         exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
@@ -30,7 +30,7 @@ repos:
           - --branch=master
           - --branch=rc
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.32.0
+    rev: v1.35.1
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier
@@ -61,15 +61,15 @@ repos:
         name: mypy
         entry: script/run-in-env.sh mypy
         language: script
-        types: [python]
+        types_or: [python, pyi]
         require_serial: true
-        files: ^(homeassistant|pylint)/.+\.py$
+        files: ^(homeassistant|pylint)/.+\.(py|pyi)$
       - id: pylint
         name: pylint
         entry: script/run-in-env.sh pylint -j 0 --ignore-missing-annotations=y
         language: script
-        types: [python]
-        files: ^homeassistant/.+\.py$
+        types_or: [python, pyi]
+        files: ^homeassistant/.+\.(py|pyi)$
       - id: gen_requirements_all
         name: gen_requirements_all
         entry: script/run-in-env.sh python3 -m script.gen_requirements_all
@@ -83,7 +83,7 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|\.coveragerc|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py)$
+        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|\.coveragerc|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py|requirements_test.txt)$
       - id: hassfest-metadata
         name: hassfest-metadata
         entry: script/run-in-env.sh python3 -m script.hassfest -p metadata

.prettierignore

@@ -1,6 +1,5 @@
 *.md
 .strict-typing
-azure-*.yml
 homeassistant/components/*/translations/*.json
 homeassistant/generated/*
 tests/components/lidarr/fixtures/initialize.js

.strict-typing

@@ -48,6 +48,7 @@ homeassistant.components.adax.*
 homeassistant.components.adguard.*
 homeassistant.components.aftership.*
 homeassistant.components.air_quality.*
+homeassistant.components.airgradient.*
 homeassistant.components.airly.*
 homeassistant.components.airnow.*
 homeassistant.components.airq.*
@@ -65,7 +66,7 @@ homeassistant.components.alexa.*
 homeassistant.components.alpha_vantage.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.amberelectric.*
-homeassistant.components.ambiclimate.*
+homeassistant.components.ambient_network.*
 homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
@@ -83,6 +84,7 @@ homeassistant.components.api.*
 homeassistant.components.apple_tv.*
 homeassistant.components.apprise.*
 homeassistant.components.aprs.*
+homeassistant.components.apsystems.*
 homeassistant.components.aqualogic.*
 homeassistant.components.aquostv.*
 homeassistant.components.aranet.*
@@ -166,10 +168,12 @@ homeassistant.components.electric_kiwi.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
+homeassistant.components.energenie_power_sockets.*
 homeassistant.components.energy.*
 homeassistant.components.energyzero.*
 homeassistant.components.enigma2.*
 homeassistant.components.enphase_envoy.*
+homeassistant.components.eq3btsmart.*
 homeassistant.components.esphome.*
 homeassistant.components.event.*
 homeassistant.components.evil_genius_labs.*
@@ -228,9 +232,11 @@ homeassistant.components.homekit_controller.select
 homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
+homeassistant.components.homeworks.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
+homeassistant.components.husqvarna_automower.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
@@ -239,6 +245,7 @@ homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
+homeassistant.components.imgw_pib.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -295,6 +302,7 @@ homeassistant.components.minecraft_server.*
 homeassistant.components.mjpeg.*
 homeassistant.components.modbus.*
 homeassistant.components.modem_callerid.*
+homeassistant.components.monzo.*
 homeassistant.components.moon.*
 homeassistant.components.mopeka.*
 homeassistant.components.motionmount.*
@@ -333,7 +341,6 @@ homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
 homeassistant.components.plugwise.*
-homeassistant.components.poolsense.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -360,6 +367,7 @@ homeassistant.components.rest_command.*
 homeassistant.components.rfxtrx.*
 homeassistant.components.rhasspy.*
 homeassistant.components.ridwell.*
+homeassistant.components.ring.*
 homeassistant.components.rituals_perfume_genie.*
 homeassistant.components.roku.*
 homeassistant.components.romy.*
@@ -420,6 +428,7 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.text.*
+homeassistant.components.thethingsnetwork.*
 homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*

.vscode/tasks.json

@@ -103,7 +103,7 @@
     {
       "label": "Install all Requirements",
       "type": "shell",
-      "command": "pip3 install -r requirements_all.txt",
+      "command": "uv pip install -r requirements_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -117,7 +117,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "pip3 install -r requirements_test_all.txt",
+      "command": "uv pip install -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true

.yamllint

@@ -1,5 +1,4 @@
 ignore: |
-  azure-*.yml
   tests/fixtures/core/config/yaml_errors/
 rules:
   braces:

CODEOWNERS

@@ -5,13 +5,30 @@
 # https://docs.github.com/en/repositories/managing-your-repositorys-settings-and-features/customizing-your-repository/about-code-owners
 
 # Home Assistant Core
-setup.cfg @home-assistant/core
+.core_files.yaml @home-assistant/core
+.git-blame-ignore-revs @home-assistant/core
+.gitattributes @home-assistant/core
+.gitignore @home-assistant/core
+.hadolint.yaml @home-assistant/core
+.pre-commit-config.yaml @home-assistant/core
+.prettierignore @home-assistant/core
+.yamllint @home-assistant/core
 pyproject.toml @home-assistant/core
+requirements_test.txt @home-assistant/core
+/.devcontainer/ @home-assistant/core
+/.github/ @home-assistant/core
+/.vscode/ @home-assistant/core
 /homeassistant/*.py @home-assistant/core
+/homeassistant/auth/ @home-assistant/core
+/homeassistant/backports/ @home-assistant/core
 /homeassistant/helpers/ @home-assistant/core
+/homeassistant/scripts/ @home-assistant/core
 /homeassistant/util/ @home-assistant/core
+/pylint/ @home-assistant/core
+/script/ @home-assistant/core
 
 # Home Assistant Supervisor
+.dockerignore @home-assistant/supervisor
 build.json @home-assistant/supervisor
 /machine/ @home-assistant/supervisor
 /rootfs/ @home-assistant/supervisor
@@ -39,6 +56,8 @@ build.json @home-assistant/supervisor
 /tests/components/agent_dvr/ @ispysoftware
 /homeassistant/components/air_quality/ @home-assistant/core
 /tests/components/air_quality/ @home-assistant/core
+/homeassistant/components/airgradient/ @airgradienthq @joostlek
+/tests/components/airgradient/ @airgradienthq @joostlek
 /homeassistant/components/airly/ @bieniu
 /tests/components/airly/ @bieniu
 /homeassistant/components/airnow/ @asymworks
@@ -61,18 +80,19 @@ build.json @home-assistant/supervisor
 /tests/components/airzone/ @Noltari
 /homeassistant/components/airzone_cloud/ @Noltari
 /tests/components/airzone_cloud/ @Noltari
-/homeassistant/components/aladdin_connect/ @mkmer
-/tests/components/aladdin_connect/ @mkmer
+/homeassistant/components/aladdin_connect/ @swcloudgenie
+/tests/components/aladdin_connect/ @swcloudgenie
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
 /tests/components/alarm_control_panel/ @home-assistant/core
 /homeassistant/components/alert/ @home-assistant/core @frenck
 /tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
+/homeassistant/components/amazon_polly/ @jschlyter
 /homeassistant/components/amberelectric/ @madpilot
 /tests/components/amberelectric/ @madpilot
-/homeassistant/components/ambiclimate/ @danielhiversen
-/tests/components/ambiclimate/ @danielhiversen
+/homeassistant/components/ambient_network/ @thomaskistler
+/tests/components/ambient_network/ @thomaskistler
 /homeassistant/components/ambient_station/ @bachya
 /tests/components/ambient_station/ @bachya
 /homeassistant/components/amcrest/ @flacjacket
@@ -108,11 +128,17 @@ build.json @home-assistant/supervisor
 /tests/components/aprilaire/ @chamberlain2007
 /homeassistant/components/aprs/ @PhilRW
 /tests/components/aprs/ @PhilRW
-/homeassistant/components/aranet/ @aschmitz @thecode
-/tests/components/aranet/ @aschmitz @thecode
+/homeassistant/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
+/tests/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
+/homeassistant/components/aquacell/ @Jordi1990
+/tests/components/aquacell/ @Jordi1990
+/homeassistant/components/aranet/ @aschmitz @thecode @anrijs
+/tests/components/aranet/ @aschmitz @thecode @anrijs
 /homeassistant/components/arcam_fmj/ @elupus
 /tests/components/arcam_fmj/ @elupus
 /homeassistant/components/arris_tg2492lg/ @vanbalken
+/homeassistant/components/arve/ @ikalnyi
+/tests/components/arve/ @ikalnyi
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
 /homeassistant/components/assist_pipeline/ @balloob @synesthesiam
@@ -140,6 +166,8 @@ build.json @home-assistant/supervisor
 /tests/components/awair/ @ahayworth @danielsjf
 /homeassistant/components/axis/ @Kane610
 /tests/components/axis/ @Kane610
+/homeassistant/components/azure_data_explorer/ @kaareseras
+/tests/components/azure_data_explorer/ @kaareseras
 /homeassistant/components/azure_devops/ @timmo001
 /tests/components/azure_devops/ @timmo001
 /homeassistant/components/azure_event_hub/ @eavanvalkenburg
@@ -159,8 +187,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/binary_sensor/ @home-assistant/core
 /tests/components/binary_sensor/ @home-assistant/core
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
-/homeassistant/components/blebox/ @bbx-a @riokuu @swistakm
-/tests/components/blebox/ @bbx-a @riokuu @swistakm
+/homeassistant/components/blebox/ @bbx-a @swistakm
+/tests/components/blebox/ @bbx-a @swistakm
 /homeassistant/components/blink/ @fronzbot @mkmer
 /tests/components/blink/ @fronzbot @mkmer
 /homeassistant/components/blue_current/ @Floris272 @gleeuwen
@@ -299,8 +327,8 @@ build.json @home-assistant/supervisor
 /tests/components/discovergy/ @jpbede
 /homeassistant/components/dlink/ @tkdrob
 /tests/components/dlink/ @tkdrob
-/homeassistant/components/dlna_dmr/ @StevenLooman @chishm
-/tests/components/dlna_dmr/ @StevenLooman @chishm
+/homeassistant/components/dlna_dmr/ @chishm
+/tests/components/dlna_dmr/ @chishm
 /homeassistant/components/dlna_dms/ @chishm
 /tests/components/dlna_dms/ @chishm
 /homeassistant/components/dnsip/ @gjohansson-ST
@@ -309,14 +337,16 @@ build.json @home-assistant/supervisor
 /tests/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /homeassistant/components/dormakaba_dkey/ @emontnemery
 /tests/components/dormakaba_dkey/ @emontnemery
+/homeassistant/components/downloader/ @erwindouna
+/tests/components/downloader/ @erwindouna
 /homeassistant/components/dremel_3d_printer/ @tkdrob
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
 /homeassistant/components/dsmr/ @Robbie1221 @frenck
 /tests/components/dsmr/ @Robbie1221 @frenck
-/homeassistant/components/dsmr_reader/ @depl0y @glodenox
-/tests/components/dsmr_reader/ @depl0y @glodenox
+/homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
+/tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
@@ -352,18 +382,21 @@ build.json @home-assistant/supervisor
 /homeassistant/components/elvia/ @ludeeus
 /tests/components/elvia/ @ludeeus
 /homeassistant/components/emby/ @mezz64
-/homeassistant/components/emoncms/ @borpin
+/homeassistant/components/emoncms/ @borpin @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
 /tests/components/emulated_hue/ @bdraco @Tho85
 /homeassistant/components/emulated_kasa/ @kbickar
 /tests/components/emulated_kasa/ @kbickar
+/homeassistant/components/energenie_power_sockets/ @gnumpi
+/tests/components/energenie_power_sockets/ @gnumpi
 /homeassistant/components/energy/ @home-assistant/core
 /tests/components/energy/ @home-assistant/core
 /homeassistant/components/energyzero/ @klaasnicolaas
 /tests/components/energyzero/ @klaasnicolaas
 /homeassistant/components/enigma2/ @autinerd
+/tests/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
 /homeassistant/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
@@ -372,11 +405,14 @@ build.json @home-assistant/supervisor
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
 /homeassistant/components/ephember/ @ttroy50
+/homeassistant/components/epic_games_store/ @hacf-fr @Quentame
+/tests/components/epic_games_store/ @hacf-fr @Quentame
 /homeassistant/components/epion/ @lhgravendeel
 /tests/components/epion/ @lhgravendeel
 /homeassistant/components/epson/ @pszafer
 /tests/components/epson/ @pszafer
-/homeassistant/components/epsonworkforce/ @ThaStealth
+/homeassistant/components/eq3btsmart/ @eulemitkeule @dbuezas
+/tests/components/eq3btsmart/ @eulemitkeule @dbuezas
 /homeassistant/components/escea/ @lazdavila
 /tests/components/escea/ @lazdavila
 /homeassistant/components/esphome/ @OttoWinter @jesserockz @kbx81 @bdraco
@@ -433,8 +469,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/forked_daapd/ @uvjustin
 /tests/components/forked_daapd/ @uvjustin
 /homeassistant/components/fortios/ @kimfrellsen
-/homeassistant/components/foscam/ @skgsergio @krmarien
-/tests/components/foscam/ @skgsergio @krmarien
+/homeassistant/components/foscam/ @krmarien
+/tests/components/foscam/ @krmarien
 /homeassistant/components/freebox/ @hacf-fr @Quentame
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
@@ -453,6 +489,8 @@ build.json @home-assistant/supervisor
 /tests/components/frontier_silicon/ @wlcrs
 /homeassistant/components/fully_kiosk/ @cgarwood
 /tests/components/fully_kiosk/ @cgarwood
+/homeassistant/components/fyta/ @dontinelli
+/tests/components/fyta/ @dontinelli
 /homeassistant/components/garages_amsterdam/ @klaasnicolaas
 /tests/components/garages_amsterdam/ @klaasnicolaas
 /homeassistant/components/gardena_bluetooth/ @elupus
@@ -519,14 +557,14 @@ build.json @home-assistant/supervisor
 /tests/components/group/ @home-assistant/core
 /homeassistant/components/guardian/ @bachya
 /tests/components/guardian/ @bachya
-/homeassistant/components/habitica/ @ASMfreaK @leikoilja
-/tests/components/habitica/ @ASMfreaK @leikoilja
+/homeassistant/components/habitica/ @ASMfreaK @leikoilja @tr4nt0r
+/tests/components/habitica/ @ASMfreaK @leikoilja @tr4nt0r
 /homeassistant/components/hardkernel/ @home-assistant/core
 /tests/components/hardkernel/ @home-assistant/core
 /homeassistant/components/hardware/ @home-assistant/core
 /tests/components/hardware/ @home-assistant/core
-/homeassistant/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
-/tests/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
+/homeassistant/components/harmony/ @ehendrix23 @bdraco @mkeesey @Aohzan
+/tests/components/harmony/ @ehendrix23 @bdraco @mkeesey @Aohzan
 /homeassistant/components/hassio/ @home-assistant/supervisor
 /tests/components/hassio/ @home-assistant/supervisor
 /homeassistant/components/hdmi_cec/ @inytar
@@ -568,8 +606,10 @@ build.json @home-assistant/supervisor
 /tests/components/homekit/ @bdraco
 /homeassistant/components/homekit_controller/ @Jc2k @bdraco
 /tests/components/homekit_controller/ @Jc2k @bdraco
-/homeassistant/components/homematic/ @pvizeli @danielperna84
-/tests/components/homematic/ @pvizeli @danielperna84
+/homeassistant/components/homematic/ @pvizeli
+/tests/components/homematic/ @pvizeli
+/homeassistant/components/homematicip_cloud/ @hahn-th
+/tests/components/homematicip_cloud/ @hahn-th
 /homeassistant/components/homewizard/ @DCSBL
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
@@ -617,9 +657,12 @@ build.json @home-assistant/supervisor
 /tests/components/image_upload/ @home-assistant/core
 /homeassistant/components/imap/ @jbouwh
 /tests/components/imap/ @jbouwh
+/homeassistant/components/imgw_pib/ @bieniu
+/tests/components/imgw_pib/ @bieniu
 /homeassistant/components/improv_ble/ @emontnemery
 /tests/components/improv_ble/ @emontnemery
-/homeassistant/components/incomfort/ @zxdavb
+/homeassistant/components/incomfort/ @jbouwh
+/tests/components/incomfort/ @jbouwh
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
@@ -657,10 +700,14 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iqvia/ @bachya
 /tests/components/iqvia/ @bachya
 /homeassistant/components/irish_rail_transport/ @ttroy50
-/homeassistant/components/islamic_prayer_times/ @engrbm87
-/tests/components/islamic_prayer_times/ @engrbm87
+/homeassistant/components/isal/ @bdraco
+/tests/components/isal/ @bdraco
+/homeassistant/components/islamic_prayer_times/ @engrbm87 @cpfair
+/tests/components/islamic_prayer_times/ @engrbm87 @cpfair
 /homeassistant/components/iss/ @DurgNomis-drol
 /tests/components/iss/ @DurgNomis-drol
+/homeassistant/components/ista_ecotrend/ @tr4nt0r
+/tests/components/ista_ecotrend/ @tr4nt0r
 /homeassistant/components/isy994/ @bdraco @shbatm
 /tests/components/isy994/ @bdraco @shbatm
 /homeassistant/components/izone/ @Swamp-Ig
@@ -669,6 +716,8 @@ build.json @home-assistant/supervisor
 /tests/components/jellyfin/ @j-stienstra @ctalkington
 /homeassistant/components/jewish_calendar/ @tsvi
 /tests/components/jewish_calendar/ @tsvi
+/homeassistant/components/juicenet/ @jesserockz
+/tests/components/juicenet/ @jesserockz
 /homeassistant/components/justnimbus/ @kvanzuijlen
 /tests/components/justnimbus/ @kvanzuijlen
 /homeassistant/components/jvc_projector/ @SteveEasley @msavazzi
@@ -725,7 +774,8 @@ build.json @home-assistant/supervisor
 /tests/components/leaone/ @bdraco
 /homeassistant/components/led_ble/ @bdraco
 /tests/components/led_ble/ @bdraco
-/homeassistant/components/lg_netcast/ @Drafteed
+/homeassistant/components/lg_netcast/ @Drafteed @splinter98
+/tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/light/ @home-assistant/core
@@ -829,18 +879,22 @@ build.json @home-assistant/supervisor
 /tests/components/moehlenhoff_alpha2/ @j-a-n
 /homeassistant/components/monoprice/ @etsinko @OnFreund
 /tests/components/monoprice/ @etsinko @OnFreund
+/homeassistant/components/monzo/ @jakemartin-icl
+/tests/components/monzo/ @jakemartin-icl
 /homeassistant/components/moon/ @fabaff @frenck
 /tests/components/moon/ @fabaff @frenck
 /homeassistant/components/mopeka/ @bdraco
 /tests/components/mopeka/ @bdraco
 /homeassistant/components/motion_blinds/ @starkillerOG
 /tests/components/motion_blinds/ @starkillerOG
+/homeassistant/components/motionblinds_ble/ @LennP @jerrybboy
+/tests/components/motionblinds_ble/ @LennP @jerrybboy
 /homeassistant/components/motioneye/ @dermotduffy
 /tests/components/motioneye/ @dermotduffy
 /homeassistant/components/motionmount/ @RJPoelstra
 /tests/components/motionmount/ @RJPoelstra
-/homeassistant/components/mqtt/ @emontnemery @jbouwh
-/tests/components/mqtt/ @emontnemery @jbouwh
+/homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
+/tests/components/mqtt/ @emontnemery @jbouwh @bdraco
 /homeassistant/components/msteams/ @peroyvind
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
@@ -858,8 +912,8 @@ build.json @home-assistant/supervisor
 /tests/components/nam/ @bieniu
 /homeassistant/components/nanoleaf/ @milanmeu
 /tests/components/nanoleaf/ @milanmeu
-/homeassistant/components/neato/ @dshokouhi @Santobert
-/tests/components/neato/ @dshokouhi @Santobert
+/homeassistant/components/neato/ @Santobert
+/tests/components/neato/ @Santobert
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM
 /homeassistant/components/ness_alarm/ @nickw444
 /tests/components/ness_alarm/ @nickw444
@@ -925,6 +979,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/octoprint/ @rfleming71
 /tests/components/octoprint/ @rfleming71
 /homeassistant/components/ohmconnect/ @robbiet480
+/homeassistant/components/ollama/ @synesthesiam
+/tests/components/ollama/ @synesthesiam
 /homeassistant/components/ombi/ @larssont
 /homeassistant/components/omnilogic/ @oliver84 @djtimca @gentoosu
 /tests/components/omnilogic/ @oliver84 @djtimca @gentoosu
@@ -991,8 +1047,8 @@ build.json @home-assistant/supervisor
 /tests/components/persistent_notification/ @home-assistant/core
 /homeassistant/components/philips_js/ @elupus
 /tests/components/philips_js/ @elupus
-/homeassistant/components/pi_hole/ @johnluetke @shenxn
-/tests/components/pi_hole/ @johnluetke @shenxn
+/homeassistant/components/pi_hole/ @shenxn
+/tests/components/pi_hole/ @shenxn
 /homeassistant/components/picnic/ @corneyl
 /tests/components/picnic/ @corneyl
 /homeassistant/components/pilight/ @trekky12
@@ -1046,8 +1102,8 @@ build.json @home-assistant/supervisor
 /tests/components/pvpc_hourly_pricing/ @azogue
 /homeassistant/components/qbittorrent/ @geoffreylagaisse @finder39
 /tests/components/qbittorrent/ @geoffreylagaisse @finder39
-/homeassistant/components/qingping/ @bdraco @skgsergio
-/tests/components/qingping/ @bdraco @skgsergio
+/homeassistant/components/qingping/ @bdraco
+/tests/components/qingping/ @bdraco
 /homeassistant/components/qld_bushfire/ @exxamalte
 /tests/components/qld_bushfire/ @exxamalte
 /homeassistant/components/qnap/ @disforw
@@ -1093,7 +1149,6 @@ build.json @home-assistant/supervisor
 /tests/components/recovery_mode/ @home-assistant/core
 /homeassistant/components/refoss/ @ashionky
 /tests/components/refoss/ @ashionky
-/homeassistant/components/rejseplanen/ @DarkFox
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/renault/ @epenet
@@ -1147,11 +1202,13 @@ build.json @home-assistant/supervisor
 /tests/components/ruuvitag_ble/ @akx
 /homeassistant/components/rympro/ @OnFreund @elad-bar @maorcc
 /tests/components/rympro/ @OnFreund @elad-bar @maorcc
-/homeassistant/components/sabnzbd/ @shaiu
-/tests/components/sabnzbd/ @shaiu
+/homeassistant/components/sabnzbd/ @shaiu @jpbede
+/tests/components/sabnzbd/ @shaiu @jpbede
 /homeassistant/components/saj/ @fredericvl
 /homeassistant/components/samsungtv/ @chemelli74 @epenet
 /tests/components/samsungtv/ @chemelli74 @epenet
+/homeassistant/components/sanix/ @tomaszsluszniak
+/tests/components/sanix/ @tomaszsluszniak
 /homeassistant/components/scene/ @home-assistant/core
 /tests/components/scene/ @home-assistant/core
 /homeassistant/components/schedule/ @home-assistant/core
@@ -1189,6 +1246,8 @@ build.json @home-assistant/supervisor
 /tests/components/senz/ @milanmeu
 /homeassistant/components/serial/ @fabaff
 /homeassistant/components/seven_segments/ @fabaff
+/homeassistant/components/seventeentrack/ @shaiu
+/tests/components/seventeentrack/ @shaiu
 /homeassistant/components/sfr_box/ @epenet
 /tests/components/sfr_box/ @epenet
 /homeassistant/components/sharkiq/ @JeffResc @funkybunch
@@ -1228,20 +1287,21 @@ build.json @home-assistant/supervisor
 /tests/components/smappee/ @bsmappee
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
-/homeassistant/components/smartthings/ @andrewsayre
-/tests/components/smartthings/ @andrewsayre
 /homeassistant/components/smarttub/ @mdz
 /tests/components/smarttub/ @mdz
 /homeassistant/components/smarty/ @z0mbieprocess
 /homeassistant/components/smhi/ @gjohansson-ST
 /tests/components/smhi/ @gjohansson-ST
 /homeassistant/components/sms/ @ocalvo
+/tests/components/sms/ @ocalvo
 /homeassistant/components/snapcast/ @luar123
 /tests/components/snapcast/ @luar123
+/homeassistant/components/snmp/ @nmaggioni
+/tests/components/snmp/ @nmaggioni
 /homeassistant/components/snooz/ @AustinBrunkhorst
 /tests/components/snooz/ @AustinBrunkhorst
-/homeassistant/components/solaredge/ @frenck
-/tests/components/solaredge/ @frenck
+/homeassistant/components/solaredge/ @frenck @bdraco
+/tests/components/solaredge/ @frenck @bdraco
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79
 /tests/components/solarlog/ @Ernst79
@@ -1253,8 +1313,8 @@ build.json @home-assistant/supervisor
 /tests/components/sonarr/ @ctalkington
 /homeassistant/components/songpal/ @rytilahti @shenxn
 /tests/components/songpal/ @rytilahti @shenxn
-/homeassistant/components/sonos/ @jjlawren
-/tests/components/sonos/ @jjlawren
+/homeassistant/components/sonos/ @jjlawren @peterager
+/tests/components/sonos/ @jjlawren @peterager
 /homeassistant/components/soundtouch/ @kroimon
 /tests/components/soundtouch/ @kroimon
 /homeassistant/components/spaceapi/ @fabaff
@@ -1313,8 +1373,8 @@ build.json @home-assistant/supervisor
 /tests/components/switchbee/ @jafar-atili
 /homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
-/homeassistant/components/switchbot_cloud/ @SeraphicRav
-/tests/components/switchbot_cloud/ @SeraphicRav
+/homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland
+/tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland
 /homeassistant/components/switcher_kis/ @thecode
 /tests/components/switcher_kis/ @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
@@ -1367,7 +1427,8 @@ build.json @home-assistant/supervisor
 /tests/components/thermobeacon/ @bdraco
 /homeassistant/components/thermopro/ @bdraco @h3ss
 /tests/components/thermopro/ @bdraco @h3ss
-/homeassistant/components/thethingsnetwork/ @fabaff
+/homeassistant/components/thethingsnetwork/ @angelnu
+/tests/components/thethingsnetwork/ @angelnu
 /homeassistant/components/thread/ @home-assistant/core
 /tests/components/thread/ @home-assistant/core
 /homeassistant/components/tibber/ @danielhiversen
@@ -1431,8 +1492,6 @@ build.json @home-assistant/supervisor
 /tests/components/unifi/ @Kane610
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
 /homeassistant/components/unifiled/ @florisvdk
-/homeassistant/components/unifiprotect/ @AngellusMortis @bdraco
-/tests/components/unifiprotect/ @AngellusMortis @bdraco
 /homeassistant/components/upb/ @gwww
 /tests/components/upb/ @gwww
 /homeassistant/components/upc_connect/ @pvizeli @fabaff
@@ -1538,8 +1597,8 @@ build.json @home-assistant/supervisor
 /tests/components/wiz/ @sbidy
 /homeassistant/components/wled/ @frenck
 /tests/components/wled/ @frenck
-/homeassistant/components/wolflink/ @adamkrol93
-/tests/components/wolflink/ @adamkrol93
+/homeassistant/components/wolflink/ @adamkrol93 @mtielen
+/tests/components/wolflink/ @adamkrol93 @mtielen
 /homeassistant/components/workday/ @fabaff @gjohansson-ST
 /tests/components/workday/ @fabaff @gjohansson-ST
 /homeassistant/components/worldclock/ @fabaff

CODE_OF_CONDUCT.md

@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.
 

Dockerfile

@@ -6,47 +6,43 @@ FROM ${BUILD_FROM}
 
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
-    S6_SERVICES_GRACETIME=240000
+    S6_SERVICES_GRACETIME=240000 \
+    UV_SYSTEM_PYTHON=true
 
 ARG QEMU_CPU
 
+# Install uv
+RUN pip3 install uv==0.1.43
+
 WORKDIR /usr/src
 
 ## Setup Home Assistant Core dependencies
 COPY requirements.txt homeassistant/
 COPY homeassistant/package_constraints.txt homeassistant/homeassistant/
 RUN \
-    pip3 install \
-        --only-binary=:all: \
+    uv pip install \
+        --no-build \
         -r homeassistant/requirements.txt
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
 RUN \
-    if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \
-        pip3 install homeassistant/home_assistant_frontend-*.whl; \
-    fi \
-    && if ls homeassistant/home_assistant_intents*.whl 1> /dev/null 2>&1; then \
-        pip3 install homeassistant/home_assistant_intents-*.whl; \
+    if ls homeassistant/home_assistant_*.whl 1> /dev/null 2>&1; then \
+        uv pip install homeassistant/home_assistant_*.whl; \
     fi \
     && if [ "${BUILD_ARCH}" = "i386" ]; then \
-        LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
-        MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \
-        linux32 pip3 install \
-            --only-binary=:all: \
+        linux32 uv pip install \
+            --no-build \
             -r homeassistant/requirements_all.txt; \
     else \
-        LD_PRELOAD="/usr/local/lib/libjemalloc.so.2" \
-        MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \
-        pip3 install \
-            --only-binary=:all: \
+        uv pip install \
+            --no-build \
             -r homeassistant/requirements_all.txt; \
     fi
 
 ## Setup Home Assistant Core
 COPY . homeassistant/
 RUN \
-    pip3 install \
-        --only-binary=:all: \
+    uv pip install \
         -e ./homeassistant \
     && python3 -m compileall \
         homeassistant/homeassistant

Dockerfile.dev

@@ -1,4 +1,4 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11
+FROM mcr.microsoft.com/devcontainers/python:1-3.12
 
 SHELL ["/bin/bash", "-o", "pipefail", "-c"]
 
@@ -22,6 +22,7 @@ RUN \
         libavcodec-dev \
         libavdevice-dev \
         libavutil-dev \
+        libgammu-dev \
         libswscale-dev \
         libswresample-dev \
         libavfilter-dev \
@@ -34,21 +35,30 @@ RUN \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# Install uv
+RUN pip3 install uv
+
 WORKDIR /usr/src
 
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
-    && pip3 install -e hass-release/
+    && uv pip install --system -e hass-release/
 
-WORKDIR /workspaces
+USER vscode
+ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
+RUN uv venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+WORKDIR /tmp
 
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements.txt
+RUN uv pip install -r requirements.txt
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN pip3 install -r requirements_test.txt
-RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
+RUN uv pip install -r requirements_test.txt
+
+WORKDIR /workspaces
 
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

README.rst

@@ -7,6 +7,8 @@ Check out `home-assistant.io <https://home-assistant.io>`__ for `a
 demo <https://demo.home-assistant.io>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
 `tutorials <https://home-assistant.io/getting-started/automation/>`__ and `documentation <https://home-assistant.io/docs/>`__.
 
+This is a project of the `Open Home Foundation <https://www.openhomefoundation.org/>`__.
+
 |screenshot-states|
 
 Featured integrations
@@ -25,4 +27,4 @@ of a component, check the `Home Assistant help section <https://home-assistant.i
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/dev/.github/assets/screenshot-states.png
    :target: https://demo.home-assistant.io
 .. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/.github/assets/screenshot-integrations.png
-   :target: https://home-assistant.io/integrations/
+   :target: https://home-assistant.io/integrations/

build.yaml

@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.02.1
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.02.1
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.02.1
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.02.1
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.02.1
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2024.06.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2024.06.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2024.06.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2024.06.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2024.06.0
 codenotary:
   signer: notary@home-assistant.io
   base_image: notary@home-assistant.io

homeassistant/__main__.py

@@ -1,7 +1,9 @@
 """Start Home Assistant."""
+
 from __future__ import annotations
 
 import argparse
+from contextlib import suppress
 import faulthandler
 import os
 import sys
@@ -145,9 +147,7 @@ def get_arguments() -> argparse.Namespace:
         help="Skips validation of operating system",
     )
 
-    arguments = parser.parse_args()
-
-    return arguments
+    return parser.parse_args()
 
 
 def check_threads() -> None:
@@ -209,8 +209,10 @@ def main() -> int:
         exit_code = runner.run(runtime_conf)
         faulthandler.disable()
 
-    if os.path.getsize(fault_file_name) == 0:
-        os.remove(fault_file_name)
+    # It's possible for the fault file to disappear, so suppress obvious errors
+    with suppress(FileNotFoundError):
+        if os.path.getsize(fault_file_name) == 0:
+            os.remove(fault_file_name)
 
     check_threads()
 

homeassistant/auth/__init__.py

@@ -1,4 +1,5 @@
 """Provide an authentication layer for Home Assistant."""
+
 from __future__ import annotations
 
 import asyncio
@@ -19,22 +20,22 @@ from homeassistant.core import (
     HomeAssistant,
     callback,
 )
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util import dt as dt_util
 
 from . import auth_store, jwt_wrapper, models
 from .const import ACCESS_TOKEN_EXPIRATION, GROUP_ID_ADMIN, REFRESH_TOKEN_EXPIRATION
 from .mfa_modules import MultiFactorAuthModule, auth_mfa_module_from_config
+from .models import AuthFlowResult
 from .providers import AuthProvider, LoginFlow, auth_provider_from_config
 
 EVENT_USER_ADDED = "user_added"
 EVENT_USER_UPDATED = "user_updated"
 EVENT_USER_REMOVED = "user_removed"
 
-_MfaModuleDict = dict[str, MultiFactorAuthModule]
-_ProviderKey = tuple[str, str | None]
-_ProviderDict = dict[_ProviderKey, AuthProvider]
+type _MfaModuleDict = dict[str, MultiFactorAuthModule]
+type _ProviderKey = tuple[str, str | None]
+type _ProviderDict = dict[_ProviderKey, AuthProvider]
 
 
 class InvalidAuthError(Exception):
@@ -52,7 +53,7 @@ async def auth_manager_from_config(
 ) -> AuthManager:
     """Initialize an auth manager from config.
 
-    CORE_CONFIG_SCHEMA will make sure do duplicated auth providers or
+    CORE_CONFIG_SCHEMA will make sure no duplicated auth providers or
     mfa modules exist in configs.
     """
     store = auth_store.AuthStore(hass)
@@ -84,13 +85,17 @@ async def auth_manager_from_config(
         module_hash[module.id] = module
 
     manager = AuthManager(hass, store, provider_hash, module_hash)
-    manager.async_setup()
+    await manager.async_setup()
     return manager
 
 
-class AuthManagerFlowManager(data_entry_flow.FlowManager):
+class AuthManagerFlowManager(
+    data_entry_flow.FlowManager[AuthFlowResult, tuple[str, str]]
+):
     """Manage authentication flows."""
 
+    _flow_result = AuthFlowResult
+
     def __init__(self, hass: HomeAssistant, auth_manager: AuthManager) -> None:
         """Init auth manager flows."""
         super().__init__(hass)
@@ -98,11 +103,11 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
 
     async def async_create_flow(
         self,
-        handler_key: str,
+        handler_key: tuple[str, str],
         *,
         context: dict[str, Any] | None = None,
         data: dict[str, Any] | None = None,
-    ) -> data_entry_flow.FlowHandler:
+    ) -> LoginFlow:
         """Create a login flow."""
         auth_provider = self.auth_manager.get_auth_provider(*handler_key)
         if not auth_provider:
@@ -110,8 +115,10 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
         return await auth_provider.async_login_flow(context)
 
     async def async_finish_flow(
-        self, flow: data_entry_flow.FlowHandler, result: FlowResult
-    ) -> FlowResult:
+        self,
+        flow: data_entry_flow.FlowHandler[AuthFlowResult, tuple[str, str]],
+        result: AuthFlowResult,
+    ) -> AuthFlowResult:
         """Return a user as result of login flow."""
         flow = cast(LoginFlow, flow)
 
@@ -174,8 +181,7 @@ class AuthManager:
             self._async_remove_expired_refresh_tokens, job_type=HassJobType.Callback
         )
 
-    @callback
-    def async_setup(self) -> None:
+    async def async_setup(self) -> None:
         """Set up the auth manager."""
         hass = self.hass
         hass.async_add_shutdown_job(
@@ -510,6 +516,13 @@ class AuthManager:
         for revoke_callback in callbacks:
             revoke_callback()
 
+    @callback
+    def async_set_expiry(
+        self, refresh_token: models.RefreshToken, *, enable_expiry: bool
+    ) -> None:
+        """Enable or disable expiry of a refresh token."""
+        self._store.async_set_expiry(refresh_token, enable_expiry=enable_expiry)
+
     @callback
     def _async_remove_expired_refresh_tokens(self, _: datetime | None = None) -> None:
         """Remove expired refresh tokens."""

homeassistant/auth/auth_store.py

@@ -1,4 +1,5 @@
 """Storage for auth models."""
+
 from __future__ import annotations
 
 from datetime import timedelta
@@ -30,6 +31,17 @@ GROUP_NAME_ADMIN = "Administrators"
 GROUP_NAME_USER = "Users"
 GROUP_NAME_READ_ONLY = "Read Only"
 
+# We always save the auth store after we load it since
+# we may migrate data and do not want to have to do it again
+# but we don't want to do it during startup so we schedule
+# the first save 5 minutes out knowing something else may
+# want to save the auth store before then, and since Storage
+# will honor the lower of the two delays, it will save it
+# faster if something else saves it.
+INITIAL_LOAD_SAVE_DELAY = 300
+
+DEFAULT_SAVE_DELAY = 1
+
 
 class AuthStore:
     """Stores authentication info.
@@ -50,6 +62,7 @@ class AuthStore:
         self._store = Store[dict[str, list[dict[str, Any]]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
+        self._token_id_to_user_id: dict[str, str] = {}
 
     async def async_get_groups(self) -> list[models.Group]:
         """Retrieve all users."""
@@ -123,7 +136,10 @@ class AuthStore:
 
     async def async_remove_user(self, user: models.User) -> None:
         """Remove a user."""
-        self._users.pop(user.id)
+        user = self._users.pop(user.id)
+        for refresh_token_id in user.refresh_tokens:
+            del self._token_id_to_user_id[refresh_token_id]
+        user.refresh_tokens.clear()
         self._async_schedule_save()
 
     async def async_update_user(
@@ -206,7 +222,9 @@ class AuthStore:
             kwargs["client_icon"] = client_icon
 
         refresh_token = models.RefreshToken(**kwargs)
-        user.refresh_tokens[refresh_token.id] = refresh_token
+        token_id = refresh_token.id
+        user.refresh_tokens[token_id] = refresh_token
+        self._token_id_to_user_id[token_id] = user.id
 
         self._async_schedule_save()
         return refresh_token
@@ -214,19 +232,17 @@ class AuthStore:
     @callback
     def async_remove_refresh_token(self, refresh_token: models.RefreshToken) -> None:
         """Remove a refresh token."""
-        for user in self._users.values():
-            if user.refresh_tokens.pop(refresh_token.id, None):
-                self._async_schedule_save()
-                break
+        refresh_token_id = refresh_token.id
+        if user_id := self._token_id_to_user_id.get(refresh_token_id):
+            del self._users[user_id].refresh_tokens[refresh_token_id]
+            del self._token_id_to_user_id[refresh_token_id]
+            self._async_schedule_save()
 
     @callback
     def async_get_refresh_token(self, token_id: str) -> models.RefreshToken | None:
         """Get refresh token by id."""
-        for user in self._users.values():
-            refresh_token = user.refresh_tokens.get(token_id)
-            if refresh_token is not None:
-                return refresh_token
-
+        if user_id := self._token_id_to_user_id.get(token_id):
+            return self._users[user_id].refresh_tokens.get(token_id)
         return None
 
     @callback
@@ -265,6 +281,21 @@ class AuthStore:
             )
         self._async_schedule_save()
 
+    @callback
+    def async_set_expiry(
+        self, refresh_token: models.RefreshToken, *, enable_expiry: bool
+    ) -> None:
+        """Enable or disable expiry of a refresh token."""
+        if enable_expiry:
+            if refresh_token.expire_at is None:
+                refresh_token.expire_at = (
+                    refresh_token.last_used_at or dt_util.utcnow()
+                ).timestamp() + REFRESH_TOKEN_EXPIRATION
+                self._async_schedule_save()
+        else:
+            refresh_token.expire_at = None
+            self._async_schedule_save()
+
     async def async_load(self) -> None:  # noqa: C901
         """Load the users."""
         if self._loaded:
@@ -278,8 +309,6 @@ class AuthStore:
         perm_lookup = PermissionLookup(ent_reg, dev_reg)
         self._perm_lookup = perm_lookup
 
-        now_ts = dt_util.utcnow().timestamp()
-
         if data is None or not isinstance(data, dict):
             self._set_defaults()
             return
@@ -433,14 +462,6 @@ class AuthStore:
             else:
                 last_used_at = None
 
-            if (
-                expire_at := rt_dict.get("expire_at")
-            ) is None and token_type == models.TOKEN_TYPE_NORMAL:
-                if last_used_at:
-                    expire_at = last_used_at.timestamp() + REFRESH_TOKEN_EXPIRATION
-                else:
-                    expire_at = now_ts + REFRESH_TOKEN_EXPIRATION
-
             token = models.RefreshToken(
                 id=rt_dict["id"],
                 user=users[rt_dict["user_id"]],
@@ -457,7 +478,7 @@ class AuthStore:
                 jwt_key=rt_dict["jwt_key"],
                 last_used_at=last_used_at,
                 last_used_ip=rt_dict.get("last_used_ip"),
-                expire_at=expire_at,
+                expire_at=rt_dict.get("expire_at"),
                 version=rt_dict.get("version"),
             )
             if "credential_id" in rt_dict:
@@ -466,13 +487,22 @@ class AuthStore:
 
         self._groups = groups
         self._users = users
-
-        self._async_schedule_save()
+        self._build_token_id_to_user_id()
+        self._async_schedule_save(INITIAL_LOAD_SAVE_DELAY)
 
     @callback
-    def _async_schedule_save(self) -> None:
+    def _build_token_id_to_user_id(self) -> None:
+        """Build a map of token id to user id."""
+        self._token_id_to_user_id = {
+            token_id: user_id
+            for user_id, user in self._users.items()
+            for token_id in user.refresh_tokens
+        }
+
+    @callback
+    def _async_schedule_save(self, delay: float = DEFAULT_SAVE_DELAY) -> None:
         """Save users."""
-        self._store.async_delay_save(self._data_to_save, 1)
+        self._store.async_delay_save(self._data_to_save, delay)
 
     @callback
     def _data_to_save(self) -> dict[str, list[dict[str, Any]]]:
@@ -562,6 +592,7 @@ class AuthStore:
         read_only_group = _system_read_only_group()
         groups[read_only_group.id] = read_only_group
         self._groups = groups
+        self._build_token_id_to_user_id()
 
 
 def _system_admin_group() -> models.Group:

homeassistant/auth/const.py

@@ -1,4 +1,5 @@
 """Constants for the auth module."""
+
 from datetime import timedelta
 
 ACCESS_TOKEN_EXPIRATION = timedelta(minutes=30)

homeassistant/auth/jwt_wrapper.py

@@ -4,6 +4,7 @@ Since we decode the same tokens over and over again
 we can cache the result of the decode of valid tokens
 to speed up the process.
 """
+
 from __future__ import annotations
 
 from datetime import timedelta
@@ -77,7 +78,7 @@ class _PyJWTWithVerify(PyJWT):
         key: str,
         algorithms: list[str],
         issuer: str | None = None,
-        leeway: int | float | timedelta = 0,
+        leeway: float | timedelta = 0,
         options: dict[str, Any] | None = None,
     ) -> dict[str, Any]:
         """Verify a JWT's signature and claims."""

homeassistant/auth/mfa_modules/__init__.py

@@ -1,7 +1,7 @@
 """Pluggable auth modules for Home Assistant."""
+
 from __future__ import annotations
 
-import importlib
 import logging
 import types
 from typing import Any
@@ -14,7 +14,9 @@ from homeassistant.const import CONF_ID, CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.importlib import async_import_module
 from homeassistant.util.decorator import Registry
+from homeassistant.util.hass_dict import HassKey
 
 MULTI_FACTOR_AUTH_MODULES: Registry[str, type[MultiFactorAuthModule]] = Registry()
 
@@ -28,7 +30,7 @@ MULTI_FACTOR_AUTH_MODULE_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-DATA_REQS = "mfa_auth_module_reqs_processed"
+DATA_REQS: HassKey[set[str]] = HassKey("mfa_auth_module_reqs_processed")
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -148,7 +150,7 @@ async def _load_mfa_module(hass: HomeAssistant, module_name: str) -> types.Modul
     module_path = f"homeassistant.auth.mfa_modules.{module_name}"
 
     try:
-        module = importlib.import_module(module_path)
+        module = await async_import_module(hass, module_path)
     except ImportError as err:
         _LOGGER.error("Unable to load mfa module %s: %s", module_name, err)
         raise HomeAssistantError(

homeassistant/auth/mfa_modules/insecure_example.py

@@ -1,4 +1,5 @@
 """Example auth module."""
+
 from __future__ import annotations
 
 from typing import Any

homeassistant/auth/mfa_modules/notify.py

@@ -2,6 +2,7 @@
 
 Sending HOTP through notify service
 """
+
 from __future__ import annotations
 
 import asyncio
@@ -87,7 +88,7 @@ class NotifySetting:
     target: str | None = attr.ib(default=None)
 
 
-_UsersDict = dict[str, NotifySetting]
+type _UsersDict = dict[str, NotifySetting]
 
 
 @MULTI_FACTOR_AUTH_MODULES.register("notify")

homeassistant/auth/mfa_modules/totp.py

@@ -1,4 +1,5 @@
 """Time-based One Time Password auth module."""
+
 from __future__ import annotations
 
 import asyncio

homeassistant/auth/models.py

@@ -1,9 +1,11 @@
 """Auth models."""
+
 from __future__ import annotations
 
 from datetime import datetime, timedelta
+from functools import cached_property
 import secrets
-from typing import TYPE_CHECKING, Any, NamedTuple
+from typing import Any, NamedTuple
 import uuid
 
 import attr
@@ -11,21 +13,18 @@ from attr import Attribute
 from attr.setters import validate
 
 from homeassistant.const import __version__
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.util import dt as dt_util
 
 from . import permissions as perm_mdl
 from .const import GROUP_ID_ADMIN
 
-if TYPE_CHECKING:
-    from functools import cached_property
-else:
-    from homeassistant.backports.functools import cached_property
-
-
 TOKEN_TYPE_NORMAL = "normal"
 TOKEN_TYPE_SYSTEM = "system"
 TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = "long_lived_access_token"
 
+AuthFlowResult = FlowResult[tuple[str, str]]
+
 
 @attr.s(slots=True)
 class Group:
@@ -87,11 +86,7 @@ class User:
     def invalidate_cache(self) -> None:
         """Invalidate permission and is_admin cache."""
         for attr_to_invalidate in ("permissions", "is_admin"):
-            # try is must more efficient than suppress
-            try:  # noqa: SIM105
-                delattr(self, attr_to_invalidate)
-            except AttributeError:
-                pass
+            self.__dict__.pop(attr_to_invalidate, None)
 
 
 @attr.s(slots=True)

homeassistant/auth/permissions/__init__.py

@@ -1,8 +1,8 @@
 """Permissions for Home Assistant."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
-from typing import Any
 
 import voluptuous as vol
 
@@ -63,7 +63,7 @@ class PolicyPermissions(AbstractPermissions):
         """Return a function that can test entity access."""
         return compile_entities(self._policy.get(CAT_ENTITIES), self._perm_lookup)
 
-    def __eq__(self, other: Any) -> bool:
+    def __eq__(self, other: object) -> bool:
         """Equals check."""
         return isinstance(other, PolicyPermissions) and other._policy == self._policy
 

homeassistant/auth/permissions/const.py

@@ -1,4 +1,5 @@
 """Permission constants."""
+
 CAT_ENTITIES = "entities"
 CAT_CONFIG_ENTRIES = "config_entries"
 SUBCAT_ALL = "all"

homeassistant/auth/permissions/entities.py

@@ -1,4 +1,5 @@
 """Entity permissions."""
+
 from __future__ import annotations
 
 from collections import OrderedDict

homeassistant/auth/permissions/events.py

@@ -1,7 +1,8 @@
 """Permission for events."""
+
 from __future__ import annotations
 
-from typing import Final
+from typing import Any, Final
 
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
@@ -20,10 +21,11 @@ from homeassistant.helpers.area_registry import EVENT_AREA_REGISTRY_UPDATED
 from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED
 from homeassistant.helpers.issue_registry import EVENT_REPAIRS_ISSUE_REGISTRY_UPDATED
+from homeassistant.util.event_type import EventType
 
 # These are events that do not contain any sensitive data
 # Except for state_changed, which is handled accordingly.
-SUBSCRIBE_ALLOWLIST: Final[set[str]] = {
+SUBSCRIBE_ALLOWLIST: Final[set[EventType[Any] | str]] = {
     EVENT_AREA_REGISTRY_UPDATED,
     EVENT_COMPONENT_LOADED,
     EVENT_CORE_CONFIG_UPDATE,

homeassistant/auth/permissions/merge.py

@@ -1,4 +1,5 @@
 """Merging of policies."""
+
 from __future__ import annotations
 
 from typing import cast
@@ -57,10 +58,7 @@ def _merge_policies(sources: list[CategoryType]) -> CategoryType:
                 continue
             seen.add(key)
 
-            key_sources = []
-            for src in sources:
-                if isinstance(src, dict):
-                    key_sources.append(src.get(key))
+            key_sources = [src.get(key) for src in sources if isinstance(src, dict)]
 
             policy[key] = _merge_policies(key_sources)
 

homeassistant/auth/permissions/models.py

@@ -1,4 +1,5 @@
 """Models for permissions."""
+
 from __future__ import annotations
 
 from typing import TYPE_CHECKING

homeassistant/auth/permissions/system_policies.py

@@ -1,4 +1,5 @@
 """System policies."""
+
 from .const import CAT_ENTITIES, POLICY_READ, SUBCAT_ALL
 
 ADMIN_POLICY = {CAT_ENTITIES: True}

homeassistant/auth/permissions/types.py

@@ -1,19 +1,20 @@
 """Common code for permissions."""
+
 from collections.abc import Mapping
 
 # MyPy doesn't support recursion yet. So writing it out as far as we need.
 
-ValueType = (
+type ValueType = (
     # Example: entities.all = { read: true, control: true }
     Mapping[str, bool] | bool | None
 )
 
 # Example: entities.domains = { light: … }
-SubCategoryDict = Mapping[str, ValueType]
+type SubCategoryDict = Mapping[str, ValueType]
 
-SubCategoryType = SubCategoryDict | bool | None
+type SubCategoryType = SubCategoryDict | bool | None
 
-CategoryType = (
+type CategoryType = (
     # Example: entities.domains
     Mapping[str, SubCategoryType]
     # Example: entities.all
@@ -23,4 +24,4 @@ CategoryType = (
 )
 
 # Example: { entities: … }
-PolicyType = Mapping[str, CategoryType]
+type PolicyType = Mapping[str, CategoryType]

homeassistant/auth/permissions/util.py

@@ -1,4 +1,5 @@
 """Helpers to deal with permissions."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
@@ -9,8 +10,8 @@ from .const import SUBCAT_ALL
 from .models import PermissionLookup
 from .types import CategoryType, SubCategoryDict, ValueType
 
-LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
-SubCatLookupType = dict[str, LookupFunc]
+type LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
+type SubCatLookupType = dict[str, LookupFunc]
 
 
 def lookup_all(

homeassistant/auth/providers/__init__.py

@@ -1,8 +1,8 @@
 """Auth providers for Home Assistant."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
-import importlib
 import logging
 import types
 from typing import Any
@@ -13,17 +13,18 @@ from voluptuous.humanize import humanize_error
 from homeassistant import data_entry_flow, requirements
 from homeassistant.const import CONF_ID, CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.importlib import async_import_module
 from homeassistant.util import dt as dt_util
 from homeassistant.util.decorator import Registry
+from homeassistant.util.hass_dict import HassKey
 
 from ..auth_store import AuthStore
 from ..const import MFA_SESSION_EXPIRATION
-from ..models import Credentials, RefreshToken, User, UserMeta
+from ..models import AuthFlowResult, Credentials, RefreshToken, User, UserMeta
 
 _LOGGER = logging.getLogger(__name__)
-DATA_REQS = "auth_prov_reqs_processed"
+DATA_REQS: HassKey[set[str]] = HassKey("auth_prov_reqs_processed")
 
 AUTH_PROVIDERS: Registry[str, type[AuthProvider]] = Registry()
 
@@ -157,7 +158,9 @@ async def load_auth_provider_module(
 ) -> types.ModuleType:
     """Load an auth provider."""
     try:
-        module = importlib.import_module(f"homeassistant.auth.providers.{provider}")
+        module = await async_import_module(
+            hass, f"homeassistant.auth.providers.{provider}"
+        )
     except ImportError as err:
         _LOGGER.error("Unable to load auth provider %s: %s", provider, err)
         raise HomeAssistantError(
@@ -181,9 +184,11 @@ async def load_auth_provider_module(
     return module
 
 
-class LoginFlow(data_entry_flow.FlowHandler):
+class LoginFlow(data_entry_flow.FlowHandler[AuthFlowResult, tuple[str, str]]):
     """Handler for the login flow."""
 
+    _flow_result = AuthFlowResult
+
     def __init__(self, auth_provider: AuthProvider) -> None:
         """Initialize the login flow."""
         self._auth_provider = auth_provider
@@ -197,7 +202,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the first step of login flow.
 
         Return self.async_show_form(step_id='init') if user_input is None.
@@ -207,7 +212,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
 
     async def async_step_select_mfa_module(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of select mfa module."""
         errors = {}
 
@@ -232,7 +237,7 @@ class LoginFlow(data_entry_flow.FlowHandler):
 
     async def async_step_mfa(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of mfa validation."""
         assert self.credential
         assert self.user
@@ -282,6 +287,6 @@ class LoginFlow(data_entry_flow.FlowHandler):
             errors=errors,
         )
 
-    async def async_finish(self, flow_result: Any) -> FlowResult:
+    async def async_finish(self, flow_result: Any) -> AuthFlowResult:
         """Handle the pass of login flow."""
         return self.async_create_entry(data=flow_result)

homeassistant/auth/providers/command_line.py

@@ -1,4 +1,5 @@
 """Auth provider that validates credentials via an external command."""
+
 from __future__ import annotations
 
 import asyncio
@@ -10,10 +11,9 @@ from typing import Any, cast
 import voluptuous as vol
 
 from homeassistant.const import CONF_COMMAND
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from ..models import Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 CONF_ARGS = "args"
@@ -138,7 +138,7 @@ class CommandLineLoginFlow(LoginFlow):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of the form."""
         errors = {}
 

homeassistant/auth/providers/homeassistant.py

@@ -1,4 +1,5 @@
 """Home Assistant auth provider."""
+
 from __future__ import annotations
 
 import asyncio
@@ -12,11 +13,10 @@ import voluptuous as vol
 
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.storage import Store
 
-from ..models import Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 STORAGE_VERSION = 1
@@ -321,7 +321,7 @@ class HassLoginFlow(LoginFlow):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of the form."""
         errors = {}
 

homeassistant/auth/providers/insecure_example.py

@@ -1,4 +1,5 @@
 """Example auth provider."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -8,10 +9,9 @@ from typing import Any, cast
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 
-from ..models import Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 USER_SCHEMA = vol.Schema(
@@ -98,7 +98,7 @@ class ExampleLoginFlow(LoginFlow):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of the form."""
         errors = None
 

homeassistant/auth/providers/legacy_api_password.py

@@ -2,6 +2,7 @@
 
 It will be removed when auth system production ready
 """
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -11,12 +12,11 @@ from typing import Any, cast
 import voluptuous as vol
 
 from homeassistant.core import async_get_hass, callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 
-from ..models import Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 AUTH_PROVIDER_TYPE = "legacy_api_password"
@@ -101,7 +101,7 @@ class LegacyLoginFlow(LoginFlow):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of the form."""
         errors = {}
 

homeassistant/auth/providers/trusted_networks.py

@@ -3,6 +3,7 @@
 It shows list of users if access from trusted network.
 Abort login flow if not access from trusted network.
 """
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -19,17 +20,16 @@ from typing import Any, cast
 import voluptuous as vol
 
 from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.network import is_cloud_connection
 
 from .. import InvalidAuthError
-from ..models import Credentials, RefreshToken, UserMeta
+from ..models import AuthFlowResult, Credentials, RefreshToken, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
-IPAddress = IPv4Address | IPv6Address
-IPNetwork = IPv4Network | IPv6Network
+type IPAddress = IPv4Address | IPv6Address
+type IPNetwork = IPv4Network | IPv6Network
 
 CONF_TRUSTED_NETWORKS = "trusted_networks"
 CONF_TRUSTED_USERS = "trusted_users"
@@ -226,7 +226,7 @@ class TrustedNetworksLoginFlow(LoginFlow):
 
     async def async_step_init(
         self, user_input: dict[str, str] | None = None
-    ) -> FlowResult:
+    ) -> AuthFlowResult:
         """Handle the step of the form."""
         try:
             cast(

homeassistant/backports/enum.py

@@ -6,10 +6,24 @@ Since we have dropped support for Python 3.10, we can remove this backport.
 This file is kept for now to avoid breaking custom components that might
 import it.
 """
+
 from __future__ import annotations
 
-from enum import StrEnum
+from enum import StrEnum as _StrEnum
+from functools import partial
 
-__all__ = [
-    "StrEnum",
-]
+from homeassistant.helpers.deprecation import (
+    DeprecatedAlias,
+    all_with_deprecated_constants,
+    check_if_deprecated_constant,
+    dir_with_deprecated_constants,
+)
+
+# StrEnum deprecated as of 2024.5 use enum.StrEnum instead.
+_DEPRECATED_StrEnum = DeprecatedAlias(_StrEnum, "enum.StrEnum", "2025.5")
+
+__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
+__dir__ = partial(
+    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
+)
+__all__ = all_with_deprecated_constants(globals())

homeassistant/backports/functools.py

@@ -1,81 +1,30 @@
-"""Functools backports from standard lib."""
+"""Functools backports from standard lib.
 
-# This file contains parts of Python's module wrapper
-# for the _functools C module
-# to allow utilities written in Python to be added
-# to the functools module.
-# Written by Nick Coghlan <ncoghlan at gmail.com>,
-# Raymond Hettinger <python at rcn.com>,
-# and Łukasz Langa <lukasz at langa.pl>.
-# Copyright © 2001-2023 Python Software Foundation; All Rights Reserved
+This file contained the backport of the cached_property implementation of Python 3.12.
+
+Since we have dropped support for Python 3.11, we can remove this backport.
+This file is kept for now to avoid breaking custom components that might
+import it.
+"""
 
 from __future__ import annotations
 
-from collections.abc import Callable
-from types import GenericAlias
-from typing import Any, Generic, Self, TypeVar, overload
+from functools import cached_property as _cached_property, partial
 
-_T = TypeVar("_T")
+from homeassistant.helpers.deprecation import (
+    DeprecatedAlias,
+    all_with_deprecated_constants,
+    check_if_deprecated_constant,
+    dir_with_deprecated_constants,
+)
 
+# cached_property deprecated as of 2024.5 use functools.cached_property instead.
+_DEPRECATED_cached_property = DeprecatedAlias(
+    _cached_property, "functools.cached_property", "2025.5"
+)
 
-class cached_property(Generic[_T]):
-    """Backport of Python 3.12's cached_property.
-
-    Includes https://github.com/python/cpython/pull/101890/files
-    """
-
-    def __init__(self, func: Callable[[Any], _T]) -> None:
-        """Initialize."""
-        self.func: Callable[[Any], _T] = func
-        self.attrname: str | None = None
-        self.__doc__ = func.__doc__
-
-    def __set_name__(self, owner: type[Any], name: str) -> None:
-        """Set name."""
-        if self.attrname is None:
-            self.attrname = name
-        elif name != self.attrname:
-            raise TypeError(
-                "Cannot assign the same cached_property to two different names "
-                f"({self.attrname!r} and {name!r})."
-            )
-
-    @overload
-    def __get__(self, instance: None, owner: type[Any] | None = None) -> Self:
-        ...
-
-    @overload
-    def __get__(self, instance: Any, owner: type[Any] | None = None) -> _T:
-        ...
-
-    def __get__(
-        self, instance: Any | None, owner: type[Any] | None = None
-    ) -> _T | Self:
-        """Get."""
-        if instance is None:
-            return self
-        if self.attrname is None:
-            raise TypeError(
-                "Cannot use cached_property instance without calling __set_name__ on it."
-            )
-        try:
-            cache = instance.__dict__
-        # not all objects have __dict__ (e.g. class defines slots)
-        except AttributeError:
-            msg = (
-                f"No '__dict__' attribute on {type(instance).__name__!r} "
-                f"instance to cache {self.attrname!r} property."
-            )
-            raise TypeError(msg) from None
-        val = self.func(instance)
-        try:
-            cache[self.attrname] = val
-        except TypeError:
-            msg = (
-                f"The '__dict__' attribute on {type(instance).__name__!r} instance "
-                f"does not support item assignment for caching {self.attrname!r} property."
-            )
-            raise TypeError(msg) from None
-        return val
-
-    __class_getitem__ = classmethod(GenericAlias)  # type: ignore[var-annotated]
+__getattr__ = partial(check_if_deprecated_constant, module_globals=globals())
+__dir__ = partial(
+    dir_with_deprecated_constants, module_globals_keys=[*globals().keys()]
+)
+__all__ = all_with_deprecated_constants(globals())

homeassistant/block_async_io.py

@@ -1,20 +1,98 @@
 """Block blocking calls being done in asyncio."""
-from http.client import HTTPConnection
-import time
 
-from .util.async_ import protect_loop
+import builtins
+from contextlib import suppress
+import glob
+from http.client import HTTPConnection
+import importlib
+import os
+import sys
+import threading
+import time
+from typing import Any
+
+from .helpers.frame import get_current_frame
+from .util.loop import protect_loop
+
+_IN_TESTS = "unittest" in sys.modules
+
+ALLOWED_FILE_PREFIXES = ("/proc",)
+
+
+def _check_import_call_allowed(mapped_args: dict[str, Any]) -> bool:
+    # If the module is already imported, we can ignore it.
+    return bool((args := mapped_args.get("args")) and args[0] in sys.modules)
+
+
+def _check_file_allowed(mapped_args: dict[str, Any]) -> bool:
+    # If the file is in /proc we can ignore it.
+    args = mapped_args["args"]
+    path = args[0] if type(args[0]) is str else str(args[0])  # noqa: E721
+    return path.startswith(ALLOWED_FILE_PREFIXES)
+
+
+def _check_sleep_call_allowed(mapped_args: dict[str, Any]) -> bool:
+    #
+    # Avoid extracting the stack unless we need to since it
+    # will have to access the linecache which can do blocking
+    # I/O and we are trying to avoid blocking calls.
+    #
+    # frame[0] is us
+    # frame[1] is raise_for_blocking_call
+    # frame[2] is protected_loop_func
+    # frame[3] is the offender
+    with suppress(ValueError):
+        return get_current_frame(4).f_code.co_filename.endswith("pydevd.py")
+    return False
 
 
 def enable() -> None:
     """Enable the detection of blocking calls in the event loop."""
+    loop_thread_id = threading.get_ident()
     # Prevent urllib3 and requests doing I/O in event loop
     HTTPConnection.putrequest = protect_loop(  # type: ignore[method-assign]
-        HTTPConnection.putrequest
+        HTTPConnection.putrequest, loop_thread_id=loop_thread_id
     )
 
-    # Prevent sleeping in event loop. Non-strict since 2022.02
-    time.sleep = protect_loop(time.sleep, strict=False)
+    # Prevent sleeping in event loop.
+    time.sleep = protect_loop(
+        time.sleep,
+        check_allowed=_check_sleep_call_allowed,
+        loop_thread_id=loop_thread_id,
+    )
 
-    # Currently disabled. pytz doing I/O when getting timezone.
-    # Prevent files being opened inside the event loop
-    # builtins.open = protect_loop(builtins.open)
+    glob.glob = protect_loop(
+        glob.glob, strict_core=False, strict=False, loop_thread_id=loop_thread_id
+    )
+    glob.iglob = protect_loop(
+        glob.iglob, strict_core=False, strict=False, loop_thread_id=loop_thread_id
+    )
+    os.walk = protect_loop(
+        os.walk, strict_core=False, strict=False, loop_thread_id=loop_thread_id
+    )
+
+    if not _IN_TESTS:
+        # Prevent files being opened inside the event loop
+        os.listdir = protect_loop(  # type: ignore[assignment]
+            os.listdir, strict_core=False, strict=False, loop_thread_id=loop_thread_id
+        )
+        os.scandir = protect_loop(  # type: ignore[assignment]
+            os.scandir, strict_core=False, strict=False, loop_thread_id=loop_thread_id
+        )
+
+        builtins.open = protect_loop(  # type: ignore[assignment]
+            builtins.open,
+            strict_core=False,
+            strict=False,
+            check_allowed=_check_file_allowed,
+            loop_thread_id=loop_thread_id,
+        )
+        # unittest uses `importlib.import_module` to do mocking
+        # so we cannot protect it if we are running tests
+        importlib.import_module = protect_loop(
+            importlib.import_module,
+            strict_core=False,
+            strict=False,
+            check_allowed=_check_import_call_allowed,
+            loop_thread_id=loop_thread_id,
+        )

homeassistant/bootstrap.py

@@ -1,12 +1,16 @@
 """Provide methods to bootstrap a Home Assistant instance."""
+
 from __future__ import annotations
 
 import asyncio
+from collections import defaultdict
 import contextlib
-from datetime import timedelta
+from functools import partial
+from itertools import chain
 import logging
 import logging.handlers
-from operator import itemgetter
+import mimetypes
+from operator import contains, itemgetter
 import os
 import platform
 import sys
@@ -20,20 +24,46 @@ import cryptography.hazmat.backends.openssl.backend  # noqa: F401
 import voluptuous as vol
 import yarl
 
-from . import config as conf_util, config_entries, core, loader, requirements
+from . import (
+    block_async_io,
+    config as conf_util,
+    config_entries,
+    core,
+    loader,
+    requirements,
+)
 
-# Pre-import config and lovelace which have no requirements here to avoid
+# Pre-import frontend deps which have no requirements here to avoid
 # loading them at run time and blocking the event loop. We do this ahead
-# of time so that we do not have to flag frontends deps with `import_executor`
+# of time so that we do not have to flag frontend deps with `import_executor`
 # as it would create a thundering heard of executor jobs trying to import
 # frontend deps at the same time.
 from .components import (
     api as api_pre_import,  # noqa: F401
+    auth as auth_pre_import,  # noqa: F401
     config as config_pre_import,  # noqa: F401
-    http,
+    default_config as default_config_pre_import,  # noqa: F401
+    device_automation as device_automation_pre_import,  # noqa: F401
+    diagnostics as diagnostics_pre_import,  # noqa: F401
+    file_upload as file_upload_pre_import,  # noqa: F401
+    group as group_pre_import,  # noqa: F401
+    history as history_pre_import,  # noqa: F401
+    http,  # not named pre_import since it has requirements
+    image_upload as image_upload_import,  # noqa: F401 - not named pre_import since it has requirements
+    logbook as logbook_pre_import,  # noqa: F401
     lovelace as lovelace_pre_import,  # noqa: F401
+    onboarding as onboarding_pre_import,  # noqa: F401
+    recorder as recorder_import,  # noqa: F401 - not named pre_import since it has requirements
+    repairs as repairs_pre_import,  # noqa: F401
+    search as search_pre_import,  # noqa: F401
+    sensor as sensor_pre_import,  # noqa: F401
+    system_log as system_log_pre_import,  # noqa: F401
+    webhook as webhook_pre_import,  # noqa: F401
+    websocket_api as websocket_api_pre_import,  # noqa: F401
 )
+from .components.sensor import recorder as sensor_recorder  # noqa: F401
 from .const import (
+    BASE_PLATFORMS,
     FORMAT_DATETIME,
     KEY_DATA_LOGGING as DATA_LOGGING,
     REQUIRED_NEXT_PYTHON_HA_RELEASE,
@@ -43,6 +73,7 @@ from .const import (
 from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
+    category_registry,
     config_validation as cv,
     device_registry,
     entity,
@@ -55,29 +86,43 @@ from .helpers import (
     template,
     translation,
 )
-from .helpers.dispatcher import async_dispatcher_send
+from .helpers.dispatcher import async_dispatcher_send_internal
+from .helpers.storage import get_internal_store_manager
+from .helpers.system_info import async_get_system_info
 from .helpers.typing import ConfigType
 from .setup import (
-    BASE_PLATFORMS,
-    DATA_SETUP_STARTED,
-    DATA_SETUP_TIME,
+    # _setup_started is marked as protected to make it clear
+    # that it is not part of the public API and should not be used
+    # by integrations. It is only used for internal tracking of
+    # which integrations are being set up.
+    _setup_started,
+    async_get_setup_timings,
     async_notify_setup_error,
     async_set_domains_to_be_loaded,
     async_setup_component,
 )
 from .util.async_ import create_eager_task
+from .util.hass_dict import HassKey
 from .util.logging import async_activate_log_queue_handler
 from .util.package import async_get_user_site, is_virtual_env
 
+with contextlib.suppress(ImportError):
+    # Ensure anyio backend is imported to avoid it being imported in the event loop
+    from anyio._backends import _asyncio  # noqa: F401
+
+
 if TYPE_CHECKING:
     from .runner import RuntimeConfig
 
 _LOGGER = logging.getLogger(__name__)
 
+SETUP_ORDER_SORT_KEY = partial(contains, BASE_PLATFORMS)
+
+
 ERROR_LOG_FILENAME = "home-assistant.log"
 
 # hass.data key for logging information.
-DATA_REGISTRIES_LOADED = "bootstrap_registries_loaded"
+DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
 
 LOG_SLOW_STARTUP_INTERVAL = 60
 SLOW_STARTUP_CHECK_INTERVAL = 1
@@ -87,11 +132,17 @@ STAGE_2_TIMEOUT = 300
 WRAP_UP_TIMEOUT = 300
 COOLDOWN_TIME = 60
 
-MAX_LOAD_CONCURRENTLY = 6
 
 DEBUGGER_INTEGRATIONS = {"debugpy"}
+
+# Core integrations are unconditionally loaded
 CORE_INTEGRATIONS = {"homeassistant", "persistent_notification"}
-LOGGING_INTEGRATIONS = {
+
+# Integrations that are loaded right after the core is set up
+LOGGING_AND_HTTP_DEPS_INTEGRATIONS = {
+    # isal is loaded right away before `http` to ensure if its
+    # enabled, that `isal` is up to date.
+    "isal",
     # Set log levels
     "logger",
     # Error logging
@@ -128,6 +179,7 @@ DEFAULT_INTEGRATIONS = {
     # These integrations are set up unless recovery mode is activated.
     #
     # Integrations providing core functionality:
+    "analytics",  # Needed for onboarding
     "application_credentials",
     "backup",
     "frontend",
@@ -168,16 +220,36 @@ CRITICAL_INTEGRATIONS = {
     "frontend",
 }
 
-SETUP_ORDER = {
-    # Load logging as soon as possible
-    "logging": LOGGING_INTEGRATIONS,
-    # Setup frontend
-    "frontend": FRONTEND_INTEGRATIONS,
-    # Setup recorder
-    "recorder": RECORDER_INTEGRATIONS,
+SETUP_ORDER = (
+    # Load logging and http deps as soon as possible
+    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
+    # Setup frontend and recorder
+    ("frontend, recorder", {*FRONTEND_INTEGRATIONS, *RECORDER_INTEGRATIONS}),
     # Start up debuggers. Start these first in case they want to wait.
-    "debugger": DEBUGGER_INTEGRATIONS,
-}
+    ("debugger", DEBUGGER_INTEGRATIONS),
+)
+
+#
+# Storage keys we are likely to load during startup
+# in order of when we expect to load them.
+#
+# If they do not exist they will not be loaded
+#
+PRELOAD_STORAGE = [
+    "core.logger",
+    "core.network",
+    "http.auth",
+    "image",
+    "lovelace_dashboards",
+    "lovelace_resources",
+    "core.uuid",
+    "lovelace.map",
+    "bluetooth.passive_update_processor",
+    "bluetooth.remote_scanners",
+    "assist_pipeline.pipelines",
+    "core.analytics",
+    "auth_module.totp",
+]
 
 
 async def async_setup_hass(
@@ -194,6 +266,9 @@ async def async_setup_hass(
         runtime_config.log_no_color,
     )
 
+    if runtime_config.debug or hass.loop.get_debug():
+        hass.config.debug = True
+
     hass.config.safe_mode = runtime_config.safe_mode
     hass.config.skip_pip = runtime_config.skip_pip
     hass.config.skip_pip_packages = runtime_config.skip_pip_packages
@@ -209,6 +284,8 @@ async def async_setup_hass(
     _LOGGER.info("Config directory: %s", runtime_config.config_dir)
 
     loader.async_setup(hass)
+    block_async_io.enable()
+
     config_dict = None
     basic_setup_success = False
 
@@ -255,6 +332,7 @@ async def async_setup_hass(
         hass = core.HomeAssistant(old_config.config_dir)
         if old_logging:
             hass.data[DATA_LOGGING] = old_logging
+        hass.config.debug = old_config.debug
         hass.config.skip_pip = old_config.skip_pip
         hass.config.skip_pip_packages = old_config.skip_pip_packages
         hass.config.internal_url = old_config.internal_url
@@ -301,37 +379,41 @@ def open_hass_ui(hass: core.HomeAssistant) -> None:
         )
 
 
+def _init_blocking_io_modules_in_executor() -> None:
+    """Initialize modules that do blocking I/O in executor."""
+    # Cache the result of platform.uname().processor in the executor.
+    # Multiple modules call this function at startup which
+    # executes a blocking subprocess call. This is a problem for the
+    # asyncio event loop. By priming the cache of uname we can
+    # avoid the blocking call in the event loop.
+    _ = platform.uname().processor
+    # Initialize the mimetypes module to avoid blocking calls
+    # to the filesystem to load the mime.types file.
+    mimetypes.init()
+
+
 async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
-    """Load the registries and cache the result of platform.uname().processor."""
+    """Load the registries and modules that will do blocking I/O."""
     if DATA_REGISTRIES_LOADED in hass.data:
         return
     hass.data[DATA_REGISTRIES_LOADED] = None
-
-    def _cache_uname_processor() -> None:
-        """Cache the result of platform.uname().processor in the executor.
-
-        Multiple modules call this function at startup which
-        executes a blocking subprocess call. This is a problem for the
-        asyncio event loop. By primeing the cache of uname we can
-        avoid the blocking call in the event loop.
-        """
-        platform.uname().processor  # pylint: disable=expression-not-assigned
-
-    # Load the registries and cache the result of platform.uname().processor
     translation.async_setup(hass)
     entity.async_setup(hass)
     template.async_setup(hass)
     await asyncio.gather(
+        create_eager_task(get_internal_store_manager(hass).async_initialize()),
         create_eager_task(area_registry.async_load(hass)),
+        create_eager_task(category_registry.async_load(hass)),
         create_eager_task(device_registry.async_load(hass)),
         create_eager_task(entity_registry.async_load(hass)),
         create_eager_task(floor_registry.async_load(hass)),
         create_eager_task(issue_registry.async_load(hass)),
         create_eager_task(label_registry.async_load(hass)),
-        hass.async_add_executor_job(_cache_uname_processor),
+        hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
         create_eager_task(template.async_load_custom_templates(hass)),
         create_eager_task(restore_state.async_load(hass)),
         create_eager_task(hass.config_entries.async_initialize()),
+        create_eager_task(async_get_system_info(hass)),
     )
 
 
@@ -346,6 +428,9 @@ async def async_from_config_dict(
     start = monotonic()
 
     hass.config_entries = config_entries.ConfigEntries(hass, config)
+    # Prime custom component cache early so we know if registry entries are tied
+    # to a custom integration
+    await loader.async_get_custom_components(hass)
     await async_load_base_functionality(hass)
 
     # Set up core.
@@ -354,7 +439,11 @@ async def async_from_config_dict(
     if not all(
         await asyncio.gather(
             *(
-                create_eager_task(async_setup_component(hass, domain, config))
+                create_eager_task(
+                    async_setup_component(hass, domain, config),
+                    name=f"bootstrap setup {domain}",
+                    loop=hass.loop,
+                )
                 for domain in CORE_INTEGRATIONS
             )
         )
@@ -510,7 +599,7 @@ def async_enable_logging(
                 err_log_path, when="midnight", backupCount=log_rotate_days
             )
         else:
-            err_handler = logging.handlers.RotatingFileHandler(
+            err_handler = _RotatingFileHandlerWithoutShouldRollOver(
                 err_log_path, backupCount=1
             )
 
@@ -534,6 +623,19 @@ def async_enable_logging(
     async_activate_log_queue_handler(hass)
 
 
+class _RotatingFileHandlerWithoutShouldRollOver(logging.handlers.RotatingFileHandler):
+    """RotatingFileHandler that does not check if it should roll over on every log."""
+
+    def shouldRollover(self, record: logging.LogRecord) -> bool:
+        """Never roll over.
+
+        The shouldRollover check is expensive because it has to stat
+        the log file for every log record. Since we do not set maxBytes
+        the result of this check is always False.
+        """
+        return False
+
+
 async def async_mount_local_lib_path(config_dir: str) -> str:
     """Add local library to Python Path.
 
@@ -571,7 +673,9 @@ class _WatchPendingSetups:
     """Periodic log and dispatch of setups that are pending."""
 
     def __init__(
-        self, hass: core.HomeAssistant, setup_started: dict[str, float]
+        self,
+        hass: core.HomeAssistant,
+        setup_started: dict[tuple[str, str | None], float],
     ) -> None:
         """Initialize the WatchPendingSetups class."""
         self._hass = hass
@@ -586,11 +690,15 @@ class _WatchPendingSetups:
         now = monotonic()
         self._duration_count += SLOW_STARTUP_CHECK_INTERVAL
 
-        remaining_with_setup_started = {
-            domain: (now - start_time)
-            for domain, start_time in self._setup_started.items()
-        }
-        _LOGGER.debug("Integration remaining: %s", remaining_with_setup_started)
+        remaining_with_setup_started: defaultdict[str, float] = defaultdict(float)
+        for integration_group, start_time in self._setup_started.items():
+            domain, _ = integration_group
+            remaining_with_setup_started[domain] += now - start_time
+
+        if remaining_with_setup_started:
+            _LOGGER.debug("Integration remaining: %s", remaining_with_setup_started)
+        elif waiting_tasks := self._hass._active_tasks:  # noqa: SLF001
+            _LOGGER.debug("Waiting on tasks: %s", waiting_tasks)
         self._async_dispatch(remaining_with_setup_started)
         if (
             self._setup_started
@@ -600,7 +708,7 @@ class _WatchPendingSetups:
             # once we take over LOG_SLOW_STARTUP_INTERVAL (60s) to start up
             _LOGGER.warning(
                 "Waiting on integrations to complete setup: %s",
-                ", ".join(self._setup_started),
+                self._setup_started,
             )
 
         _LOGGER.debug("Running timeout Zones: %s", self._hass.timeout.zones)
@@ -609,7 +717,7 @@ class _WatchPendingSetups:
     def _async_dispatch(self, remaining_with_setup_started: dict[str, float]) -> None:
         """Dispatch the signal."""
         if remaining_with_setup_started or not self._previous_was_empty:
-            async_dispatcher_send(
+            async_dispatcher_send_internal(
                 self._hass, SIGNAL_BOOTSTRAP_INTEGRATIONS, remaining_with_setup_started
             )
         self._previous_was_empty = not remaining_with_setup_started
@@ -640,13 +748,18 @@ async def async_setup_multi_components(
     """Set up multiple domains. Log on failure."""
     # Avoid creating tasks for domains that were setup in a previous stage
     domains_not_yet_setup = domains - hass.config.components
+    # Create setup tasks for base platforms first since everything will have
+    # to wait to be imported, and the sooner we can get the base platforms
+    # loaded the sooner we can start loading the rest of the integrations.
     futures = {
-        domain: hass.async_create_task(
+        domain: hass.async_create_task_internal(
             async_setup_component(hass, domain, config),
             f"setup component {domain}",
             eager_start=True,
         )
-        for domain in domains_not_yet_setup
+        for domain in sorted(
+            domains_not_yet_setup, key=SETUP_ORDER_SORT_KEY, reverse=True
+        )
     }
     results = await asyncio.gather(*futures.values(), return_exceptions=True)
     for idx, domain in enumerate(futures):
@@ -663,26 +776,53 @@ async def _async_resolve_domains_to_setup(
     hass: core.HomeAssistant, config: dict[str, Any]
 ) -> tuple[set[str], dict[str, loader.Integration]]:
     """Resolve all dependencies and return list of domains to set up."""
-    base_platforms_loaded = False
     domains_to_setup = _get_domains(hass, config)
     needed_requirements: set[str] = set()
+    platform_integrations = conf_util.extract_platform_integrations(
+        config, BASE_PLATFORMS
+    )
+    # Ensure base platforms that have platform integrations are added to
+    # to `domains_to_setup so they can be setup first instead of
+    # discovering them when later when a config entry setup task
+    # notices its needed and there is already a long line to use
+    # the import executor.
+    #
+    # For example if we have
+    # sensor:
+    #   - platform: template
+    #
+    # `template` has to be loaded to validate the config for sensor
+    # so we want to start loading `sensor` as soon as we know
+    # it will be needed. The more platforms under `sensor:`, the longer
+    # it will take to finish setup for `sensor` because each of these
+    # platforms has to be imported before we can validate the config.
+    #
+    # Thankfully we are migrating away from the platform pattern
+    # so this will be less of a problem in the future.
+    domains_to_setup.update(platform_integrations)
+
+    # Load manifests for base platforms and platform based integrations
+    # that are defined under base platforms right away since we do not require
+    # the manifest to list them as dependencies and we want to avoid the lock
+    # contention when multiple integrations try to load them at once
+    additional_manifests_to_load = {
+        *BASE_PLATFORMS,
+        *chain.from_iterable(platform_integrations.values()),
+    }
+
+    translations_to_load = additional_manifests_to_load.copy()
 
     # Resolve all dependencies so we know all integrations
-    # that will have to be loaded and start rightaway
+    # that will have to be loaded and start right-away
     integration_cache: dict[str, loader.Integration] = {}
     to_resolve: set[str] = domains_to_setup
-    while to_resolve:
+    while to_resolve or additional_manifests_to_load:
         old_to_resolve: set[str] = to_resolve
         to_resolve = set()
 
-        if not base_platforms_loaded:
-            # Load base platforms right away since
-            # we do not require the manifest to list
-            # them as dependencies and we want
-            # to avoid the lock contention when multiple
-            # integrations try to resolve them at once
-            base_platforms_loaded = True
-            to_get = {*old_to_resolve, *BASE_PLATFORMS}
+        if additional_manifests_to_load:
+            to_get = {*old_to_resolve, *additional_manifests_to_load}
+            additional_manifests_to_load.clear()
         else:
             to_get = old_to_resolve
 
@@ -691,13 +831,27 @@ async def _async_resolve_domains_to_setup(
         integrations_to_process: list[loader.Integration] = []
 
         for domain, itg in (await loader.async_get_integrations(hass, to_get)).items():
-            if not isinstance(itg, loader.Integration) or domain not in old_to_resolve:
+            if not isinstance(itg, loader.Integration):
                 continue
-            integrations_to_process.append(itg)
             integration_cache[domain] = itg
+            needed_requirements.update(itg.requirements)
+
+            # Make sure manifests for dependencies are loaded in the next
+            # loop to try to group as many as manifest loads in a single
+            # call to avoid the creating one-off executor jobs later in
+            # the setup process
+            additional_manifests_to_load.update(
+                dep
+                for dep in chain(itg.dependencies, itg.after_dependencies)
+                if dep not in integration_cache
+            )
+
+            if domain not in old_to_resolve:
+                continue
+
+            integrations_to_process.append(itg)
             manifest_deps.update(itg.dependencies)
             manifest_deps.update(itg.after_dependencies)
-            needed_requirements.update(itg.requirements)
             if not itg.all_dependencies_resolved:
                 resolve_dependencies_tasks.append(
                     create_eager_task(
@@ -740,6 +894,12 @@ async def _async_resolve_domains_to_setup(
         "check installed requirements",
         eager_start=True,
     )
+
+    #
+    # Only add the domains_to_setup after we finish resolving
+    # as new domains are likely to added in the process
+    #
+    translations_to_load.update(domains_to_setup)
     # Start loading translations for all integrations we are going to set up
     # in the background so they are ready when we need them. This avoids a
     # lot of waiting for the translation load lock and a thundering herd of
@@ -751,11 +911,22 @@ async def _async_resolve_domains_to_setup(
     # wait for the translation load lock, loading will be done by the
     # time it gets to it.
     hass.async_create_background_task(
-        translation.async_load_integrations(hass, {*BASE_PLATFORMS, *domains_to_setup}),
+        translation.async_load_integrations(hass, translations_to_load),
         "load translations",
         eager_start=True,
     )
 
+    # Preload storage for all integrations we are going to set up
+    # so we do not have to wait for it to be loaded when we need it
+    # in the setup process.
+    hass.async_create_background_task(
+        get_internal_store_manager(hass).async_preload(
+            [*PRELOAD_STORAGE, *domains_to_setup]
+        ),
+        "preload storage",
+        eager_start=True,
+    )
+
     return domains_to_setup, integration_cache
 
 
@@ -763,11 +934,7 @@ async def _async_set_up_integrations(
     hass: core.HomeAssistant, config: dict[str, Any]
 ) -> None:
     """Set up all the integrations."""
-    setup_started: dict[str, float] = {}
-    hass.data[DATA_SETUP_STARTED] = setup_started
-    setup_time: dict[str, timedelta] = hass.data.setdefault(DATA_SETUP_TIME, {})
-
-    watcher = _WatchPendingSetups(hass, setup_started)
+    watcher = _WatchPendingSetups(hass, _setup_started(hass))
     watcher.async_start()
 
     domains_to_setup, integration_cache = await _async_resolve_domains_to_setup(
@@ -778,10 +945,9 @@ async def _async_set_up_integrations(
     if "recorder" in domains_to_setup:
         recorder.async_initialize_recorder(hass)
 
-    pre_stage_domains: dict[str, set[str]] = {
-        name: domains_to_setup & domain_group
-        for name, domain_group in SETUP_ORDER.items()
-    }
+    pre_stage_domains = [
+        (name, domains_to_setup & domain_group) for name, domain_group in SETUP_ORDER
+    ]
 
     # calculate what components to setup in what stage
     stage_1_domains: set[str] = set()
@@ -807,10 +973,18 @@ async def _async_set_up_integrations(
 
     stage_2_domains = domains_to_setup - stage_1_domains
 
-    for name, domain_group in pre_stage_domains.items():
+    for name, domain_group in pre_stage_domains:
         if domain_group:
             stage_2_domains -= domain_group
             _LOGGER.info("Setting up %s: %s", name, domain_group)
+            to_be_loaded = domain_group.copy()
+            to_be_loaded.update(
+                dep
+                for domain in domain_group
+                if (integration := integration_cache.get(domain)) is not None
+                for dep in integration.all_dependencies
+            )
+            async_set_domains_to_be_loaded(hass, to_be_loaded)
             await async_setup_multi_components(hass, domain_group, config)
 
     # Enables after dependencies when setting up stage 1 domains
@@ -825,7 +999,10 @@ async def _async_set_up_integrations(
             ):
                 await async_setup_multi_components(hass, stage_1_domains, config)
         except TimeoutError:
-            _LOGGER.warning("Setup timed out for stage 1 - moving forward")
+            _LOGGER.warning(
+                "Setup timed out for stage 1 waiting on %s - moving forward",
+                hass._active_tasks,  # noqa: SLF001
+            )
 
     # Add after dependencies when setting up stage 2 domains
     async_set_domains_to_be_loaded(hass, stage_2_domains)
@@ -838,7 +1015,10 @@ async def _async_set_up_integrations(
             ):
                 await async_setup_multi_components(hass, stage_2_domains, config)
         except TimeoutError:
-            _LOGGER.warning("Setup timed out for stage 2 - moving forward")
+            _LOGGER.warning(
+                "Setup timed out for stage 2 waiting on %s - moving forward",
+                hass._active_tasks,  # noqa: SLF001
+            )
 
     # Wrap up startup
     _LOGGER.debug("Waiting for startup to wrap up")
@@ -846,11 +1026,16 @@ async def _async_set_up_integrations(
         async with hass.timeout.async_timeout(WRAP_UP_TIMEOUT, cool_down=COOLDOWN_TIME):
             await hass.async_block_till_done()
     except TimeoutError:
-        _LOGGER.warning("Setup timed out for bootstrap - moving forward")
+        _LOGGER.warning(
+            "Setup timed out for bootstrap waiting on %s - moving forward",
+            hass._active_tasks,  # noqa: SLF001
+        )
 
     watcher.async_stop()
 
-    _LOGGER.debug(
-        "Integration setup times: %s",
-        dict(sorted(setup_time.items(), key=itemgetter(1))),
-    )
+    if _LOGGER.isEnabledFor(logging.DEBUG):
+        setup_time = async_get_setup_timings(hass)
+        _LOGGER.debug(
+            "Integration setup times: %s",
+            dict(sorted(setup_time.items(), key=itemgetter(1), reverse=True)),
+        )

homeassistant/brands/epson.json

@@ -1,5 +0,0 @@
-{
-  "domain": "epson",
-  "name": "Epson",
-  "integrations": ["epson", "epsonworkforce"]
-}

homeassistant/brands/eq3.json

@@ -1,5 +1,5 @@
 {
   "domain": "eq3",
   "name": "eQ-3",
-  "integrations": ["maxcube"]
+  "integrations": ["maxcube", "eq3btsmart"]
 }

homeassistant/brands/motionblinds.json

@@ -0,0 +1,5 @@
+{
+  "domain": "motionblinds",
+  "name": "Motionblinds",
+  "integrations": ["motion_blinds", "motionblinds_ble"]
+}

homeassistant/brands/ruuvi.json

@@ -0,0 +1,5 @@
+{
+  "domain": "ruuvi",
+  "name": "Ruuvi",
+  "integrations": ["ruuvi_gateway", "ruuvitag_ble"]
+}

homeassistant/brands/weatherflow.json

@@ -0,0 +1,5 @@
+{
+  "domain": "weatherflow",
+  "name": "WeatherFlow",
+  "integrations": ["weatherflow", "weatherflow_cloud"]
+}

homeassistant/components/__init__.py

@@ -6,11 +6,13 @@ Component design guidelines:
   format "<DOMAIN>.<OBJECT_ID>".
 - Each component should publish services only under its own domain.
 """
+
 from __future__ import annotations
 
 import logging
 
 from homeassistant.core import HomeAssistant, split_entity_id
+from homeassistant.helpers.frame import report
 from homeassistant.helpers.group import expand_entity_ids
 
 _LOGGER = logging.getLogger(__name__)
@@ -21,6 +23,15 @@ def is_on(hass: HomeAssistant, entity_id: str | None = None) -> bool:
 
     If there is no entity id given we will check all.
     """
+    report(
+        (
+            "uses homeassistant.components.is_on."
+            " This is deprecated and will stop working in Home Assistant 2024.9, it"
+            " should be updated to use the function of the platform directly."
+        ),
+        error_if_core=True,
+    )
+
     if entity_id:
         entity_ids = expand_entity_ids(hass, [entity_id])
     else:

homeassistant/components/abode/__init__.py

@@ -1,12 +1,11 @@
 """Support for the Abode Security System."""
+
 from __future__ import annotations
 
 from dataclasses import dataclass, field
 from functools import partial
 
-from jaraco.abode.automation import Automation as AbodeAuto
 from jaraco.abode.client import Client as Abode
-from jaraco.abode.devices.base import Device as AbodeDev
 from jaraco.abode.exceptions import (
     AuthenticationException as AbodeAuthenticationException,
     Exception as AbodeException,
@@ -28,11 +27,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, entity
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
+from homeassistant.helpers.typing import ConfigType
 
-from .const import ATTRIBUTION, CONF_POLLING, DOMAIN, LOGGER
+from .const import CONF_POLLING, DOMAIN, LOGGER
 
 SERVICE_SETTINGS = "change_setting"
 SERVICE_CAPTURE_IMAGE = "capture_image"
@@ -82,6 +81,12 @@ class AbodeSystem:
     logout_listener: CALLBACK_TYPE | None = None
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Abode component."""
+    setup_hass_services(hass)
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Abode integration from a config entry."""
     username = entry.data[CONF_USERNAME]
@@ -110,7 +115,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     await setup_hass_events(hass)
-    await hass.async_add_executor_job(setup_hass_services, hass)
     await hass.async_add_executor_job(setup_abode_events, hass)
 
     return True
@@ -118,10 +122,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    hass.services.async_remove(DOMAIN, SERVICE_SETTINGS)
-    hass.services.async_remove(DOMAIN, SERVICE_CAPTURE_IMAGE)
-    hass.services.async_remove(DOMAIN, SERVICE_TRIGGER_AUTOMATION)
-
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
     await hass.async_add_executor_job(hass.data[DOMAIN].abode.events.stop)
@@ -174,15 +174,15 @@ def setup_hass_services(hass: HomeAssistant) -> None:
             signal = f"abode_trigger_automation_{entity_id}"
             dispatcher_send(hass, signal)
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_SETTINGS, change_setting, schema=CHANGE_SETTING_SCHEMA
     )
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image, schema=CAPTURE_IMAGE_SCHEMA
     )
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_TRIGGER_AUTOMATION, trigger_automation, schema=AUTOMATION_SCHEMA
     )
 
@@ -246,108 +246,3 @@ def setup_abode_events(hass: HomeAssistant) -> None:
         hass.data[DOMAIN].abode.events.add_event_callback(
             event, partial(event_callback, event)
         )
-
-
-class AbodeEntity(entity.Entity):
-    """Representation of an Abode entity."""
-
-    _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True
-
-    def __init__(self, data: AbodeSystem) -> None:
-        """Initialize Abode entity."""
-        self._data = data
-        self._attr_should_poll = data.polling
-
-    async def async_added_to_hass(self) -> None:
-        """Subscribe to Abode connection status updates."""
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.add_connection_status_callback,
-            self.unique_id,
-            self._update_connection_status,
-        )
-
-        self.hass.data[DOMAIN].entity_ids.add(self.entity_id)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Unsubscribe from Abode connection status updates."""
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.remove_connection_status_callback, self.unique_id
-        )
-
-    def _update_connection_status(self) -> None:
-        """Update the entity available property."""
-        self._attr_available = self._data.abode.events.connected
-        self.schedule_update_ha_state()
-
-
-class AbodeDevice(AbodeEntity):
-    """Representation of an Abode device."""
-
-    def __init__(self, data: AbodeSystem, device: AbodeDev) -> None:
-        """Initialize Abode device."""
-        super().__init__(data)
-        self._device = device
-        self._attr_unique_id = device.uuid
-
-    async def async_added_to_hass(self) -> None:
-        """Subscribe to device events."""
-        await super().async_added_to_hass()
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.add_device_callback,
-            self._device.id,
-            self._update_callback,
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Unsubscribe from device events."""
-        await super().async_will_remove_from_hass()
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.remove_all_device_callbacks, self._device.id
-        )
-
-    def update(self) -> None:
-        """Update device state."""
-        self._device.refresh()
-
-    @property
-    def extra_state_attributes(self) -> dict[str, str]:
-        """Return the state attributes."""
-        return {
-            "device_id": self._device.id,
-            "battery_low": self._device.battery_low,
-            "no_response": self._device.no_response,
-            "device_type": self._device.type,
-        }
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self._device.id)},
-            manufacturer="Abode",
-            model=self._device.type,
-            name=self._device.name,
-        )
-
-    def _update_callback(self, device: AbodeDev) -> None:
-        """Update the device state."""
-        self.schedule_update_ha_state()
-
-
-class AbodeAutomation(AbodeEntity):
-    """Representation of an Abode automation."""
-
-    def __init__(self, data: AbodeSystem, automation: AbodeAuto) -> None:
-        """Initialize for Abode automation."""
-        super().__init__(data)
-        self._automation = automation
-        self._attr_name = automation.name
-        self._attr_unique_id = automation.automation_id
-        self._attr_extra_state_attributes = {
-            "type": "CUE automation",
-        }
-
-    def update(self) -> None:
-        """Update automation state."""
-        self._automation.refresh()

homeassistant/components/abode/alarm_control_panel.py

@@ -1,10 +1,13 @@
 """Support for Abode Security System alarm control panels."""
+
 from __future__ import annotations
 
-from jaraco.abode.devices.alarm import Alarm as AbodeAl
+from jaraco.abode.devices.alarm import Alarm
 
-import homeassistant.components.alarm_control_panel as alarm
-from homeassistant.components.alarm_control_panel import AlarmControlPanelEntityFeature
+from homeassistant.components.alarm_control_panel import (
+    AlarmControlPanelEntity,
+    AlarmControlPanelEntityFeature,
+)
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY,
@@ -14,8 +17,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -28,7 +32,7 @@ async def async_setup_entry(
     )
 
 
-class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
+class AbodeAlarm(AbodeDevice, AlarmControlPanelEntity):
     """An alarm_control_panel implementation for Abode."""
 
     _attr_name = None
@@ -37,7 +41,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
         AlarmControlPanelEntityFeature.ARM_HOME
         | AlarmControlPanelEntityFeature.ARM_AWAY
     )
-    _device: AbodeAl
+    _device: Alarm
 
     @property
     def state(self) -> str | None:

homeassistant/components/abode/binary_sensor.py

@@ -1,10 +1,17 @@
 """Support for Abode Security System binary sensors."""
+
 from __future__ import annotations
 
 from typing import cast
 
-from jaraco.abode.devices.sensor import BinarySensor as ABBinarySensor
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.sensor import BinarySensor
+from jaraco.abode.helpers.constants import (
+    TYPE_CONNECTIVITY,
+    TYPE_MOISTURE,
+    TYPE_MOTION,
+    TYPE_OCCUPANCY,
+    TYPE_OPENING,
+)
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -15,8 +22,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -26,11 +34,11 @@ async def async_setup_entry(
     data: AbodeSystem = hass.data[DOMAIN]
 
     device_types = [
-        CONST.TYPE_CONNECTIVITY,
-        CONST.TYPE_MOISTURE,
-        CONST.TYPE_MOTION,
-        CONST.TYPE_OCCUPANCY,
-        CONST.TYPE_OPENING,
+        TYPE_CONNECTIVITY,
+        TYPE_MOISTURE,
+        TYPE_MOTION,
+        TYPE_OCCUPANCY,
+        TYPE_OPENING,
     ]
 
     async_add_entities(
@@ -43,7 +51,7 @@ class AbodeBinarySensor(AbodeDevice, BinarySensorEntity):
     """A binary sensor implementation for Abode device."""
 
     _attr_name = None
-    _device: ABBinarySensor
+    _device: BinarySensor
 
     @property
     def is_on(self) -> bool:

homeassistant/components/abode/camera.py

@@ -1,12 +1,14 @@
 """Support for Abode Security System cameras."""
+
 from __future__ import annotations
 
 from datetime import timedelta
 from typing import Any, cast
 
-from jaraco.abode.devices.base import Device as AbodeDev
+from jaraco.abode.devices.base import Device
 from jaraco.abode.devices.camera import Camera as AbodeCam
-from jaraco.abode.helpers import constants as CONST, timeline as TIMELINE
+from jaraco.abode.helpers import timeline
+from jaraco.abode.helpers.constants import TYPE_CAMERA
 import requests
 from requests.models import Response
 
@@ -17,8 +19,9 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import Throttle
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN, LOGGER
+from .entity import AbodeDevice
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
 
@@ -30,8 +33,8 @@ async def async_setup_entry(
     data: AbodeSystem = hass.data[DOMAIN]
 
     async_add_entities(
-        AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE)
-        for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA)
+        AbodeCamera(data, device, timeline.CAPTURE_IMAGE)
+        for device in data.abode.get_devices(generic_type=TYPE_CAMERA)
     )
 
 
@@ -41,7 +44,7 @@ class AbodeCamera(AbodeDevice, Camera):
     _device: AbodeCam
     _attr_name = None
 
-    def __init__(self, data: AbodeSystem, device: AbodeDev, event: Event) -> None:
+    def __init__(self, data: AbodeSystem, device: Device, event: Event) -> None:
         """Initialize the Abode device."""
         AbodeDevice.__init__(self, data, device)
         Camera.__init__(self)

homeassistant/components/abode/config_flow.py

@@ -1,4 +1,5 @@
 """Config flow for the Abode Security System component."""
+
 from __future__ import annotations
 
 from collections.abc import Mapping
@@ -14,16 +15,15 @@ from jaraco.abode.helpers.errors import MFA_CODE_REQUIRED
 from requests.exceptions import ConnectTimeout, HTTPError
 import voluptuous as vol
 
-from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.data_entry_flow import FlowResult
 
 from .const import CONF_POLLING, DOMAIN, LOGGER
 
 CONF_MFA = "mfa_code"
 
 
-class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class AbodeFlowHandler(ConfigFlow, domain=DOMAIN):
     """Config flow for Abode."""
 
     VERSION = 1
@@ -43,7 +43,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
         self._polling: bool = False
         self._username: str | None = None
 
-    async def _async_abode_login(self, step_id: str) -> FlowResult:
+    async def _async_abode_login(self, step_id: str) -> ConfigFlowResult:
         """Handle login with Abode."""
         errors = {}
 
@@ -74,7 +74,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         return await self._async_create_entry()
 
-    async def _async_abode_mfa_login(self) -> FlowResult:
+    async def _async_abode_mfa_login(self) -> ConfigFlowResult:
         """Handle multi-factor authentication (MFA) login with Abode."""
         try:
             # Create instance to access login method for passing MFA code
@@ -92,7 +92,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         return await self._async_create_entry()
 
-    async def _async_create_entry(self) -> FlowResult:
+    async def _async_create_entry(self) -> ConfigFlowResult:
         """Create the config entry."""
         config_data = {
             CONF_USERNAME: self._username,
@@ -118,7 +118,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
         if self._async_current_entries():
             return self.async_abort(reason="single_instance_allowed")
@@ -135,7 +135,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_mfa(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a multi-factor authentication (MFA) flow."""
         if user_input is None:
             return self.async_show_form(
@@ -146,7 +146,9 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         return await self._async_abode_mfa_login()
 
-    async def async_step_reauth(self, entry_data: Mapping[str, Any]) -> FlowResult:
+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
         """Handle reauthorization request from Abode."""
         self._username = entry_data[CONF_USERNAME]
 
@@ -154,7 +156,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_reauth_confirm(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle reauthorization flow."""
         if user_input is None:
             return self.async_show_form(

homeassistant/components/abode/const.py

@@ -1,4 +1,5 @@
 """Constants for the Abode Security System component."""
+
 import logging
 
 LOGGER = logging.getLogger(__package__)

homeassistant/components/abode/cover.py

@@ -1,16 +1,18 @@
 """Support for Abode Security System covers."""
+
 from typing import Any
 
-from jaraco.abode.devices.cover import Cover as AbodeCV
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.cover import Cover
+from jaraco.abode.helpers.constants import TYPE_COVER
 
 from homeassistant.components.cover import CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -21,14 +23,14 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeCover(data, device)
-        for device in data.abode.get_devices(generic_type=CONST.TYPE_COVER)
+        for device in data.abode.get_devices(generic_type=TYPE_COVER)
     )
 
 
 class AbodeCover(AbodeDevice, CoverEntity):
     """Representation of an Abode cover."""
 
-    _device: AbodeCV
+    _device: Cover
     _attr_name = None
 
     @property

homeassistant/components/abode/entity.py

@@ -0,0 +1,115 @@
+"""Support for Abode Security System entities."""
+
+from jaraco.abode.automation import Automation as AbodeAuto
+from jaraco.abode.devices.base import Device as AbodeDev
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import Entity
+
+from . import AbodeSystem
+from .const import ATTRIBUTION, DOMAIN
+
+
+class AbodeEntity(Entity):
+    """Representation of an Abode entity."""
+
+    _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+
+    def __init__(self, data: AbodeSystem) -> None:
+        """Initialize Abode entity."""
+        self._data = data
+        self._attr_should_poll = data.polling
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to Abode connection status updates."""
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.add_connection_status_callback,
+            self.unique_id,
+            self._update_connection_status,
+        )
+
+        self.hass.data[DOMAIN].entity_ids.add(self.entity_id)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe from Abode connection status updates."""
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.remove_connection_status_callback, self.unique_id
+        )
+
+    def _update_connection_status(self) -> None:
+        """Update the entity available property."""
+        self._attr_available = self._data.abode.events.connected
+        self.schedule_update_ha_state()
+
+
+class AbodeDevice(AbodeEntity):
+    """Representation of an Abode device."""
+
+    def __init__(self, data: AbodeSystem, device: AbodeDev) -> None:
+        """Initialize Abode device."""
+        super().__init__(data)
+        self._device = device
+        self._attr_unique_id = device.uuid
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to device events."""
+        await super().async_added_to_hass()
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.add_device_callback,
+            self._device.id,
+            self._update_callback,
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe from device events."""
+        await super().async_will_remove_from_hass()
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.remove_all_device_callbacks, self._device.id
+        )
+
+    def update(self) -> None:
+        """Update device state."""
+        self._device.refresh()
+
+    @property
+    def extra_state_attributes(self) -> dict[str, str]:
+        """Return the state attributes."""
+        return {
+            "device_id": self._device.id,
+            "battery_low": self._device.battery_low,
+            "no_response": self._device.no_response,
+            "device_type": self._device.type,
+        }
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device registry information for this entity."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._device.id)},
+            manufacturer="Abode",
+            model=self._device.type,
+            name=self._device.name,
+        )
+
+    def _update_callback(self, device: AbodeDev) -> None:
+        """Update the device state."""
+        self.schedule_update_ha_state()
+
+
+class AbodeAutomation(AbodeEntity):
+    """Representation of an Abode automation."""
+
+    def __init__(self, data: AbodeSystem, automation: AbodeAuto) -> None:
+        """Initialize for Abode automation."""
+        super().__init__(data)
+        self._automation = automation
+        self._attr_name = automation.name
+        self._attr_unique_id = automation.automation_id
+        self._attr_extra_state_attributes = {
+            "type": "CUE automation",
+        }
+
+    def update(self) -> None:
+        """Update automation state."""
+        self._automation.refresh()

homeassistant/components/abode/icons.json

@@ -5,5 +5,10 @@
         "default": "mdi:robot"
       }
     }
+  },
+  "services": {
+    "capture_image": "mdi:camera",
+    "change_setting": "mdi:cog",
+    "trigger_automation": "mdi:play"
   }
 }

homeassistant/components/abode/light.py

@@ -1,11 +1,12 @@
 """Support for Abode Security System lights."""
+
 from __future__ import annotations
 
 from math import ceil
 from typing import Any
 
-from jaraco.abode.devices.light import Light as AbodeLT
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.light import Light
+from jaraco.abode.helpers.constants import TYPE_LIGHT
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -22,8 +23,9 @@ from homeassistant.util.color import (
     color_temperature_mired_to_kelvin,
 )
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -34,14 +36,14 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeLight(data, device)
-        for device in data.abode.get_devices(generic_type=CONST.TYPE_LIGHT)
+        for device in data.abode.get_devices(generic_type=TYPE_LIGHT)
     )
 
 
 class AbodeLight(AbodeDevice, LightEntity):
     """Representation of an Abode light."""
 
-    _device: AbodeLT
+    _device: Light
     _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:

homeassistant/components/abode/lock.py

@@ -1,16 +1,18 @@
 """Support for the Abode Security System locks."""
+
 from typing import Any
 
-from jaraco.abode.devices.lock import Lock as AbodeLK
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.lock import Lock
+from jaraco.abode.helpers.constants import TYPE_LOCK
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -21,14 +23,14 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeLock(data, device)
-        for device in data.abode.get_devices(generic_type=CONST.TYPE_LOCK)
+        for device in data.abode.get_devices(generic_type=TYPE_LOCK)
     )
 
 
 class AbodeLock(AbodeDevice, LockEntity):
     """Representation of an Abode lock."""
 
-    _device: AbodeLK
+    _device: Lock
     _attr_name = None
 
     def lock(self, **kwargs: Any) -> None:

homeassistant/components/abode/sensor.py

@@ -1,12 +1,21 @@
 """Support for Abode Security System sensors."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
 from typing import cast
 
-from jaraco.abode.devices.sensor import Sensor as AbodeSense
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.sensor import Sensor
+from jaraco.abode.helpers.constants import (
+    HUMI_STATUS_KEY,
+    LUX_STATUS_KEY,
+    STATUSES_KEY,
+    TEMP_STATUS_KEY,
+    TYPE_SENSOR,
+    UNIT_CELSIUS,
+    UNIT_FAHRENHEIT,
+)
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -18,31 +27,27 @@ from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 ABODE_TEMPERATURE_UNIT_HA_UNIT = {
-    CONST.UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
-    CONST.UNIT_CELSIUS: UnitOfTemperature.CELSIUS,
+    UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
+    UNIT_CELSIUS: UnitOfTemperature.CELSIUS,
 }
 
 
-@dataclass(frozen=True)
-class AbodeSensorDescriptionMixin:
-    """Mixin for Abode sensor."""
-
-    value_fn: Callable[[AbodeSense], float]
-    native_unit_of_measurement_fn: Callable[[AbodeSense], str]
-
-
-@dataclass(frozen=True)
-class AbodeSensorDescription(SensorEntityDescription, AbodeSensorDescriptionMixin):
+@dataclass(frozen=True, kw_only=True)
+class AbodeSensorDescription(SensorEntityDescription):
     """Class describing Abode sensor entities."""
 
+    value_fn: Callable[[Sensor], float]
+    native_unit_of_measurement_fn: Callable[[Sensor], str]
+
 
 SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
-        key=CONST.TEMP_STATUS_KEY,
+        key=TEMP_STATUS_KEY,
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
@@ -50,13 +55,13 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
         value_fn=lambda device: cast(float, device.temp),
     ),
     AbodeSensorDescription(
-        key=CONST.HUMI_STATUS_KEY,
+        key=HUMI_STATUS_KEY,
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
-        key=CONST.LUX_STATUS_KEY,
+        key=LUX_STATUS_KEY,
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
@@ -73,8 +78,8 @@ async def async_setup_entry(
     async_add_entities(
         AbodeSensor(data, device, description)
         for description in SENSOR_TYPES
-        for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR)
-        if description.key in device.get_value(CONST.STATUSES_KEY)
+        for device in data.abode.get_devices(generic_type=TYPE_SENSOR)
+        if description.key in device.get_value(STATUSES_KEY)
     )
 
 
@@ -82,12 +87,12 @@ class AbodeSensor(AbodeDevice, SensorEntity):
     """A sensor implementation for Abode devices."""
 
     entity_description: AbodeSensorDescription
-    _device: AbodeSense
+    _device: Sensor
 
     def __init__(
         self,
         data: AbodeSystem,
-        device: AbodeSense,
+        device: Sensor,
         description: AbodeSensorDescription,
     ) -> None:
         """Initialize a sensor for an Abode device."""

homeassistant/components/abode/switch.py

@@ -1,10 +1,11 @@
 """Support for Abode Security System switches."""
+
 from __future__ import annotations
 
 from typing import Any, cast
 
-from jaraco.abode.devices.switch import Switch as AbodeSW
-from jaraco.abode.helpers import constants as CONST
+from jaraco.abode.devices.switch import Switch
+from jaraco.abode.helpers.constants import TYPE_SWITCH, TYPE_VALVE
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
@@ -12,10 +13,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeAutomation, AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeAutomation, AbodeDevice
 
-DEVICE_TYPES = [CONST.TYPE_SWITCH, CONST.TYPE_VALVE]
+DEVICE_TYPES = [TYPE_SWITCH, TYPE_VALVE]
 
 
 async def async_setup_entry(
@@ -41,7 +43,7 @@ async def async_setup_entry(
 class AbodeSwitch(AbodeDevice, SwitchEntity):
     """Representation of an Abode switch."""
 
-    _device: AbodeSW
+    _device: Switch
     _attr_name = None
 
     def turn_on(self, **kwargs: Any) -> None:

homeassistant/components/accuweather/__init__.py

@@ -1,14 +1,11 @@
 """The AccuWeather component."""
+
 from __future__ import annotations
 
-from asyncio import timeout
-from datetime import timedelta
+from dataclasses import dataclass
 import logging
-from typing import Any
 
-from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
-from aiohttp import ClientSession
-from aiohttp.client_exceptions import ClientConnectorError
+from accuweather import AccuWeather
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
 from homeassistant.config_entries import ConfigEntry
@@ -16,43 +13,71 @@ from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN, MANUFACTURER
+from .const import DOMAIN, UPDATE_INTERVAL_DAILY_FORECAST, UPDATE_INTERVAL_OBSERVATION
+from .coordinator import (
+    AccuWeatherDailyForecastDataUpdateCoordinator,
+    AccuWeatherObservationDataUpdateCoordinator,
+)
 
 _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+@dataclass
+class AccuWeatherData:
+    """Data for AccuWeather integration."""
+
+    coordinator_observation: AccuWeatherObservationDataUpdateCoordinator
+    coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
+
+
+type AccuWeatherConfigEntry = ConfigEntry[AccuWeatherData]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry) -> bool:
     """Set up AccuWeather as config entry."""
     api_key: str = entry.data[CONF_API_KEY]
     name: str = entry.data[CONF_NAME]
-    assert entry.unique_id is not None
-    location_key = entry.unique_id
-    forecast: bool = entry.options.get(CONF_FORECAST, False)
 
-    _LOGGER.debug("Using location_key: %s, get forecast: %s", location_key, forecast)
+    location_key = entry.unique_id
+
+    _LOGGER.debug("Using location_key: %s", location_key)
 
     websession = async_get_clientsession(hass)
+    accuweather = AccuWeather(api_key, websession, location_key=location_key)
 
-    coordinator = AccuWeatherDataUpdateCoordinator(
-        hass, websession, api_key, location_key, forecast, name
+    coordinator_observation = AccuWeatherObservationDataUpdateCoordinator(
+        hass,
+        accuweather,
+        name,
+        "observation",
+        UPDATE_INTERVAL_OBSERVATION,
     )
-    await coordinator.async_config_entry_first_refresh()
 
-    entry.async_on_unload(entry.add_update_listener(update_listener))
+    coordinator_daily_forecast = AccuWeatherDailyForecastDataUpdateCoordinator(
+        hass,
+        accuweather,
+        name,
+        "daily forecast",
+        UPDATE_INTERVAL_DAILY_FORECAST,
+    )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    await coordinator_observation.async_config_entry_first_refresh()
+    await coordinator_daily_forecast.async_config_entry_first_refresh()
+
+    entry.runtime_data = AccuWeatherData(
+        coordinator_observation=coordinator_observation,
+        coordinator_daily_forecast=coordinator_daily_forecast,
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     # Remove ozone sensors from registry if they exist
     ent_reg = er.async_get(hass)
-    for day in range(0, 5):
-        unique_id = f"{coordinator.location_key}-ozone-{day}"
+    for day in range(5):
+        unique_id = f"{location_key}-ozone-{day}"
         if entity_id := ent_reg.async_get_entity_id(SENSOR_PLATFORM, DOMAIN, unique_id):
             _LOGGER.debug("Removing ozone sensor entity %s", entity_id)
             ent_reg.async_remove(entity_id)
@@ -60,78 +85,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AccuWeatherConfigEntry
+) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
-
-
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Update listener."""
-    await hass.config_entries.async_reload(entry.entry_id)
-
-
-class AccuWeatherDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):  # pylint: disable=hass-enforce-coordinator-module
-    """Class to manage fetching AccuWeather data API."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        session: ClientSession,
-        api_key: str,
-        location_key: str,
-        forecast: bool,
-        name: str,
-    ) -> None:
-        """Initialize."""
-        self.location_key = location_key
-        self.forecast = forecast
-        self.accuweather = AccuWeather(api_key, session, location_key=location_key)
-        self.device_info = DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, location_key)},
-            manufacturer=MANUFACTURER,
-            name=name,
-            # You don't need to provide specific details for the URL,
-            # so passing in _ characters is fine if the location key
-            # is correct
-            configuration_url=(
-                "http://accuweather.com/en/"
-                f"_/_/{location_key}/"
-                f"weather-forecast/{location_key}/"
-            ),
-        )
-
-        # Enabling the forecast download increases the number of requests per data
-        # update, we use 40 minutes for current condition only and 80 minutes for
-        # current condition and forecast as update interval to not exceed allowed number
-        # of requests. We have 50 requests allowed per day, so we use 36 and leave 14 as
-        # a reserve for restarting HA.
-        update_interval = timedelta(minutes=40)
-        if self.forecast:
-            update_interval *= 2
-        _LOGGER.debug("Data will be update every %s", update_interval)
-
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Update data via library."""
-        forecast: list[dict[str, Any]] = []
-        try:
-            async with timeout(10):
-                current = await self.accuweather.async_get_current_conditions()
-                if self.forecast:
-                    forecast = await self.accuweather.async_get_daily_forecast()
-        except (
-            ApiError,
-            ClientConnectorError,
-            InvalidApiKeyError,
-            RequestsExceededError,
-        ) as error:
-            raise UpdateFailed(error) from error
-        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
-        return {**current, **{ATTR_FORECAST: forecast}}
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/accuweather/config_flow.py

@@ -1,4 +1,5 @@
 """Adds config flow for AccuWeather."""
+
 from __future__ import annotations
 
 from asyncio import timeout
@@ -9,44 +10,23 @@ from aiohttp import ClientError
 from aiohttp.client_exceptions import ClientConnectorError
 import voluptuous as vol
 
-from homeassistant import config_entries
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
-from homeassistant.core import callback
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.schema_config_entry_flow import (
-    SchemaFlowFormStep,
-    SchemaOptionsFlowHandler,
-)
 
-from .const import CONF_FORECAST, DOMAIN
-
-OPTIONS_SCHEMA = vol.Schema(
-    {
-        vol.Optional(CONF_FORECAST, default=False): bool,
-    }
-)
-OPTIONS_FLOW = {
-    "init": SchemaFlowFormStep(OPTIONS_SCHEMA),
-}
+from .const import DOMAIN
 
 
-class AccuWeatherFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class AccuWeatherFlowHandler(ConfigFlow, domain=DOMAIN):
     """Config flow for AccuWeather."""
 
     VERSION = 1
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
-        # Under the terms of use of the API, one user can use one free API key. Due to
-        # the small number of requests allowed, we only allow one integration instance.
-        if self._async_current_entries():
-            return self.async_abort(reason="single_instance_allowed")
-
         errors = {}
 
         if user_input is not None:
@@ -93,9 +73,3 @@ class AccuWeatherFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             ),
             errors=errors,
         )
-
-    @staticmethod
-    @callback
-    def async_get_options_flow(config_entry: ConfigEntry) -> SchemaOptionsFlowHandler:
-        """Options callback for AccuWeather."""
-        return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW)

homeassistant/components/accuweather/const.py

@@ -1,6 +1,8 @@
 """Constants for AccuWeather integration."""
+
 from __future__ import annotations
 
+from datetime import timedelta
 from typing import Final
 
 from homeassistant.components.weather import (
@@ -26,10 +28,8 @@ ATTR_CATEGORY: Final = "Category"
 ATTR_DIRECTION: Final = "Direction"
 ATTR_ENGLISH: Final = "English"
 ATTR_LEVEL: Final = "level"
-ATTR_FORECAST: Final = "forecast"
 ATTR_SPEED: Final = "Speed"
 ATTR_VALUE: Final = "Value"
-CONF_FORECAST: Final = "forecast"
 DOMAIN: Final = "accuweather"
 MANUFACTURER: Final = "AccuWeather, Inc."
 MAX_FORECAST_DAYS: Final = 4
@@ -55,3 +55,5 @@ CONDITION_MAP = {
     for cond_ha, cond_codes in CONDITION_CLASSES.items()
     for cond_code in cond_codes
 }
+UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
+UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)

homeassistant/components/accuweather/coordinator.py

@@ -0,0 +1,124 @@
+"""The AccuWeather coordinator."""
+
+from asyncio import timeout
+from datetime import timedelta
+import logging
+from typing import TYPE_CHECKING, Any
+
+from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
+from aiohttp.client_exceptions import ClientConnectorError
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.update_coordinator import (
+    DataUpdateCoordinator,
+    TimestampDataUpdateCoordinator,
+    UpdateFailed,
+)
+
+from .const import DOMAIN, MANUFACTURER
+
+EXCEPTIONS = (ApiError, ClientConnectorError, InvalidApiKeyError, RequestsExceededError)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AccuWeatherObservationDataUpdateCoordinator(
+    DataUpdateCoordinator[dict[str, Any]]
+):
+    """Class to manage fetching AccuWeather data API."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        accuweather: AccuWeather,
+        name: str,
+        coordinator_type: str,
+        update_interval: timedelta,
+    ) -> None:
+        """Initialize."""
+        self.accuweather = accuweather
+        self.location_key = accuweather.location_key
+
+        if TYPE_CHECKING:
+            assert self.location_key is not None
+
+        self.device_info = _get_device_info(self.location_key, name)
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=f"{name} ({coordinator_type})",
+            update_interval=update_interval,
+        )
+
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Update data via library."""
+        try:
+            async with timeout(10):
+                result = await self.accuweather.async_get_current_conditions()
+        except EXCEPTIONS as error:
+            raise UpdateFailed(error) from error
+
+        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
+
+        return result
+
+
+class AccuWeatherDailyForecastDataUpdateCoordinator(
+    TimestampDataUpdateCoordinator[list[dict[str, Any]]]
+):
+    """Class to manage fetching AccuWeather data API."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        accuweather: AccuWeather,
+        name: str,
+        coordinator_type: str,
+        update_interval: timedelta,
+    ) -> None:
+        """Initialize."""
+        self.accuweather = accuweather
+        self.location_key = accuweather.location_key
+
+        if TYPE_CHECKING:
+            assert self.location_key is not None
+
+        self.device_info = _get_device_info(self.location_key, name)
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=f"{name} ({coordinator_type})",
+            update_interval=update_interval,
+        )
+
+    async def _async_update_data(self) -> list[dict[str, Any]]:
+        """Update data via library."""
+        try:
+            async with timeout(10):
+                result = await self.accuweather.async_get_daily_forecast()
+        except EXCEPTIONS as error:
+            raise UpdateFailed(error) from error
+
+        _LOGGER.debug("Requests remaining: %d", self.accuweather.requests_remaining)
+
+        return result
+
+
+def _get_device_info(location_key: str, name: str) -> DeviceInfo:
+    """Get device info."""
+    return DeviceInfo(
+        entry_type=DeviceEntryType.SERVICE,
+        identifiers={(DOMAIN, location_key)},
+        manufacturer=MANUFACTURER,
+        name=name,
+        # You don't need to provide specific details for the URL,
+        # so passing in _ characters is fine if the location key
+        # is correct
+        configuration_url=(
+            "http://accuweather.com/en/"
+            f"_/_/{location_key}/weather-forecast/{location_key}/"
+        ),
+    )

homeassistant/components/accuweather/diagnostics.py

@@ -1,30 +1,25 @@
 """Diagnostics support for AccuWeather."""
+
 from __future__ import annotations
 
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 
-from . import AccuWeatherDataUpdateCoordinator
-from .const import DOMAIN
+from . import AccuWeatherConfigEntry, AccuWeatherData
 
 TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AccuWeatherConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][
-        config_entry.entry_id
-    ]
+    accuweather_data: AccuWeatherData = config_entry.runtime_data
 
-    diagnostics_data = {
+    return {
         "config_entry_data": async_redact_data(dict(config_entry.data), TO_REDACT),
-        "coordinator_data": coordinator.data,
+        "observation_data": accuweather_data.coordinator_observation.data,
     }
-
-    return diagnostics_data

homeassistant/components/accuweather/icons.json

@@ -0,0 +1,51 @@
+{
+  "entity": {
+    "sensor": {
+      "cloud_ceiling": {
+        "default": "mdi:weather-fog"
+      },
+      "cloud_cover": {
+        "default": "mdi:weather-cloudy"
+      },
+      "cloud_cover_day": {
+        "default": "mdi:weather-cloudy"
+      },
+      "cloud_cover_night": {
+        "default": "mdi:weather-cloudy"
+      },
+      "grass_pollen": {
+        "default": "mdi:grass"
+      },
+      "hours_of_sun": {
+        "default": "mdi:weather-partly-cloudy"
+      },
+      "mold_pollen": {
+        "default": "mdi:blur"
+      },
+      "pressure_tendency": {
+        "default": "mdi:gauge"
+      },
+      "ragweed_pollen": {
+        "default": "mdi:sprout"
+      },
+      "thunderstorm_probability_day": {
+        "default": "mdi:weather-lightning"
+      },
+      "thunderstorm_probability_night": {
+        "default": "mdi:weather-lightning"
+      },
+      "translation_key": {
+        "default": "mdi:air-filter"
+      },
+      "tree_pollen": {
+        "default": "mdi:tree-outline"
+      },
+      "uv_index": {
+        "default": "mdi:weather-sunny"
+      },
+      "uv_index_forecast": {
+        "default": "mdi:weather-sunny"
+      }
+    }
+  }
+}

homeassistant/components/accuweather/manifest.json

@@ -8,5 +8,6 @@
   "iot_class": "cloud_polling",
   "loggers": ["accuweather"],
   "quality_scale": "platinum",
-  "requirements": ["accuweather==2.1.1"]
+  "requirements": ["accuweather==3.0.0"],
+  "single_config_entry": true
 }

homeassistant/components/accuweather/sensor.py

@@ -1,4 +1,5 @@
 """Support for the AccuWeather service."""
+
 from __future__ import annotations
 
 from collections.abc import Callable
@@ -11,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_CUBIC_METER,
     PERCENTAGE,
@@ -27,312 +27,202 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AccuWeatherDataUpdateCoordinator
+from . import AccuWeatherConfigEntry
 from .const import (
     API_METRIC,
     ATTR_CATEGORY,
     ATTR_DIRECTION,
     ATTR_ENGLISH,
-    ATTR_FORECAST,
     ATTR_LEVEL,
     ATTR_SPEED,
     ATTR_VALUE,
     ATTRIBUTION,
-    DOMAIN,
     MAX_FORECAST_DAYS,
 )
+from .coordinator import (
+    AccuWeatherDailyForecastDataUpdateCoordinator,
+    AccuWeatherObservationDataUpdateCoordinator,
+)
 
 PARALLEL_UPDATES = 1
 
 
-@dataclass(frozen=True)
-class AccuWeatherSensorDescriptionMixin:
-    """Mixin for AccuWeather sensor."""
-
-    value_fn: Callable[[dict[str, Any]], str | int | float | None]
-
-
-@dataclass(frozen=True)
-class AccuWeatherSensorDescription(
-    SensorEntityDescription, AccuWeatherSensorDescriptionMixin
-):
+@dataclass(frozen=True, kw_only=True)
+class AccuWeatherSensorDescription(SensorEntityDescription):
     """Class describing AccuWeather sensor entities."""
 
+    value_fn: Callable[[dict[str, Any]], str | int | float | None]
     attr_fn: Callable[[dict[str, Any]], dict[str, Any]] = lambda _: {}
-    day: int | None = None
 
 
 FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
-    *(
-        AccuWeatherSensorDescription(
-            key="AirQuality",
-            icon="mdi:air-filter",
-            value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
-            device_class=SensorDeviceClass.ENUM,
-            options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
-            translation_key=f"air_quality_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="AirQuality",
+        value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+        translation_key="air_quality",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="CloudCoverDay",
-            icon="mdi:weather-cloudy",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"cloud_cover_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="CloudCoverDay",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="cloud_cover_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="CloudCoverNight",
-            icon="mdi:weather-cloudy",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"cloud_cover_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="CloudCoverNight",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="cloud_cover_night",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="Grass",
-            icon="mdi:grass",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"grass_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Grass",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="grass_pollen",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="HoursOfSun",
-            icon="mdi:weather-partly-cloudy",
-            native_unit_of_measurement=UnitOfTime.HOURS,
-            value_fn=lambda data: cast(float, data),
-            translation_key=f"hours_of_sun_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="HoursOfSun",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        value_fn=lambda data: cast(float, data),
+        translation_key="hours_of_sun",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="LongPhraseDay",
-            value_fn=lambda data: cast(str, data),
-            translation_key=f"condition_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="LongPhraseDay",
+        value_fn=lambda data: cast(str, data),
+        translation_key="condition_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="LongPhraseNight",
-            value_fn=lambda data: cast(str, data),
-            translation_key=f"condition_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="LongPhraseNight",
+        value_fn=lambda data: cast(str, data),
+        translation_key="condition_night",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="Mold",
-            icon="mdi:blur",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"mold_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Mold",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="mold_pollen",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="Ragweed",
-            icon="mdi:sprout",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            entity_registry_enabled_default=False,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"ragweed_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Ragweed",
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="ragweed_pollen",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="RealFeelTemperatureMax",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_max_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_max",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="RealFeelTemperatureMin",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_min_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_min",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="RealFeelTemperatureShadeMax",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_shade_max_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_shade_max",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="RealFeelTemperatureShadeMin",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_shade_min_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_shade_min",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="SolarIrradianceDay",
-            icon="mdi:weather-sunny",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"solar_irradiance_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceDay",
+        device_class=SensorDeviceClass.IRRADIANCE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="solar_irradiance_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="SolarIrradianceNight",
-            icon="mdi:weather-sunny",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"solar_irradiance_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceNight",
+        device_class=SensorDeviceClass.IRRADIANCE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="solar_irradiance_night",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="ThunderstormProbabilityDay",
-            icon="mdi:weather-lightning",
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"thunderstorm_probability_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityDay",
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="thunderstorm_probability_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="ThunderstormProbabilityNight",
-            icon="mdi:weather-lightning",
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"thunderstorm_probability_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityNight",
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="thunderstorm_probability_night",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="Tree",
-            icon="mdi:tree-outline",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            entity_registry_enabled_default=False,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"tree_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Tree",
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="tree_pollen",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="UVIndex",
-            icon="mdi:weather-sunny",
-            native_unit_of_measurement=UV_INDEX,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"uv_index_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="UVIndex",
+        native_unit_of_measurement=UV_INDEX,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="uv_index_forecast",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="WindGustDay",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_gust_speed_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindGustDay",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_gust_speed_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="WindGustNight",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_gust_speed_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindGustNight",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_gust_speed_night",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="WindDay",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_speed_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindDay",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_speed_day",
     ),
-    *(
-        AccuWeatherSensorDescription(
-            key="WindNight",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_speed_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindNight",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_speed_night",
     ),
 )
 
@@ -349,7 +239,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="Ceiling",
         device_class=SensorDeviceClass.DISTANCE,
-        icon="mdi:weather-fog",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfLength.METERS,
         value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
@@ -358,7 +247,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     ),
     AccuWeatherSensorDescription(
         key="CloudCover",
-        icon="mdi:weather-cloudy",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
@@ -403,14 +291,12 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="PressureTendency",
         device_class=SensorDeviceClass.ENUM,
-        icon="mdi:gauge",
         options=["falling", "rising", "steady"],
         value_fn=lambda data: cast(str, data["LocalizedText"]).lower(),
         translation_key="pressure_tendency",
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
-        icon="mdi:weather-sunny",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UV_INDEX,
         value_fn=lambda data: cast(int, data),
@@ -456,29 +342,37 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AccuWeatherConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add AccuWeather entities from a config_entry."""
+    observation_coordinator: AccuWeatherObservationDataUpdateCoordinator = (
+        entry.runtime_data.coordinator_observation
+    )
+    forecast_daily_coordinator: AccuWeatherDailyForecastDataUpdateCoordinator = (
+        entry.runtime_data.coordinator_daily_forecast
+    )
 
-    coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-
-    sensors = [
-        AccuWeatherSensor(coordinator, description) for description in SENSOR_TYPES
+    sensors: list[AccuWeatherSensor | AccuWeatherForecastSensor] = [
+        AccuWeatherSensor(observation_coordinator, description)
+        for description in SENSOR_TYPES
     ]
 
-    if coordinator.forecast:
-        for description in FORECAST_SENSOR_TYPES:
-            # Some air quality/allergy sensors are only available for certain
-            # locations.
-            if description.key not in coordinator.data[ATTR_FORECAST][description.day]:
-                continue
-            sensors.append(AccuWeatherSensor(coordinator, description))
+    sensors.extend(
+        [
+            AccuWeatherForecastSensor(forecast_daily_coordinator, description, day)
+            for day in range(MAX_FORECAST_DAYS + 1)
+            for description in FORECAST_SENSOR_TYPES
+            if description.key in forecast_daily_coordinator.data[day]
+        ]
+    )
 
     async_add_entities(sensors)
 
 
 class AccuWeatherSensor(
-    CoordinatorEntity[AccuWeatherDataUpdateCoordinator], SensorEntity
+    CoordinatorEntity[AccuWeatherObservationDataUpdateCoordinator], SensorEntity
 ):
     """Define an AccuWeather entity."""
 
@@ -488,22 +382,15 @@ class AccuWeatherSensor(
 
     def __init__(
         self,
-        coordinator: AccuWeatherDataUpdateCoordinator,
+        coordinator: AccuWeatherObservationDataUpdateCoordinator,
         description: AccuWeatherSensorDescription,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
-        self.forecast_day = description.day
+
         self.entity_description = description
-        self._sensor_data = _get_sensor_data(
-            coordinator.data, description.key, self.forecast_day
-        )
-        if self.forecast_day is not None:
-            self._attr_unique_id = f"{coordinator.location_key}-{description.key}-{self.forecast_day}".lower()
-        else:
-            self._attr_unique_id = (
-                f"{coordinator.location_key}-{description.key}".lower()
-            )
+        self._sensor_data = self._get_sensor_data(coordinator.data, description.key)
+        self._attr_unique_id = f"{coordinator.location_key}-{description.key}".lower()
         self._attr_device_info = coordinator.device_info
 
     @property
@@ -514,30 +401,80 @@ class AccuWeatherSensor(
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
-        if self.forecast_day is not None:
-            return self.entity_description.attr_fn(self._sensor_data)
-
         return self.entity_description.attr_fn(self.coordinator.data)
 
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle data update."""
-        self._sensor_data = _get_sensor_data(
+        self._sensor_data = self._get_sensor_data(
+            self.coordinator.data, self.entity_description.key
+        )
+        self.async_write_ha_state()
+
+    @staticmethod
+    def _get_sensor_data(
+        sensors: dict[str, Any],
+        kind: str,
+    ) -> Any:
+        """Get sensor data."""
+        if kind == "Precipitation":
+            return sensors["PrecipitationSummary"]["PastHour"]
+
+        return sensors[kind]
+
+
+class AccuWeatherForecastSensor(
+    CoordinatorEntity[AccuWeatherDailyForecastDataUpdateCoordinator], SensorEntity
+):
+    """Define an AccuWeather entity."""
+
+    _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+    entity_description: AccuWeatherSensorDescription
+
+    def __init__(
+        self,
+        coordinator: AccuWeatherDailyForecastDataUpdateCoordinator,
+        description: AccuWeatherSensorDescription,
+        forecast_day: int,
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.entity_description = description
+        self._sensor_data = self._get_sensor_data(
+            coordinator.data, description.key, forecast_day
+        )
+        self._attr_unique_id = (
+            f"{coordinator.location_key}-{description.key}-{forecast_day}".lower()
+        )
+        self._attr_device_info = coordinator.device_info
+        self._attr_translation_placeholders = {"forecast_day": str(forecast_day)}
+        self.forecast_day = forecast_day
+
+    @property
+    def native_value(self) -> str | int | float | None:
+        """Return the state."""
+        return self.entity_description.value_fn(self._sensor_data)
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        """Return the state attributes."""
+        return self.entity_description.attr_fn(self._sensor_data)
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle data update."""
+        self._sensor_data = self._get_sensor_data(
             self.coordinator.data, self.entity_description.key, self.forecast_day
         )
         self.async_write_ha_state()
 
-
-def _get_sensor_data(
-    sensors: dict[str, Any],
-    kind: str,
-    forecast_day: int | None = None,
-) -> Any:
-    """Get sensor data."""
-    if forecast_day is not None:
-        return sensors[ATTR_FORECAST][forecast_day][kind]
-
-    if kind == "Precipitation":
-        return sensors["PrecipitationSummary"]["PastHour"]
-
-    return sensors[kind]
+    @staticmethod
+    def _get_sensor_data(
+        sensors: list[dict[str, Any]],
+        kind: str,
+        forecast_day: int,
+    ) -> Any:
+        """Get sensor data."""
+        return sensors[forecast_day][kind]

homeassistant/components/accuweather/strings.json

@@ -11,21 +11,18 @@
       }
     },
     "create_entry": {
-      "default": "Some sensors are not enabled by default. You can enable them in the entity registry after the integration configuration.\nWeather forecast is not enabled by default. You can enable it in the integration options."
+      "default": "Some sensors are not enabled by default. You can enable them in the entity registry after the integration configuration."
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_api_key": "[%key:common::config_flow::error::invalid_api_key%]",
       "requests_exceeded": "The allowed number of requests to Accuweather API has been exceeded. You have to wait or change API Key."
-    },
-    "abort": {
-      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
     }
   },
   "entity": {
     "sensor": {
-      "air_quality_0d": {
-        "name": "Air quality today",
+      "air_quality": {
+        "name": "Air quality day {forecast_day}",
         "state": {
           "good": "Good",
           "hazardous": "Hazardous",
@@ -35,50 +32,6 @@
           "unhealthy": "Unhealthy"
         }
       },
-      "air_quality_1d": {
-        "name": "Air quality day 1",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_2d": {
-        "name": "Air quality day 2",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_3d": {
-        "name": "Air quality day 3",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_4d": {
-        "name": "Air quality day 4",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
       "apparent_temperature": {
         "name": "Apparent temperature"
       },
@@ -88,240 +41,52 @@
       "cloud_cover": {
         "name": "Cloud cover"
       },
-      "cloud_cover_day_0d": {
-        "name": "Cloud cover today"
+      "cloud_cover_day": {
+        "name": "Cloud cover day {forecast_day}"
       },
-      "cloud_cover_day_1d": {
-        "name": "Cloud cover day 1"
+      "cloud_cover_night": {
+        "name": "Cloud cover night {forecast_day}"
       },
-      "cloud_cover_day_2d": {
-        "name": "Cloud cover day 2"
+      "condition_day": {
+        "name": "Condition day {forecast_day}"
       },
-      "cloud_cover_day_3d": {
-        "name": "Cloud cover day 3"
-      },
-      "cloud_cover_day_4d": {
-        "name": "Cloud cover day 4"
-      },
-      "cloud_cover_night_0d": {
-        "name": "Cloud cover tonight"
-      },
-      "cloud_cover_night_1d": {
-        "name": "Cloud cover night 1"
-      },
-      "cloud_cover_night_2d": {
-        "name": "Cloud cover night 2"
-      },
-      "cloud_cover_night_3d": {
-        "name": "Cloud cover night 3"
-      },
-      "cloud_cover_night_4d": {
-        "name": "Cloud cover night 4"
-      },
-      "condition_day_0d": {
-        "name": "Condition today"
-      },
-      "condition_day_1d": {
-        "name": "Condition day 1"
-      },
-      "condition_day_2d": {
-        "name": "Condition day 2"
-      },
-      "condition_day_3d": {
-        "name": "Condition day 3"
-      },
-      "condition_day_4d": {
-        "name": "Condition day 4"
-      },
-      "condition_night_0d": {
-        "name": "Condition tonight"
-      },
-      "condition_night_1d": {
-        "name": "Condition night 1"
-      },
-      "condition_night_2d": {
-        "name": "Condition night 2"
-      },
-      "condition_night_3d": {
-        "name": "Condition night 3"
-      },
-      "condition_night_4d": {
-        "name": "Condition night 4"
+      "condition_night": {
+        "name": "Condition night {forecast_day}"
       },
       "dew_point": {
         "name": "Dew point"
       },
-      "grass_pollen_0d": {
-        "name": "Grass pollen today",
+      "grass_pollen": {
+        "name": "Grass pollen day {forecast_day}",
         "state_attributes": {
           "level": {
             "name": "Level",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
       },
-      "grass_pollen_1d": {
-        "name": "Grass pollen day 1",
+      "hours_of_sun": {
+        "name": "Hours of sun day {forecast_day}"
+      },
+      "mold_pollen": {
+        "name": "Mold pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_2d": {
-        "name": "Grass pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_3d": {
-        "name": "Grass pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_4d": {
-        "name": "Grass pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "hours_of_sun_0d": {
-        "name": "Hours of sun today"
-      },
-      "hours_of_sun_1d": {
-        "name": "Hours of sun day 1"
-      },
-      "hours_of_sun_2d": {
-        "name": "Hours of sun day 2"
-      },
-      "hours_of_sun_3d": {
-        "name": "Hours of sun day 3"
-      },
-      "hours_of_sun_4d": {
-        "name": "Hours of sun day 4"
-      },
-      "mold_pollen_0d": {
-        "name": "Mold pollen today",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_1d": {
-        "name": "Mold pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_2d": {
-        "name": "Mold pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_3d": {
-        "name": "Mold pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_4d": {
-        "name": "Mold pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -337,82 +102,18 @@
           "falling": "Falling"
         }
       },
-      "ragweed_pollen_0d": {
-        "name": "Ragweed pollen today",
+      "ragweed_pollen": {
+        "name": "Ragweed pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_1d": {
-        "name": "Ragweed pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_2d": {
-        "name": "Ragweed pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_3d": {
-        "name": "Ragweed pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_4d": {
-        "name": "Ragweed pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -420,205 +121,45 @@
       "realfeel_temperature": {
         "name": "RealFeel temperature"
       },
-      "realfeel_temperature_max_0d": {
-        "name": "RealFeel temperature max today"
+      "realfeel_temperature_max": {
+        "name": "RealFeel temperature max day {forecast_day}"
       },
-      "realfeel_temperature_max_1d": {
-        "name": "RealFeel temperature max day 1"
-      },
-      "realfeel_temperature_max_2d": {
-        "name": "RealFeel temperature max day 2"
-      },
-      "realfeel_temperature_max_3d": {
-        "name": "RealFeel temperature max day 3"
-      },
-      "realfeel_temperature_max_4d": {
-        "name": "RealFeel temperature max day 4"
-      },
-      "realfeel_temperature_min_0d": {
-        "name": "RealFeel temperature min today"
-      },
-      "realfeel_temperature_min_1d": {
-        "name": "RealFeel temperature min day 1"
-      },
-      "realfeel_temperature_min_2d": {
-        "name": "RealFeel temperature min day 2"
-      },
-      "realfeel_temperature_min_3d": {
-        "name": "RealFeel temperature min day 3"
-      },
-      "realfeel_temperature_min_4d": {
-        "name": "RealFeel temperature min day 4"
+      "realfeel_temperature_min": {
+        "name": "RealFeel temperature min day {forecast_day}"
       },
       "realfeel_temperature_shade": {
         "name": "RealFeel temperature shade"
       },
-      "realfeel_temperature_shade_max_0d": {
-        "name": "RealFeel temperature shade max today"
+      "realfeel_temperature_shade_max": {
+        "name": "RealFeel temperature shade max day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_1d": {
-        "name": "RealFeel temperature shade max day 1"
+      "realfeel_temperature_shade_min": {
+        "name": "RealFeel temperature shade min day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_2d": {
-        "name": "RealFeel temperature shade max day 2"
+      "solar_irradiance_day": {
+        "name": "Solar irradiance day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_3d": {
-        "name": "RealFeel temperature shade max day 3"
+      "solar_irradiance_night": {
+        "name": "Solar irradiance night {forecast_day}"
       },
-      "realfeel_temperature_shade_max_4d": {
-        "name": "RealFeel temperature shade max day 4"
+      "thunderstorm_probability_day": {
+        "name": "Thunderstorm probability day {forecast_day}"
       },
-      "realfeel_temperature_shade_min_0d": {
-        "name": "RealFeel temperature shade min today"
+      "thunderstorm_probability_night": {
+        "name": "Thunderstorm probability night {forecast_day}"
       },
-      "realfeel_temperature_shade_min_1d": {
-        "name": "RealFeel temperature shade min day 1"
-      },
-      "realfeel_temperature_shade_min_2d": {
-        "name": "RealFeel temperature shade min day 2"
-      },
-      "realfeel_temperature_shade_min_3d": {
-        "name": "RealFeel temperature shade min day 3"
-      },
-      "realfeel_temperature_shade_min_4d": {
-        "name": "RealFeel temperature shade min day 4"
-      },
-      "solar_irradiance_day_0d": {
-        "name": "Solar irradiance today"
-      },
-      "solar_irradiance_day_1d": {
-        "name": "Solar irradiance day 1"
-      },
-      "solar_irradiance_day_2d": {
-        "name": "Solar irradiance day 2"
-      },
-      "solar_irradiance_day_3d": {
-        "name": "Solar irradiance day 3"
-      },
-      "solar_irradiance_day_4d": {
-        "name": "Solar irradiance day 4"
-      },
-      "solar_irradiance_night_0d": {
-        "name": "Solar irradiance tonight"
-      },
-      "solar_irradiance_night_1d": {
-        "name": "Solar irradiance night 1"
-      },
-      "solar_irradiance_night_2d": {
-        "name": "Solar irradiance night 2"
-      },
-      "solar_irradiance_night_3d": {
-        "name": "Solar irradiance night 3"
-      },
-      "solar_irradiance_night_4d": {
-        "name": "Solar irradiance night 4"
-      },
-      "thunderstorm_probability_day_0d": {
-        "name": "Thunderstorm probability today"
-      },
-      "thunderstorm_probability_day_1d": {
-        "name": "Thunderstorm probability day 1"
-      },
-      "thunderstorm_probability_day_2d": {
-        "name": "Thunderstorm probability day 2"
-      },
-      "thunderstorm_probability_day_3d": {
-        "name": "Thunderstorm probability day 3"
-      },
-      "thunderstorm_probability_day_4d": {
-        "name": "Thunderstorm probability day 4"
-      },
-      "thunderstorm_probability_night_0d": {
-        "name": "Thunderstorm probability tonight"
-      },
-      "thunderstorm_probability_night_1d": {
-        "name": "Thunderstorm probability night 1"
-      },
-      "thunderstorm_probability_night_2d": {
-        "name": "Thunderstorm probability night 2"
-      },
-      "thunderstorm_probability_night_3d": {
-        "name": "Thunderstorm probability night 3"
-      },
-      "thunderstorm_probability_night_4d": {
-        "name": "Thunderstorm probability night 4"
-      },
-      "tree_pollen_0d": {
-        "name": "Tree pollen today",
+      "tree_pollen": {
+        "name": "Tree pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_1d": {
-        "name": "Tree pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_2d": {
-        "name": "Tree pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_3d": {
-        "name": "Tree pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_4d": {
-        "name": "Tree pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -627,94 +168,30 @@
         "name": "UV index",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
       },
-      "uv_index_0d": {
-        "name": "UV index today",
+      "uv_index_forecast": {
+        "name": "UV index day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_1d": {
-        "name": "UV index day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_2d": {
-        "name": "UV index day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_3d": {
-        "name": "UV index day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_4d": {
-        "name": "UV index day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -731,75 +208,17 @@
       "wind_gust_speed": {
         "name": "[%key:component::weather::entity_component::_::state_attributes::wind_gust_speed::name%]"
       },
-      "wind_gust_speed_day_0d": {
-        "name": "Wind gust speed today"
+      "wind_gust_speed_day": {
+        "name": "Wind gust speed day {forecast_day}"
       },
-      "wind_gust_speed_day_1d": {
-        "name": "Wind gust speed day 1"
+      "wind_gust_speed_night": {
+        "name": "Wind gust speed night {forecast_day}"
       },
-      "wind_gust_speed_day_2d": {
-        "name": "Wind gust speed day 2"
+      "wind_speed_day": {
+        "name": "Wind speed day {forecast_day}"
       },
-      "wind_gust_speed_day_3d": {
-        "name": "Wind gust speed day 3"
-      },
-      "wind_gust_speed_day_4d": {
-        "name": "Wind gust speed day 4"
-      },
-      "wind_gust_speed_night_0d": {
-        "name": "Wind gust speed tonight"
-      },
-      "wind_gust_speed_night_1d": {
-        "name": "Wind gust speed night 1"
-      },
-      "wind_gust_speed_night_2d": {
-        "name": "Wind gust speed night 2"
-      },
-      "wind_gust_speed_night_3d": {
-        "name": "Wind gust speed night 3"
-      },
-      "wind_gust_speed_night_4d": {
-        "name": "Wind gust speed night 4"
-      },
-      "wind_speed_day_0d": {
-        "name": "Wind speed today"
-      },
-      "wind_speed_day_1d": {
-        "name": "Wind speed day 1"
-      },
-      "wind_speed_day_2d": {
-        "name": "Wind speed day 2"
-      },
-      "wind_speed_day_3d": {
-        "name": "Wind speed day 3"
-      },
-      "wind_speed_day_4d": {
-        "name": "Wind speed day 4"
-      },
-      "wind_speed_night_0d": {
-        "name": "Wind speed tonight"
-      },
-      "wind_speed_night_1d": {
-        "name": "Wind speed night 1"
-      },
-      "wind_speed_night_2d": {
-        "name": "Wind speed night 2"
-      },
-      "wind_speed_night_3d": {
-        "name": "Wind speed night 3"
-      },
-      "wind_speed_night_4d": {
-        "name": "Wind speed night 4"
-      }
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "description": "Due to the limitations of the free version of the AccuWeather API key, when you enable weather forecast, data updates will be performed every 80 minutes instead of every 40 minutes.",
-        "data": {
-          "forecast": "Weather forecast"
-        }
+      "wind_speed_night": {
+        "name": "Wind speed night {forecast_day}"
       }
     }
   },

homeassistant/components/accuweather/system_health.py

@@ -1,4 +1,5 @@
 """Provide info to system health."""
+
 from __future__ import annotations
 
 from typing import Any
@@ -8,6 +9,7 @@ from accuweather.const import ENDPOINT
 from homeassistant.components import system_health
 from homeassistant.core import HomeAssistant, callback
 
+from . import AccuWeatherConfigEntry
 from .const import DOMAIN
 
 
@@ -21,9 +23,11 @@ def async_register(
 
 async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     """Get info for the info page."""
-    remaining_requests = list(hass.data[DOMAIN].values())[
-        0
-    ].accuweather.requests_remaining
+    config_entry: AccuWeatherConfigEntry = hass.config_entries.async_entries(DOMAIN)[0]
+
+    remaining_requests = (
+        config_entry.runtime_data.coordinator_observation.accuweather.requests_remaining
+    )
 
     return {
         "can_reach_server": system_health.async_check_can_reach_url(hass, ENDPOINT),

homeassistant/components/accuweather/weather.py

@@ -1,4 +1,5 @@
 """Support for the AccuWeather service."""
+
 from __future__ import annotations
 
 from typing import cast
@@ -6,6 +7,7 @@ from typing import cast
 from homeassistant.components.weather import (
     ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
@@ -16,11 +18,10 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_TIME,
     ATTR_FORECAST_UV_INDEX,
     ATTR_FORECAST_WIND_BEARING,
+    CoordinatorWeatherEntity,
     Forecast,
-    SingleCoordinatorWeatherEntity,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfLength,
     UnitOfPrecipitationDepth,
@@ -32,129 +33,158 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.dt import utc_from_timestamp
 
-from . import AccuWeatherDataUpdateCoordinator
+from . import AccuWeatherConfigEntry, AccuWeatherData
 from .const import (
     API_METRIC,
     ATTR_DIRECTION,
-    ATTR_FORECAST,
     ATTR_SPEED,
     ATTR_VALUE,
     ATTRIBUTION,
     CONDITION_MAP,
-    DOMAIN,
+)
+from .coordinator import (
+    AccuWeatherDailyForecastDataUpdateCoordinator,
+    AccuWeatherObservationDataUpdateCoordinator,
 )
 
 PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AccuWeatherConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add a AccuWeather weather entity from a config_entry."""
-
-    coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-
-    async_add_entities([AccuWeatherEntity(coordinator)])
+    async_add_entities([AccuWeatherEntity(entry.runtime_data)])
 
 
 class AccuWeatherEntity(
-    SingleCoordinatorWeatherEntity[AccuWeatherDataUpdateCoordinator]
+    CoordinatorWeatherEntity[
+        AccuWeatherObservationDataUpdateCoordinator,
+        AccuWeatherDailyForecastDataUpdateCoordinator,
+    ]
 ):
     """Define an AccuWeather entity."""
 
     _attr_has_entity_name = True
     _attr_name = None
 
-    def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
+    def __init__(self, accuweather_data: AccuWeatherData) -> None:
         """Initialize."""
-        super().__init__(coordinator)
+        super().__init__(
+            observation_coordinator=accuweather_data.coordinator_observation,
+            daily_coordinator=accuweather_data.coordinator_daily_forecast,
+        )
+
         self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
         self._attr_native_pressure_unit = UnitOfPressure.HPA
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
         self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
         self._attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
-        self._attr_unique_id = coordinator.location_key
+        self._attr_unique_id = accuweather_data.coordinator_observation.location_key
         self._attr_attribution = ATTRIBUTION
-        self._attr_device_info = coordinator.device_info
-        if self.coordinator.forecast:
-            self._attr_supported_features = WeatherEntityFeature.FORECAST_DAILY
+        self._attr_device_info = accuweather_data.coordinator_observation.device_info
+        self._attr_supported_features = WeatherEntityFeature.FORECAST_DAILY
+
+        self.observation_coordinator = accuweather_data.coordinator_observation
+        self.daily_coordinator = accuweather_data.coordinator_daily_forecast
 
     @property
     def condition(self) -> str | None:
         """Return the current condition."""
-        return CONDITION_MAP.get(self.coordinator.data["WeatherIcon"])
+        return CONDITION_MAP.get(self.observation_coordinator.data["WeatherIcon"])
 
     @property
     def cloud_coverage(self) -> float:
         """Return the Cloud coverage in %."""
-        return cast(float, self.coordinator.data["CloudCover"])
+        return cast(float, self.observation_coordinator.data["CloudCover"])
 
     @property
     def native_apparent_temperature(self) -> float:
         """Return the apparent temperature."""
         return cast(
-            float, self.coordinator.data["ApparentTemperature"][API_METRIC][ATTR_VALUE]
+            float,
+            self.observation_coordinator.data["ApparentTemperature"][API_METRIC][
+                ATTR_VALUE
+            ],
         )
 
     @property
     def native_temperature(self) -> float:
         """Return the temperature."""
-        return cast(float, self.coordinator.data["Temperature"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float,
+            self.observation_coordinator.data["Temperature"][API_METRIC][ATTR_VALUE],
+        )
 
     @property
     def native_pressure(self) -> float:
         """Return the pressure."""
-        return cast(float, self.coordinator.data["Pressure"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float, self.observation_coordinator.data["Pressure"][API_METRIC][ATTR_VALUE]
+        )
 
     @property
     def native_dew_point(self) -> float:
         """Return the dew point."""
-        return cast(float, self.coordinator.data["DewPoint"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float, self.observation_coordinator.data["DewPoint"][API_METRIC][ATTR_VALUE]
+        )
 
     @property
     def humidity(self) -> int:
         """Return the humidity."""
-        return cast(int, self.coordinator.data["RelativeHumidity"])
+        return cast(int, self.observation_coordinator.data["RelativeHumidity"])
 
     @property
     def native_wind_gust_speed(self) -> float:
         """Return the wind gust speed."""
         return cast(
-            float, self.coordinator.data["WindGust"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+            float,
+            self.observation_coordinator.data["WindGust"][ATTR_SPEED][API_METRIC][
+                ATTR_VALUE
+            ],
         )
 
     @property
     def native_wind_speed(self) -> float:
         """Return the wind speed."""
         return cast(
-            float, self.coordinator.data["Wind"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+            float,
+            self.observation_coordinator.data["Wind"][ATTR_SPEED][API_METRIC][
+                ATTR_VALUE
+            ],
         )
 
     @property
     def wind_bearing(self) -> int:
         """Return the wind bearing."""
-        return cast(int, self.coordinator.data["Wind"][ATTR_DIRECTION]["Degrees"])
+        return cast(
+            int, self.observation_coordinator.data["Wind"][ATTR_DIRECTION]["Degrees"]
+        )
 
     @property
     def native_visibility(self) -> float:
         """Return the visibility."""
-        return cast(float, self.coordinator.data["Visibility"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float,
+            self.observation_coordinator.data["Visibility"][API_METRIC][ATTR_VALUE],
+        )
 
     @property
     def uv_index(self) -> float:
         """Return the UV index."""
-        return cast(float, self.coordinator.data["UVIndex"])
+        return cast(float, self.observation_coordinator.data["UVIndex"])
 
-    @property
-    def forecast(self) -> list[Forecast] | None:
-        """Return the forecast array."""
-        if not self.coordinator.forecast:
-            return None
-        # remap keys from library to keys understood by the weather component
+    @callback
+    def _async_forecast_daily(self) -> list[Forecast] | None:
+        """Return the daily forecast in native units."""
         return [
             {
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
                 ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
+                ATTR_FORECAST_HUMIDITY: item["RelativeHumidityDay"]["Average"],
                 ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][
@@ -174,10 +204,5 @@ class AccuWeatherEntity(
                 ATTR_FORECAST_WIND_BEARING: item["WindDay"][ATTR_DIRECTION]["Degrees"],
                 ATTR_FORECAST_CONDITION: CONDITION_MAP.get(item["IconDay"]),
             }
-            for item in self.coordinator.data[ATTR_FORECAST]
+            for item in self.daily_coordinator.data
         ]
-
-    @callback
-    def _async_forecast_daily(self) -> list[Forecast] | None:
-        """Return the daily forecast in native units."""
-        return self.forecast

homeassistant/components/acer_projector/const.py

@@ -1,4 +1,5 @@
 """Use serial protocol of Acer projector to obtain state of the projector."""
+
 from __future__ import annotations
 
 from typing import Final

homeassistant/components/acer_projector/switch.py

@@ -1,4 +1,5 @@
 """Use serial protocol of Acer projector to obtain state of the projector."""
+
 from __future__ import annotations
 
 import logging

homeassistant/components/acmeda/__init__.py

@@ -1,32 +1,38 @@
 """The Rollease Acmeda Automate integration."""
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
 from .hub import PulseHub
 
 CONF_HUBS = "hubs"
 
 PLATFORMS = [Platform.COVER, Platform.SENSOR]
 
+type AcmedaConfigEntry = ConfigEntry[PulseHub]
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: AcmedaConfigEntry
+) -> bool:
     """Set up Rollease Acmeda Automate hub from a config entry."""
     hub = PulseHub(hass, config_entry)
 
     if not await hub.async_setup():
         return False
 
-    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = hub
+    config_entry.runtime_data = hub
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: AcmedaConfigEntry
+) -> bool:
     """Unload a config entry."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     unload_ok = await hass.config_entries.async_unload_platforms(
         config_entry, PLATFORMS
@@ -35,7 +41,4 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     if not await hub.async_reset():
         return False
 
-    if unload_ok:
-        hass.data[DOMAIN].pop(config_entry.entry_id)
-
     return unload_ok

homeassistant/components/acmeda/base.py

@@ -1,4 +1,5 @@
 """Base class for Acmeda Roller Blinds."""
+
 from __future__ import annotations
 
 import aiopulse

homeassistant/components/acmeda/config_flow.py

@@ -1,4 +1,5 @@
 """Config flow for Rollease Acmeda Automate Pulse Hub."""
+
 from __future__ import annotations
 
 from asyncio import timeout
@@ -8,14 +9,13 @@ from typing import Any
 import aiopulse
 import voluptuous as vol
 
-from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_ID
-from homeassistant.data_entry_flow import FlowResult
 
 from .const import DOMAIN
 
 
-class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
+class AcmedaFlowHandler(ConfigFlow, domain=DOMAIN):
     """Handle a Acmeda config flow."""
 
     VERSION = 1
@@ -26,7 +26,7 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
         if (
             user_input is not None
@@ -40,12 +40,13 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             entry.unique_id for entry in self._async_current_entries()
         }
 
-        hubs: list[aiopulse.Hub] = []
         with suppress(TimeoutError):
             async with timeout(5):
-                async for hub in aiopulse.Hub.discover():
-                    if hub.id not in already_configured:
-                        hubs.append(hub)
+                hubs: list[aiopulse.Hub] = [
+                    hub
+                    async for hub in aiopulse.Hub.discover()
+                    if hub.id not in already_configured
+                ]
 
         if not hubs:
             return self.async_abort(reason="no_devices_found")
@@ -66,7 +67,7 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             ),
         )
 
-    async def async_create(self, hub: aiopulse.Hub) -> FlowResult:
+    async def async_create(self, hub: aiopulse.Hub) -> ConfigFlowResult:
         """Create the Acmeda Hub entry."""
         await self.async_set_unique_id(hub.id, raise_on_progress=False)
         return self.async_create_entry(title=hub.id, data={CONF_HOST: hub.host})

homeassistant/components/acmeda/const.py

@@ -1,4 +1,5 @@
 """Constants for the Rollease Acmeda Automate integration."""
+
 import logging
 
 LOGGER = logging.getLogger(__package__)

homeassistant/components/acmeda/cover.py

@@ -1,4 +1,5 @@
 """Support for Acmeda Roller Blinds."""
+
 from __future__ import annotations
 
 from typing import Any
@@ -8,24 +9,23 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AcmedaConfigEntry
 from .base import AcmedaBase
-from .const import ACMEDA_HUB_UPDATE, DOMAIN
+from .const import ACMEDA_HUB_UPDATE
 from .helpers import async_add_acmeda_entities
-from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     current: set[int] = set()
 

homeassistant/components/acmeda/errors.py

@@ -1,4 +1,5 @@
 """Errors for the Acmeda Pulse component."""
+
 from homeassistant.exceptions import HomeAssistantError
 
 

homeassistant/components/acmeda/helpers.py

@@ -1,6 +1,9 @@
 """Helper functions for Acmeda Pulse."""
+
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from aiopulse import Roller
 
 from homeassistant.config_entries import ConfigEntry
@@ -10,17 +13,20 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 
+if TYPE_CHECKING:
+    from . import AcmedaConfigEntry
+
 
 @callback
 def async_add_acmeda_entities(
     hass: HomeAssistant,
     entity_class: type,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     current: set[int],
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add any new entities."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
     LOGGER.debug("Looking for new %s on: %s", entity_class.__name__, hub.host)
 
     api = hub.api.rollers

homeassistant/components/acmeda/hub.py

@@ -1,4 +1,5 @@
 """Code to handle a Pulse Hub."""
+
 from __future__ import annotations
 
 import asyncio

homeassistant/components/acmeda/sensor.py

@@ -1,26 +1,26 @@
 """Support for Acmeda Roller Blind Batteries."""
+
 from __future__ import annotations
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AcmedaConfigEntry
 from .base import AcmedaBase
-from .const import ACMEDA_HUB_UPDATE, DOMAIN
+from .const import ACMEDA_HUB_UPDATE
 from .helpers import async_add_acmeda_entities
-from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     current: set[int] = set()
 

homeassistant/components/actiontec/const.py

@@ -1,4 +1,5 @@
 """Support for Actiontec MI424WR (Verizon FIOS) routers."""
+
 from __future__ import annotations
 
 import re
@@ -8,7 +9,7 @@ from typing import Final
 
 LEASES_REGEX: Final[re.Pattern[str]] = re.compile(
     r"(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})"
-    + r"\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))"
-    + r"\svalid\sfor:\s(?P<timevalid>(-?\d+))"
-    + r"\ssec"
+    r"\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))"
+    r"\svalid\sfor:\s(?P<timevalid>(-?\d+))"
+    r"\ssec"
 )

homeassistant/components/actiontec/device_tracker.py

@@ -1,4 +1,5 @@
 """Support for Actiontec MI424WR (Verizon FIOS) routers."""
+
 from __future__ import annotations
 
 import logging

homeassistant/components/actiontec/model.py

@@ -1,4 +1,5 @@
 """Model definitions for Actiontec MI424WR (Verizon FIOS) routers."""
+
 from dataclasses import dataclass
 
 

homeassistant/components/adax/__init__.py

@@ -1,4 +1,5 @@
 """The Adax integration."""
+
 from __future__ import annotations
 
 from homeassistant.config_entries import ConfigEntry

homeassistant/components/adax/climate.py

@@ -1,4 +1,5 @@
 """Support for Adax wifi-enabled home heaters."""
+
 from __future__ import annotations
 
 from typing import Any, cast
@@ -134,11 +135,15 @@ class AdaxDevice(ClimateEntity):
 class LocalAdaxDevice(ClimateEntity):
     """Representation of a heater."""
 
-    _attr_hvac_modes = [HVACMode.HEAT]
+    _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
     _attr_hvac_mode = HVACMode.HEAT
     _attr_max_temp = 35
     _attr_min_temp = 5
-    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+    _attr_supported_features = (
+        ClimateEntityFeature.TARGET_TEMPERATURE
+        | ClimateEntityFeature.TURN_OFF
+        | ClimateEntityFeature.TURN_ON
+    )
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
@@ -151,6 +156,14 @@ class LocalAdaxDevice(ClimateEntity):
             manufacturer="Adax",
         )
 
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set hvac mode."""
+        if hvac_mode == HVACMode.HEAT:
+            temperature = self._attr_target_temperature or self._attr_min_temp
+            await self._adax_data_handler.set_target_temperature(temperature)
+        elif hvac_mode == HVACMode.OFF:
+            await self._adax_data_handler.set_target_temperature(0)
+
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
@@ -160,6 +173,14 @@ class LocalAdaxDevice(ClimateEntity):
     async def async_update(self) -> None:
         """Get the latest data."""
         data = await self._adax_data_handler.get_status()
-        self._attr_target_temperature = data["target_temperature"]
         self._attr_current_temperature = data["current_temperature"]
         self._attr_available = self._attr_current_temperature is not None
+        if (target_temp := data["target_temperature"]) == 0:
+            self._attr_hvac_mode = HVACMode.OFF
+            self._attr_icon = "mdi:radiator-off"
+            if target_temp == 0:
+                self._attr_target_temperature = self._attr_min_temp
+        else:
+            self._attr_hvac_mode = HVACMode.HEAT
+            self._attr_icon = "mdi:radiator"
+            self._attr_target_temperature = target_temp

homeassistant/components/adax/config_flow.py

@@ -1,4 +1,5 @@
 """Config flow for Adax integration."""
+
 from __future__ import annotations
 
 import logging
@@ -8,14 +9,13 @@ import adax
 import adax_local
 import voluptuous as vol
 
-from homeassistant import config_entries
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import (
     CONF_IP_ADDRESS,
     CONF_PASSWORD,
     CONF_TOKEN,
     CONF_UNIQUE_ID,
 )
-from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
@@ -31,14 +31,14 @@ from .const import (
 _LOGGER = logging.getLogger(__name__)
 
 
-class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+class AdaxConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Adax."""
 
     VERSION = 2
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle the initial step."""
         data_schema = vol.Schema(
             {
@@ -63,7 +63,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_local(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle the local step."""
         data_schema = vol.Schema(
             {vol.Required(WIFI_SSID): str, vol.Required(WIFI_PSWD): str}
@@ -110,7 +110,7 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
 
     async def async_step_cloud(
         self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
+    ) -> ConfigFlowResult:
         """Handle the cloud step."""
         data_schema = vol.Schema(
             {vol.Required(ACCOUNT_ID): int, vol.Required(CONF_PASSWORD): str}

homeassistant/components/adax/const.py

@@ -1,4 +1,5 @@
 """Constants for the Adax integration."""
+
 from typing import Final
 
 ACCOUNT_ID: Final = "account_id"

homeassistant/components/adguard/__init__.py

@@ -1,10 +1,13 @@
 """Support for AdGuard Home."""
+
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
     CONF_NAME,
@@ -23,7 +26,6 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import (
     CONF_FORCE,
-    DATA_ADGUARD_CLIENT,
     DOMAIN,
     SERVICE_ADD_URL,
     SERVICE_DISABLE_URL,
@@ -41,9 +43,18 @@ SERVICE_REFRESH_SCHEMA = vol.Schema(
 )
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
+type AdGuardConfigEntry = ConfigEntry[AdGuardData]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+@dataclass
+class AdGuardData:
+    """Adguard data type."""
+
+    client: AdGuardHome
+    version: str
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
     """Set up AdGuard Home from a config entry."""
     session = async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL])
     adguard = AdGuardHome(
@@ -56,13 +67,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         session=session,
     )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {DATA_ADGUARD_CLIENT: adguard}
-
     try:
-        await adguard.version()
+        version = await adguard.version()
     except AdGuardHomeConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
+    entry.runtime_data = AdGuardData(adguard, version)
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def add_url(call: ServiceCall) -> None:
@@ -106,17 +117,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
     """Unload AdGuard Home config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    if not hass.data[DOMAIN]:
+    loaded_entries = [
+        entry
+        for entry in hass.config_entries.async_entries(DOMAIN)
+        if entry.state == ConfigEntryState.LOADED
+    ]
+    if len(loaded_entries) == 1:
+        # This is the last loaded instance of AdGuard, deregister any services
         hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
         hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_ENABLE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_DISABLE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_REFRESH)
-        del hass.data[DOMAIN]
 
     return unload_ok