Merge pull request #50507 from home-assistant/rc

Bumped version to 2021.5.3
Bump aiohue to 2.3.1 (#50506 )
2021-05-11 22:59:33 -07:00 · 2021-05-11 22:27:42 -07:00 · 2021-05-11 22:27:27 -07:00 · 2021-05-11 22:27:27 -07:00 · 2021-05-11 22:27:26 -07:00 · 2021-05-11 21:55:32 -07:00
7682 changed files with 225972 additions and 63926 deletions
--- a/.coveragerc
+++ b/.coveragerc
@@ -23,6 +23,8 @@ omit =
    homeassistant/components/adguard/sensor.py
    homeassistant/components/adguard/switch.py
    homeassistant/components/ads/*
+    homeassistant/components/aemet/abstract_aemet_sensor.py
+    homeassistant/components/aemet/weather_update_coordinator.py
    homeassistant/components/aftership/sensor.py
    homeassistant/components/agent_dvr/__init__.py
    homeassistant/components/agent_dvr/alarm_control_panel.py
@@ -67,11 +69,14 @@ omit =
    homeassistant/components/arwn/sensor.py
    homeassistant/components/asterisk_cdr/mailbox.py
    homeassistant/components/asterisk_mbox/*
+    homeassistant/components/asuswrt/__init__.py
+    homeassistant/components/asuswrt/router.py
    homeassistant/components/aten_pe/*
    homeassistant/components/atome/*
    homeassistant/components/aurora/__init__.py
    homeassistant/components/aurora/binary_sensor.py
    homeassistant/components/aurora/const.py
+    homeassistant/components/aurora/sensor.py
    homeassistant/components/aurora_abb_powerone/sensor.py
    homeassistant/components/avea/light.py
    homeassistant/components/avion/light.py
@@ -156,7 +161,6 @@ omit =
    homeassistant/components/coolmaster/const.py
    homeassistant/components/cppm_tracker/device_tracker.py
    homeassistant/components/cpuspeed/sensor.py
-    homeassistant/components/crimereports/sensor.py
    homeassistant/components/cups/sensor.py
    homeassistant/components/currencylayer/sensor.py
    homeassistant/components/daikin/*
@@ -169,10 +173,10 @@ omit =
    homeassistant/components/deluge/sensor.py
    homeassistant/components/deluge/switch.py
    homeassistant/components/denon/media_player.py
+    homeassistant/components/denonavr/__init__.py
    homeassistant/components/denonavr/media_player.py
    homeassistant/components/denonavr/receiver.py
    homeassistant/components/deutsche_bahn/sensor.py
-    homeassistant/components/devolo_home_control/__init__.py
    homeassistant/components/devolo_home_control/binary_sensor.py
    homeassistant/components/devolo_home_control/climate.py
    homeassistant/components/devolo_home_control/const.py
@@ -217,6 +221,7 @@ omit =
    homeassistant/components/ecobee/weather.py
    homeassistant/components/econet/__init__.py
    homeassistant/components/econet/binary_sensor.py
+    homeassistant/components/econet/climate.py
    homeassistant/components/econet/const.py
    homeassistant/components/econet/sensor.py
    homeassistant/components/econet/water_heater.py
@@ -232,6 +237,8 @@ omit =
    homeassistant/components/emby/media_player.py
    homeassistant/components/emoncms/sensor.py
    homeassistant/components/emoncms_history/*
+    homeassistant/components/emonitor/__init__.py
+    homeassistant/components/emonitor/sensor.py
    homeassistant/components/enigma2/media_player.py
    homeassistant/components/enocean/__init__.py
    homeassistant/components/enocean/binary_sensor.py
@@ -241,12 +248,14 @@ omit =
    homeassistant/components/enocean/light.py
    homeassistant/components/enocean/sensor.py
    homeassistant/components/enocean/switch.py
+    homeassistant/components/enphase_envoy/__init__.py
    homeassistant/components/enphase_envoy/sensor.py
    homeassistant/components/entur_public_transport/*
    homeassistant/components/environment_canada/*
    homeassistant/components/envirophat/sensor.py
    homeassistant/components/envisalink/*
    homeassistant/components/ephember/climate.py
+    homeassistant/components/epson/__init__.py
    homeassistant/components/epson/const.py
    homeassistant/components/epson/media_player.py
    homeassistant/components/epsonworkforce/sensor.py
@@ -266,8 +275,16 @@ omit =
    homeassistant/components/eufy/*
    homeassistant/components/everlights/light.py
    homeassistant/components/evohome/*
-    homeassistant/components/ezviz/*
+    homeassistant/components/ezviz/__init__.py
+    homeassistant/components/ezviz/camera.py
+    homeassistant/components/ezviz/coordinator.py
+    homeassistant/components/ezviz/const.py
+    homeassistant/components/ezviz/binary_sensor.py
+    homeassistant/components/ezviz/sensor.py
+    homeassistant/components/ezviz/switch.py
    homeassistant/components/familyhub/camera.py
+    homeassistant/components/faa_delays/__init__.py
+    homeassistant/components/faa_delays/binary_sensor.py
    homeassistant/components/fastdotcom/*
    homeassistant/components/ffmpeg/camera.py
    homeassistant/components/fibaro/*
@@ -308,11 +325,13 @@ omit =
    homeassistant/components/foscam/camera.py
    homeassistant/components/foursquare/*
    homeassistant/components/free_mobile/notify.py
-    homeassistant/components/freebox/__init__.py
    homeassistant/components/freebox/device_tracker.py
    homeassistant/components/freebox/router.py
    homeassistant/components/freebox/sensor.py
    homeassistant/components/freebox/switch.py
+    homeassistant/components/fritz/__init__.py
+    homeassistant/components/fritz/common.py
+    homeassistant/components/fritz/const.py
    homeassistant/components/fritz/device_tracker.py
    homeassistant/components/fritzbox_callmonitor/__init__.py
    homeassistant/components/fritzbox_callmonitor/const.py
@@ -329,7 +348,6 @@ omit =
    homeassistant/components/garmin_connect/alarm_util.py
    homeassistant/components/gc100/*
    homeassistant/components/geniushub/*
-    homeassistant/components/geizhals/sensor.py
    homeassistant/components/github/sensor.py
    homeassistant/components/gitlab_ci/sensor.py
    homeassistant/components/gitter/sensor.py
@@ -343,6 +361,8 @@ omit =
    homeassistant/components/google/*
    homeassistant/components/google_cloud/tts.py
    homeassistant/components/google_maps/device_tracker.py
+    homeassistant/components/google_travel_time/__init__.py
+    homeassistant/components/google_travel_time/helpers.py
    homeassistant/components/google_travel_time/sensor.py
    homeassistant/components/gpmdp/media_player.py
    homeassistant/components/gpsd/sensor.py
@@ -358,7 +378,9 @@ omit =
    homeassistant/components/guardian/sensor.py
    homeassistant/components/guardian/switch.py
    homeassistant/components/guardian/util.py
-    homeassistant/components/habitica/*
+    homeassistant/components/habitica/__init__.py
+    homeassistant/components/habitica/const.py
+    homeassistant/components/habitica/sensor.py
    homeassistant/components/hangouts/*
    homeassistant/components/hangouts/__init__.py
    homeassistant/components/hangouts/const.py
@@ -369,6 +391,9 @@ omit =
    homeassistant/components/harmony/data.py
    homeassistant/components/harmony/remote.py
    homeassistant/components/harmony/util.py
+    homeassistant/components/hassio/binary_sensor.py
+    homeassistant/components/hassio/entity.py
+    homeassistant/components/hassio/sensor.py
    homeassistant/components/haveibeenpwned/sensor.py
    homeassistant/components/hdmi_cec/*
    homeassistant/components/heatmiser/climate.py
@@ -376,7 +401,13 @@ omit =
    homeassistant/components/hikvisioncam/switch.py
    homeassistant/components/hisense_aehw4a1/*
    homeassistant/components/hitron_coda/device_tracker.py
-    homeassistant/components/hive/*
+    homeassistant/components/hive/__init__.py
+    homeassistant/components/hive/climate.py
+    homeassistant/components/hive/binary_sensor.py
+    homeassistant/components/hive/light.py
+    homeassistant/components/hive/sensor.py
+    homeassistant/components/hive/switch.py
+    homeassistant/components/hive/water_heater.py
    homeassistant/components/hlk_sw16/__init__.py
    homeassistant/components/hlk_sw16/switch.py
    homeassistant/components/home_connect/*
@@ -384,6 +415,9 @@ omit =
    homeassistant/components/homematic/climate.py
    homeassistant/components/homematic/cover.py
    homeassistant/components/homematic/notify.py
+    homeassistant/components/home_plus_control/api.py
+    homeassistant/components/home_plus_control/helpers.py
+    homeassistant/components/home_plus_control/switch.py
    homeassistant/components/homeworks/*
    homeassistant/components/honeywell/climate.py
    homeassistant/components/horizon/media_player.py
@@ -401,6 +435,7 @@ omit =
    homeassistant/components/hvv_departures/sensor.py
    homeassistant/components/hvv_departures/__init__.py
    homeassistant/components/hydrawise/*
+    homeassistant/components/ialarm/alarm_control_panel.py
    homeassistant/components/iammeter/sensor.py
    homeassistant/components/iaqualink/binary_sensor.py
    homeassistant/components/iaqualink/climate.py
@@ -463,7 +498,11 @@ omit =
    homeassistant/components/kaiterra/*
    homeassistant/components/kankun/switch.py
    homeassistant/components/keba/*
+    homeassistant/components/keenetic_ndms2/__init__.py
+    homeassistant/components/keenetic_ndms2/binary_sensor.py
+    homeassistant/components/keenetic_ndms2/const.py
    homeassistant/components/keenetic_ndms2/device_tracker.py
+    homeassistant/components/keenetic_ndms2/router.py
    homeassistant/components/kef/*
    homeassistant/components/keyboard/*
    homeassistant/components/keyboard_remote/*
@@ -478,6 +517,10 @@ omit =
    homeassistant/components/kodi/media_player.py
    homeassistant/components/kodi/notify.py
    homeassistant/components/konnected/*
+    homeassistant/components/kostal_plenticore/__init__.py
+    homeassistant/components/kostal_plenticore/const.py
+    homeassistant/components/kostal_plenticore/helper.py
+    homeassistant/components/kostal_plenticore/sensor.py
    homeassistant/components/kwb/sensor.py
    homeassistant/components/lacrosse/sensor.py
    homeassistant/components/lametric/*
@@ -485,7 +528,18 @@ omit =
    homeassistant/components/lastfm/sensor.py
    homeassistant/components/launch_library/const.py
    homeassistant/components/launch_library/sensor.py
-    homeassistant/components/lcn/*
+    homeassistant/components/lcn/__init__.py
+    homeassistant/components/lcn/binary_sensor.py
+    homeassistant/components/lcn/climate.py
+    homeassistant/components/lcn/const.py
+    homeassistant/components/lcn/cover.py
+    homeassistant/components/lcn/helpers.py
+    homeassistant/components/lcn/light.py
+    homeassistant/components/lcn/scene.py
+    homeassistant/components/lcn/schemas.py
+    homeassistant/components/lcn/sensor.py
+    homeassistant/components/lcn/services.py
+    homeassistant/components/lcn/switch.py
    homeassistant/components/lg_netcast/media_player.py
    homeassistant/components/lg_soundbar/media_player.py
    homeassistant/components/life360/*
@@ -519,12 +573,15 @@ omit =
    homeassistant/components/lutron_caseta/switch.py
    homeassistant/components/lw12wifi/light.py
    homeassistant/components/lyft/sensor.py
+    homeassistant/components/lyric/__init__.py
+    homeassistant/components/lyric/api.py
+    homeassistant/components/lyric/climate.py
+    homeassistant/components/lyric/sensor.py
    homeassistant/components/magicseaweed/sensor.py
    homeassistant/components/mailgun/notify.py
    homeassistant/components/map/*
    homeassistant/components/mastodon/notify.py
    homeassistant/components/matrix/*
-    homeassistant/components/maxcube/*
    homeassistant/components/mcp23017/*
    homeassistant/components/media_extractor/*
    homeassistant/components/mediaroom/media_player.py
@@ -535,6 +592,8 @@ omit =
    homeassistant/components/melcloud/water_heater.py
    homeassistant/components/message_bird/notify.py
    homeassistant/components/met/weather.py
+    homeassistant/components/met_eireann/__init__.py
+    homeassistant/components/met_eireann/weather.py
    homeassistant/components/meteo_france/__init__.py
    homeassistant/components/meteo_france/const.py
    homeassistant/components/meteo_france/sensor.py
@@ -560,8 +619,8 @@ omit =
    homeassistant/components/mochad/*
    homeassistant/components/modbus/climate.py
    homeassistant/components/modbus/cover.py
+    homeassistant/components/modbus/modbus.py
    homeassistant/components/modbus/switch.py
-    homeassistant/components/modbus/sensor.py
    homeassistant/components/modem_callerid/sensor.py
    homeassistant/components/motion_blinds/__init__.py
    homeassistant/components/motion_blinds/const.py
@@ -571,11 +630,29 @@ omit =
    homeassistant/components/mpd/media_player.py
    homeassistant/components/mqtt_room/sensor.py
    homeassistant/components/msteams/notify.py
+    homeassistant/components/mullvad/__init__.py
+    homeassistant/components/mullvad/binary_sensor.py
+    homeassistant/components/mutesync/__init__.py
+    homeassistant/components/mutesync/binary_sensor.py
+    homeassistant/components/nest/const.py
    homeassistant/components/mvglive/sensor.py
    homeassistant/components/mychevy/*
    homeassistant/components/mycroft/*
    homeassistant/components/mycroft/notify.py
-    homeassistant/components/mysensors/*
+    homeassistant/components/mysensors/__init__.py
+    homeassistant/components/mysensors/binary_sensor.py
+    homeassistant/components/mysensors/climate.py
+    homeassistant/components/mysensors/const.py
+    homeassistant/components/mysensors/cover.py
+    homeassistant/components/mysensors/device.py
+    homeassistant/components/mysensors/device_tracker.py
+    homeassistant/components/mysensors/gateway.py
+    homeassistant/components/mysensors/handler.py
+    homeassistant/components/mysensors/helpers.py
+    homeassistant/components/mysensors/light.py
+    homeassistant/components/mysensors/notify.py
+    homeassistant/components/mysensors/sensor.py
+    homeassistant/components/mysensors/switch.py
    homeassistant/components/mystrom/binary_sensor.py
    homeassistant/components/mystrom/light.py
    homeassistant/components/mystrom/switch.py
@@ -591,17 +668,6 @@ omit =
    homeassistant/components/nederlandse_spoorwegen/sensor.py
    homeassistant/components/nello/lock.py
    homeassistant/components/nest/legacy/*
-    homeassistant/components/netatmo/__init__.py
-    homeassistant/components/netatmo/api.py
-    homeassistant/components/netatmo/camera.py
-    homeassistant/components/netatmo/climate.py
-    homeassistant/components/netatmo/const.py
-    homeassistant/components/netatmo/data_handler.py
-    homeassistant/components/netatmo/helper.py
-    homeassistant/components/netatmo/light.py
-    homeassistant/components/netatmo/netatmo_entity_base.py
-    homeassistant/components/netatmo/sensor.py
-    homeassistant/components/netatmo/webhook.py
    homeassistant/components/netdata/sensor.py
    homeassistant/components/netgear/device_tracker.py
    homeassistant/components/netgear_lte/*
@@ -621,7 +687,9 @@ omit =
    homeassistant/components/norway_air/air_quality.py
    homeassistant/components/notify_events/notify.py
    homeassistant/components/nsw_fuel_station/sensor.py
-    homeassistant/components/nuimo_controller/*
+    homeassistant/components/nuki/__init__.py
+    homeassistant/components/nuki/const.py
+    homeassistant/components/nuki/binary_sensor.py
    homeassistant/components/nuki/lock.py
    homeassistant/components/nut/sensor.py
    homeassistant/components/nx584/alarm_control_panel.py
@@ -687,19 +755,26 @@ omit =
    homeassistant/components/pandora/media_player.py
    homeassistant/components/pcal9535a/*
    homeassistant/components/pencom/switch.py
+    homeassistant/components/philips_js/__init__.py
    homeassistant/components/philips_js/media_player.py
+    homeassistant/components/philips_js/remote.py
    homeassistant/components/pi_hole/sensor.py
    homeassistant/components/pi4ioe5v9xxxx/binary_sensor.py
    homeassistant/components/pi4ioe5v9xxxx/switch.py
    homeassistant/components/picotts/tts.py
    homeassistant/components/piglow/light.py
    homeassistant/components/pilight/*
+    homeassistant/components/ping/__init__.py
    homeassistant/components/ping/const.py
    homeassistant/components/ping/binary_sensor.py
    homeassistant/components/ping/device_tracker.py
    homeassistant/components/pioneer/media_player.py
    homeassistant/components/pjlink/media_player.py
-    homeassistant/components/plaato/*
+    homeassistant/components/plaato/__init__.py
+    homeassistant/components/plaato/binary_sensor.py
+    homeassistant/components/plaato/const.py
+    homeassistant/components/plaato/entity.py
+    homeassistant/components/plaato/sensor.py
    homeassistant/components/plex/media_player.py
    homeassistant/components/plum_lightpad/light.py
    homeassistant/components/pocketcasts/sensor.py
@@ -707,6 +782,7 @@ omit =
    homeassistant/components/poolsense/__init__.py
    homeassistant/components/poolsense/sensor.py
    homeassistant/components/poolsense/binary_sensor.py
+    homeassistant/components/powerwall/__init__.py
    homeassistant/components/proliphix/climate.py
    homeassistant/components/progettihwsw/__init__.py
    homeassistant/components/progettihwsw/binary_sensor.py
@@ -743,6 +819,7 @@ omit =
    homeassistant/components/raspyrfm/*
    homeassistant/components/recollect_waste/__init__.py
    homeassistant/components/recollect_waste/sensor.py
+    homeassistant/components/recorder/repack.py
    homeassistant/components/recswitch/switch.py
    homeassistant/components/reddit/*
    homeassistant/components/rejseplanen/sensor.py
@@ -754,7 +831,13 @@ omit =
    homeassistant/components/rest/switch.py
    homeassistant/components/ring/camera.py
    homeassistant/components/ripple/sensor.py
+    homeassistant/components/rituals_perfume_genie/binary_sensor.py
+    homeassistant/components/rituals_perfume_genie/entity.py
+    homeassistant/components/rituals_perfume_genie/sensor.py
+    homeassistant/components/rituals_perfume_genie/switch.py
+    homeassistant/components/rituals_perfume_genie/__init__.py
    homeassistant/components/rocketchat/notify.py
+    homeassistant/components/roomba/__init__.py
    homeassistant/components/roomba/binary_sensor.py
    homeassistant/components/roomba/braava.py
    homeassistant/components/roomba/irobot_base.py
@@ -782,6 +865,12 @@ omit =
    homeassistant/components/satel_integra/*
    homeassistant/components/schluter/*
    homeassistant/components/scrape/sensor.py
+    homeassistant/components/screenlogic/__init__.py
+    homeassistant/components/screenlogic/binary_sensor.py
+    homeassistant/components/screenlogic/climate.py
+    homeassistant/components/screenlogic/sensor.py
+    homeassistant/components/screenlogic/services.py
+    homeassistant/components/screenlogic/switch.py
    homeassistant/components/scsgate/*
    homeassistant/components/scsgate/cover.py
    homeassistant/components/sendgrid/notify.py
@@ -818,6 +907,7 @@ omit =
    homeassistant/components/slack/notify.py
    homeassistant/components/sinch/*
    homeassistant/components/slide/*
+    homeassistant/components/sma/__init__.py
    homeassistant/components/sma/sensor.py
    homeassistant/components/smappee/__init__.py
    homeassistant/components/smappee/api.py
@@ -833,7 +923,6 @@ omit =
    homeassistant/components/snapcast/*
    homeassistant/components/snmp/*
    homeassistant/components/sochain/sensor.py
-    homeassistant/components/socialblade/sensor.py
    homeassistant/components/solaredge/__init__.py
    homeassistant/components/solaredge/sensor.py
    homeassistant/components/solaredge_local/sensor.py
@@ -876,7 +965,6 @@ omit =
    homeassistant/components/switcher_kis/switch.py
    homeassistant/components/switchmate/switch.py
    homeassistant/components/syncthru/sensor.py
-    homeassistant/components/synology/camera.py
    homeassistant/components/synology_chat/notify.py
    homeassistant/components/synology_dsm/__init__.py
    homeassistant/components/synology_dsm/binary_sensor.py
@@ -944,7 +1032,10 @@ omit =
    homeassistant/components/toon/sensor.py
    homeassistant/components/toon/switch.py
    homeassistant/components/torque/sensor.py
-    homeassistant/components/totalconnect/*
+    homeassistant/components/totalconnect/__init__.py
+    homeassistant/components/totalconnect/alarm_control_panel.py
+    homeassistant/components/totalconnect/binary_sensor.py
+    homeassistant/components/totalconnect/const.py
    homeassistant/components/touchline/climate.py
    homeassistant/components/tplink/common.py
    homeassistant/components/tplink/switch.py
@@ -963,7 +1054,14 @@ omit =
    homeassistant/components/transmission/const.py
    homeassistant/components/transmission/errors.py
    homeassistant/components/travisci/sensor.py
-    homeassistant/components/tuya/*
+    homeassistant/components/tuya/__init__.py
+    homeassistant/components/tuya/climate.py
+    homeassistant/components/tuya/const.py
+    homeassistant/components/tuya/cover.py
+    homeassistant/components/tuya/fan.py
+    homeassistant/components/tuya/light.py
+    homeassistant/components/tuya/scene.py
+    homeassistant/components/tuya/switch.py
    homeassistant/components/twentemilieu/const.py
    homeassistant/components/twentemilieu/sensor.py
    homeassistant/components/twilio_call/notify.py
@@ -995,12 +1093,20 @@ omit =
    homeassistant/components/velbus/switch.py
    homeassistant/components/velux/*
    homeassistant/components/venstar/climate.py
-    homeassistant/components/verisure/*
+    homeassistant/components/verisure/__init__.py
+    homeassistant/components/verisure/alarm_control_panel.py
+    homeassistant/components/verisure/binary_sensor.py
+    homeassistant/components/verisure/camera.py
+    homeassistant/components/verisure/coordinator.py
+    homeassistant/components/verisure/lock.py
+    homeassistant/components/verisure/sensor.py
+    homeassistant/components/verisure/switch.py
    homeassistant/components/versasense/*
    homeassistant/components/vesync/__init__.py
    homeassistant/components/vesync/common.py
    homeassistant/components/vesync/const.py
    homeassistant/components/vesync/fan.py
+    homeassistant/components/vesync/light.py
    homeassistant/components/vesync/switch.py
    homeassistant/components/viaggiatreno/sensor.py
    homeassistant/components/vicare/*
@@ -1020,6 +1126,8 @@ omit =
    homeassistant/components/waterfurnace/*
    homeassistant/components/watson_iot/*
    homeassistant/components/watson_tts/tts.py
+    homeassistant/components/waze_travel_time/__init__.py
+    homeassistant/components/waze_travel_time/helpers.py
    homeassistant/components/waze_travel_time/sensor.py
    homeassistant/components/webostv/*
    homeassistant/components/whois/sensor.py
@@ -1043,7 +1151,6 @@ omit =
    homeassistant/components/xbox/sensor.py
    homeassistant/components/xbox_live/sensor.py
    homeassistant/components/xeoma/camera.py
-    homeassistant/components/xfinity/device_tracker.py
    homeassistant/components/xiaomi/camera.py
    homeassistant/components/xiaomi_aqara/__init__.py
    homeassistant/components/xiaomi_aqara/binary_sensor.py
@@ -1056,6 +1163,7 @@ omit =
    homeassistant/components/xiaomi_miio/__init__.py
    homeassistant/components/xiaomi_miio/air_quality.py
    homeassistant/components/xiaomi_miio/alarm_control_panel.py
+    homeassistant/components/xiaomi_miio/device.py
    homeassistant/components/xiaomi_miio/device_tracker.py
    homeassistant/components/xiaomi_miio/fan.py
    homeassistant/components/xiaomi_miio/gateway.py
@@ -1113,3 +1221,6 @@ exclude_lines =
    # Don't complain if tests don't hit defensive assertion code:
    raise AssertionError
    raise NotImplementedError
+
+    # TYPE_CHECKING block is never executed during pytest run
+    if TYPE_CHECKING:
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -2,13 +2,14 @@
  "name": "Home Assistant Dev",
  "context": "..",
  "dockerFile": "../Dockerfile.dev",
-  "postCreateCommand": "mkdir -p config && pip3 install -e .",
+  "postCreateCommand": "script/setup",
+  "postStartCommand": "script/bootstrap",
+  "containerEnv": { "DEVCONTAINER": "1" },
  "appPort": 8123,
  "runArgs": ["-e", "GIT_EDITOR=code --wait"],
  "extensions": [
    "ms-python.vscode-pylance",
    "visualstudioexptteam.vscodeintellicode",
-    "ms-azure-devops.azure-pipelines",
    "redhat.vscode-yaml",
    "esbenp.prettier-vscode"
  ],
@@ -19,12 +20,11 @@
    "python.linting.enabled": true,
    "python.formatting.provider": "black",
    "python.testing.pytestArgs": ["--no-cov"],
-    "python.testing.pytestEnabled": true,
    "editor.formatOnPaste": false,
    "editor.formatOnSave": true,
    "editor.formatOnType": true,
    "files.trimTrailingWhitespace": true,
-    "terminal.integrated.shell.linux": "/bin/bash",
+    "terminal.integrated.shell.linux": "/usr/bin/zsh",
    "yaml.customTags": [
      "!input scalar",
      "!secret scalar",
--- a/.github/FUNDING.yml
+++ b/.github/FUNDING.yml
@@ -0,0 +1,2 @@
+custom: https://www.nabucasa.com
+github: balloob
--- a/.github/ISSUE_TEMPLATE/BUG_REPORT.md
+++ b/.github/ISSUE_TEMPLATE/BUG_REPORT.md
@@ -1,53 +0,0 @@
---
-name: Report a bug with Home Assistant Core
-about: Report an issue with Home Assistant Core
---
-<!-- READ THIS FIRST:
-  - If you need additional help with this template, please refer to https://www.home-assistant.io/help/reporting_issues/
-  - Make sure you are running the latest version of Home Assistant before reporting an issue: https://github.com/home-assistant/core/releases
-  - Do not report issues for integrations if you are using custom components or integrations.
-  - Provide as many details as possible. Paste logs, configuration samples and code into the backticks.
-  DO NOT DELETE ANY TEXT from this template! Otherwise, your issue may be closed without comment.
-->
-## The problem
-<!-- 
-  Describe the issue you are experiencing here to communicate to the
-  maintainers. Tell us what you were trying to do and what happened.
-->
-
-
-## Environment
-<!--
-  Provide details about the versions you are using, which helps us to reproduce
-  and find the issue quicker. Version information is found in the
-  Home Assistant frontend: Configuration -> Info.
-->
-
- Home Assistant Core release with the issue: 
- Last working Home Assistant Core release (if known): 
- Operating environment (OS/Container/Supervised/Core): 
- Integration causing this issue: 
- Link to integration documentation on our website: 
-
-## Problem-relevant `configuration.yaml`
-<!--
-  An example configuration that caused the problem for you. Fill this out even
-  if it seems unimportant to you. Please be sure to remove personal information
-  like passwords, private URLs and other credentials.
-->
-
-```yaml
-
-```
-
-## Traceback/Error logs
-<!--
-  If you come across any trace or error logs, please provide them.
-->
-
-```txt
-
-```
-
-## Additional information
-
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -0,0 +1,92 @@
+name: Report an issue with Home Assistant Core
+description: Report an issue with Home Assistant Core.
+body:
+  - type: markdown
+    attributes:
+      value: |
+        This issue form is for reporting bugs only!
+
+        If you have a feature or enhancement request, please use the [feature request][fr] section of our [Community Forum][fr].
+
+        [fr]: https://community.home-assistant.io/c/feature-requests
+  - type: textarea
+    validations:
+      required: true
+    attributes:
+      label: The problem
+      description: >-
+        Describe the issue you are experiencing here to communicate to the
+        maintainers. Tell us what you were trying to do and what happened.
+
+        Provide a clear and concise description of what the problem is.
+  - type: markdown
+    attributes:
+      value: |
+        ## Environment
+  - type: input
+    id: version
+    validations:
+      required: true
+    attributes:
+      label: What is version of Home Assistant Core has the issue?
+      placeholder: core-
+      description: >
+        Can be found in the Configuration panel -> Info.
+  - type: input
+    attributes:
+      label: What was the last working version of Home Assistant Core?
+      placeholder: core-
+      description: >
+        If known, otherwise leave blank.
+  - type: dropdown
+    validations:
+      required: true
+    attributes:
+      label: What type of installation are you running?
+      description: >
+        If you don't know, you can find it in: Configuration panel -> Info.
+      options:
+        - Home Assistant OS
+        - Home Assistant Container
+        - Home Assistant Supervised
+        - Home Assistant Core
+  - type: input
+    id: integration_name
+    attributes:
+      label: Integration causing the issue
+      description: >
+        The name of the integration, for example, Automation or Philips Hue.
+  - type: input
+    id: integration_link
+    attributes:
+      label: Link to integration documentation on our website
+      placeholder: "https://www.home-assistant.io/integrations/..."
+      description: |
+        Providing a link [to the documentation][docs] help us categorizing the
+        issue, while providing a useful reference at the same time.
+
+        [docs]: https://www.home-assistant.io/integrations
+
+  - type: markdown
+    attributes:
+      value: |
+        # Details
+  - type: textarea
+    attributes:
+      label: Example YAML snippet
+      description: |
+        If this issue has an example piece of YAML that can help reproducing this problem, please provide.
+        This can be an piece of YAML from, e.g., an automation, script, scene or configuration.
+      render: yaml
+  - type: textarea
+    attributes:
+      label: Anything in the logs that might be useful for us?
+      description: For example, error message, or stack traces.
+      render: txt
+  - type: textarea
+    attributes:
+      label: Additional information
+      description: >
+        If you have any additional information for us, use the field below.
+        Please note, you can attach screenshots or screen recordings here, by
+        dragging and dropping files in the field below.
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -0,0 +1,311 @@
+name: Build images
+
+# yamllint disable-line rule:truthy
+on:
+  workflow_dispatch:
+  release:
+    types: ["published"]
+  schedule:
+    - cron: "0 2 * * *"
+
+env:
+  BUILD_TYPE: core
+  DEFAULT_PYTHON: 3.8
+
+jobs:
+  init:
+    name: Initialize build
+    runs-on: ubuntu-latest
+    outputs:
+      architectures: ${{ steps.info.outputs.architectures }}
+      version: ${{ steps.version.outputs.version }}
+      channel: ${{ steps.version.outputs.channel }}
+      publish: ${{ steps.version.outputs.publish }}
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+        with:
+          fetch-depth: 0
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.2.2
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Get information
+        id: info
+        uses: home-assistant/actions/helpers/info@master
+
+      - name: Get version
+        id: version
+        uses: home-assistant/actions/helpers/version@master
+        with:
+          type: ${{ env.BUILD_TYPE }}
+
+      - name: Verify version
+        uses: home-assistant/actions/helpers/verify-version@master
+        with:
+          ignore-dev: true
+
+  build_python:
+    name: Build PyPi package
+    needs: init
+    runs-on: ubuntu-latest
+    if: needs.init.outputs.publish == 'true'
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v2.2.2
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Build package
+        shell: bash
+        run: |
+          pip install twine wheel
+          python setup.py sdist bdist_wheel
+
+      - name: Upload package
+        shell: bash
+        run: |
+          export TWINE_USERNAME="__token__"
+          export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
+
+          twine upload dist/* --skip-existing
+
+  build_base:
+    name: Build ${{ matrix.arch }} base core image
+    needs: init
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        arch: ${{ fromJson(needs.init.outputs.architectures) }}
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        if: needs.init.outputs.channel == 'dev'
+        uses: actions/setup-python@v2.2.2
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+
+      - name: Adjust nightly version
+        if: needs.init.outputs.channel == 'dev'
+        shell: bash
+        run: |
+          python3 -m pip install packaging
+          python3 -m pip install .
+          python3 script/version_bump.py nightly
+          version="$(python setup.py -V)"
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build base image
+        uses: home-assistant/builder@2021.04.2
+        with:
+          args: |
+            $BUILD_ARGS \
+            --${{ matrix.arch }} \
+            --target /data \
+            --with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
+            --validate-from "${{ secrets.VCN_ORG }}" \
+            --generic ${{ needs.init.outputs.version }}
+
+  build_machine:
+    name: Build ${{ matrix.machine }} machine core image
+    needs: ["init", "build_base"]
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        machine:
+          - generic-x86-64
+          - intel-nuc
+          - odroid-c2
+          - odroid-c4
+          - odroid-n2
+          - odroid-xu
+          - qemuarm
+          - qemuarm-64
+          - qemux86
+          - qemux86-64
+          - raspberrypi
+          - raspberrypi2
+          - raspberrypi3
+          - raspberrypi3-64
+          - raspberrypi4
+          - raspberrypi4-64
+          - tinker
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build base image
+        uses: home-assistant/builder@2021.04.2
+        with:
+          args: |
+            $BUILD_ARGS \
+            --target /data/machine \
+            --with-codenotary "${{ secrets.VCN_USER }}" "${{ secrets.VCN_PASSWORD }}" "${{ secrets.VCN_ORG }}" \
+            --validate-from "${{ secrets.VCN_ORG }}" \
+            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
+
+  publish_ha:
+    name: Publish version files
+    needs: ["init", "build_machine"]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+
+      - name: Initialize git
+        uses: home-assistant/actions/helpers/git-init@master
+        with:
+          name: ${{ secrets.GIT_NAME }}
+          email: ${{ secrets.GIT_EMAIL }}
+          token: ${{ secrets.GIT_TOKEN }}
+
+      - name: Update version file
+        uses: home-assistant/actions/helpers/version-push@master
+        with:
+          key: "homeassistant[]"
+          key-description: "Home Assistant Core"
+          version: ${{ needs.init.outputs.version }}
+          channel: ${{ needs.init.outputs.channel }}
+
+      - name: Update version file (stable -> beta)
+        if: needs.init.outputs.channel == 'stable'
+        uses: home-assistant/actions/helpers/version-push@master
+        with:
+          key: "homeassistant[]"
+          key-description: "Home Assistant Core"
+          version: ${{ needs.init.outputs.version }}
+          channel: beta
+
+  publish_container:
+    name: Publish meta container
+    needs: ["init", "build_base"]
+    runs-on: ubuntu-latest
+    steps:
+      - name: Checkout the repository
+        uses: actions/checkout@v2
+
+      - name: Login to DockerHub
+        uses: docker/login-action@v1
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v1
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build Meta Image
+        shell: bash
+        run: |
+          bash <(curl https://getvcn.codenotary.com -L)
+
+          export DOCKER_CLI_EXPERIMENTAL=enabled
+
+          function create_manifest() {
+            local docker_reg=${1}
+            local tag_l=${2}
+            local tag_r=${3}
+
+            docker manifest create "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/amd64-homeassistant:${tag_r}" \
+              "${docker_reg}/i386-homeassistant:${tag_r}" \
+              "${docker_reg}/armhf-homeassistant:${tag_r}" \
+              "${docker_reg}/armv7-homeassistant:${tag_r}" \
+              "${docker_reg}/aarch64-homeassistant:${tag_r}"
+
+            docker manifest annotate "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/amd64-homeassistant:${tag_r}" \
+              --os linux --arch amd64
+
+            docker manifest annotate "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/i386-homeassistant:${tag_r}" \
+              --os linux --arch 386
+
+            docker manifest annotate "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/armhf-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v6
+
+            docker manifest annotate "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/armv7-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v7
+
+            docker manifest annotate "${docker_reg}/home-assistant:${tag_l}" \
+              "${docker_reg}/aarch64-homeassistant:${tag_r}" \
+              --os linux --arch arm64 --variant=v8
+
+            docker manifest push --purge "${docker_reg}/home-assistant:${tag_l}"
+          }
+
+          function validate_image() {
+            local image=${1}
+            state="$(vcn authenticate --org home-assistant.io --output json docker://${image} | jq '.verification.status // 2')"
+            if [[ "${state}" != "0" ]]; then
+              echo "Invalid signature!"
+              exit 1
+            fi
+          }
+
+          for docker_reg in "homeassistant" "ghcr.io/home-assistant"; do
+            docker pull "${docker_reg}/amd64-homeassistant:${{ needs.init.outputs.version }}"
+            docker pull "${docker_reg}/i386-homeassistant:${{ needs.init.outputs.version }}"
+            docker pull "${docker_reg}/armhf-homeassistant:${{ needs.init.outputs.version }}"
+            docker pull "${docker_reg}/armv7-homeassistant:${{ needs.init.outputs.version }}"
+            docker pull "${docker_reg}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+            validate_image "${docker_reg}/amd64-homeassistant:${{ needs.init.outputs.version }}"
+            validate_image "${docker_reg}/i386-homeassistant:${{ needs.init.outputs.version }}"
+            validate_image "${docker_reg}/armhf-homeassistant:${{ needs.init.outputs.version }}"
+            validate_image "${docker_reg}/armv7-homeassistant:${{ needs.init.outputs.version }}"
+            validate_image "${docker_reg}/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+            # Create version tag
+            create_manifest "${docker_reg}" "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
+
+            # Create general tags
+            if [[ "${{ needs.init.outputs.version }}" =~ d ]]; then
+              create_manifest "${docker_reg}" "dev" "${{ needs.init.outputs.version }}"
+            elif [[ "${{ needs.init.outputs.version }}" =~ b ]]; then
+              create_manifest "${docker_reg}" "beta" "${{ needs.init.outputs.version }}"
+              create_manifest "${docker_reg}" "rc" "${{ needs.init.outputs.version }}"
+            else
+              create_manifest "${docker_reg}" "stable" "${{ needs.init.outputs.version }}"
+              create_manifest "${docker_reg}" "latest" "${{ needs.init.outputs.version }}"
+              create_manifest "${docker_reg}" "beta" "${{ needs.init.outputs.version }}"
+              create_manifest "${docker_reg}" "rc" "${{ needs.init.outputs.version }}"
+            fi
+          done
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -12,7 +12,8 @@ on:
 env:
  CACHE_VERSION: 1
  DEFAULT_PYTHON: 3.8
-  PRE_COMMIT_HOME: ~/.cache/pre-commit
+  PRE_COMMIT_CACHE: ~/.cache/pre-commit
+  SQLALCHEMY_WARN_20: 1

 jobs:
  # Separate job to pre-populate the base dependency cache
@@ -20,29 +21,36 @@ jobs:
  prepare-base:
    name: Prepare base dependencies
    runs-on: ubuntu-latest
+    outputs:
+      python-key: ${{ steps.generate-python-key.outputs.key }}
+      pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Generate partial Python venv restore key
+        id: generate-python-key
+        run: >-
+          echo "::set-output name=key::base-venv-${{ env.CACHE_VERSION }}-${{
+            hashFiles('requirements.txt') }}-${{
+            hashFiles('requirements_test.txt') }}-${{
+            hashFiles('homeassistant/package_constraints.txt') }}"
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            steps.generate-python-key.outputs.key }}
          restore-keys: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-${{ hashFiles('requirements.txt') }}
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{ steps.python.outputs.python-version }}-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-venv-${{ env.CACHE_VERSION }}-${{ hashFiles('requirements.txt') }}-${{ hashFiles('requirements_test.txt') }}-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-venv-${{ env.CACHE_VERSION }}-${{ hashFiles('requirements.txt') }}-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-venv-${{ env.CACHE_VERSION }}-
      - name: Create Python virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -50,15 +58,20 @@ jobs:
          . venv/bin/activate
          pip install -U "pip<20.3" setuptools
          pip install -r requirements.txt -r requirements_test.txt
+      - name: Generate partial pre-commit restore key
+        id: generate-pre-commit-key
+        run: >-
+          echo "::set-output name=key::pre-commit-${{ env.CACHE_VERSION }}-${{
+            hashFiles('.pre-commit-config.yaml') }}"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: >-
+            ${{ runner.os }}-${{ steps.generate-pre-commit-key.outputs.key }}
          restore-keys: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-
+            ${{ runner.os }}-pre-commit-${{ env.CACHE_VERSION }}-
      - name: Install pre-commit dependencies
        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
@@ -73,21 +86,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -95,15 +104,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Run bandit
        run: |
@@ -118,21 +126,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -140,15 +144,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Run black
        run: |
@@ -163,21 +166,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -185,15 +184,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Register codespell problem matcher
        run: |
@@ -230,21 +228,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -252,15 +246,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Register check executables problem matcher
        run: |
@@ -278,21 +271,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -300,15 +289,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Register flake8 problem matcher
        run: |
@@ -326,21 +314,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -348,15 +332,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Run isort
        run: |
@@ -371,21 +354,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -393,15 +372,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Register check-json problem matcher
        run: |
@@ -419,21 +397,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -441,15 +415,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Run pyupgrade
        run: |
@@ -475,21 +448,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -497,15 +466,14 @@ jobs:
          exit 1
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
-          path: ${{ env.PRE_COMMIT_HOME }}
-          key: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-pre-commit-${{ hashFiles('.pre-commit-config.yaml') }}
-      - name: Fail job if cache restore failed
-        if: steps.cache-venv.outputs.cache-hit != 'true'
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+      - name: Fail job if pre-commit cache restore failed
+        if: steps.cache-precommit.outputs.cache-hit != 'true'
        run: |
-          echo "Failed to restore Python virtual environment from cache"
+          echo "Failed to restore pre-commit environment from cache"
          exit 1
      - name: Register yamllint problem matcher
        run: |
@@ -528,14 +496,11 @@ jobs:
        uses: actions/checkout@v2
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
+            needs.prepare-tests.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -554,21 +519,17 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v2.2.1
+        uses: actions/setup-python@v2.2.2
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-base-venv-${{
-            steps.python.outputs.python-version }}-${{
-            hashFiles('requirements.txt') }}-${{
-            hashFiles('requirements_test.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.prepare-base.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -585,24 +546,31 @@ jobs:
    strategy:
      matrix:
        python-version: [3.8, 3.9]
+    outputs:
+      python-key: ${{ steps.generate-python-key.outputs.key }}
    container: homeassistant/ci-azure:${{ matrix.python-version }}
    steps:
      - name: Check out code from GitHub
        uses: actions/checkout@v2
+      - name: Generate partial Python venv restore key
+        id: generate-python-key
+        run: >-
+          echo "::set-output name=key::venv-${{ env.CACHE_VERSION }}-${{
+            hashFiles('requirements_test.txt') }}-${{
+            hashFiles('requirements_all.txt') }}-${{
+            hashFiles('homeassistant/package_constraints.txt') }}"
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+            ${{ runner.os }}-${{ matrix.python-version }}-${{
+            steps.generate-python-key.outputs.key }}
          restore-keys: |
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_all.txt') }}
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-${{ hashFiles('requirements_test.txt') }}
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{ matrix.python-version }}-
+            ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ env.CACHE_VERSION }}-${{ hashFiles('requirements_test.txt') }}-${{ hashFiles('requirements_all.txt') }}-
+            ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ env.CACHE_VERSION }}-${{ hashFiles('requirements_test.txt') }}-
+            ${{ runner.os }}-${{ matrix.python-version }}-venv-${{ env.CACHE_VERSION }}-
      - name: Create full Python ${{ matrix.python-version }} virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -630,14 +598,11 @@ jobs:
        uses: actions/checkout@v2
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
+            needs.prepare-tests.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -664,14 +629,11 @@ jobs:
        uses: actions/checkout@v2
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
+            needs.prepare-tests.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -689,6 +651,7 @@ jobs:
    runs-on: ubuntu-latest
    needs: prepare-tests
    strategy:
+      fail-fast: false
      matrix:
        group: [1, 2, 3, 4]
        python-version: [3.8, 3.9]
@@ -700,14 +663,11 @@ jobs:
        uses: actions/checkout@v2
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
+            needs.prepare-tests.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -735,11 +695,12 @@ jobs:
            --test-group-count 4 \
            --test-group=${{ matrix.group }} \
            --cov homeassistant \
+            --cov-report= \
            -o console_output_style=count \
            -p no:sugar \
            tests
      - name: Upload coverage artifact
-        uses: actions/upload-artifact@v2.2.2
+        uses: actions/upload-artifact@v2.2.3
        with:
          name: coverage-${{ matrix.python-version }}-group${{ matrix.group }}
          path: .coverage
@@ -750,7 +711,7 @@ jobs:
  coverage:
    name: Process test coverage
    runs-on: ubuntu-latest
-    needs: pytest
+    needs: ["prepare-tests", "pytest"]
    strategy:
      matrix:
        python-version: [3.8]
@@ -760,14 +721,11 @@ jobs:
        uses: actions/checkout@v2
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.5
        with:
          path: venv
-          key: >-
-            ${{ env.CACHE_VERSION}}-${{ runner.os }}-venv-${{
-            matrix.python-version }}-${{ hashFiles('requirements_test.txt')
-            }}-${{ hashFiles('requirements_all.txt') }}-${{
-            hashFiles('homeassistant/package_constraints.txt') }}
+          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
+            needs.prepare-tests.outputs.python-key }}
      - name: Fail job if Python cache restore failed
        if: steps.cache-venv.outputs.cache-hit != 'true'
        run: |
@@ -782,4 +740,4 @@ jobs:
          coverage report --fail-under=94
          coverage xml
      - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v1.2.1
+        uses: codecov/codecov-action@v1.4.1
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -16,7 +16,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues marked as no-stale or help-wanted
      - name: 90 days stale issues & PRs policy
-        uses: actions/stale@v3.0.15
+        uses: actions/stale@v3.0.18
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
@@ -53,7 +53,7 @@ jobs:
      # - No PRs marked as no-stale or new-integrations
      # - No issues (-1)
      - name: 30 days stale PRs policy
-        uses: actions/stale@v3.0.15
+        uses: actions/stale@v3.0.18
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 30
@@ -78,7 +78,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@v3.0.15
+        uses: actions/stale@v3.0.18
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          only-labels: "needs-more-information"
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,11 +1,11 @@
 repos:
  - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.2
+    rev: v2.12.0
    hooks:
      - id: pyupgrade
        args: [--py38-plus]
  - repo: https://github.com/psf/black
-    rev: 20.8b1
+    rev: 21.4b0
    hooks:
      - id: black
        args:
@@ -23,12 +23,17 @@ repos:
        exclude_types: [csv, json]
        exclude: ^tests/fixtures/
  - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.1
    hooks:
      - id: flake8
        additional_dependencies:
-          - flake8-docstrings==1.5.0
-          - pydocstyle==5.1.1
+          - pycodestyle==2.7.0
+          - pyflakes==2.3.1
+          - flake8-docstrings==1.6.0
+          - pydocstyle==6.0.0
+          - flake8-comprehensions==3.4.0
+          - flake8-noqa==1.1.0
+          - mccabe==0.6.1
        files: ^(homeassistant|script|tests)/.+\.py$
  - repo: https://github.com/PyCQA/bandit
    rev: 1.7.0
@@ -40,7 +45,7 @@ repos:
          - --configfile=tests/bandit.yaml
        files: ^(homeassistant|script|tests)/.+\.py$
  - repo: https://github.com/PyCQA/isort
-    rev: 5.5.3
+    rev: 5.8.0
    hooks:
      - id: isort
  - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -59,11 +64,24 @@ repos:
    rev: v1.24.2
    hooks:
      - id: yamllint
-  - repo: https://github.com/prettier/prettier
-    rev: 2.0.4
+  - repo: https://github.com/pre-commit/mirrors-prettier
+    rev: v2.2.1
    hooks:
      - id: prettier
        stages: [manual]
+  - repo: https://github.com/cdce8p/python-typing-update
+    rev: v0.3.3
+    hooks:
+      # Run `python-typing-update` hook manually from time to time
+      # to update python typing syntax.
+      # Will require manual work, before submitting changes!
+      - id: python-typing-update
+        stages: [manual]
+        args:
+          - --py38-plus
+          - --force
+          - --keep-updates
+        files: ^(homeassistant|tests|script)/.+\.py$
  - repo: local
    hooks:
      # Run mypy through our wrapper script in order to get the possible
@@ -90,4 +108,4 @@ repos:
        pass_filenames: false
        language: script
        types: [text]
-        files: ^(homeassistant/.+/(manifest|strings)\.json|\.coveragerc)$
+        files: ^(homeassistant/.+/(manifest|strings)\.json|\.coveragerc|homeassistant/.+/services\.yaml)$
--- a/.strict-typing
+++ b/.strict-typing
@@ -0,0 +1,47 @@
+# Used by hassfest for generating mypy.ini.
+# If component is fully covered with type annotations, please add it here
+# to enable strict mypy checks.
+
+homeassistant.components
+homeassistant.components.automation.*
+homeassistant.components.binary_sensor.*
+homeassistant.components.bond.*
+homeassistant.components.calendar.*
+homeassistant.components.cover.*
+homeassistant.components.device_automation.*
+homeassistant.components.frontend.*
+homeassistant.components.geo_location.*
+homeassistant.components.group.*
+homeassistant.components.history.*
+homeassistant.components.http.*
+homeassistant.components.huawei_lte.*
+homeassistant.components.hyperion.*
+homeassistant.components.image_processing.*
+homeassistant.components.integration.*
+homeassistant.components.knx.*
+homeassistant.components.light.*
+homeassistant.components.lock.*
+homeassistant.components.mailbox.*
+homeassistant.components.media_player.*
+homeassistant.components.notify.*
+homeassistant.components.number.*
+homeassistant.components.persistent_notification.*
+homeassistant.components.proximity.*
+homeassistant.components.recorder.purge
+homeassistant.components.recorder.repack
+homeassistant.components.remote.*
+homeassistant.components.scene.*
+homeassistant.components.sensor.*
+homeassistant.components.slack.*
+homeassistant.components.sonos.media_player
+homeassistant.components.sun.*
+homeassistant.components.switch.*
+homeassistant.components.systemmonitor.*
+homeassistant.components.tts.*
+homeassistant.components.vacuum.*
+homeassistant.components.water_heater.*
+homeassistant.components.weather.*
+homeassistant.components.websocket_api.*
+homeassistant.components.zeroconf.*
+homeassistant.components.zone.*
+homeassistant.components.zwave_js.*
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -9,11 +9,8 @@
      "type": "python",
      "request": "launch",
      "module": "homeassistant",
-      "args": [
-        "--debug",
-        "-c",
-        "config"
-      ]
+      "justMyCode": false,
+      "args": ["--debug", "-c", "config"]
    },
    {
      // Debug by attaching to local Home Asistant server using Remote Python Debugger.
@@ -28,7 +25,7 @@
          "localRoot": "${workspaceFolder}",
          "remoteRoot": "."
        }
-      ],
+      ]
    },
    {
      // Debug by attaching to remote Home Asistant server using Remote Python Debugger.
@@ -43,7 +40,7 @@
          "localRoot": "${workspaceFolder}",
          "remoteRoot": "/usr/src/homeassistant"
        }
-      ],
+      ]
    }
  ]
-}
+}
--- a/66
+++ b/66
@@ -24,6 +24,7 @@ homeassistant/components/accuweather/* @bieniu
 homeassistant/components/acmeda/* @atmurray
 homeassistant/components/adguard/* @frenck
 homeassistant/components/advantage_air/* @Bre77
+homeassistant/components/aemet/* @noltari
 homeassistant/components/agent_dvr/* @ispysoftware
 homeassistant/components/airly/* @bieniu
 homeassistant/components/airnow/* @asymworks
@@ -34,7 +35,7 @@ homeassistant/components/almond/* @gcampax @balloob
 homeassistant/components/alpha_vantage/* @fabaff
 homeassistant/components/ambiclimate/* @danielhiversen
 homeassistant/components/ambient_station/* @bachya
-homeassistant/components/amcrest/* @pnbruckner
+homeassistant/components/analytics/* @home-assistant/core @ludeeus
 homeassistant/components/androidtv/* @JeffLIrion
 homeassistant/components/apache_kafka/* @bachya
 homeassistant/components/api/* @home-assistant/core
@@ -45,7 +46,7 @@ homeassistant/components/arcam_fmj/* @elupus
 homeassistant/components/arduino/* @fabaff
 homeassistant/components/arest/* @fabaff
 homeassistant/components/arris_tg2492lg/* @vanbalken
-homeassistant/components/asuswrt/* @kennedyshead
+homeassistant/components/asuswrt/* @kennedyshead @ollo69
 homeassistant/components/atag/* @MatsNL
 homeassistant/components/aten_pe/* @mtdcr
 homeassistant/components/atome/* @baqs
@@ -82,10 +83,12 @@ homeassistant/components/circuit/* @braam
 homeassistant/components/cisco_ios/* @fbradyirl
 homeassistant/components/cisco_mobility_express/* @fbradyirl
 homeassistant/components/cisco_webex_teams/* @fbradyirl
+homeassistant/components/climacell/* @raman325
 homeassistant/components/cloud/* @home-assistant/cloud
 homeassistant/components/cloudflare/* @ludeeus @ctalkington
 homeassistant/components/color_extractor/* @GenericStudent
 homeassistant/components/comfoconnect/* @michaelarnauts
+homeassistant/components/compensation/* @Petro31
 homeassistant/components/config/* @home-assistant/core
 homeassistant/components/configurator/* @home-assistant/core
 homeassistant/components/control4/* @lawtancool
@@ -130,6 +133,7 @@ homeassistant/components/elkm1/* @gwww @bdraco
 homeassistant/components/elv/* @majuss
 homeassistant/components/emby/* @mezz64
 homeassistant/components/emoncms/* @borpin
+homeassistant/components/emonitor/* @bdraco
 homeassistant/components/emulated_kasa/* @kbickar
 homeassistant/components/enigma2/* @fbradyirl
 homeassistant/components/enocean/* @bdurrer
@@ -143,7 +147,8 @@ homeassistant/components/eq3btsmart/* @rytilahti
 homeassistant/components/esphome/* @OttoWinter
 homeassistant/components/essent/* @TheLastProject
 homeassistant/components/evohome/* @zxdavb
-homeassistant/components/ezviz/* @baqs
+homeassistant/components/ezviz/* @RenierM26 @baqs
+homeassistant/components/faa_delays/* @ntilley905
 homeassistant/components/fastdotcom/* @rohankapoorcom
 homeassistant/components/file/* @fabaff
 homeassistant/components/filter/* @dgomes
@@ -158,7 +163,9 @@ homeassistant/components/flunearyou/* @bachya
 homeassistant/components/forked_daapd/* @uvjustin
 homeassistant/components/fortios/* @kimfrellsen
 homeassistant/components/foscam/* @skgsergio
-homeassistant/components/freebox/* @snoof85 @Quentame
+homeassistant/components/freebox/* @hacf-fr @Quentame
+homeassistant/components/fritz/* @mammuth @AaronDavidSchneider @chemelli74
+homeassistant/components/fritzbox/* @mib1185
 homeassistant/components/fronius/* @nielstron
 homeassistant/components/frontend/* @home-assistant/frontend
 homeassistant/components/garmin_connect/* @cyberjunky
@@ -177,13 +184,12 @@ homeassistant/components/google_cloud/* @lufton
 homeassistant/components/gpsd/* @fabaff
 homeassistant/components/gree/* @cmroche
 homeassistant/components/greeneye_monitor/* @jkeljo
-homeassistant/components/griddy/* @bdraco
 homeassistant/components/group/* @home-assistant/core
-homeassistant/components/growatt_server/* @indykoning
+homeassistant/components/growatt_server/* @indykoning @muppet3000
 homeassistant/components/guardian/* @bachya
+homeassistant/components/habitica/* @ASMfreaK @leikoilja
 homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco @mkeesey
 homeassistant/components/hassio/* @home-assistant/supervisor
-homeassistant/components/hdmi_cec/* @newAM
 homeassistant/components/heatmiser/* @andylockran
 homeassistant/components/heos/* @andrewsayre
 homeassistant/components/here_travel_time/* @eifinger
@@ -194,11 +200,11 @@ homeassistant/components/history/* @home-assistant/core
 homeassistant/components/hive/* @Rendili @KJonline
 homeassistant/components/hlk_sw16/* @jameshilliard
 homeassistant/components/home_connect/* @DavidMStraub
+homeassistant/components/home_plus_control/* @chemaaa
 homeassistant/components/homeassistant/* @home-assistant/core
 homeassistant/components/homekit/* @bdraco
 homeassistant/components/homekit_controller/* @Jc2k
 homeassistant/components/homematic/* @pvizeli @danielperna84
-homeassistant/components/homematicip_cloud/* @SukramJ
 homeassistant/components/http/* @home-assistant/core
 homeassistant/components/huawei_lte/* @scop @fphammerle
 homeassistant/components/huawei_router/* @abmantis
@@ -209,6 +215,7 @@ homeassistant/components/hunterdouglas_powerview/* @bdraco
 homeassistant/components/hvv_departures/* @vigonotion
 homeassistant/components/hydrawise/* @ptcryan
 homeassistant/components/hyperion/* @dermotduffy
+homeassistant/components/ialarm/* @RyuzakiKK
 homeassistant/components/iammeter/* @lewei50
 homeassistant/components/iaqualink/* @flz
 homeassistant/components/icloud/* @Quentame @nzapponi
@@ -241,15 +248,19 @@ homeassistant/components/keba/* @dannerph
 homeassistant/components/keenetic_ndms2/* @foxel
 homeassistant/components/kef/* @basnijholt
 homeassistant/components/keyboard_remote/* @bendavid
+homeassistant/components/kmtronic/* @dgomes
 homeassistant/components/knx/* @Julius2342 @farmio @marvin-w
 homeassistant/components/kodi/* @OnFreund @cgtobi
 homeassistant/components/konnected/* @heythisisnate @kit-klein
+homeassistant/components/kostal_plenticore/* @stegm
 homeassistant/components/kulersky/* @emlove
 homeassistant/components/lametric/* @robbiet480
 homeassistant/components/launch_library/* @ludeeus
 homeassistant/components/lcn/* @alengwenus
 homeassistant/components/life360/* @pnbruckner
 homeassistant/components/linux_battery/* @fabaff
+homeassistant/components/litejet/* @joncar
+homeassistant/components/litterrobot/* @natekspencer
 homeassistant/components/local_ip/* @issacg
 homeassistant/components/logger/* @home-assistant/core
 homeassistant/components/logi_circle/* @evanjd
@@ -260,14 +271,17 @@ homeassistant/components/luftdaten/* @fabaff
 homeassistant/components/lupusec/* @majuss
 homeassistant/components/lutron/* @JonGilmore
 homeassistant/components/lutron_caseta/* @swails @bdraco
+homeassistant/components/lyric/* @timmo001
 homeassistant/components/mastodon/* @fabaff
 homeassistant/components/matrix/* @tinloaf
+homeassistant/components/mazda/* @bdr99
 homeassistant/components/mcp23017/* @jardiamj
 homeassistant/components/media_source/* @hunterjm
 homeassistant/components/mediaroom/* @dgomes
 homeassistant/components/melcloud/* @vilppuvuorinen
 homeassistant/components/melissa/* @kennedyshead
 homeassistant/components/met/* @danielhiversen @thimic
+homeassistant/components/met_eireann/* @DylanGore
 homeassistant/components/meteo_france/* @hacf-fr @oncleben31 @Quentame
 homeassistant/components/meteoalarm/* @rolfberkenbosch
 homeassistant/components/metoffice/* @MrHarcombe
@@ -282,11 +296,15 @@ homeassistant/components/modbus/* @adamchengtkc @janiversen @vzahradnik
 homeassistant/components/monoprice/* @etsinko @OnFreund
 homeassistant/components/moon/* @fabaff
 homeassistant/components/motion_blinds/* @starkillerOG
+homeassistant/components/motioneye/* @dermotduffy
 homeassistant/components/mpd/* @fabaff
-homeassistant/components/mqtt/* @home-assistant/core @emontnemery
+homeassistant/components/mqtt/* @emontnemery
 homeassistant/components/msteams/* @peroyvind
+homeassistant/components/mullvad/* @meichthys
+homeassistant/components/mutesync/* @currentoor
+homeassistant/components/my/* @home-assistant/core
 homeassistant/components/myq/* @bdraco
-homeassistant/components/mysensors/* @MartinHjelmare
+homeassistant/components/mysensors/* @MartinHjelmare @functionpointer
 homeassistant/components/mystrom/* @fabaff
 homeassistant/components/neato/* @dshokouhi @Santobert
 homeassistant/components/nederlandse_spoorwegen/* @YarmoM
@@ -310,7 +328,7 @@ homeassistant/components/notion/* @bachya
 homeassistant/components/nsw_fuel_station/* @nickw444
 homeassistant/components/nsw_rural_fire_service_feed/* @exxamalte
 homeassistant/components/nuheat/* @bdraco
-homeassistant/components/nuki/* @pschmitt @pvizeli
+homeassistant/components/nuki/* @pschmitt @pvizeli @pree
 homeassistant/components/numato/* @clssn
 homeassistant/components/number/* @home-assistant/core @Shulyaka
 homeassistant/components/nut/* @bdraco
@@ -342,6 +360,7 @@ homeassistant/components/persistent_notification/* @home-assistant/core
 homeassistant/components/philips_js/* @elupus
 homeassistant/components/pi4ioe5v9xxxx/* @antonverburg
 homeassistant/components/pi_hole/* @fabaff @johnluetke @shenxn
+homeassistant/components/picnic/* @corneyl
 homeassistant/components/pilight/* @trekky12
 homeassistant/components/plaato/* @JohNan
 homeassistant/components/plex/* @jjlawren
@@ -353,7 +372,7 @@ homeassistant/components/powerwall/* @bdraco @jrester
 homeassistant/components/profiler/* @bdraco
 homeassistant/components/progettihwsw/* @ardaseremet
 homeassistant/components/prometheus/* @knyar
-homeassistant/components/proxmoxve/* @k4ds3 @jhollowe
+homeassistant/components/proxmoxve/* @k4ds3 @jhollowe @Corbeno
 homeassistant/components/ps4/* @ktnrg45
 homeassistant/components/push/* @dgomes
 homeassistant/components/pvoutput/* @fabaff
@@ -374,9 +393,11 @@ homeassistant/components/random/* @fabaff
 homeassistant/components/recollect_waste/* @bachya
 homeassistant/components/rejseplanen/* @DarkFox
 homeassistant/components/repetier/* @MTrab
+homeassistant/components/rflink/* @javicalle
 homeassistant/components/rfxtrx/* @danielhiversen @elupus @RobBie1221
 homeassistant/components/ring/* @balloob
 homeassistant/components/risco/* @OnFreund
+homeassistant/components/rituals_perfume_genie/* @milanmeu
 homeassistant/components/rmvtransport/* @cgtobi
 homeassistant/components/roku/* @ctalkington
 homeassistant/components/roomba/* @pschmitt @cyr-ius @shenxn
@@ -390,6 +411,7 @@ homeassistant/components/samsungtv/* @escoand
 homeassistant/components/scene/* @home-assistant/core
 homeassistant/components/schluter/* @prairieapps
 homeassistant/components/scrape/* @fabaff
+homeassistant/components/screenlogic/* @dieselrabbit
 homeassistant/components/script/* @home-assistant/core
 homeassistant/components/search/* @home-assistant/core
 homeassistant/components/sense/* @kbickar
@@ -411,20 +433,21 @@ homeassistant/components/sisyphus/* @jkeljo
 homeassistant/components/sky_hub/* @rogerselwyn
 homeassistant/components/slack/* @bachya
 homeassistant/components/slide/* @ualex73
-homeassistant/components/sma/* @kellerza
+homeassistant/components/sma/* @kellerza @rklomp
 homeassistant/components/smappee/* @bsmappee
 homeassistant/components/smart_meter_texas/* @grahamwetzler
 homeassistant/components/smarthab/* @outadoc
 homeassistant/components/smartthings/* @andrewsayre
+homeassistant/components/smarttub/* @mdz
 homeassistant/components/smarty/* @z0mbieprocess
 homeassistant/components/sms/* @ocalvo
 homeassistant/components/smtp/* @fabaff
+homeassistant/components/solaredge/* @frenck
 homeassistant/components/solaredge_local/* @drobtravels @scheric
 homeassistant/components/solarlog/* @Ernst79
 homeassistant/components/solax/* @squishykid
 homeassistant/components/soma/* @ratsept
 homeassistant/components/somfy/* @tetienne
-homeassistant/components/somfy_mylink/* @bdraco
 homeassistant/components/sonarr/* @ctalkington
 homeassistant/components/songpal/* @rytilahti @shenxn
 homeassistant/components/sonos/* @cgtobi
@@ -440,8 +463,9 @@ homeassistant/components/starline/* @anonym-tsk
 homeassistant/components/statistics/* @fabaff
 homeassistant/components/stiebel_eltron/* @fucm
 homeassistant/components/stookalert/* @fwestenberg
-homeassistant/components/stream/* @hunterjm @uvjustin
+homeassistant/components/stream/* @hunterjm @uvjustin @allenporter
 homeassistant/components/stt/* @pvizeli
+homeassistant/components/subaru/* @G-Two
 homeassistant/components/suez_water/* @ooii
 homeassistant/components/sun/* @Swamp-Ig
 homeassistant/components/supla/* @mwegrzynek
@@ -455,7 +479,7 @@ homeassistant/components/syncthru/* @nielstron
 homeassistant/components/synology_dsm/* @hacf-fr @Quentame @mib1185
 homeassistant/components/synology_srm/* @aerialls
 homeassistant/components/syslog/* @fabaff
-homeassistant/components/tado/* @michaelarnauts @bdraco
+homeassistant/components/tado/* @michaelarnauts @bdraco @noltari
 homeassistant/components/tag/* @balloob @dmulcahey
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tankerkoenig/* @guillempages
@@ -477,7 +501,7 @@ homeassistant/components/toon/* @frenck
 homeassistant/components/totalconnect/* @austinmroczek
 homeassistant/components/tplink/* @rytilahti @thegardenmonkey
 homeassistant/components/traccar/* @ludeeus
-homeassistant/components/tradfri/* @ggravlingen
+homeassistant/components/trace/* @home-assistant/core
 homeassistant/components/trafikverket_train/* @endor-force
 homeassistant/components/trafikverket_weatherstation/* @endor-force
 homeassistant/components/transmission/* @engrbm87 @JPHutchins
@@ -485,6 +509,7 @@ homeassistant/components/tts/* @pvizeli
 homeassistant/components/tuya/* @ollo69
 homeassistant/components/twentemilieu/* @frenck
 homeassistant/components/twinkly/* @dr1rrb
+homeassistant/components/ubus/* @noltari
 homeassistant/components/unifi/* @Kane610
 homeassistant/components/unifiled/* @florisvdk
 homeassistant/components/upb/* @gwww
@@ -497,7 +522,7 @@ homeassistant/components/usgs_earthquakes_feed/* @exxamalte
 homeassistant/components/utility_meter/* @dgomes
 homeassistant/components/velbus/* @Cereal2nd @brefra
 homeassistant/components/velux/* @Julius2342
-homeassistant/components/vera/* @vangorra
+homeassistant/components/vera/* @pavoni
 homeassistant/components/verisure/* @frenck
 homeassistant/components/versasense/* @flamm3blemuff1n
 homeassistant/components/version/* @fabaff @ludeeus
@@ -506,14 +531,16 @@ homeassistant/components/vicare/* @oischinger
 homeassistant/components/vilfo/* @ManneW
 homeassistant/components/vivotek/* @HarlemSquirrel
 homeassistant/components/vizio/* @raman325
-homeassistant/components/vlc_telnet/* @rodripf
+homeassistant/components/vlc_telnet/* @rodripf @dmcc
 homeassistant/components/volkszaehler/* @fabaff
 homeassistant/components/volumio/* @OnFreund
+homeassistant/components/wake_on_lan/* @ntilley905
 homeassistant/components/waqi/* @andrey-git
 homeassistant/components/watson_tts/* @rutkai
 homeassistant/components/weather/* @fabaff
 homeassistant/components/webostv/* @bendavid
 homeassistant/components/websocket_api/* @home-assistant/core
+homeassistant/components/wemo/* @esev
 homeassistant/components/wiffi/* @mampfes
 homeassistant/components/wilight/* @leofig-rj
 homeassistant/components/withings/* @vangorra
@@ -523,7 +550,6 @@ homeassistant/components/workday/* @fabaff
 homeassistant/components/worldclock/* @fabaff
 homeassistant/components/xbox/* @hunterjm
 homeassistant/components/xbox_live/* @MartinHjelmare
-homeassistant/components/xfinity/* @cisasteelersfan
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
 homeassistant/components/xiaomi_miio/* @rytilahti @syssi @starkillerOG
 homeassistant/components/xiaomi_tv/* @simse
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,7 +1,11 @@
 FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.8

+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN \
-    apt-get update && apt-get install -y --no-install-recommends \
+    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
+    && apt-get update \
+    && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
        libudev-dev \
        libavformat-dev \
        libavcodec-dev \
@@ -10,6 +14,7 @@ RUN \
        libswscale-dev \
        libswresample-dev \
        libavfilter-dev \
+        libpcap-dev \
        git \
    && apt-get clean \
    && rm -rf /var/lib/apt/lists/*
@@ -23,10 +28,11 @@ RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
 WORKDIR /workspaces

 # Install Python dependencies from requirements
-COPY requirements_test.txt requirements_test_pre_commit.txt ./
+COPY requirements.txt requirements_test.txt requirements_test_pre_commit.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements_test.txt \
-   && rm -rf requirements_test.txt requirements_test_pre_commit.txt homeassistant/
+RUN pip3 install -r requirements.txt \
+   && pip3 install -r requirements_test.txt \
+   && rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/

 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash
--- a/azure-pipelines-release.yml
+++ b/azure-pipelines-release.yml
@@ -1,321 +0,0 @@
-# https://dev.azure.com/home-assistant
-
-trigger:
-  tags:
-    include:
-      - '*'
-pr: none
-schedules:
-  - cron: "0 1 * * *"
-    displayName: "nightly builds"
-    branches:
-      include:
-        - dev
-    always: true
-variables:
-  - name: versionBuilder
-    value: '2020.11.0'
-  - group: docker
-  - group: github
-  - group: twine
-resources:
-  repositories:
-    - repository: azure
-      type: github
-      name: 'home-assistant/ci-azure'
-      endpoint: 'home-assistant'
-
-stages:
-
- stage: 'Validate'
-  jobs:
-  - template: templates/azp-job-version.yaml@azure
-    parameters:
-      ignoreDev: true
-  - job: 'Permission'
-    pool:
-      vmImage: 'ubuntu-latest'
-    steps:
-    - script: |
-        sudo apt-get install -y --no-install-recommends \
-          jq curl
-
-        release="$(Build.SourceBranchName)"
-        created_by="$(curl -s https://api.github.com/repos/home-assistant/core/releases/tags/${release} | jq --raw-output '.author.login')"
-
-        if [[ "${created_by}" =~ ^(balloob|pvizeli|fabaff|robbiet480|bramkragten|frenck)$ ]]; then
-          exit 0
-        fi
-
-        echo "${created_by} is not allowed to create an release!"
-        exit 1
-      displayName: 'Check rights'
-      condition: and(succeeded(), startsWith(variables['Build.SourceBranch'], 'refs/tags'))
-
- stage: 'Build'
-  jobs:
-  - job: 'ReleasePython'
-    condition: startsWith(variables['Build.SourceBranch'], 'refs/tags')
-    pool:
-      vmImage: 'ubuntu-latest'
-    steps:
-    - task: UsePythonVersion@0
-      displayName: 'Use Python 3.8'
-      inputs:
-        versionSpec: '3.8'
-    - script: pip install twine wheel
-      displayName: 'Install tools'
-    - script: python setup.py sdist bdist_wheel
-      displayName: 'Build package'
-    - script: |
-        export TWINE_USERNAME="$(twineUser)"
-        export TWINE_PASSWORD="$(twinePassword)"
-
-        twine upload dist/* --skip-existing
-      displayName: 'Upload pypi'
-  - job: 'ReleaseDocker'
-    timeoutInMinutes: 240
-    pool:
-      vmImage: 'ubuntu-latest'
-    strategy:
-      maxParallel: 5
-      matrix:
-        amd64:
-          buildArch: 'amd64'
-        i386:
-          buildArch: 'i386'
-        armhf:
-          buildArch: 'armhf'
-        armv7:
-          buildArch: 'armv7'
-        aarch64:
-          buildArch: 'aarch64'
-    steps:
-    - template: templates/azp-step-ha-version.yaml@azure
-    - script: |
-        docker login -u $(dockerUser) -p $(dockerPassword)
-      displayName: 'Docker hub login'
-    - script: docker pull homeassistant/amd64-builder:$(versionBuilder)
-      displayName: 'Install Builder'
-    - script: |
-        set -e
-
-        docker run --rm --privileged \
-          -v ~/.docker:/root/.docker:rw \
-          -v /run/docker.sock:/run/docker.sock:rw \
-          -v $(pwd):/data:ro \
-          homeassistant/amd64-builder:$(versionBuilder) \
-          --generic $(homeassistantRelease) "--$(buildArch)" -t /data \
-      displayName: 'Build Release'
-  - job: 'ReleaseMachine'
-    dependsOn:
-    - ReleaseDocker
-    timeoutInMinutes: 240
-    pool:
-      vmImage: 'ubuntu-latest'
-    strategy:
-      maxParallel: 15
-      matrix:
-        qemux86-64:
-          buildMachine: 'qemux86-64'
-        intel-nuc:
-          buildMachine: 'intel-nuc'
-        qemux86:
-          buildMachine: 'qemux86'
-        qemuarm:
-          buildMachine: 'qemuarm'
-        raspberrypi:
-          buildMachine: 'raspberrypi'
-        raspberrypi2:
-          buildMachine: 'raspberrypi2'
-        raspberrypi3:
-          buildMachine: 'raspberrypi3'
-        raspberrypi4:
-          buildMachine: 'raspberrypi4'
-        odroid-xu:
-          buildMachine: 'odroid-xu'
-        tinker:
-          buildMachine: 'tinker'
-        qemuarm-64:
-          buildMachine: 'qemuarm-64'
-        raspberrypi3-64:
-          buildMachine: 'raspberrypi3-64'
-        raspberrypi4-64:
-          buildMachine: 'raspberrypi4-64'
-        odroid-c2:
-          buildMachine: 'odroid-c2'
-        odroid-c4:
-          buildMachine: 'odroid-c4'
-        odroid-n2:
-          buildMachine: 'odroid-n2'
-    steps:
-    - template: templates/azp-step-ha-version.yaml@azure
-    - script: |
-        docker login -u $(dockerUser) -p $(dockerPassword)
-      displayName: 'Docker hub login'
-    - script: docker pull homeassistant/amd64-builder:$(versionBuilder)
-      displayName: 'Install Builder'
-    - script: |
-        set -e
-
-        docker run --rm --privileged \
-          -v ~/.docker:/root/.docker \
-          -v /run/docker.sock:/run/docker.sock:rw \
-          -v $(pwd):/data:ro \
-          homeassistant/amd64-builder:$(versionBuilder) \
-          --homeassistant-machine "$(homeassistantRelease)=$(buildMachine)" \
-          -t /data/machine --docker-hub homeassistant
-      displayName: 'Build Machine'
-
- stage: 'Publish'
-  jobs:
-  - job: 'ReleaseHassio'
-    pool:
-      vmImage: 'ubuntu-latest'
-    steps:
-    - template: templates/azp-step-ha-version.yaml@azure
-    - script: |
-        sudo apt-get install -y --no-install-recommends \
-          git jq curl
-
-        git config --global user.name "Pascal Vizeli"
-        git config --global user.email "pvizeli@syshack.ch"
-        git config --global credential.helper store
-
-        echo "https://$(githubToken):x-oauth-basic@github.com" > $HOME/.git-credentials
-      displayName: 'Install requirements'
-    - script: |
-        set -e
-
-        version="$(homeassistantRelease)"
-
-        git clone https://github.com/home-assistant/version
-        cd version
-
-        dev_version="$(jq --raw-output '.homeassistant.default' dev.json)"
-        beta_version="$(jq --raw-output '.homeassistant.default' beta.json)"
-        stable_version="$(jq --raw-output '.homeassistant.default' stable.json)"
-
-        if [[ "$version" =~ d ]]; then
-          sed -i "s|$dev_version|$version|g" dev.json
-        elif [[ "$version" =~ b ]]; then
-          sed -i "s|$beta_version|$version|g" beta.json
-        else
-          sed -i "s|$beta_version|$version|g" beta.json
-          sed -i "s|$stable_version|$version|g" stable.json
-        fi
-
-        git commit -am "Bump Home Assistant $version"
-        git push
-      displayName: "Update version files"
-  - job: 'ReleaseDocker'
-    pool:
-      vmImage: 'ubuntu-latest'
-    steps:
-    - template: templates/azp-step-ha-version.yaml@azure
-    - script: |
-        docker login -u $(dockerUser) -p $(dockerPassword)
-      displayName: 'Docker login'
-    - script: |
-        set -e
-        export DOCKER_CLI_EXPERIMENTAL=enabled
-
-        function create_manifest() {
-          local tag_l=$1
-          local tag_r=$2
-
-          docker manifest create homeassistant/home-assistant:${tag_l} \
-            homeassistant/amd64-homeassistant:${tag_r} \
-            homeassistant/i386-homeassistant:${tag_r} \
-            homeassistant/armhf-homeassistant:${tag_r} \
-            homeassistant/armv7-homeassistant:${tag_r} \
-            homeassistant/aarch64-homeassistant:${tag_r}
-
-          docker manifest annotate homeassistant/home-assistant:${tag_l} \
-            homeassistant/amd64-homeassistant:${tag_r} \
-            --os linux --arch amd64
-
-          docker manifest annotate homeassistant/home-assistant:${tag_l} \
-            homeassistant/i386-homeassistant:${tag_r} \
-            --os linux --arch 386
-
-          docker manifest annotate homeassistant/home-assistant:${tag_l} \
-            homeassistant/armhf-homeassistant:${tag_r} \
-            --os linux --arch arm --variant=v6
-
-          docker manifest annotate homeassistant/home-assistant:${tag_l} \
-            homeassistant/armv7-homeassistant:${tag_r} \
-            --os linux --arch arm --variant=v7
-
-          docker manifest annotate homeassistant/home-assistant:${tag_l} \
-            homeassistant/aarch64-homeassistant:${tag_r} \
-            --os linux --arch arm64 --variant=v8
-
-          docker manifest push --purge homeassistant/home-assistant:${tag_l}
-        }
-
-        docker pull homeassistant/amd64-homeassistant:$(homeassistantRelease)
-        docker pull homeassistant/i386-homeassistant:$(homeassistantRelease)
-        docker pull homeassistant/armhf-homeassistant:$(homeassistantRelease)
-        docker pull homeassistant/armv7-homeassistant:$(homeassistantRelease)
-        docker pull homeassistant/aarch64-homeassistant:$(homeassistantRelease)
-
-        # Create version tag
-        create_manifest "$(homeassistantRelease)" "$(homeassistantRelease)"
-
-        # Create general tags
-        if [[ "$(homeassistantRelease)" =~ d ]]; then
-          create_manifest "dev" "$(homeassistantRelease)"
-        elif [[ "$(homeassistantRelease)" =~ b ]]; then
-          create_manifest "beta" "$(homeassistantRelease)"
-          create_manifest "rc" "$(homeassistantRelease)"
-        else
-          create_manifest "stable" "$(homeassistantRelease)"
-          create_manifest "latest" "$(homeassistantRelease)"
-          create_manifest "beta" "$(homeassistantRelease)"
-          create_manifest "rc" "$(homeassistantRelease)"
-        fi
-
-      displayName: 'Create Meta-Image'
-
- stage: 'Addidional'
-  jobs:
-  - job: 'Updater'
-    pool:
-      vmImage: 'ubuntu-latest'
-    variables:
-    - group: gcloud
-    steps:
-    - template: templates/azp-step-ha-version.yaml@azure
-    - script: |
-        set -e
-
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-
-        curl -o google-cloud-sdk.tar.gz https://dl.google.com/dl/cloudsdk/release/google-cloud-sdk.tar.gz
-        tar -C . -xvf google-cloud-sdk.tar.gz
-        rm -f google-cloud-sdk.tar.gz
-        ./google-cloud-sdk/install.sh
-      displayName: 'Setup gCloud'
-      condition: eq(variables['homeassistantReleaseStable'], 'true')
-    - script: |
-        set -e
-
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-
-        echo "$(gcloudAnalytic)" > gcloud_auth.json
-        ./google-cloud-sdk/bin/gcloud auth activate-service-account --key-file gcloud_auth.json
-        rm -f gcloud_auth.json
-      displayName: 'Auth gCloud'
-      condition: eq(variables['homeassistantReleaseStable'], 'true')
-    - script: |
-        set -e
-
-        export CLOUDSDK_CORE_DISABLE_PROMPTS=1
-
-        ./google-cloud-sdk/bin/gcloud functions deploy Analytics-Receiver \
-          --project home-assistant-analytics \
-          --update-env-vars VERSION=$(homeassistantRelease) \
-          --source gs://analytics-src/function-source.zip
-      displayName: 'Push details to updater'
-      condition: eq(variables['homeassistantReleaseStable'], 'true')
--- a/build.json
+++ b/build.json
@@ -1,14 +1,22 @@
 {
  "image": "homeassistant/{arch}-homeassistant",
+  "shadow_repository": "ghcr.io/home-assistant",
  "build_from": {
-    "aarch64": "homeassistant/aarch64-homeassistant-base:2021.02.0",
-    "armhf": "homeassistant/armhf-homeassistant-base:2021.02.0",
-    "armv7": "homeassistant/armv7-homeassistant-base:2021.02.0",
-    "amd64": "homeassistant/amd64-homeassistant-base:2021.02.0",
-    "i386": "homeassistant/i386-homeassistant-base:2021.02.0"
+    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.04.3",
+    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.04.3",
+    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.04.3",
+    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.04.3",
+    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.04.3"
  },
  "labels": {
-    "io.hass.type": "core"
+    "io.hass.type": "core",
+    "org.opencontainers.image.title": "Home Assistant",
+    "org.opencontainers.image.description": "Open-source home automation platform running on Python 3",
+    "org.opencontainers.image.source": "https://github.com/home-assistant/core",
+    "org.opencontainers.image.authors": "The Home Assistant Authors",
+    "org.opencontainers.image.url": "https://www.home-assistant.io/",
+    "org.opencontainers.image.documentation": "https://www.home-assistant.io/docs/",
+    "org.opencontainers.image.licenses": "Apache License 2.0"
  },
  "version_tag": true
 }
--- a/homeassistant/main.py
+++ b/homeassistant/main.py
@@ -1,11 +1,12 @@
 """Start Home Assistant."""
+from __future__ import annotations
+
 import argparse
 import os
 import platform
 import subprocess
 import sys
 import threading
-from typing import List

 from homeassistant.const import REQUIRED_PYTHON_VER, RESTART_EXIT_CODE, __version__

@@ -144,6 +145,7 @@ def daemonize() -> None:
        sys.exit(0)

    # redirect standard file descriptors to devnull
+    # pylint: disable=consider-using-with
    infd = open(os.devnull)
    outfd = open(os.devnull, "a+")
    sys.stdout.flush()
@@ -206,7 +208,7 @@ def closefds_osx(min_fd: int, max_fd: int) -> None:
            pass


-def cmdline() -> List[str]:
+def cmdline() -> list[str]:
    """Collect path and arguments to re-execute the current hass instance."""
    if os.path.basename(sys.argv[0]) == "__main__.py":
        modulepath = os.path.dirname(sys.argv[0])
--- a/homeassistant/auth/init.py
+++ b/homeassistant/auth/init.py
@@ -1,14 +1,17 @@
 """Provide an authentication layer for Home Assistant."""
+from __future__ import annotations
+
 import asyncio
 from collections import OrderedDict
 from datetime import timedelta
-from typing import Any, Dict, List, Optional, Tuple, cast
+from typing import Any, Dict, Mapping, Optional, Tuple, cast

 import jwt

 from homeassistant import data_entry_flow
 from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.util import dt as dt_util

 from . import auth_store, models
@@ -24,11 +27,19 @@ _ProviderKey = Tuple[str, Optional[str]]
 _ProviderDict = Dict[_ProviderKey, AuthProvider]


+class InvalidAuthError(Exception):
+    """Raised when a authentication error occurs."""
+
+
+class InvalidProvider(Exception):
+    """Authentication provider not found."""
+
+
 async def auth_manager_from_config(
    hass: HomeAssistant,
-    provider_configs: List[Dict[str, Any]],
-    module_configs: List[Dict[str, Any]],
-) -> "AuthManager":
+    provider_configs: list[dict[str, Any]],
+    module_configs: list[dict[str, Any]],
+) -> AuthManager:
    """Initialize an auth manager from config.

    CORE_CONFIG_SCHEMA will make sure do duplicated auth providers or
@@ -68,7 +79,7 @@ async def auth_manager_from_config(
 class AuthManagerFlowManager(data_entry_flow.FlowManager):
    """Manage authentication flows."""

-    def __init__(self, hass: HomeAssistant, auth_manager: "AuthManager"):
+    def __init__(self, hass: HomeAssistant, auth_manager: AuthManager):
        """Init auth manager flows."""
        super().__init__(hass)
        self.auth_manager = auth_manager
@@ -77,8 +88,8 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
        self,
        handler_key: Any,
        *,
-        context: Optional[Dict[str, Any]] = None,
-        data: Optional[Dict[str, Any]] = None,
+        context: dict[str, Any] | None = None,
+        data: dict[str, Any] | None = None,
    ) -> data_entry_flow.FlowHandler:
        """Create a login flow."""
        auth_provider = self.auth_manager.get_auth_provider(*handler_key)
@@ -87,8 +98,8 @@ 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: Dict[str, Any]
-    ) -> Dict[str, Any]:
+        self, flow: data_entry_flow.FlowHandler, result: FlowResult
+    ) -> FlowResult:
        """Return a user as result of login flow."""
        flow = cast(LoginFlow, flow)

@@ -96,7 +107,7 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
            return result

        # we got final result
-        if isinstance(result["data"], models.User):
+        if isinstance(result["data"], models.Credentials):
            result["result"] = result["data"]
            return result

@@ -105,7 +116,7 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
            raise KeyError(f"Unknown auth provider {result['handler']}")

        credentials = await auth_provider.async_get_or_create_credentials(
-            result["data"]
+            cast(Mapping[str, str], result["data"]),
        )

        if flow.context.get("credential_only"):
@@ -120,11 +131,12 @@ class AuthManagerFlowManager(data_entry_flow.FlowManager):
                modules = await self.auth_manager.async_get_enabled_mfa(user)

                if modules:
+                    flow.credential = credentials
                    flow.user = user
                    flow.available_mfa_modules = modules
                    return await flow.async_step_select_mfa_module()

-        result["result"] = await self.auth_manager.async_get_or_create_user(credentials)
+        result["result"] = credentials
        return result


@@ -146,22 +158,22 @@ class AuthManager:
        self.login_flow = AuthManagerFlowManager(hass, self)

    @property
-    def auth_providers(self) -> List[AuthProvider]:
+    def auth_providers(self) -> list[AuthProvider]:
        """Return a list of available auth providers."""
        return list(self._providers.values())

    @property
-    def auth_mfa_modules(self) -> List[MultiFactorAuthModule]:
+    def auth_mfa_modules(self) -> list[MultiFactorAuthModule]:
        """Return a list of available auth modules."""
        return list(self._mfa_modules.values())

    def get_auth_provider(
-        self, provider_type: str, provider_id: str
-    ) -> Optional[AuthProvider]:
+        self, provider_type: str, provider_id: str | None
+    ) -> AuthProvider | None:
        """Return an auth provider, None if not found."""
        return self._providers.get((provider_type, provider_id))

-    def get_auth_providers(self, provider_type: str) -> List[AuthProvider]:
+    def get_auth_providers(self, provider_type: str) -> list[AuthProvider]:
        """Return a List of auth provider of one type, Empty if not found."""
        return [
            provider
@@ -169,30 +181,30 @@ class AuthManager:
            if p_type == provider_type
        ]

-    def get_auth_mfa_module(self, module_id: str) -> Optional[MultiFactorAuthModule]:
+    def get_auth_mfa_module(self, module_id: str) -> MultiFactorAuthModule | None:
        """Return a multi-factor auth module, None if not found."""
        return self._mfa_modules.get(module_id)

-    async def async_get_users(self) -> List[models.User]:
+    async def async_get_users(self) -> list[models.User]:
        """Retrieve all users."""
        return await self._store.async_get_users()

-    async def async_get_user(self, user_id: str) -> Optional[models.User]:
+    async def async_get_user(self, user_id: str) -> models.User | None:
        """Retrieve a user."""
        return await self._store.async_get_user(user_id)

-    async def async_get_owner(self) -> Optional[models.User]:
+    async def async_get_owner(self) -> models.User | None:
        """Retrieve the owner."""
        users = await self.async_get_users()
        return next((user for user in users if user.is_owner), None)

-    async def async_get_group(self, group_id: str) -> Optional[models.Group]:
+    async def async_get_group(self, group_id: str) -> models.Group | None:
        """Retrieve all groups."""
        return await self._store.async_get_group(group_id)

    async def async_get_user_by_credentials(
        self, credentials: models.Credentials
-    ) -> Optional[models.User]:
+    ) -> models.User | None:
        """Get a user by credential, return None if not found."""
        for user in await self.async_get_users():
            for creds in user.credentials:
@@ -202,7 +214,7 @@ class AuthManager:
        return None

    async def async_create_system_user(
-        self, name: str, group_ids: Optional[List[str]] = None
+        self, name: str, group_ids: list[str] | None = None
    ) -> models.User:
        """Create a system user."""
        user = await self._store.async_create_user(
@@ -214,10 +226,10 @@ class AuthManager:
        return user

    async def async_create_user(
-        self, name: str, group_ids: Optional[List[str]] = None
+        self, name: str, group_ids: list[str] | None = None
    ) -> models.User:
        """Create a user."""
-        kwargs: Dict[str, Any] = {
+        kwargs: dict[str, Any] = {
            "name": name,
            "is_active": True,
            "group_ids": group_ids or [],
@@ -283,12 +295,12 @@ class AuthManager:
    async def async_update_user(
        self,
        user: models.User,
-        name: Optional[str] = None,
-        is_active: Optional[bool] = None,
-        group_ids: Optional[List[str]] = None,
+        name: str | None = None,
+        is_active: bool | None = None,
+        group_ids: list[str] | None = None,
    ) -> None:
        """Update a user."""
-        kwargs: Dict[str, Any] = {}
+        kwargs: dict[str, Any] = {}
        if name is not None:
            kwargs["name"] = name
        if group_ids is not None:
@@ -351,9 +363,9 @@ class AuthManager:

        await module.async_depose_user(user.id)

-    async def async_get_enabled_mfa(self, user: models.User) -> Dict[str, str]:
+    async def async_get_enabled_mfa(self, user: models.User) -> dict[str, str]:
        """List enabled mfa modules for user."""
-        modules: Dict[str, str] = OrderedDict()
+        modules: dict[str, str] = OrderedDict()
        for module_id, module in self._mfa_modules.items():
            if await module.async_is_user_setup(user.id):
                modules[module_id] = module.name
@@ -362,11 +374,12 @@ class AuthManager:
    async def async_create_refresh_token(
        self,
        user: models.User,
-        client_id: Optional[str] = None,
-        client_name: Optional[str] = None,
-        client_icon: Optional[str] = None,
-        token_type: Optional[str] = None,
+        client_id: str | None = None,
+        client_name: str | None = None,
+        client_icon: str | None = None,
+        token_type: str | None = None,
        access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION,
+        credential: models.Credentials | None = None,
    ) -> models.RefreshToken:
        """Create a new refresh token for a user."""
        if not user.is_active:
@@ -415,17 +428,18 @@ class AuthManager:
            client_icon,
            token_type,
            access_token_expiration,
+            credential,
        )

    async def async_get_refresh_token(
        self, token_id: str
-    ) -> Optional[models.RefreshToken]:
+    ) -> models.RefreshToken | None:
        """Get refresh token by id."""
        return await self._store.async_get_refresh_token(token_id)

    async def async_get_refresh_token_by_token(
        self, token: str
-    ) -> Optional[models.RefreshToken]:
+    ) -> models.RefreshToken | None:
        """Get refresh token by token."""
        return await self._store.async_get_refresh_token_by_token(token)

@@ -437,9 +451,11 @@ class AuthManager:

    @callback
    def async_create_access_token(
-        self, refresh_token: models.RefreshToken, remote_ip: Optional[str] = None
+        self, refresh_token: models.RefreshToken, remote_ip: str | None = None
    ) -> str:
        """Create a new access token."""
+        self.async_validate_refresh_token(refresh_token, remote_ip)
+
        self._store.async_log_refresh_token_usage(refresh_token, remote_ip)

        now = dt_util.utcnow()
@@ -453,9 +469,43 @@ class AuthManager:
            algorithm="HS256",
        ).decode()

+    @callback
+    def _async_resolve_provider(
+        self, refresh_token: models.RefreshToken
+    ) -> AuthProvider | None:
+        """Get the auth provider for the given refresh token.
+
+        Raises an exception if the expected provider is no longer available or return
+        None if no provider was expected for this refresh token.
+        """
+        if refresh_token.credential is None:
+            return None
+
+        provider = self.get_auth_provider(
+            refresh_token.credential.auth_provider_type,
+            refresh_token.credential.auth_provider_id,
+        )
+        if provider is None:
+            raise InvalidProvider(
+                f"Auth provider {refresh_token.credential.auth_provider_type}, {refresh_token.credential.auth_provider_id} not available"
+            )
+        return provider
+
+    @callback
+    def async_validate_refresh_token(
+        self, refresh_token: models.RefreshToken, remote_ip: str | None = None
+    ) -> None:
+        """Validate that a refresh token is usable.
+
+        Will raise InvalidAuthError on errors.
+        """
+        provider = self._async_resolve_provider(refresh_token)
+        if provider:
+            provider.async_validate_refresh_token(refresh_token, remote_ip)
+
    async def async_validate_access_token(
        self, token: str
-    ) -> Optional[models.RefreshToken]:
+    ) -> models.RefreshToken | None:
        """Return refresh token if an access token is valid."""
        try:
            unverif_claims = jwt.decode(token, verify=False)
@@ -486,7 +536,7 @@ class AuthManager:
    @callback
    def _async_get_auth_provider(
        self, credentials: models.Credentials
-    ) -> Optional[AuthProvider]:
+    ) -> AuthProvider | None:
        """Get auth provider from a set of credentials."""
        auth_provider_key = (
            credentials.auth_provider_type,
--- a/homeassistant/auth/auth_store.py
+++ b/homeassistant/auth/auth_store.py
@@ -1,10 +1,12 @@
 """Storage for auth models."""
+from __future__ import annotations
+
 import asyncio
 from collections import OrderedDict
 from datetime import timedelta
 import hmac
 from logging import getLogger
-from typing import Any, Dict, List, Optional
+from typing import Any

 from homeassistant.auth.const import ACCESS_TOKEN_EXPIRATION
 from homeassistant.core import HomeAssistant, callback
@@ -34,15 +36,15 @@ class AuthStore:
    def __init__(self, hass: HomeAssistant) -> None:
        """Initialize the auth store."""
        self.hass = hass
-        self._users: Optional[Dict[str, models.User]] = None
-        self._groups: Optional[Dict[str, models.Group]] = None
-        self._perm_lookup: Optional[PermissionLookup] = None
+        self._users: dict[str, models.User] | None = None
+        self._groups: dict[str, models.Group] | None = None
+        self._perm_lookup: PermissionLookup | None = None
        self._store = hass.helpers.storage.Store(
            STORAGE_VERSION, STORAGE_KEY, private=True
        )
        self._lock = asyncio.Lock()

-    async def async_get_groups(self) -> List[models.Group]:
+    async def async_get_groups(self) -> list[models.Group]:
        """Retrieve all users."""
        if self._groups is None:
            await self._async_load()
@@ -50,7 +52,7 @@ class AuthStore:

        return list(self._groups.values())

-    async def async_get_group(self, group_id: str) -> Optional[models.Group]:
+    async def async_get_group(self, group_id: str) -> models.Group | None:
        """Retrieve all users."""
        if self._groups is None:
            await self._async_load()
@@ -58,7 +60,7 @@ class AuthStore:

        return self._groups.get(group_id)

-    async def async_get_users(self) -> List[models.User]:
+    async def async_get_users(self) -> list[models.User]:
        """Retrieve all users."""
        if self._users is None:
            await self._async_load()
@@ -66,7 +68,7 @@ class AuthStore:

        return list(self._users.values())

-    async def async_get_user(self, user_id: str) -> Optional[models.User]:
+    async def async_get_user(self, user_id: str) -> models.User | None:
        """Retrieve a user by id."""
        if self._users is None:
            await self._async_load()
@@ -76,12 +78,12 @@ class AuthStore:

    async def async_create_user(
        self,
-        name: Optional[str],
-        is_owner: Optional[bool] = None,
-        is_active: Optional[bool] = None,
-        system_generated: Optional[bool] = None,
-        credentials: Optional[models.Credentials] = None,
-        group_ids: Optional[List[str]] = None,
+        name: str | None,
+        is_owner: bool | None = None,
+        is_active: bool | None = None,
+        system_generated: bool | None = None,
+        credentials: models.Credentials | None = None,
+        group_ids: list[str] | None = None,
    ) -> models.User:
        """Create a new user."""
        if self._users is None:
@@ -97,7 +99,7 @@ class AuthStore:
                raise ValueError(f"Invalid group specified {group_id}")
            groups.append(group)

-        kwargs: Dict[str, Any] = {
+        kwargs: dict[str, Any] = {
            "name": name,
            # Until we get group management, we just put everyone in the
            # same group.
@@ -146,9 +148,9 @@ class AuthStore:
    async def async_update_user(
        self,
        user: models.User,
-        name: Optional[str] = None,
-        is_active: Optional[bool] = None,
-        group_ids: Optional[List[str]] = None,
+        name: str | None = None,
+        is_active: bool | None = None,
+        group_ids: list[str] | None = None,
    ) -> None:
        """Update a user."""
        assert self._groups is not None
@@ -203,18 +205,20 @@ class AuthStore:
    async def async_create_refresh_token(
        self,
        user: models.User,
-        client_id: Optional[str] = None,
-        client_name: Optional[str] = None,
-        client_icon: Optional[str] = None,
+        client_id: str | None = None,
+        client_name: str | None = None,
+        client_icon: str | None = None,
        token_type: str = models.TOKEN_TYPE_NORMAL,
        access_token_expiration: timedelta = ACCESS_TOKEN_EXPIRATION,
+        credential: models.Credentials | None = None,
    ) -> models.RefreshToken:
        """Create a new token for a user."""
-        kwargs: Dict[str, Any] = {
+        kwargs: dict[str, Any] = {
            "user": user,
            "client_id": client_id,
            "token_type": token_type,
            "access_token_expiration": access_token_expiration,
+            "credential": credential,
        }
        if client_name:
            kwargs["client_name"] = client_name
@@ -242,7 +246,7 @@ class AuthStore:

    async def async_get_refresh_token(
        self, token_id: str
-    ) -> Optional[models.RefreshToken]:
+    ) -> models.RefreshToken | None:
        """Get refresh token by id."""
        if self._users is None:
            await self._async_load()
@@ -257,7 +261,7 @@ class AuthStore:

    async def async_get_refresh_token_by_token(
        self, token: str
-    ) -> Optional[models.RefreshToken]:
+    ) -> models.RefreshToken | None:
        """Get refresh token by token."""
        if self._users is None:
            await self._async_load()
@@ -274,7 +278,7 @@ class AuthStore:

    @callback
    def async_log_refresh_token_usage(
-        self, refresh_token: models.RefreshToken, remote_ip: Optional[str] = None
+        self, refresh_token: models.RefreshToken, remote_ip: str | None = None
    ) -> None:
        """Update refresh token last used information."""
        refresh_token.last_used_at = dt_util.utcnow()
@@ -307,8 +311,9 @@ class AuthStore:
            self._set_defaults()
            return

-        users: Dict[str, models.User] = OrderedDict()
-        groups: Dict[str, models.Group] = OrderedDict()
+        users: dict[str, models.User] = OrderedDict()
+        groups: dict[str, models.Group] = OrderedDict()
+        credentials: dict[str, models.Credentials] = OrderedDict()

        # Soft-migrating data as we load. We are going to make sure we have a
        # read only group and an admin group. There are two states that we can
@@ -325,7 +330,7 @@ class AuthStore:
        # was added.

        for group_dict in data.get("groups", []):
-            policy: Optional[PolicyType] = None
+            policy: PolicyType | None = None

            if group_dict["id"] == GROUP_ID_ADMIN:
                has_admin_group = True
@@ -415,15 +420,15 @@ class AuthStore:
            )

        for cred_dict in data["credentials"]:
-            users[cred_dict["user_id"]].credentials.append(
-                models.Credentials(
-                    id=cred_dict["id"],
-                    is_new=False,
-                    auth_provider_type=cred_dict["auth_provider_type"],
-                    auth_provider_id=cred_dict["auth_provider_id"],
-                    data=cred_dict["data"],
-                )
+            credential = models.Credentials(
+                id=cred_dict["id"],
+                is_new=False,
+                auth_provider_type=cred_dict["auth_provider_type"],
+                auth_provider_id=cred_dict["auth_provider_id"],
+                data=cred_dict["data"],
            )
+            credentials[cred_dict["id"]] = credential
+            users[cred_dict["user_id"]].credentials.append(credential)

        for rt_dict in data["refresh_tokens"]:
            # Filter out the old keys that don't have jwt_key (pre-0.76)
@@ -469,6 +474,8 @@ class AuthStore:
                jwt_key=rt_dict["jwt_key"],
                last_used_at=last_used_at,
                last_used_ip=rt_dict.get("last_used_ip"),
+                credential=credentials.get(rt_dict.get("credential_id")),
+                version=rt_dict.get("version"),
            )
            users[rt_dict["user_id"]].refresh_tokens[token.id] = token

@@ -484,7 +491,7 @@ class AuthStore:
        self._store.async_delay_save(self._data_to_save, 1)

    @callback
-    def _data_to_save(self) -> Dict:
+    def _data_to_save(self) -> dict:
        """Return the data to store."""
        assert self._users is not None
        assert self._groups is not None
@@ -503,7 +510,7 @@ class AuthStore:

        groups = []
        for group in self._groups.values():
-            g_dict: Dict[str, Any] = {
+            g_dict: dict[str, Any] = {
                "id": group.id,
                # Name not read for sys groups. Kept here for backwards compat
                "name": group.name,
@@ -542,6 +549,10 @@ class AuthStore:
                if refresh_token.last_used_at
                else None,
                "last_used_ip": refresh_token.last_used_ip,
+                "credential_id": refresh_token.credential.id
+                if refresh_token.credential
+                else None,
+                "version": refresh_token.version,
            }
            for user in self._users.values()
            for refresh_token in user.refresh_tokens.values()
@@ -558,7 +569,7 @@ class AuthStore:
        """Set default values for auth store."""
        self._users = OrderedDict()

-        groups: Dict[str, models.Group] = OrderedDict()
+        groups: dict[str, models.Group] = OrderedDict()
        admin_group = _system_admin_group()
        groups[admin_group.id] = admin_group
        user_group = _system_user_group()
--- a/homeassistant/auth/mfa_modules/init.py
+++ b/homeassistant/auth/mfa_modules/init.py
@@ -1,8 +1,10 @@
 """Pluggable auth modules for Home Assistant."""
+from __future__ import annotations
+
 import importlib
 import logging
 import types
-from typing import Any, Dict, Optional
+from typing import Any

 import voluptuous as vol
 from voluptuous.humanize import humanize_error
@@ -10,6 +12,7 @@ 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
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.util.decorator import Registry

@@ -36,7 +39,7 @@ class MultiFactorAuthModule:
    DEFAULT_TITLE = "Unnamed auth module"
    MAX_RETRY_TIME = 3

-    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+    def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
        """Initialize an auth module."""
        self.hass = hass
        self.config = config
@@ -66,7 +69,7 @@ class MultiFactorAuthModule:
        """Return a voluptuous schema to define mfa auth module's input."""
        raise NotImplementedError

-    async def async_setup_flow(self, user_id: str) -> "SetupFlow":
+    async def async_setup_flow(self, user_id: str) -> SetupFlow:
        """Return a data entry flow handler for setup module.

        Mfa module should extend SetupFlow
@@ -85,7 +88,7 @@ class MultiFactorAuthModule:
        """Return whether user is setup."""
        raise NotImplementedError

-    async def async_validate(self, user_id: str, user_input: Dict[str, Any]) -> bool:
+    async def async_validate(self, user_id: str, user_input: dict[str, Any]) -> bool:
        """Return True if validation passed."""
        raise NotImplementedError

@@ -102,14 +105,14 @@ class SetupFlow(data_entry_flow.FlowHandler):
        self._user_id = user_id

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the first step of setup flow.

        Return self.async_show_form(step_id='init') if user_input is None.
        Return self.async_create_entry(data={'result': result}) if finish.
        """
-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}

        if user_input:
            result = await self._auth_module.async_setup_user(self._user_id, user_input)
@@ -123,7 +126,7 @@ class SetupFlow(data_entry_flow.FlowHandler):


 async def auth_mfa_module_from_config(
-    hass: HomeAssistant, config: Dict[str, Any]
+    hass: HomeAssistant, config: dict[str, Any]
 ) -> MultiFactorAuthModule:
    """Initialize an auth module from a config."""
    module_name = config[CONF_TYPE]
--- a/homeassistant/auth/mfa_modules/insecure_example.py
+++ b/homeassistant/auth/mfa_modules/insecure_example.py
@@ -1,5 +1,7 @@
 """Example auth module."""
-from typing import Any, Dict
+from __future__ import annotations
+
+from typing import Any

 import voluptuous as vol

@@ -28,7 +30,7 @@ class InsecureExampleModule(MultiFactorAuthModule):

    DEFAULT_TITLE = "Insecure Personal Identify Number"

-    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+    def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
        """Initialize the user data store."""
        super().__init__(hass, config)
        self._data = config["data"]
@@ -75,17 +77,11 @@ class InsecureExampleModule(MultiFactorAuthModule):

    async def async_is_user_setup(self, user_id: str) -> bool:
        """Return whether user is setup."""
-        for data in self._data:
-            if data["user_id"] == user_id:
-                return True
-        return False
+        return any(data["user_id"] == user_id for data in self._data)

-    async def async_validate(self, user_id: str, user_input: Dict[str, Any]) -> bool:
+    async def async_validate(self, user_id: str, user_input: dict[str, Any]) -> bool:
        """Return True if validation passed."""
-        for data in self._data:
-            if data["user_id"] == user_id:
-                # user_input has been validate in caller
-                if data["pin"] == user_input["pin"]:
-                    return True
-
-        return False
+        return any(
+            data["user_id"] == user_id and data["pin"] == user_input["pin"]
+            for data in self._data
+        )
--- a/homeassistant/auth/mfa_modules/notify.py
+++ b/homeassistant/auth/mfa_modules/notify.py
@@ -2,16 +2,19 @@

 Sending HOTP through notify service
 """
+from __future__ import annotations
+
 import asyncio
 from collections import OrderedDict
 import logging
-from typing import Any, Dict, List, Optional
+from typing import Any, Dict

 import attr
 import voluptuous as vol

 from homeassistant.const import CONF_EXCLUDE, CONF_INCLUDE
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import ServiceNotFound
 from homeassistant.helpers import config_validation as cv

@@ -79,8 +82,8 @@ class NotifySetting:

    secret: str = attr.ib(factory=_generate_secret)  # not persistent
    counter: int = attr.ib(factory=_generate_random)  # not persistent
-    notify_service: Optional[str] = attr.ib(default=None)
-    target: Optional[str] = attr.ib(default=None)
+    notify_service: str | None = attr.ib(default=None)
+    target: str | None = attr.ib(default=None)


 _UsersDict = Dict[str, NotifySetting]
@@ -92,10 +95,10 @@ class NotifyAuthModule(MultiFactorAuthModule):

    DEFAULT_TITLE = "Notify One-Time Password"

-    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+    def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
        """Initialize the user data store."""
        super().__init__(hass, config)
-        self._user_settings: Optional[_UsersDict] = None
+        self._user_settings: _UsersDict | None = None
        self._user_store = hass.helpers.storage.Store(
            STORAGE_VERSION, STORAGE_KEY, private=True
        )
@@ -146,7 +149,7 @@ class NotifyAuthModule(MultiFactorAuthModule):
        )

    @callback
-    def aync_get_available_notify_services(self) -> List[str]:
+    def aync_get_available_notify_services(self) -> list[str]:
        """Return list of notify services."""
        unordered_services = set()

@@ -198,7 +201,7 @@ class NotifyAuthModule(MultiFactorAuthModule):

        return user_id in self._user_settings

-    async def async_validate(self, user_id: str, user_input: Dict[str, Any]) -> bool:
+    async def async_validate(self, user_id: str, user_input: dict[str, Any]) -> bool:
        """Return True if validation passed."""
        if self._user_settings is None:
            await self._async_load()
@@ -258,7 +261,7 @@ class NotifyAuthModule(MultiFactorAuthModule):
        )

    async def async_notify(
-        self, code: str, notify_service: str, target: Optional[str] = None
+        self, code: str, notify_service: str, target: str | None = None
    ) -> None:
        """Send code by notify service."""
        data = {"message": self._message_template.format(code)}
@@ -276,23 +279,23 @@ class NotifySetupFlow(SetupFlow):
        auth_module: NotifyAuthModule,
        setup_schema: vol.Schema,
        user_id: str,
-        available_notify_services: List[str],
+        available_notify_services: list[str],
    ) -> None:
        """Initialize the setup flow."""
        super().__init__(auth_module, setup_schema, user_id)
        # to fix typing complaint
        self._auth_module: NotifyAuthModule = auth_module
        self._available_notify_services = available_notify_services
-        self._secret: Optional[str] = None
-        self._count: Optional[int] = None
-        self._notify_service: Optional[str] = None
-        self._target: Optional[str] = None
+        self._secret: str | None = None
+        self._count: int | None = None
+        self._notify_service: str | None = None
+        self._target: str | None = None

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Let user select available notify services."""
-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}

        hass = self._auth_module.hass
        if user_input:
@@ -306,7 +309,7 @@ class NotifySetupFlow(SetupFlow):
        if not self._available_notify_services:
            return self.async_abort(reason="no_available_service")

-        schema: Dict[str, Any] = OrderedDict()
+        schema: dict[str, Any] = OrderedDict()
        schema["notify_service"] = vol.In(self._available_notify_services)
        schema["target"] = vol.Optional(str)

@@ -315,10 +318,10 @@ class NotifySetupFlow(SetupFlow):
        )

    async def async_step_setup(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Verify user can receive one-time password."""
-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}

        hass = self._auth_module.hass
        if user_input:
--- a/homeassistant/auth/mfa_modules/totp.py
+++ b/homeassistant/auth/mfa_modules/totp.py
@@ -1,12 +1,15 @@
 """Time-based One Time Password auth module."""
+from __future__ import annotations
+
 import asyncio
 from io import BytesIO
-from typing import Any, Dict, Optional, Tuple
+from typing import Any

 import voluptuous as vol

 from homeassistant.auth.models import User
 from homeassistant.core import HomeAssistant
+from homeassistant.data_entry_flow import FlowResult

 from . import (
    MULTI_FACTOR_AUTH_MODULE_SCHEMA,
@@ -50,7 +53,7 @@ def _generate_qr_code(data: str) -> str:
        )


-def _generate_secret_and_qr_code(username: str) -> Tuple[str, str, str]:
+def _generate_secret_and_qr_code(username: str) -> tuple[str, str, str]:
    """Generate a secret, url, and QR code."""
    import pyotp  # pylint: disable=import-outside-toplevel

@@ -69,10 +72,10 @@ class TotpAuthModule(MultiFactorAuthModule):
    DEFAULT_TITLE = "Time-based One Time Password"
    MAX_RETRY_TIME = 5

-    def __init__(self, hass: HomeAssistant, config: Dict[str, Any]) -> None:
+    def __init__(self, hass: HomeAssistant, config: dict[str, Any]) -> None:
        """Initialize the user data store."""
        super().__init__(hass, config)
-        self._users: Optional[Dict[str, str]] = None
+        self._users: dict[str, str] | None = None
        self._user_store = hass.helpers.storage.Store(
            STORAGE_VERSION, STORAGE_KEY, private=True
        )
@@ -100,7 +103,7 @@ class TotpAuthModule(MultiFactorAuthModule):
        """Save data."""
        await self._user_store.async_save({STORAGE_USERS: self._users})

-    def _add_ota_secret(self, user_id: str, secret: Optional[str] = None) -> str:
+    def _add_ota_secret(self, user_id: str, secret: str | None = None) -> str:
        """Create a ota_secret for user."""
        import pyotp  # pylint: disable=import-outside-toplevel

@@ -145,7 +148,7 @@ class TotpAuthModule(MultiFactorAuthModule):

        return user_id in self._users  # type: ignore

-    async def async_validate(self, user_id: str, user_input: Dict[str, Any]) -> bool:
+    async def async_validate(self, user_id: str, user_input: dict[str, Any]) -> bool:
        """Return True if validation passed."""
        if self._users is None:
            await self._async_load()
@@ -181,13 +184,13 @@ class TotpSetupFlow(SetupFlow):
        # to fix typing complaint
        self._auth_module: TotpAuthModule = auth_module
        self._user = user
-        self._ota_secret: Optional[str] = None
+        self._ota_secret: str | None = None
        self._url = None  # type Optional[str]
        self._image = None  # type Optional[str]

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the first step of setup flow.

        Return self.async_show_form(step_id='init') if user_input is None.
@@ -195,10 +198,10 @@ class TotpSetupFlow(SetupFlow):
        """
        import pyotp  # pylint: disable=import-outside-toplevel

-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}

        if user_input:
-            verified = await self.hass.async_add_executor_job(  # type: ignore
+            verified = await self.hass.async_add_executor_job(
                pyotp.TOTP(self._ota_secret).verify, user_input["code"]
            )
            if verified:
--- a/homeassistant/auth/models.py
+++ b/homeassistant/auth/models.py
@@ -1,11 +1,14 @@
 """Auth models."""
+from __future__ import annotations
+
 from datetime import datetime, timedelta
 import secrets
-from typing import Dict, List, NamedTuple, Optional
+from typing import NamedTuple
 import uuid

 import attr

+from homeassistant.const import __version__
 from homeassistant.util import dt as dt_util

 from . import permissions as perm_mdl
@@ -20,7 +23,7 @@ TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = "long_lived_access_token"
 class Group:
    """A group."""

-    name: Optional[str] = attr.ib()
+    name: str | None = attr.ib()
    policy: perm_mdl.PolicyType = attr.ib()
    id: str = attr.ib(factory=lambda: uuid.uuid4().hex)
    system_generated: bool = attr.ib(default=False)
@@ -30,24 +33,24 @@ class Group:
 class User:
    """A user."""

-    name: Optional[str] = attr.ib()
+    name: str | None = attr.ib()
    perm_lookup: perm_mdl.PermissionLookup = attr.ib(eq=False, order=False)
    id: str = attr.ib(factory=lambda: uuid.uuid4().hex)
    is_owner: bool = attr.ib(default=False)
    is_active: bool = attr.ib(default=False)
    system_generated: bool = attr.ib(default=False)

-    groups: List[Group] = attr.ib(factory=list, eq=False, order=False)
+    groups: list[Group] = attr.ib(factory=list, eq=False, order=False)

    # List of credentials of a user.
-    credentials: List["Credentials"] = attr.ib(factory=list, eq=False, order=False)
+    credentials: list[Credentials] = attr.ib(factory=list, eq=False, order=False)

    # Tokens associated with a user.
-    refresh_tokens: Dict[str, "RefreshToken"] = attr.ib(
+    refresh_tokens: dict[str, RefreshToken] = attr.ib(
        factory=dict, eq=False, order=False
    )

-    _permissions: Optional[perm_mdl.PolicyPermissions] = attr.ib(
+    _permissions: perm_mdl.PolicyPermissions | None = attr.ib(
        init=False,
        eq=False,
        order=False,
@@ -88,10 +91,10 @@ class RefreshToken:
    """RefreshToken for a user to grant new access tokens."""

    user: User = attr.ib()
-    client_id: Optional[str] = attr.ib()
+    client_id: str | None = attr.ib()
    access_token_expiration: timedelta = attr.ib()
-    client_name: Optional[str] = attr.ib(default=None)
-    client_icon: Optional[str] = attr.ib(default=None)
+    client_name: str | None = attr.ib(default=None)
+    client_icon: str | None = attr.ib(default=None)
    token_type: str = attr.ib(
        default=TOKEN_TYPE_NORMAL,
        validator=attr.validators.in_(
@@ -103,8 +106,12 @@ class RefreshToken:
    token: str = attr.ib(factory=lambda: secrets.token_hex(64))
    jwt_key: str = attr.ib(factory=lambda: secrets.token_hex(64))

-    last_used_at: Optional[datetime] = attr.ib(default=None)
-    last_used_ip: Optional[str] = attr.ib(default=None)
+    last_used_at: datetime | None = attr.ib(default=None)
+    last_used_ip: str | None = attr.ib(default=None)
+
+    credential: Credentials | None = attr.ib(default=None)
+
+    version: str | None = attr.ib(default=__version__)


@attr.s(slots=True)
@@ -112,7 +119,7 @@ class Credentials:
    """Credentials for a user on an auth provider."""

    auth_provider_type: str = attr.ib()
-    auth_provider_id: Optional[str] = attr.ib()
+    auth_provider_id: str | None = attr.ib()

    # Allow the auth provider to store data to represent their auth.
    data: dict = attr.ib()
@@ -124,5 +131,5 @@ class Credentials:
 class UserMeta(NamedTuple):
    """User metadata."""

-    name: Optional[str]
+    name: str | None
    is_active: bool
--- a/homeassistant/auth/permissions/init.py
+++ b/homeassistant/auth/permissions/init.py
@@ -1,6 +1,8 @@
 """Permissions for Home Assistant."""
+from __future__ import annotations
+
 import logging
-from typing import Any, Callable, Optional
+from typing import Any, Callable

 import voluptuous as vol

@@ -19,7 +21,7 @@ _LOGGER = logging.getLogger(__name__)
 class AbstractPermissions:
    """Default permissions class."""

-    _cached_entity_func: Optional[Callable[[str, str], bool]] = None
+    _cached_entity_func: Callable[[str, str], bool] | None = None

    def _entity_func(self) -> Callable[[str, str], bool]:
        """Return a function that can test entity access."""
--- a/homeassistant/auth/permissions/entities.py
+++ b/homeassistant/auth/permissions/entities.py
@@ -1,6 +1,8 @@
 """Entity permissions."""
+from __future__ import annotations
+
 from collections import OrderedDict
-from typing import Callable, Optional
+from typing import Callable

 import voluptuous as vol

@@ -43,14 +45,14 @@ ENTITY_POLICY_SCHEMA = vol.Any(

 def _lookup_domain(
    perm_lookup: PermissionLookup, domains_dict: SubCategoryDict, entity_id: str
-) -> Optional[ValueType]:
+) -> ValueType | None:
    """Look up entity permissions by domain."""
    return domains_dict.get(entity_id.split(".", 1)[0])


 def _lookup_area(
    perm_lookup: PermissionLookup, area_dict: SubCategoryDict, entity_id: str
-) -> Optional[ValueType]:
+) -> ValueType | None:
    """Look up entity permissions by area."""
    entity_entry = perm_lookup.entity_registry.async_get(entity_id)

@@ -67,7 +69,7 @@ def _lookup_area(

 def _lookup_device(
    perm_lookup: PermissionLookup, devices_dict: SubCategoryDict, entity_id: str
-) -> Optional[ValueType]:
+) -> ValueType | None:
    """Look up entity permissions by device."""
    entity_entry = perm_lookup.entity_registry.async_get(entity_id)

@@ -79,7 +81,7 @@ def _lookup_device(

 def _lookup_entity_id(
    perm_lookup: PermissionLookup, entities_dict: SubCategoryDict, entity_id: str
-) -> Optional[ValueType]:
+) -> ValueType | None:
    """Look up entity permission by entity id."""
    return entities_dict.get(entity_id)

--- a/homeassistant/auth/permissions/merge.py
+++ b/homeassistant/auth/permissions/merge.py
@@ -1,13 +1,15 @@
 """Merging of policies."""
-from typing import Dict, List, Set, cast
+from __future__ import annotations
+
+from typing import cast

 from .types import CategoryType, PolicyType


-def merge_policies(policies: List[PolicyType]) -> PolicyType:
+def merge_policies(policies: list[PolicyType]) -> PolicyType:
    """Merge policies."""
-    new_policy: Dict[str, CategoryType] = {}
-    seen: Set[str] = set()
+    new_policy: dict[str, CategoryType] = {}
+    seen: set[str] = set()
    for policy in policies:
        for category in policy:
            if category in seen:
@@ -20,7 +22,7 @@ def merge_policies(policies: List[PolicyType]) -> PolicyType:
    return new_policy


-def _merge_policies(sources: List[CategoryType]) -> CategoryType:
+def _merge_policies(sources: list[CategoryType]) -> CategoryType:
    """Merge a policy."""
    # When merging policies, the most permissive wins.
    # This means we order it like this:
@@ -34,7 +36,7 @@ def _merge_policies(sources: List[CategoryType]) -> CategoryType:
    # merge each key in the source.

    policy: CategoryType = None
-    seen: Set[str] = set()
+    seen: set[str] = set()
    for source in sources:
        if source is None:
            continue
--- a/homeassistant/auth/permissions/models.py
+++ b/homeassistant/auth/permissions/models.py
@@ -1,11 +1,12 @@
 """Models for permissions."""
+from __future__ import annotations
+
 from typing import TYPE_CHECKING

 import attr

 if TYPE_CHECKING:
-    # pylint: disable=unused-import
-    from homeassistant.helpers import (  # noqa: F401
+    from homeassistant.helpers import (
        device_registry as dev_reg,
        entity_registry as ent_reg,
    )
@@ -15,5 +16,5 @@ if TYPE_CHECKING:
 class PermissionLookup:
    """Class to hold data for permission lookups."""

-    entity_registry: "ent_reg.EntityRegistry" = attr.ib()
-    device_registry: "dev_reg.DeviceRegistry" = attr.ib()
+    entity_registry: ent_reg.EntityRegistry = attr.ib()
+    device_registry: dev_reg.DeviceRegistry = attr.ib()
--- a/homeassistant/auth/permissions/util.py
+++ b/homeassistant/auth/permissions/util.py
@@ -1,6 +1,8 @@
 """Helpers to deal with permissions."""
+from __future__ import annotations
+
 from functools import wraps
-from typing import Callable, Dict, List, Optional, cast
+from typing import Callable, Dict, Optional, cast

 from .const import SUBCAT_ALL
 from .models import PermissionLookup
@@ -45,7 +47,7 @@ def compile_policy(

    assert isinstance(policy, dict)

-    funcs: List[Callable[[str, str], Optional[bool]]] = []
+    funcs: list[Callable[[str, str], bool | None]] = []

    for key, lookup_func in subcategories.items():
        lookup_value = policy.get(key)
@@ -80,10 +82,10 @@ def compile_policy(

 def _gen_dict_test_func(
    perm_lookup: PermissionLookup, lookup_func: LookupFunc, lookup_dict: SubCategoryDict
-) -> Callable[[str, str], Optional[bool]]:
+) -> Callable[[str, str], bool | None]:
    """Generate a lookup function."""

-    def test_value(object_id: str, key: str) -> Optional[bool]:
+    def test_value(object_id: str, key: str) -> bool | None:
        """Test if permission is allowed based on the keys."""
        schema: ValueType = lookup_func(perm_lookup, lookup_dict, object_id)

--- a/homeassistant/auth/providers/init.py
+++ b/homeassistant/auth/providers/init.py
@@ -1,8 +1,11 @@
 """Auth providers for Home Assistant."""
+from __future__ import annotations
+
+from collections.abc import Mapping
 import importlib
 import logging
 import types
-from typing import Any, Dict, List, Optional
+from typing import Any

 import voluptuous as vol
 from voluptuous.humanize import humanize_error
@@ -10,13 +13,14 @@ 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.util import dt as dt_util
 from homeassistant.util.decorator import Registry

 from ..auth_store import AuthStore
 from ..const import MFA_SESSION_EXPIRATION
-from ..models import Credentials, User, UserMeta
+from ..models import Credentials, RefreshToken, User, UserMeta

 _LOGGER = logging.getLogger(__name__)
 DATA_REQS = "auth_prov_reqs_processed"
@@ -40,7 +44,7 @@ class AuthProvider:
    DEFAULT_TITLE = "Unnamed auth provider"

    def __init__(
-        self, hass: HomeAssistant, store: AuthStore, config: Dict[str, Any]
+        self, hass: HomeAssistant, store: AuthStore, config: dict[str, Any]
    ) -> None:
        """Initialize an auth provider."""
        self.hass = hass
@@ -48,7 +52,7 @@ class AuthProvider:
        self.config = config

    @property
-    def id(self) -> Optional[str]:
+    def id(self) -> str | None:
        """Return id of the auth provider.

        Optional, can be None.
@@ -70,7 +74,7 @@ class AuthProvider:
        """Return whether multi-factor auth supported by the auth provider."""
        return True

-    async def async_credentials(self) -> List[Credentials]:
+    async def async_credentials(self) -> list[Credentials]:
        """Return all credentials of this provider."""
        users = await self.store.async_get_users()
        return [
@@ -84,7 +88,7 @@ class AuthProvider:
        ]

    @callback
-    def async_create_credentials(self, data: Dict[str, str]) -> Credentials:
+    def async_create_credentials(self, data: dict[str, str]) -> Credentials:
        """Create credentials."""
        return Credentials(
            auth_provider_type=self.type, auth_provider_id=self.id, data=data
@@ -92,7 +96,7 @@ class AuthProvider:

    # Implement by extending class

-    async def async_login_flow(self, context: Optional[Dict]) -> "LoginFlow":
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return the data flow for logging in with auth provider.

        Auth provider should extend LoginFlow and return an instance.
@@ -100,7 +104,7 @@ class AuthProvider:
        raise NotImplementedError

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Get credentials based on the flow result."""
        raise NotImplementedError
@@ -117,9 +121,19 @@ class AuthProvider:
    async def async_initialize(self) -> None:
        """Initialize the auth provider."""

+    @callback
+    def async_validate_refresh_token(
+        self, refresh_token: RefreshToken, remote_ip: str | None = None
+    ) -> None:
+        """Verify a refresh token is still valid.
+
+        Optional hook for an auth provider to verify validity of a refresh token.
+        Should raise InvalidAuthError on errors.
+        """
+

 async def auth_provider_from_config(
-    hass: HomeAssistant, store: AuthStore, config: Dict[str, Any]
+    hass: HomeAssistant, store: AuthStore, config: dict[str, Any]
 ) -> AuthProvider:
    """Initialize an auth provider from a config."""
    provider_name = config[CONF_TYPE]
@@ -176,16 +190,17 @@ class LoginFlow(data_entry_flow.FlowHandler):
    def __init__(self, auth_provider: AuthProvider) -> None:
        """Initialize the login flow."""
        self._auth_provider = auth_provider
-        self._auth_module_id: Optional[str] = None
+        self._auth_module_id: str | None = None
        self._auth_manager = auth_provider.hass.auth
-        self.available_mfa_modules: Dict[str, str] = {}
+        self.available_mfa_modules: dict[str, str] = {}
        self.created_at = dt_util.utcnow()
        self.invalid_mfa_times = 0
-        self.user: Optional[User] = None
+        self.user: User | None = None
+        self.credential: Credentials | None = None

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the first step of login flow.

        Return self.async_show_form(step_id='init') if user_input is None.
@@ -194,8 +209,8 @@ class LoginFlow(data_entry_flow.FlowHandler):
        raise NotImplementedError

    async def async_step_select_mfa_module(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of select mfa module."""
        errors = {}

@@ -219,9 +234,10 @@ class LoginFlow(data_entry_flow.FlowHandler):
        )

    async def async_step_mfa(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of mfa validation."""
+        assert self.credential
        assert self.user

        errors = {}
@@ -257,9 +273,9 @@ class LoginFlow(data_entry_flow.FlowHandler):
                    return self.async_abort(reason="too_many_retry")

            if not errors:
-                return await self.async_finish(self.user)
+                return await self.async_finish(self.credential)

-        description_placeholders: Dict[str, Optional[str]] = {
+        description_placeholders: dict[str, str | None] = {
            "mfa_module_name": auth_module.name,
            "mfa_module_id": auth_module.id,
        }
@@ -271,6 +287,6 @@ class LoginFlow(data_entry_flow.FlowHandler):
            errors=errors,
        )

-    async def async_finish(self, flow_result: Any) -> Dict:
+    async def async_finish(self, flow_result: Any) -> FlowResult:
        """Handle the pass of login flow."""
        return self.async_create_entry(title=self._auth_provider.name, data=flow_result)
--- a/homeassistant/auth/providers/command_line.py
+++ b/homeassistant/auth/providers/command_line.py
@@ -1,19 +1,22 @@
 """Auth provider that validates credentials via an external command."""
+from __future__ import annotations

 import asyncio.subprocess
 import collections
+from collections.abc import Mapping
 import logging
 import os
-from typing import Any, Dict, Optional, cast
+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 . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta

-CONF_COMMAND = "command"
 CONF_ARGS = "args"
 CONF_META = "meta"

@@ -51,9 +54,9 @@ class CommandLineAuthProvider(AuthProvider):
        attributes provided by external programs.
        """
        super().__init__(*args, **kwargs)
-        self._user_meta: Dict[str, Dict[str, Any]] = {}
+        self._user_meta: dict[str, dict[str, Any]] = {}

-    async def async_login_flow(self, context: Optional[dict]) -> LoginFlow:
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return a flow to login."""
        return CommandLineLoginFlow(self)

@@ -82,7 +85,7 @@ class CommandLineAuthProvider(AuthProvider):
            raise InvalidAuthError

        if self.config[CONF_META]:
-            meta: Dict[str, str] = {}
+            meta: dict[str, str] = {}
            for _line in stdout.splitlines():
                try:
                    line = _line.decode().lstrip()
@@ -99,7 +102,7 @@ class CommandLineAuthProvider(AuthProvider):
            self._user_meta[username] = meta

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Get credentials based on the flow result."""
        username = flow_result["username"]
@@ -125,8 +128,8 @@ class CommandLineLoginFlow(LoginFlow):
    """Handler for the login flow."""

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of the form."""
        errors = {}

@@ -143,7 +146,7 @@ class CommandLineLoginFlow(LoginFlow):
                user_input.pop("password")
                return await self.async_finish(user_input)

-        schema: Dict[str, type] = collections.OrderedDict()
+        schema: dict[str, type] = collections.OrderedDict()
        schema["username"] = str
        schema["password"] = str

--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -1,15 +1,19 @@
 """Home Assistant auth provider."""
+from __future__ import annotations
+
 import asyncio
 import base64
 from collections import OrderedDict
+from collections.abc import Mapping
 import logging
-from typing import Any, Dict, List, Optional, Set, cast
+from typing import Any, cast

 import bcrypt
 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 . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
@@ -19,7 +23,7 @@ STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"


-def _disallow_id(conf: Dict[str, Any]) -> Dict[str, Any]:
+def _disallow_id(conf: dict[str, Any]) -> dict[str, Any]:
    """Disallow ID in config."""
    if CONF_ID in conf:
        raise vol.Invalid("ID is not allowed for the homeassistant auth provider.")
@@ -31,7 +35,7 @@ CONFIG_SCHEMA = vol.All(AUTH_PROVIDER_SCHEMA, _disallow_id)


@callback
-def async_get_provider(hass: HomeAssistant) -> "HassAuthProvider":
+def async_get_provider(hass: HomeAssistant) -> HassAuthProvider:
    """Get the provider."""
    for prv in hass.auth.auth_providers:
        if prv.type == "homeassistant":
@@ -60,7 +64,7 @@ class Data:
        self._store = hass.helpers.storage.Store(
            STORAGE_VERSION, STORAGE_KEY, private=True
        )
-        self._data: Optional[Dict[str, Any]] = None
+        self._data: dict[str, Any] | None = None
        # Legacy mode will allow usernames to start/end with whitespace
        # and will compare usernames case-insensitive.
        # Remove in 2020 or when we launch 1.0.
@@ -81,7 +85,7 @@ class Data:
        if data is None:
            data = {"users": []}

-        seen: Set[str] = set()
+        seen: set[str] = set()

        for user in data["users"]:
            username = user["username"]
@@ -119,7 +123,7 @@ class Data:
        self._data = data

    @property
-    def users(self) -> List[Dict[str, str]]:
+    def users(self) -> list[dict[str, str]]:
        """Return users."""
        return self._data["users"]  # type: ignore

@@ -218,7 +222,7 @@ class HassAuthProvider(AuthProvider):
    def __init__(self, *args: Any, **kwargs: Any) -> None:
        """Initialize an Home Assistant auth provider."""
        super().__init__(*args, **kwargs)
-        self.data: Optional[Data] = None
+        self.data: Data | None = None
        self._init_lock = asyncio.Lock()

    async def async_initialize(self) -> None:
@@ -231,7 +235,7 @@ class HassAuthProvider(AuthProvider):
            await data.async_load()
            self.data = data

-    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return a flow to login."""
        return HassLoginFlow(self)

@@ -275,7 +279,7 @@ class HassAuthProvider(AuthProvider):
        await self.data.async_save()

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Get credentials based on the flow result."""
        if self.data is None:
@@ -316,8 +320,8 @@ class HassLoginFlow(LoginFlow):
    """Handler for the login flow."""

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of the form."""
        errors = {}

@@ -333,7 +337,7 @@ class HassLoginFlow(LoginFlow):
                user_input.pop("password")
                return await self.async_finish(user_input)

-        schema: Dict[str, type] = OrderedDict()
+        schema: dict[str, type] = OrderedDict()
        schema["username"] = str
        schema["password"] = str

--- a/homeassistant/auth/providers/insecure_example.py
+++ b/homeassistant/auth/providers/insecure_example.py
@@ -1,11 +1,15 @@
 """Example auth provider."""
+from __future__ import annotations
+
 from collections import OrderedDict
+from collections.abc import Mapping
 import hmac
-from typing import Any, Dict, Optional, cast
+from typing import cast

 import voluptuous as vol

 from homeassistant.core import callback
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError

 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
@@ -33,7 +37,7 @@ class InvalidAuthError(HomeAssistantError):
 class ExampleAuthProvider(AuthProvider):
    """Example auth provider based on hardcoded usernames and passwords."""

-    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return a flow to login."""
        return ExampleLoginFlow(self)

@@ -60,7 +64,7 @@ class ExampleAuthProvider(AuthProvider):
            raise InvalidAuthError

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Get credentials based on the flow result."""
        username = flow_result["username"]
@@ -94,8 +98,8 @@ class ExampleLoginFlow(LoginFlow):
    """Handler for the login flow."""

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of the form."""
        errors = {}

@@ -111,7 +115,7 @@ class ExampleLoginFlow(LoginFlow):
                user_input.pop("password")
                return await self.async_finish(user_input)

-        schema: Dict[str, type] = OrderedDict()
+        schema: dict[str, type] = OrderedDict()
        schema["username"] = str
        schema["password"] = str

--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -3,18 +3,21 @@ Support Legacy API password auth provider.

 It will be removed when auth system production ready
 """
+from __future__ import annotations
+
+from collections.abc import Mapping
 import hmac
-from typing import Any, Dict, Optional, cast
+from typing import cast

 import voluptuous as vol

-from homeassistant.core import HomeAssistant, callback
+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 . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
-from .. import AuthManager
-from ..models import Credentials, User, UserMeta
+from ..models import Credentials, UserMeta

 AUTH_PROVIDER_TYPE = "legacy_api_password"
 CONF_API_PASSWORD = "api_password"
@@ -30,23 +33,6 @@ class InvalidAuthError(HomeAssistantError):
    """Raised when submitting invalid authentication."""


-async def async_validate_password(hass: HomeAssistant, password: str) -> Optional[User]:
-    """Return a user if password is valid. None if not."""
-    auth = cast(AuthManager, hass.auth)  # type: ignore
-    providers = auth.get_auth_providers(AUTH_PROVIDER_TYPE)
-    if not providers:
-        raise ValueError("Legacy API password provider not found")
-
-    try:
-        provider = cast(LegacyApiPasswordAuthProvider, providers[0])
-        provider.async_validate_login(password)
-        return await auth.async_get_or_create_user(
-            await provider.async_get_or_create_credentials({})
-        )
-    except InvalidAuthError:
-        return None
-
-
@AUTH_PROVIDERS.register(AUTH_PROVIDER_TYPE)
 class LegacyApiPasswordAuthProvider(AuthProvider):
    """An auth provider support legacy api_password."""
@@ -58,7 +44,7 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
        """Return api_password."""
        return str(self.config[CONF_API_PASSWORD])

-    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return a flow to login."""
        return LegacyLoginFlow(self)

@@ -73,7 +59,7 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
            raise InvalidAuthError

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Return credentials for this login."""
        credentials = await self.async_credentials()
@@ -97,8 +83,8 @@ class LegacyLoginFlow(LoginFlow):
    """Handler for the login flow."""

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of the form."""
        errors = {}

--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -3,17 +3,29 @@
 It shows list of users if access from trusted network.
 Abort login flow if not access from trusted network.
 """
-from ipaddress import IPv4Address, IPv4Network, IPv6Address, IPv6Network, ip_network
-from typing import Any, Dict, List, Optional, Union, cast
+from __future__ import annotations
+
+from collections.abc import Mapping
+from ipaddress import (
+    IPv4Address,
+    IPv4Network,
+    IPv6Address,
+    IPv6Network,
+    ip_address,
+    ip_network,
+)
+from typing import Any, Dict, List, Union, 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 . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
-from ..models import Credentials, UserMeta
+from .. import InvalidAuthError
+from ..models import Credentials, RefreshToken, UserMeta

 IPAddress = Union[IPv4Address, IPv6Address]
 IPNetwork = Union[IPv4Network, IPv6Network]
@@ -46,10 +58,6 @@ CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend(
 )


-class InvalidAuthError(HomeAssistantError):
-    """Raised when try to access from untrusted networks."""
-
-
 class InvalidUserError(HomeAssistantError):
    """Raised when try to login as invalid user."""

@@ -64,12 +72,12 @@ class TrustedNetworksAuthProvider(AuthProvider):
    DEFAULT_TITLE = "Trusted Networks"

    @property
-    def trusted_networks(self) -> List[IPNetwork]:
+    def trusted_networks(self) -> list[IPNetwork]:
        """Return trusted networks."""
        return cast(List[IPNetwork], self.config[CONF_TRUSTED_NETWORKS])

    @property
-    def trusted_users(self) -> Dict[IPNetwork, Any]:
+    def trusted_users(self) -> dict[IPNetwork, Any]:
        """Return trusted users per network."""
        return cast(Dict[IPNetwork, Any], self.config[CONF_TRUSTED_USERS])

@@ -78,7 +86,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
        """Trusted Networks auth provider does not support MFA."""
        return False

-    async def async_login_flow(self, context: Optional[Dict]) -> LoginFlow:
+    async def async_login_flow(self, context: dict | None) -> LoginFlow:
        """Return a flow to login."""
        assert context is not None
        ip_addr = cast(IPAddress, context.get("ip_address"))
@@ -107,7 +115,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
                    if (
                        user.id in user_list
                        or any(
-                            [group.id in flattened_group_list for group in user.groups]
+                            group.id in flattened_group_list for group in user.groups
                        )
                    )
                ]
@@ -121,7 +129,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
        )

    async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: Mapping[str, str]
    ) -> Credentials:
        """Get credentials based on the flow result."""
        user_id = flow_result["user"]
@@ -163,6 +171,17 @@ class TrustedNetworksAuthProvider(AuthProvider):
        ):
            raise InvalidAuthError("Not in trusted_networks")

+    @callback
+    def async_validate_refresh_token(
+        self, refresh_token: RefreshToken, remote_ip: str | None = None
+    ) -> None:
+        """Verify a refresh token is still valid."""
+        if remote_ip is None:
+            raise InvalidAuthError(
+                "Unknown remote ip can't be used for trusted network provider."
+            )
+        self.async_validate_access(ip_address(remote_ip))
+

 class TrustedNetworksLoginFlow(LoginFlow):
    """Handler for the login flow."""
@@ -171,7 +190,7 @@ class TrustedNetworksLoginFlow(LoginFlow):
        self,
        auth_provider: TrustedNetworksAuthProvider,
        ip_addr: IPAddress,
-        available_users: Dict[str, Optional[str]],
+        available_users: dict[str, str | None],
        allow_bypass_login: bool,
    ) -> None:
        """Initialize the login flow."""
@@ -181,8 +200,8 @@ class TrustedNetworksLoginFlow(LoginFlow):
        self._allow_bypass_login = allow_bypass_login

    async def async_step_init(
-        self, user_input: Optional[Dict[str, str]] = None
-    ) -> Dict[str, Any]:
+        self, user_input: dict[str, str] | None = None
+    ) -> FlowResult:
        """Handle the step of the form."""
        try:
            cast(
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -1,4 +1,6 @@
 """Provide methods to bootstrap a Home Assistant instance."""
+from __future__ import annotations
+
 import asyncio
 import contextlib
 from datetime import datetime
@@ -8,7 +10,7 @@ import os
 import sys
 import threading
 from time import monotonic
-from typing import TYPE_CHECKING, Any, Dict, Optional, Set
+from typing import TYPE_CHECKING, Any

 import voluptuous as vol
 import yarl
@@ -17,17 +19,20 @@ from homeassistant import config as conf_util, config_entries, core, loader
 from homeassistant.components import http
 from homeassistant.const import REQUIRED_NEXT_PYTHON_DATE, REQUIRED_NEXT_PYTHON_VER
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import area_registry, device_registry, entity_registry
+from homeassistant.helpers.dispatcher import async_dispatcher_send
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.setup import (
    DATA_SETUP,
    DATA_SETUP_STARTED,
+    DATA_SETUP_TIME,
    async_set_domains_to_be_loaded,
    async_setup_component,
 )
 from homeassistant.util.async_ import gather_with_concurrency
+import homeassistant.util.dt as dt_util
 from homeassistant.util.logging import async_activate_log_queue_handler
 from homeassistant.util.package import async_get_user_site, is_virtual_env
-from homeassistant.util.yaml import clear_secret_cache

 if TYPE_CHECKING:
    from .runner import RuntimeConfig
@@ -40,6 +45,8 @@ ERROR_LOG_FILENAME = "home-assistant.log"
 DATA_LOGGING = "logging"

 LOG_SLOW_STARTUP_INTERVAL = 60
+SLOW_STARTUP_CHECK_INTERVAL = 1
+SIGNAL_BOOTSTRAP_INTEGRATONS = "bootstrap_integrations"

 STAGE_1_TIMEOUT = 120
 STAGE_2_TIMEOUT = 300
@@ -74,8 +81,8 @@ STAGE_1_INTEGRATIONS = {


 async def async_setup_hass(
-    runtime_config: "RuntimeConfig",
-) -> Optional[core.HomeAssistant]:
+    runtime_config: RuntimeConfig,
+) -> core.HomeAssistant | None:
    """Set up Home Assistant."""
    hass = core.HomeAssistant()
    hass.config.config_dir = runtime_config.config_dir
@@ -121,8 +128,6 @@ async def async_setup_hass(
            basic_setup_success = (
                await async_from_config_dict(config_dict, hass) is not None
            )
-        finally:
-            clear_secret_cache()

    if config_dict is None:
        safe_mode = True
@@ -190,7 +195,7 @@ def open_hass_ui(hass: core.HomeAssistant) -> None:

 async def async_from_config_dict(
    config: ConfigType, hass: core.HomeAssistant
-) -> Optional[core.HomeAssistant]:
+) -> core.HomeAssistant | None:
    """Try to configure Home Assistant from a configuration dictionary.

    Dynamically loads required components and its dependencies.
@@ -257,8 +262,8 @@ async def async_from_config_dict(
 def async_enable_logging(
    hass: core.HomeAssistant,
    verbose: bool = False,
-    log_rotate_days: Optional[int] = None,
-    log_file: Optional[str] = None,
+    log_rotate_days: int | None = None,
+    log_file: str | None = None,
    log_no_color: bool = False,
 ) -> None:
    """Set up the logging.
@@ -364,7 +369,7 @@ async def async_mount_local_lib_path(config_dir: str) -> str:


@core.callback
-def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
+def _get_domains(hass: core.HomeAssistant, config: dict[str, Any]) -> set[str]:
    """Get domains of components to set up."""
    # Filter out the repeating and common config section [homeassistant]
    domains = {key.split(" ")[0] for key in config if key != core.DOMAIN}
@@ -380,38 +385,46 @@ def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
    return domains


-async def _async_log_pending_setups(
-    hass: core.HomeAssistant, domains: Set[str], setup_started: Dict[str, datetime]
-) -> None:
+async def _async_watch_pending_setups(hass: core.HomeAssistant) -> None:
    """Periodic log of setups that are pending for longer than LOG_SLOW_STARTUP_INTERVAL."""
+    loop_count = 0
+    setup_started: dict[str, datetime] = hass.data[DATA_SETUP_STARTED]
+    previous_was_empty = True
    while True:
-        await asyncio.sleep(LOG_SLOW_STARTUP_INTERVAL)
-        remaining = [domain for domain in domains if domain in setup_started]
+        now = dt_util.utcnow()
+        remaining_with_setup_started = {
+            domain: (now - setup_started[domain]).total_seconds()
+            for domain in setup_started
+        }
+        _LOGGER.debug("Integration remaining: %s", remaining_with_setup_started)
+        if remaining_with_setup_started or not previous_was_empty:
+            async_dispatcher_send(
+                hass, SIGNAL_BOOTSTRAP_INTEGRATONS, remaining_with_setup_started
+            )
+        previous_was_empty = not remaining_with_setup_started
+        await asyncio.sleep(SLOW_STARTUP_CHECK_INTERVAL)
+        loop_count += SLOW_STARTUP_CHECK_INTERVAL

-        if remaining:
+        if loop_count >= LOG_SLOW_STARTUP_INTERVAL and setup_started:
            _LOGGER.warning(
                "Waiting on integrations to complete setup: %s",
-                ", ".join(remaining),
+                ", ".join(setup_started),
            )
+            loop_count = 0
        _LOGGER.debug("Running timeout Zones: %s", hass.timeout.zones)


 async def async_setup_multi_components(
    hass: core.HomeAssistant,
-    domains: Set[str],
-    config: Dict[str, Any],
-    setup_started: Dict[str, datetime],
+    domains: set[str],
+    config: dict[str, Any],
 ) -> None:
    """Set up multiple domains. Log on failure."""
    futures = {
        domain: hass.async_create_task(async_setup_component(hass, domain, config))
        for domain in domains
    }
-    log_task = asyncio.create_task(
-        _async_log_pending_setups(hass, domains, setup_started)
-    )
    await asyncio.wait(futures.values())
-    log_task.cancel()
    errors = [domain for domain in domains if futures[domain].exception()]
    for domain in errors:
        exception = futures[domain].exception()
@@ -424,15 +437,19 @@ async def async_setup_multi_components(


 async def _async_set_up_integrations(
-    hass: core.HomeAssistant, config: Dict[str, Any]
+    hass: core.HomeAssistant, config: dict[str, Any]
 ) -> None:
    """Set up all the integrations."""
-    setup_started = hass.data[DATA_SETUP_STARTED] = {}
+    hass.data[DATA_SETUP_STARTED] = {}
+    setup_time = hass.data[DATA_SETUP_TIME] = {}
+
+    watch_task = asyncio.create_task(_async_watch_pending_setups(hass))
+
    domains_to_setup = _get_domains(hass, config)

    # Resolve all dependencies so we know all integrations
    # that will have to be loaded and start rightaway
-    integration_cache: Dict[str, loader.Integration] = {}
+    integration_cache: dict[str, loader.Integration] = {}
    to_resolve = domains_to_setup
    while to_resolve:
        old_to_resolve = to_resolve
@@ -476,14 +493,14 @@ async def _async_set_up_integrations(
    # Load logging as soon as possible
    if logging_domains:
        _LOGGER.info("Setting up logging: %s", logging_domains)
-        await async_setup_multi_components(hass, logging_domains, config, setup_started)
+        await async_setup_multi_components(hass, logging_domains, config)

    # Start up debuggers. Start these first in case they want to wait.
    debuggers = domains_to_setup & DEBUGGER_INTEGRATIONS

    if debuggers:
        _LOGGER.debug("Setting up debuggers: %s", debuggers)
-        await async_setup_multi_components(hass, debuggers, config, setup_started)
+        await async_setup_multi_components(hass, debuggers, config)

    # calculate what components to setup in what stage
    stage_1_domains = set()
@@ -510,10 +527,12 @@ async def _async_set_up_integrations(

    stage_2_domains = domains_to_setup - logging_domains - debuggers - stage_1_domains

-    # Kick off loading the registries. They don't need to be awaited.
-    asyncio.create_task(hass.helpers.device_registry.async_get_registry())
-    asyncio.create_task(hass.helpers.entity_registry.async_get_registry())
-    asyncio.create_task(hass.helpers.area_registry.async_get_registry())
+    # Load the registries
+    await asyncio.gather(
+        device_registry.async_load(hass),
+        entity_registry.async_load(hass),
+        area_registry.async_load(hass),
+    )

    # Start setup
    if stage_1_domains:
@@ -522,9 +541,7 @@ async def _async_set_up_integrations(
            async with hass.timeout.async_timeout(
                STAGE_1_TIMEOUT, cool_down=COOLDOWN_TIME
            ):
-                await async_setup_multi_components(
-                    hass, stage_1_domains, config, setup_started
-                )
+                await async_setup_multi_components(hass, stage_1_domains, config)
        except asyncio.TimeoutError:
            _LOGGER.warning("Setup timed out for stage 1 - moving forward")

@@ -537,12 +554,23 @@ async def _async_set_up_integrations(
            async with hass.timeout.async_timeout(
                STAGE_2_TIMEOUT, cool_down=COOLDOWN_TIME
            ):
-                await async_setup_multi_components(
-                    hass, stage_2_domains, config, setup_started
-                )
+                await async_setup_multi_components(hass, stage_2_domains, config)
        except asyncio.TimeoutError:
            _LOGGER.warning("Setup timed out for stage 2 - moving forward")

+    watch_task.cancel()
+    async_dispatcher_send(hass, SIGNAL_BOOTSTRAP_INTEGRATONS, {})
+
+    _LOGGER.debug(
+        "Integration setup times: %s",
+        {
+            integration: timedelta.total_seconds()
+            for integration, timedelta in sorted(
+                setup_time.items(), key=lambda item: item[1].total_seconds()  # type: ignore
+            )
+        },
+    )
+
    # Wrap up startup
    _LOGGER.debug("Waiting for startup to wrap up")
    try:
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -7,16 +7,16 @@ 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 split_entity_id
-
-# mypy: allow-untyped-defs
+from homeassistant.core import HomeAssistant, split_entity_id

 _LOGGER = logging.getLogger(__name__)


-def is_on(hass, entity_id=None):
+def is_on(hass: HomeAssistant, entity_id: str | None = None) -> bool:
    """Load up the module to call the is_on method.

    If there is no entity id given we will check all.
--- a/homeassistant/components/abode/init.py
+++ b/homeassistant/components/abode/init.py
@@ -1,5 +1,4 @@
 """Support for the Abode Security System."""
-from asyncio import gather
 from copy import deepcopy
 from functools import partial

@@ -9,17 +8,18 @@ import abodepy.helpers.timeline as TIMELINE
 from requests.exceptions import ConnectTimeout, HTTPError
 import voluptuous as vol

-from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
+from homeassistant.config_entries import SOURCE_IMPORT
 from homeassistant.const import (
    ATTR_ATTRIBUTION,
    ATTR_DATE,
+    ATTR_DEVICE_ID,
    ATTR_ENTITY_ID,
    ATTR_TIME,
    CONF_PASSWORD,
    CONF_USERNAME,
    EVENT_HOMEASSISTANT_STOP,
 )
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
 from homeassistant.helpers.entity import Entity
@@ -32,7 +32,6 @@ SERVICE_SETTINGS = "change_setting"
 SERVICE_CAPTURE_IMAGE = "capture_image"
 SERVICE_TRIGGER_AUTOMATION = "trigger_automation"

-ATTR_DEVICE_ID = "device_id"
 ATTR_DEVICE_NAME = "device_name"
 ATTR_DEVICE_TYPE = "device_type"
 ATTR_EVENT_CODE = "event_code"
@@ -66,7 +65,7 @@ CAPTURE_IMAGE_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})

 AUTOMATION_SCHEMA = vol.Schema({ATTR_ENTITY_ID: cv.entity_ids})

-ABODE_PLATFORMS = [
+PLATFORMS = [
    "alarm_control_panel",
    "binary_sensor",
    "lock",
@@ -124,24 +123,14 @@ async def async_setup_entry(hass, config_entry):
        )

    except AbodeAuthenticationException as ex:
-        LOGGER.error("Invalid credentials: %s", ex)
-        await hass.config_entries.flow.async_init(
-            DOMAIN,
-            context={"source": SOURCE_REAUTH},
-            data=config_entry.data,
-        )
-        return False
+        raise ConfigEntryAuthFailed(f"Invalid credentials: {ex}") from ex

    except (AbodeException, ConnectTimeout, HTTPError) as ex:
-        LOGGER.error("Unable to connect to Abode: %s", ex)
-        raise ConfigEntryNotReady from ex
+        raise ConfigEntryNotReady(f"Unable to connect to Abode: {ex}") from ex

    hass.data[DOMAIN] = AbodeSystem(abode, polling)

-    for platform in ABODE_PLATFORMS:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, platform)
-        )
+    hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)

    await setup_hass_events(hass)
    await hass.async_add_executor_job(setup_hass_services, hass)
@@ -156,14 +145,9 @@ async def async_unload_entry(hass, config_entry):
    hass.services.async_remove(DOMAIN, SERVICE_CAPTURE_IMAGE)
    hass.services.async_remove(DOMAIN, SERVICE_TRIGGER_AUTOMATION)

-    tasks = []
-
-    for platform in ABODE_PLATFORMS:
-        tasks.append(
-            hass.config_entries.async_forward_entry_unload(config_entry, platform)
-        )
-
-    await gather(*tasks)
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
+    )

    await hass.async_add_executor_job(hass.data[DOMAIN].abode.events.stop)
    await hass.async_add_executor_job(hass.data[DOMAIN].abode.logout)
@@ -171,7 +155,7 @@ async def async_unload_entry(hass, config_entry):
    hass.data[DOMAIN].logout_listener()
    hass.data.pop(DOMAIN)

-    return True
+    return unload_ok


 def setup_hass_services(hass):
@@ -363,7 +347,7 @@ class AbodeDevice(AbodeEntity):
        return self._device.name

    @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
        """Return the state attributes."""
        return {
            ATTR_ATTRIBUTION: ATTRIBUTION,
@@ -411,7 +395,7 @@ class AbodeAutomation(AbodeEntity):
        return self._automation.name

    @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
        """Return the state attributes."""
        return {ATTR_ATTRIBUTION: ATTRIBUTION, "type": "CUE automation"}

--- a/homeassistant/components/abode/alarm_control_panel.py
+++ b/homeassistant/components/abode/alarm_control_panel.py
@@ -69,7 +69,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
        self._device.set_away()

    @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
        """Return the state attributes."""
        return {
            ATTR_ATTRIBUTION: ATTRIBUTION,
--- a/homeassistant/components/abode/config_flow.py
+++ b/homeassistant/components/abode/config_flow.py
@@ -8,7 +8,7 @@ import voluptuous as vol
 from homeassistant import config_entries
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME, HTTP_BAD_REQUEST

-from .const import DEFAULT_CACHEDB, DOMAIN, LOGGER  # pylint: disable=unused-import
+from .const import DEFAULT_CACHEDB, DOMAIN, LOGGER

 CONF_MFA = "mfa_code"
 CONF_POLLING = "polling"
@@ -163,7 +163,7 @@ class AbodeFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
    async def async_step_import(self, import_config):
        """Import a config entry from configuration.yaml."""
        if self._async_current_entries():
-            LOGGER.warning("Already configured. Only a single configuration possible.")
+            LOGGER.warning("Already configured; Only a single configuration possible")
            return self.async_abort(reason="single_instance_allowed")

        self._polling = import_config.get(CONF_POLLING, False)
--- a/homeassistant/components/abode/manifest.json
+++ b/homeassistant/components/abode/manifest.json
@@ -7,5 +7,6 @@
  "codeowners": ["@shred86"],
  "homekit": {
    "models": ["Abode", "Iota"]
-  }
+  },
+  "iot_class": "cloud_push"
 }
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -1,6 +1,7 @@
 """Support for Abode Security System sensors."""
 import abodepy.helpers.constants as CONST

+from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import (
    DEVICE_CLASS_HUMIDITY,
    DEVICE_CLASS_ILLUMINANCE,
@@ -33,7 +34,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
    async_add_entities(entities)


-class AbodeSensor(AbodeDevice):
+class AbodeSensor(AbodeDevice, SensorEntity):
    """A sensor implementation for Abode devices."""

    def __init__(self, data, device, sensor_type):
--- a/homeassistant/components/abode/translations/es-419.json
+++ b/homeassistant/components/abode/translations/es-419.json
@@ -3,7 +3,22 @@
        "abort": {
            "single_instance_allowed": "Solo se permite una \u00fanica configuraci\u00f3n de Abode."
        },
+        "error": {
+            "invalid_mfa_code": "C\u00f3digo MFA no v\u00e1lido"
+        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "C\u00f3digo MFA (6 d\u00edgitos)"
+                },
+                "title": "Ingrese su c\u00f3digo MFA para Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Contrase\u00f1a"
+                },
+                "title": "Complete su informaci\u00f3n de inicio de sesi\u00f3n de Abode"
+            },
            "user": {
                "data": {
                    "password": "Contrase\u00f1a",
--- a/homeassistant/components/abode/translations/fa.json
+++ b/homeassistant/components/abode/translations/fa.json
@@ -0,0 +1,12 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u06a9\u0644\u0645\u0647 \u0639\u0628\u0648\u0631",
+                    "username": "\u0627\u06cc\u0645\u06cc\u0644"
+                }
+            }
+        }
+    }
+}
--- a/homeassistant/components/abode/translations/he.json
+++ b/homeassistant/components/abode/translations/he.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9"
+                }
+            }
+        }
+    }
+}
--- a/homeassistant/components/abode/translations/hu.json
+++ b/homeassistant/components/abode/translations/hu.json
@@ -1,16 +1,25 @@
 {
    "config": {
        "abort": {
-            "single_instance_allowed": "Csak egyetlen Abode konfigur\u00e1ci\u00f3 enged\u00e9lyezett."
+            "reauth_successful": "Az \u00fajrahiteles\u00edt\u00e9s sikeres volt",
+            "single_instance_allowed": "M\u00e1r konfigur\u00e1lva van. Csak egy konfigur\u00e1ci\u00f3 lehets\u00e9ges."
        },
        "error": {
            "cannot_connect": "Sikertelen csatlakoz\u00e1s",
+            "invalid_auth": "\u00c9rv\u00e9nytelen hiteles\u00edt\u00e9s",
            "invalid_mfa_code": "\u00c9rv\u00e9nytelen MFA k\u00f3d"
        },
        "step": {
            "mfa": {
                "data": {
                    "mfa_code": "MFA k\u00f3d (6 jegy\u0171)"
+                },
+                "title": "Add meg az Abode MFA k\u00f3dj\u00e1t"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Jelsz\u00f3",
+                    "username": "E-mail"
                }
            },
            "user": {
--- a/homeassistant/components/abode/translations/id.json
+++ b/homeassistant/components/abode/translations/id.json
@@ -0,0 +1,35 @@
+{
+    "config": {
+        "abort": {
+            "reauth_successful": "Autentikasi ulang berhasil",
+            "single_instance_allowed": "Sudah dikonfigurasi. Hanya satu konfigurasi yang diizinkan."
+        },
+        "error": {
+            "cannot_connect": "Gagal terhubung",
+            "invalid_auth": "Autentikasi tidak valid",
+            "invalid_mfa_code": "Kode MFA tidak valid"
+        },
+        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "Kode MFA (6 digit)"
+                },
+                "title": "Masukkan kode MFA Anda untuk Abode"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "Kata Sandi",
+                    "username": "Email"
+                },
+                "title": "Masukkan informasi masuk Abode Anda"
+            },
+            "user": {
+                "data": {
+                    "password": "Kata Sandi",
+                    "username": "Email"
+                },
+                "title": "Masukkan informasi masuk Abode Anda"
+            }
+        }
+    }
+}
--- a/homeassistant/components/abode/translations/it.json
+++ b/homeassistant/components/abode/translations/it.json
@@ -1,7 +1,7 @@
 {
    "config": {
        "abort": {
-            "reauth_successful": "La riautenticazione ha avuto successo",
+            "reauth_successful": "La nuova autenticazione \u00e8 stata eseguita correttamente",
            "single_instance_allowed": "Gi\u00e0 configurato. \u00c8 possibile una sola configurazione."
        },
        "error": {
--- a/homeassistant/components/abode/translations/ko.json
+++ b/homeassistant/components/abode/translations/ko.json
@@ -1,9 +1,28 @@
 {
    "config": {
        "abort": {
-            "single_instance_allowed": "\ud558\ub098\uc758 Abode \ub9cc \uad6c\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+            "reauth_successful": "\uc7ac\uc778\uc99d\uc5d0 \uc131\uacf5\ud588\uc2b5\ub2c8\ub2e4",
+            "single_instance_allowed": "\uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \ud558\ub098\uc758 \uc778\uc2a4\ud134\uc2a4\ub9cc \uad6c\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+        },
+        "error": {
+            "cannot_connect": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4",
+            "invalid_auth": "\uc778\uc99d\uc774 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "invalid_mfa_code": "MFA \ucf54\ub4dc\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4"
        },
        "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA \ucf54\ub4dc (6\uc790\ub9ac)"
+                },
+                "title": "Abode\uc5d0 \ub300\ud55c MFA \ucf54\ub4dc\ub97c \uc785\ub825\ud574\uc8fc\uc138\uc694"
+            },
+            "reauth_confirm": {
+                "data": {
+                    "password": "\ube44\ubc00\ubc88\ud638",
+                    "username": "\uc774\uba54\uc77c"
+                },
+                "title": "Abode \ub85c\uadf8\uc778 \uc815\ubcf4 \uc785\ub825\ud558\uae30"
+            },
            "user": {
                "data": {
                    "password": "\ube44\ubc00\ubc88\ud638",
--- a/homeassistant/components/abode/translations/nl.json
+++ b/homeassistant/components/abode/translations/nl.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "reauth_successful": "Herauthenticatie was succesvol",
            "single_instance_allowed": "Slechts een enkele configuratie van Abode is toegestaan."
        },
        "error": {
@@ -12,9 +13,14 @@
            "mfa": {
                "data": {
                    "mfa_code": "MFA-code (6-cijfers)"
-                }
+                },
+                "title": "Voer uw MFA-code voor Abode in"
            },
            "reauth_confirm": {
+                "data": {
+                    "password": "Wachtwoord",
+                    "username": "E-mail"
+                },
                "title": "Vul uw Abode-inloggegevens in"
            },
            "user": {
--- a/homeassistant/components/abode/translations/ro.json
+++ b/homeassistant/components/abode/translations/ro.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "reauth_successful": "Re-autentificare efectuata cu succes"
+        }
+    }
+}
--- a/homeassistant/components/abode/translations/ru.json
+++ b/homeassistant/components/abode/translations/ru.json
@@ -6,7 +6,7 @@
        },
        "error": {
            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
-            "invalid_auth": "\u041d\u0435\u0432\u0435\u0440\u043d\u0430\u044f \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u044f.",
+            "invalid_auth": "\u041e\u0448\u0438\u0431\u043a\u0430 \u0430\u0443\u0442\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0446\u0438\u0438.",
            "invalid_mfa_code": "\u041d\u0435\u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u043a\u043e\u0434 MFA."
        },
        "step": {
--- a/homeassistant/components/accuweather/init.py
+++ b/homeassistant/components/accuweather/init.py
@@ -1,5 +1,4 @@
 """The AccuWeather component."""
-import asyncio
 from datetime import timedelta
 import logging

@@ -8,8 +7,6 @@ from aiohttp.client_exceptions import ClientConnectorError
 from async_timeout import timeout

 from homeassistant.const import CONF_API_KEY
-from homeassistant.core import Config, HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

@@ -26,12 +23,6 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORMS = ["sensor", "weather"]


-async def async_setup(hass: HomeAssistant, config: Config) -> bool:
-    """Set up configured AccuWeather."""
-    hass.data.setdefault(DOMAIN, {})
-    return True
-
-
 async def async_setup_entry(hass, config_entry) -> bool:
    """Set up AccuWeather as config entry."""
    api_key = config_entry.data[CONF_API_KEY]
@@ -45,35 +36,24 @@ async def async_setup_entry(hass, config_entry) -> bool:
    coordinator = AccuWeatherDataUpdateCoordinator(
        hass, websession, api_key, location_key, forecast
    )
-    await coordinator.async_refresh()
-
-    if not coordinator.last_update_success:
-        raise ConfigEntryNotReady
+    await coordinator.async_config_entry_first_refresh()

    undo_listener = config_entry.add_update_listener(update_listener)

-    hass.data[DOMAIN][config_entry.entry_id] = {
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = {
        COORDINATOR: coordinator,
        UNDO_UPDATE_LISTENER: undo_listener,
    }

-    for component in PLATFORMS:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, component)
-        )
+    hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)

    return True


 async def async_unload_entry(hass, config_entry):
    """Unload a config entry."""
-    unload_ok = all(
-        await asyncio.gather(
-            *[
-                hass.config_entries.async_forward_entry_unload(config_entry, component)
-                for component in PLATFORMS
-            ]
-        )
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
    )

    hass.data[DOMAIN][config_entry.entry_id][UNDO_UPDATE_LISTENER]()
--- a/homeassistant/components/accuweather/config_flow.py
+++ b/homeassistant/components/accuweather/config_flow.py
@@ -13,7 +13,7 @@ from homeassistant.core import callback
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv

-from .const import CONF_FORECAST, DOMAIN  # pylint:disable=unused-import
+from .const import CONF_FORECAST, DOMAIN


 class AccuWeatherFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -17,6 +17,7 @@ from homeassistant.components.weather import (
 )
 from homeassistant.const import (
    ATTR_DEVICE_CLASS,
+    ATTR_ICON,
    CONCENTRATION_PARTS_PER_CUBIC_METER,
    DEVICE_CLASS_TEMPERATURE,
    LENGTH_FEET,
@@ -33,7 +34,6 @@ from homeassistant.const import (
 )

 ATTRIBUTION = "Data provided by AccuWeather"
-ATTR_ICON = "icon"
 ATTR_FORECAST = CONF_FORECAST = "forecast"
 ATTR_LABEL = "label"
 ATTR_UNIT_IMPERIAL = "Imperial"
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -2,8 +2,9 @@
  "domain": "accuweather",
  "name": "AccuWeather",
  "documentation": "https://www.home-assistant.io/integrations/accuweather/",
-  "requirements": ["accuweather==0.0.11"],
+  "requirements": ["accuweather==0.1.1"],
  "codeowners": ["@bieniu"],
  "config_flow": true,
-  "quality_scale": "platinum"
+  "quality_scale": "platinum",
+  "iot_class": "cloud_polling"
 }
--- a/homeassistant/components/accuweather/sensor.py
+++ b/homeassistant/components/accuweather/sensor.py
@@ -1,4 +1,5 @@
 """Support for the AccuWeather service."""
+from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import (
    ATTR_ATTRIBUTION,
    ATTR_DEVICE_CLASS,
@@ -48,7 +49,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
    async_add_entities(sensors, False)


-class AccuWeatherSensor(CoordinatorEntity):
+class AccuWeatherSensor(CoordinatorEntity, SensorEntity):
    """Define an AccuWeather entity."""

    def __init__(self, name, kind, coordinator, forecast_day=None):
@@ -141,7 +142,7 @@ class AccuWeatherSensor(CoordinatorEntity):
        return SENSOR_TYPES[self.kind][self._unit_system]

    @property
-    def device_state_attributes(self):
+    def extra_state_attributes(self):
        """Return the state attributes."""
        if self.forecast_day is not None:
            if self.kind in ["WindDay", "WindNight", "WindGustDay", "WindGustNight"]:
--- a/homeassistant/components/accuweather/translations/de.json
+++ b/homeassistant/components/accuweather/translations/de.json
@@ -5,7 +5,8 @@
        },
        "error": {
            "cannot_connect": "Verbindung fehlgeschlagen",
-            "invalid_api_key": "Ung\u00fcltiger API-Schl\u00fcssel"
+            "invalid_api_key": "Ung\u00fcltiger API-Schl\u00fcssel",
+            "requests_exceeded": "Die zul\u00e4ssige Anzahl von Anforderungen an die Accuweather-API wurde \u00fcberschritten. Sie m\u00fcssen warten oder den API-Schl\u00fcssel \u00e4ndern."
        },
        "step": {
            "user": {
@@ -15,6 +16,7 @@
                    "longitude": "L\u00e4ngengrad",
                    "name": "Name"
                },
+                "description": "Wenn du Hilfe bei der Konfiguration ben\u00f6tigst, schaue hier nach: https://www.home-assistant.io/integrations/accuweather/\n\nEinige Sensoren sind standardm\u00e4\u00dfig nicht aktiviert. Du kannst sie in der Entit\u00e4tsregister nach der Integrationskonfiguration aktivieren.\nDie Wettervorhersage ist nicht standardm\u00e4\u00dfig aktiviert. Du kannst sie in den Integrationsoptionen aktivieren.",
                "title": "AccuWeather"
            }
        }
@@ -24,7 +26,9 @@
            "user": {
                "data": {
                    "forecast": "Wettervorhersage"
-                }
+                },
+                "description": "Aufgrund der Einschr\u00e4nkungen der kostenlosen Version des AccuWeather-API-Schl\u00fcssels werden bei aktivierter Wettervorhersage Datenaktualisierungen alle 80 Minuten statt alle 40 Minuten durchgef\u00fchrt.",
+                "title": "AccuWeather Optionen"
            }
        }
    },
--- a/homeassistant/components/accuweather/translations/es-419.json
+++ b/homeassistant/components/accuweather/translations/es-419.json
@@ -16,8 +16,14 @@
                "data": {
                    "forecast": "Pron\u00f3stico del tiempo"
                },
-                "description": "Debido a las limitaciones de la versi\u00f3n gratuita de la clave API de AccuWeather, cuando habilita el pron\u00f3stico del tiempo, las actualizaciones de datos se realizar\u00e1n cada 64 minutos en lugar de cada 32 minutos."
+                "description": "Debido a las limitaciones de la versi\u00f3n gratuita de la clave API de AccuWeather, cuando habilita el pron\u00f3stico del tiempo, las actualizaciones de datos se realizar\u00e1n cada 64 minutos en lugar de cada 32 minutos.",
+                "title": "Opciones de AccuWeather"
            }
        }
+    },
+    "system_health": {
+        "info": {
+            "remaining_requests": "Solicitudes permitidas restantes"
+        }
    }
 }
--- a/homeassistant/components/accuweather/translations/he.json
+++ b/homeassistant/components/accuweather/translations/he.json
@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "longitude": "\u05e7\u05d5 \u05d0\u05d5\u05e8\u05da"
+                }
+            }
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/hu.json
+++ b/homeassistant/components/accuweather/translations/hu.json
@@ -0,0 +1,29 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "M\u00e1r konfigur\u00e1lva van. Csak egy konfigur\u00e1ci\u00f3 lehets\u00e9ges."
+        },
+        "error": {
+            "cannot_connect": "Sikertelen csatlakoz\u00e1s",
+            "invalid_api_key": "\u00c9rv\u00e9nytelen API kulcs"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "API kulcs",
+                    "latitude": "Sz\u00e9less\u00e9g",
+                    "longitude": "Hossz\u00fas\u00e1g",
+                    "name": "N\u00e9v"
+                },
+                "title": "AccuWeather"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "title": "AccuWeather be\u00e1ll\u00edt\u00e1sok"
+            }
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/id.json
+++ b/homeassistant/components/accuweather/translations/id.json
@@ -0,0 +1,41 @@
+{
+    "config": {
+        "abort": {
+            "single_instance_allowed": "Sudah dikonfigurasi. Hanya satu konfigurasi yang diizinkan."
+        },
+        "error": {
+            "cannot_connect": "Gagal terhubung",
+            "invalid_api_key": "Kunci API tidak valid",
+            "requests_exceeded": "Jumlah permintaan yang diizinkan ke API Accuweather telah terlampaui. Anda harus menunggu atau mengubah Kunci API."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "api_key": "Kunci API",
+                    "latitude": "Lintang",
+                    "longitude": "Bujur",
+                    "name": "Nama"
+                },
+                "description": "Jika Anda memerlukan bantuan tentang konfigurasi, baca di sini: https://www.home-assistant.io/integrations/accuweather/\n\nBeberapa sensor tidak diaktifkan secara default. Anda dapat mengaktifkannya di registri entitas setelah konfigurasi integrasi.\nPrakiraan cuaca tidak diaktifkan secara default. Anda dapat mengaktifkannya di opsi integrasi.",
+                "title": "AccuWeather"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "Prakiraan cuaca"
+                },
+                "description": "Karena keterbatasan versi gratis kunci API AccuWeather, ketika Anda mengaktifkan prakiraan cuaca, pembaruan data akan dilakukan setiap 80 menit, bukan setiap 40 menit.",
+                "title": "Opsi AccuWeather"
+            }
+        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "Keterjangkauan server AccuWeather",
+            "remaining_requests": "Sisa permintaan yang diizinkan"
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/ko.json
+++ b/homeassistant/components/accuweather/translations/ko.json
@@ -1,9 +1,41 @@
 {
    "config": {
+        "abort": {
+            "single_instance_allowed": "\uc774\ubbf8 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \ud558\ub098\uc758 \uc778\uc2a4\ud134\uc2a4\ub9cc \uad6c\uc131\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+        },
+        "error": {
+            "cannot_connect": "\uc5f0\uacb0\ud558\uc9c0 \ubabb\ud588\uc2b5\ub2c8\ub2e4",
+            "invalid_api_key": "API \ud0a4\uac00 \uc798\ubabb\ub418\uc5c8\uc2b5\ub2c8\ub2e4",
+            "requests_exceeded": "Accuweather API\uc5d0 \ud5c8\uc6a9\ub41c \uc694\uccad \uc218\uac00 \ucd08\uacfc\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uae30\ub2e4\ub9ac\uac70\ub098 API \ud0a4\ub97c \ubcc0\uacbd\ud574\uc57c \ud569\ub2c8\ub2e4."
+        },
        "step": {
            "user": {
-                "description": "\uad6c\uc131\uc5d0 \ub300\ud55c \ub3c4\uc6c0\uc774 \ud544\uc694\ud55c \uacbd\uc6b0 \ub2e4\uc74c\uc744 \ucc38\uc870\ud574\uc8fc\uc138\uc694:\nhttps://www.home-assistant.io/integrations/accuweather/\n\n\uc77c\ubd80 \uc13c\uc11c\ub294 \uae30\ubcf8\uc801\uc73c\ub85c \ud65c\uc131\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc5f0\ub3d9 \uad6c\uc131 \ud6c4 \uad6c\uc131\uc694\uc18c \ub808\uc9c0\uc2a4\ud2b8\ub9ac\uc5d0\uc11c \ud65c\uc131\ud654\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.\n\uc77c\uae30\uc608\ubcf4\ub294 \uae30\ubcf8\uc801\uc73c\ub85c \ud65c\uc131\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \uc5f0\ub3d9 \uc635\uc158\uc5d0\uc11c \ud65c\uc131\ud654\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4."
+                "data": {
+                    "api_key": "API \ud0a4",
+                    "latitude": "\uc704\ub3c4",
+                    "longitude": "\uacbd\ub3c4",
+                    "name": "\uc774\ub984"
+                },
+                "description": "\uad6c\uc131\uc5d0 \ub300\ud55c \ub3c4\uc6c0\uc774 \ud544\uc694\ud55c \uacbd\uc6b0 \ub2e4\uc74c\uc744 \ucc38\uc870\ud574\uc8fc\uc138\uc694: https://www.home-assistant.io/integrations/accuweather/\n\n\uc77c\ubd80 \uc13c\uc11c\ub294 \uae30\ubcf8\uc801\uc73c\ub85c \ud65c\uc131\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \ud1b5\ud569 \uad6c\uc131\uc694\uc18c \uad6c\uc131 \ud6c4 \uad6c\uc131\uc694\uc18c \ub808\uc9c0\uc2a4\ud2b8\ub9ac\uc5d0\uc11c \ud65c\uc131\ud654\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.\n\uc77c\uae30\uc608\ubcf4\ub294 \uae30\ubcf8\uc801\uc73c\ub85c \ud65c\uc131\ud654\ub418\uc5b4 \uc788\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. \ud1b5\ud569 \uad6c\uc131\uc694\uc18c \uc635\uc158\uc5d0\uc11c \ud65c\uc131\ud654\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.",
+                "title": "AccuWeather"
            }
        }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "\ub0a0\uc528 \uc608\ubcf4"
+                },
+                "description": "\ubb34\ub8cc \ubc84\uc804\uc758 AccuWeather API \ud0a4\ub85c \uc77c\uae30\uc608\ubcf4\ub97c \ud65c\uc131\ud654\ud55c \uacbd\uc6b0 \uc81c\ud55c\uc0ac\ud56d\uc73c\ub85c \uc778\ud574 \uc5c5\ub370\uc774\ud2b8\ub294 40 \ubd84\uc774 \uc544\ub2cc 80 \ubd84\ub9c8\ub2e4 \uc218\ud589\ub429\ub2c8\ub2e4.",
+                "title": "AccuWeather \uc635\uc158"
+            }
+        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "AccuWeather \uc11c\ubc84 \uc5f0\uacb0",
+            "remaining_requests": "\ub0a8\uc740 \ud5c8\uc6a9 \uc694\uccad \ud69f\uc218"
+        }
    }
 }
--- a/homeassistant/components/accuweather/translations/nl.json
+++ b/homeassistant/components/accuweather/translations/nl.json
@@ -1,6 +1,10 @@
 {
    "config": {
+        "abort": {
+            "single_instance_allowed": "Al geconfigureerd. Slechts een enkele configuratie mogelijk."
+        },
        "error": {
+            "cannot_connect": "Kan geen verbinding maken",
            "invalid_api_key": "API-sleutel",
            "requests_exceeded": "Het toegestane aantal verzoeken aan de Accuweather API is overschreden. U moet wachten of de API-sleutel wijzigen."
        },
@@ -27,5 +31,11 @@
                "title": "AccuWeather-opties"
            }
        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "Kan AccuWeather server bereiken",
+            "remaining_requests": "Resterende toegestane verzoeken"
+        }
    }
 }
--- a/homeassistant/components/accuweather/translations/sensor.es-419.json
+++ b/homeassistant/components/accuweather/translations/sensor.es-419.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Descendente",
+            "rising": "Creciente",
+            "steady": "Firme"
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/sensor.hu.json
+++ b/homeassistant/components/accuweather/translations/sensor.hu.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Cs\u00f6kken\u0151",
+            "rising": "Emelked\u0151",
+            "steady": "\u00c1lland\u00f3"
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/sensor.id.json
+++ b/homeassistant/components/accuweather/translations/sensor.id.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Turun",
+            "rising": "Naik",
+            "steady": "Tetap"
+        }
+    }
+}
--- a/homeassistant/components/accuweather/translations/sensor.ko.json
+++ b/homeassistant/components/accuweather/translations/sensor.ko.json
@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "\ud558\uac15",
+            "rising": "\uc0c1\uc2b9",
+            "steady": "\uc548\uc815"
+        }
+    }
+}
--- a/homeassistant/components/acer_projector/manifest.json
+++ b/homeassistant/components/acer_projector/manifest.json
@@ -3,5 +3,6 @@
  "name": "Acer Projector",
  "documentation": "https://www.home-assistant.io/integrations/acer_projector",
  "requirements": ["pyserial==3.5"],
-  "codeowners": []
+  "codeowners": [],
+  "iot_class": "local_polling"
 }
--- a/homeassistant/components/acer_projector/switch.py
+++ b/homeassistant/components/acer_projector/switch.py
@@ -9,6 +9,7 @@ from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
 from homeassistant.const import (
    CONF_FILENAME,
    CONF_NAME,
+    CONF_TIMEOUT,
    STATE_OFF,
    STATE_ON,
    STATE_UNKNOWN,
@@ -17,7 +18,6 @@ import homeassistant.helpers.config_validation as cv

 _LOGGER = logging.getLogger(__name__)

-CONF_TIMEOUT = "timeout"
 CONF_WRITE_TIMEOUT = "write_timeout"

 DEFAULT_NAME = "Acer Projector"
@@ -74,7 +74,6 @@ class AcerSwitch(SwitchEntity):

    def __init__(self, serial_port, name, timeout, write_timeout, **kwargs):
        """Init of the Acer projector."""
-
        self.ser = serial.Serial(
            port=serial_port, timeout=timeout, write_timeout=write_timeout, **kwargs
        )
@@ -90,7 +89,6 @@ class AcerSwitch(SwitchEntity):

    def _write_read(self, msg):
        """Write to the projector and read the return."""
-
        ret = ""
        # Sometimes the projector won't answer for no reason or the projector
        # was disconnected during runtime.
@@ -134,7 +132,7 @@ class AcerSwitch(SwitchEntity):
        return self._state

    @property
-    def state_attributes(self):
+    def extra_state_attributes(self):
        """Return state attributes."""
        return self._attributes

--- a/homeassistant/components/acmeda/init.py
+++ b/homeassistant/components/acmeda/init.py
@@ -1,5 +1,4 @@
 """The Rollease Acmeda Automate integration."""
-import asyncio

 from homeassistant import config_entries, core

@@ -11,11 +10,6 @@ CONF_HUBS = "hubs"
 PLATFORMS = ["cover", "sensor"]


-async def async_setup(hass: core.HomeAssistant, config: dict):
-    """Set up the Rollease Acmeda Automate component."""
-    return True
-
-
 async def async_setup_entry(
    hass: core.HomeAssistant, config_entry: config_entries.ConfigEntry
 ):
@@ -28,10 +22,7 @@ async def async_setup_entry(
    hass.data.setdefault(DOMAIN, {})
    hass.data[DOMAIN][config_entry.entry_id] = hub

-    for component in PLATFORMS:
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, component)
-        )
+    hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)

    return True

@@ -42,14 +33,10 @@ async def async_unload_entry(
    """Unload a config entry."""
    hub = hass.data[DOMAIN][config_entry.entry_id]

-    unload_ok = all(
-        await asyncio.gather(
-            *[
-                hass.config_entries.async_forward_entry_unload(config_entry, component)
-                for component in PLATFORMS
-            ]
-        )
+    unload_ok = await hass.config_entries.async_unload_platforms(
+        config_entry, PLATFORMS
    )
+
    if not await hub.async_reset():
        return False

--- a/homeassistant/components/acmeda/base.py
+++ b/homeassistant/components/acmeda/base.py
@@ -32,7 +32,7 @@ class AcmedaBase(entity.Entity):
                device.id, remove_config_entry_id=self.registry_entry.config_entry_id
            )

-        await self.async_remove()
+        await self.async_remove(force_remove=True)

    async def async_added_to_hass(self):
        """Entity has been added to hass."""
--- a/homeassistant/components/acmeda/config_flow.py
+++ b/homeassistant/components/acmeda/config_flow.py
@@ -1,6 +1,8 @@
 """Config flow for Rollease Acmeda Automate Pulse Hub."""
+from __future__ import annotations
+
 import asyncio
-from typing import Dict, Optional
+from contextlib import suppress

 import aiopulse
 import async_timeout
@@ -8,7 +10,7 @@ import voluptuous as vol

 from homeassistant import config_entries

-from .const import DOMAIN  # pylint: disable=unused-import
+from .const import DOMAIN


 class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
@@ -19,7 +21,7 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):

    def __init__(self):
        """Initialize the config flow."""
-        self.discovered_hubs: Optional[Dict[str, aiopulse.Hub]] = None
+        self.discovered_hubs: dict[str, aiopulse.Hub] | None = None

    async def async_step_user(self, user_input=None):
        """Handle a flow initialized by the user."""
@@ -36,15 +38,13 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
        }

        hubs = []
-        try:
-            with async_timeout.timeout(5):
+        with suppress(asyncio.TimeoutError):
+            async with async_timeout.timeout(5):
                async for hub in aiopulse.Hub.discover():
                    if hub.id not in already_configured:
                        hubs.append(hub)
-        except asyncio.TimeoutError:
-            pass

-        if len(hubs) == 0:
+        if not hubs:
            return self.async_abort(reason="no_devices_found")

        if len(hubs) == 1:
--- a/homeassistant/components/acmeda/hub.py
+++ b/homeassistant/components/acmeda/hub.py
@@ -1,6 +1,7 @@
 """Code to handle a Pulse Hub."""
+from __future__ import annotations
+
 import asyncio
-from typing import Optional

 import aiopulse

@@ -17,7 +18,7 @@ class PulseHub:
        """Initialize the system."""
        self.config_entry = config_entry
        self.hass = hass
-        self.api: Optional[aiopulse.Hub] = None
+        self.api: aiopulse.Hub | None = None
        self.tasks = []
        self.current_rollers = {}
        self.cleanup_callbacks = []
--- a/homeassistant/components/acmeda/manifest.json
+++ b/homeassistant/components/acmeda/manifest.json
@@ -4,7 +4,6 @@
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/acmeda",
  "requirements": ["aiopulse==0.4.2"],
-  "codeowners": [
-    "@atmurray"
-  ]
-}
+  "codeowners": ["@atmurray"],
+  "iot_class": "local_push"
+}
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -1,4 +1,5 @@
 """Support for Acmeda Roller Blind Batteries."""
+from homeassistant.components.sensor import SensorEntity
 from homeassistant.const import DEVICE_CLASS_BATTERY, PERCENTAGE
 from homeassistant.core import callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
@@ -29,7 +30,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
    )


-class AcmedaBattery(AcmedaBase):
+class AcmedaBattery(AcmedaBase, SensorEntity):
    """Representation of a Acmeda cover device."""

    device_class = DEVICE_CLASS_BATTERY
--- a/homeassistant/components/acmeda/translations/hu.json
+++ b/homeassistant/components/acmeda/translations/hu.json
@@ -0,0 +1,7 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Nem tal\u00e1lhat\u00f3 eszk\u00f6z a h\u00e1l\u00f3zaton"
+        }
+    }
+}
--- a/homeassistant/components/acmeda/translations/id.json
+++ b/homeassistant/components/acmeda/translations/id.json
@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Tidak ada perangkat yang ditemukan di jaringan"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "id": "ID Host"
+                },
+                "title": "Pilih hub untuk ditambahkan"
+            }
+        }
+    }
+}
--- a/homeassistant/components/acmeda/translations/ko.json
+++ b/homeassistant/components/acmeda/translations/ko.json
@@ -1,5 +1,8 @@
 {
    "config": {
+        "abort": {
+            "no_devices_found": "\ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \uae30\uae30\ub97c \ucc3e\uc744 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4"
+        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/acmeda/translations/nl.json
+++ b/homeassistant/components/acmeda/translations/nl.json
@@ -1,5 +1,8 @@
 {
    "config": {
+        "abort": {
+            "no_devices_found": "Geen apparaten gevonden op het netwerk"
+        },
        "step": {
            "user": {
                "data": {
--- a/homeassistant/components/actiontec/device_tracker.py
+++ b/homeassistant/components/actiontec/device_tracker.py
@@ -53,7 +53,7 @@ class ActiontecDeviceScanner(DeviceScanner):
        self.last_results = []
        data = self.get_actiontec_data()
        self.success_init = data is not None
-        _LOGGER.info("canner initialized")
+        _LOGGER.info("Scanner initialized")

    def scan_devices(self):
        """Scan for new devices and return a list with found device IDs."""
--- a/homeassistant/components/actiontec/manifest.json
+++ b/homeassistant/components/actiontec/manifest.json
@@ -2,5 +2,6 @@
  "domain": "actiontec",
  "name": "Actiontec",
  "documentation": "https://www.home-assistant.io/integrations/actiontec",
-  "codeowners": []
+  "codeowners": [],
+  "iot_class": "local_polling"
 }
--- a/homeassistant/components/adguard/init.py
+++ b/homeassistant/components/adguard/init.py
@@ -1,6 +1,8 @@
 """Support for AdGuard Home."""
+from __future__ import annotations
+
 import logging
-from typing import Any, Dict
+from typing import Any

 from adguardhome import AdGuardHome, AdGuardHomeConnectionError, AdGuardHomeError
 import voluptuous as vol
@@ -8,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components.adguard.const import (
    CONF_FORCE,
    DATA_ADGUARD_CLIENT,
-    DATA_ADGUARD_VERION,
+    DATA_ADGUARD_VERSION,
    DOMAIN,
    SERVICE_ADD_URL,
    SERVICE_DISABLE_URL,
@@ -27,11 +29,11 @@ from homeassistant.const import (
    CONF_USERNAME,
    CONF_VERIFY_SSL,
 )
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.entity import Entity
-from homeassistant.helpers.typing import ConfigType, HomeAssistantType

 _LOGGER = logging.getLogger(__name__)

@@ -43,13 +45,10 @@ SERVICE_REFRESH_SCHEMA = vol.Schema(
    {vol.Optional(CONF_FORCE, default=False): cv.boolean}
 )

-
-async def async_setup(hass: HomeAssistantType, config: ConfigType) -> bool:
-    """Set up the AdGuard Home components."""
-    return True
+PLATFORMS = ["sensor", "switch"]


-async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Set up AdGuard Home from a config entry."""
    session = async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL])
    adguard = AdGuardHome(
@@ -62,39 +61,40 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
        session=session,
    )

-    hass.data.setdefault(DOMAIN, {})[DATA_ADGUARD_CLIENT] = adguard
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {DATA_ADGUARD_CLIENT: adguard}

    try:
        await adguard.version()
    except AdGuardHomeConnectionError as exception:
        raise ConfigEntryNotReady from exception

-    for component in "sensor", "switch":
-        hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(entry, component)
-        )
+    hass.config_entries.async_setup_platforms(entry, PLATFORMS)

    async def add_url(call) -> None:
        """Service call to add a new filter subscription to AdGuard Home."""
        await adguard.filtering.add_url(
-            call.data.get(CONF_NAME), call.data.get(CONF_URL)
+            allowlist=False, name=call.data.get(CONF_NAME), url=call.data.get(CONF_URL)
        )

    async def remove_url(call) -> None:
        """Service call to remove a filter subscription from AdGuard Home."""
-        await adguard.filtering.remove_url(call.data.get(CONF_URL))
+        await adguard.filtering.remove_url(allowlist=False, url=call.data.get(CONF_URL))

    async def enable_url(call) -> None:
        """Service call to enable a filter subscription in AdGuard Home."""
-        await adguard.filtering.enable_url(call.data.get(CONF_URL))
+        await adguard.filtering.enable_url(allowlist=False, url=call.data.get(CONF_URL))

    async def disable_url(call) -> None:
        """Service call to disable a filter subscription in AdGuard Home."""
-        await adguard.filtering.disable_url(call.data.get(CONF_URL))
+        await adguard.filtering.disable_url(
+            allowlist=False, url=call.data.get(CONF_URL)
+        )

    async def refresh(call) -> None:
        """Service call to refresh the filter subscriptions in AdGuard Home."""
-        await adguard.filtering.refresh(call.data.get(CONF_FORCE))
+        await adguard.filtering.refresh(
+            allowlist=False, force=call.data.get(CONF_FORCE)
+        )

    hass.services.async_register(
        DOMAIN, SERVICE_ADD_URL, add_url, schema=SERVICE_ADD_URL_SCHEMA
@@ -115,7 +115,7 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
    return True


-async def async_unload_entry(hass: HomeAssistantType, entry: ConfigType) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Unload AdGuard Home config entry."""
    hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
    hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
@@ -123,25 +123,30 @@ async def async_unload_entry(hass: HomeAssistantType, entry: ConfigType) -> bool
    hass.services.async_remove(DOMAIN, SERVICE_DISABLE_URL)
    hass.services.async_remove(DOMAIN, SERVICE_REFRESH)

-    for component in "sensor", "switch":
-        await hass.config_entries.async_forward_entry_unload(entry, component)
+    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    if unload_ok:
+        del hass.data[DOMAIN]

-    del hass.data[DOMAIN]
-
-    return True
+    return unload_ok


 class AdGuardHomeEntity(Entity):
    """Defines a base AdGuard Home entity."""

    def __init__(
-        self, adguard, name: str, icon: str, enabled_default: bool = True
+        self,
+        adguard: AdGuardHome,
+        entry: ConfigEntry,
+        name: str,
+        icon: str,
+        enabled_default: bool = True,
    ) -> None:
        """Initialize the AdGuard Home entity."""
        self._available = True
        self._enabled_default = enabled_default
        self._icon = icon
        self._name = name
+        self._entry = entry
        self.adguard = adguard

    @property
@@ -189,7 +194,7 @@ class AdGuardHomeDeviceEntity(AdGuardHomeEntity):
    """Defines a AdGuard Home device entity."""

    @property
-    def device_info(self) -> Dict[str, Any]:
+    def device_info(self) -> dict[str, Any]:
        """Return device information about this AdGuard Home instance."""
        return {
            "identifiers": {
@@ -197,6 +202,8 @@ class AdGuardHomeDeviceEntity(AdGuardHomeEntity):
            },
            "name": "AdGuard Home",
            "manufacturer": "AdGuard Team",
-            "sw_version": self.hass.data[DOMAIN].get(DATA_ADGUARD_VERION),
+            "sw_version": self.hass.data[DOMAIN][self._entry.entry_id].get(
+                DATA_ADGUARD_VERSION
+            ),
            "entry_type": "service",
        }
--- a/homeassistant/components/adguard/config_flow.py
+++ b/homeassistant/components/adguard/config_flow.py
@@ -1,9 +1,12 @@
 """Config flow to configure the AdGuard Home integration."""
+from __future__ import annotations
+
+from typing import Any
+
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol

 from homeassistant import config_entries
-from homeassistant.components.adguard.const import DOMAIN
 from homeassistant.config_entries import ConfigFlow
 from homeassistant.const import (
    CONF_HOST,
@@ -13,11 +16,13 @@ from homeassistant.const import (
    CONF_USERNAME,
    CONF_VERIFY_SSL,
 )
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

+from .const import DOMAIN

-@config_entries.HANDLERS.register(DOMAIN)
-class AdGuardHomeFlowHandler(ConfigFlow):
+
+class AdGuardHomeFlowHandler(ConfigFlow, domain=DOMAIN):
    """Handle a AdGuard Home config flow."""

    VERSION = 1
@@ -25,7 +30,9 @@ class AdGuardHomeFlowHandler(ConfigFlow):

    _hassio_discovery = None

-    async def _show_setup_form(self, errors=None):
+    async def _show_setup_form(
+        self, errors: dict[str, str] | None = None
+    ) -> FlowResult:
        """Show the setup form to the user."""
        return self.async_show_form(
            step_id="user",
@@ -42,7 +49,9 @@ class AdGuardHomeFlowHandler(ConfigFlow):
            errors=errors or {},
        )

-    async def _show_hassio_form(self, errors=None):
+    async def _show_hassio_form(
+        self, errors: dict[str, str] | None = None
+    ) -> FlowResult:
        """Show the Hass.io confirmation form to the user."""
        return self.async_show_form(
            step_id="hassio_confirm",
@@ -51,14 +60,21 @@ class AdGuardHomeFlowHandler(ConfigFlow):
            errors=errors or {},
        )

-    async def async_step_user(self, user_input=None):
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
        """Handle a flow initiated by the user."""
-        if self._async_current_entries():
-            return self.async_abort(reason="single_instance_allowed")
-
        if user_input is None:
            return await self._show_setup_form(user_input)

+        entries = self._async_current_entries()
+        for entry in entries:
+            if (
+                entry.data[CONF_HOST] == user_input[CONF_HOST]
+                and entry.data[CONF_PORT] == user_input[CONF_PORT]
+            ):
+                return self.async_abort(reason="already_configured")
+
        errors = {}

        session = async_get_clientsession(self.hass, user_input[CONF_VERIFY_SSL])
@@ -91,46 +107,20 @@ class AdGuardHomeFlowHandler(ConfigFlow):
            },
        )

-    async def async_step_hassio(self, discovery_info):
+    async def async_step_hassio(self, discovery_info: dict[str, Any]) -> FlowResult:
        """Prepare configuration for a Hass.io AdGuard Home add-on.

        This flow is triggered by the discovery component.
        """
-        entries = self._async_current_entries()
+        await self._async_handle_discovery_without_unique_id()

-        if not entries:
-            self._hassio_discovery = discovery_info
-            return await self.async_step_hassio_confirm()
+        self._hassio_discovery = discovery_info
+        return await self.async_step_hassio_confirm()

-        cur_entry = entries[0]
-
-        if (
-            cur_entry.data[CONF_HOST] == discovery_info[CONF_HOST]
-            and cur_entry.data[CONF_PORT] == discovery_info[CONF_PORT]
-        ):
-            return self.async_abort(reason="single_instance_allowed")
-
-        is_loaded = cur_entry.state == config_entries.ENTRY_STATE_LOADED
-
-        if is_loaded:
-            await self.hass.config_entries.async_unload(cur_entry.entry_id)
-
-        self.hass.config_entries.async_update_entry(
-            cur_entry,
-            data={
-                **cur_entry.data,
-                CONF_HOST: discovery_info[CONF_HOST],
-                CONF_PORT: discovery_info[CONF_PORT],
-            },
-        )
-
-        if is_loaded:
-            await self.hass.config_entries.async_setup(cur_entry.entry_id)
-
-        return self.async_abort(reason="existing_instance_updated")
-
-    async def async_step_hassio_confirm(self, user_input=None):
-        """Confirm Hass.io discovery."""
+    async def async_step_hassio_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Confirm Supervisor discovery."""
        if user_input is None:
            return await self._show_hassio_form()

--- a/homeassistant/components/adguard/const.py
+++ b/homeassistant/components/adguard/const.py
@@ -3,7 +3,7 @@
 DOMAIN = "adguard"

 DATA_ADGUARD_CLIENT = "adguard_client"
-DATA_ADGUARD_VERION = "adguard_version"
+DATA_ADGUARD_VERSION = "adguard_version"

 CONF_FORCE = "force"

--- a/homeassistant/components/adguard/manifest.json
+++ b/homeassistant/components/adguard/manifest.json
@@ -3,6 +3,7 @@
  "name": "AdGuard Home",
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/adguard",
-  "requirements": ["adguardhome==0.4.2"],
-  "codeowners": ["@frenck"]
+  "requirements": ["adguardhome==0.5.0"],
+  "codeowners": ["@frenck"],
+  "iot_class": "local_polling"
 }
--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -1,56 +1,61 @@
 """Support for AdGuard Home sensors."""
+from __future__ import annotations
+
 from datetime import timedelta
+from typing import Callable

-from adguardhome import AdGuardHomeConnectionError
+from adguardhome import AdGuardHome, AdGuardHomeConnectionError

-from homeassistant.components.adguard import AdGuardHomeDeviceEntity
-from homeassistant.components.adguard.const import (
-    DATA_ADGUARD_CLIENT,
-    DATA_ADGUARD_VERION,
-    DOMAIN,
-)
+from homeassistant.components.sensor import SensorEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, TIME_MILLISECONDS
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.entity import Entity
+
+from . import AdGuardHomeDeviceEntity
+from .const import DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERSION, DOMAIN

 SCAN_INTERVAL = timedelta(seconds=300)
 PARALLEL_UPDATES = 4


 async def async_setup_entry(
-    hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: Callable[[list[Entity], bool], None],
 ) -> None:
    """Set up AdGuard Home sensor based on a config entry."""
-    adguard = hass.data[DOMAIN][DATA_ADGUARD_CLIENT]
+    adguard = hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_CLIENT]

    try:
        version = await adguard.version()
    except AdGuardHomeConnectionError as exception:
        raise PlatformNotReady from exception

-    hass.data[DOMAIN][DATA_ADGUARD_VERION] = version
+    hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_VERSION] = version

    sensors = [
-        AdGuardHomeDNSQueriesSensor(adguard),
-        AdGuardHomeBlockedFilteringSensor(adguard),
-        AdGuardHomePercentageBlockedSensor(adguard),
-        AdGuardHomeReplacedParentalSensor(adguard),
-        AdGuardHomeReplacedSafeBrowsingSensor(adguard),
-        AdGuardHomeReplacedSafeSearchSensor(adguard),
-        AdGuardHomeAverageProcessingTimeSensor(adguard),
-        AdGuardHomeRulesCountSensor(adguard),
+        AdGuardHomeDNSQueriesSensor(adguard, entry),
+        AdGuardHomeBlockedFilteringSensor(adguard, entry),
+        AdGuardHomePercentageBlockedSensor(adguard, entry),
+        AdGuardHomeReplacedParentalSensor(adguard, entry),
+        AdGuardHomeReplacedSafeBrowsingSensor(adguard, entry),
+        AdGuardHomeReplacedSafeSearchSensor(adguard, entry),
+        AdGuardHomeAverageProcessingTimeSensor(adguard, entry),
+        AdGuardHomeRulesCountSensor(adguard, entry),
    ]

    async_add_entities(sensors, True)


-class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
+class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
    """Defines a AdGuard Home sensor."""

    def __init__(
        self,
-        adguard,
+        adguard: AdGuardHome,
+        entry: ConfigEntry,
        name: str,
        icon: str,
        measurement: str,
@@ -62,7 +67,7 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
        self._unit_of_measurement = unit_of_measurement
        self.measurement = measurement

-        super().__init__(adguard, name, icon, enabled_default)
+        super().__init__(adguard, entry, name, icon, enabled_default)

    @property
    def unique_id(self) -> str:
@@ -78,12 +83,12 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
        )

    @property
-    def state(self):
+    def state(self) -> str | None:
        """Return the state of the sensor."""
        return self._state

    @property
-    def unit_of_measurement(self) -> str:
+    def unit_of_measurement(self) -> str | None:
        """Return the unit this state is expressed in."""
        return self._unit_of_measurement

@@ -91,10 +96,15 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
 class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home DNS Queries sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
-            adguard, "AdGuard DNS Queries", "mdi:magnify", "dns_queries", "queries"
+            adguard,
+            entry,
+            "AdGuard DNS Queries",
+            "mdi:magnify",
+            "dns_queries",
+            "queries",
        )

    async def _adguard_update(self) -> None:
@@ -105,10 +115,11 @@ class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
 class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home blocked by filtering sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard DNS Queries Blocked",
            "mdi:magnify-close",
            "blocked_filtering",
@@ -124,10 +135,11 @@ class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
 class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home blocked percentage sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard DNS Queries Blocked Ratio",
            "mdi:magnify-close",
            "blocked_percentage",
@@ -143,10 +155,11 @@ class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home replaced by parental control sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Parental Control Blocked",
            "mdi:human-male-girl",
            "blocked_parental",
@@ -161,10 +174,11 @@ class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home replaced by safe browsing sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Safe Browsing Blocked",
            "mdi:shield-half-full",
            "blocked_safebrowsing",
@@ -179,10 +193,11 @@ class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home replaced by safe search sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Safe Searches Enforced",
            "mdi:shield-search",
            "enforced_safesearch",
@@ -197,10 +212,11 @@ class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
 class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home average processing time sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Average Processing Speed",
            "mdi:speedometer",
            "average_speed",
@@ -216,10 +232,11 @@ class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
 class AdGuardHomeRulesCountSensor(AdGuardHomeSensor):
    """Defines a AdGuard Home rules count sensor."""

-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home sensor."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Rules Count",
            "mdi:counter",
            "rules_count",
@@ -229,4 +246,4 @@ class AdGuardHomeRulesCountSensor(AdGuardHomeSensor):

    async def _adguard_update(self) -> None:
        """Update AdGuard Home entity."""
-        self._state = await self.adguard.filtering.rules_count()
+        self._state = await self.adguard.filtering.rules_count(allowlist=False)
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -13,8 +13,8 @@
        }
      },
      "hassio_confirm": {
-        "title": "AdGuard Home via Hass.io add-on",
-        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the Hass.io add-on: {addon}?"
+        "title": "AdGuard Home via Home Assistant add-on",
+        "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?"
      }
    },
    "error": {
@@ -22,7 +22,7 @@
    },
    "abort": {
      "existing_instance_updated": "Updated existing configuration.",
-      "single_instance_allowed": "[%key:common::config_flow::abort::single_instance_allowed%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
    }
  }
 }
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -1,19 +1,20 @@
 """Support for AdGuard Home switches."""
+from __future__ import annotations
+
 from datetime import timedelta
 import logging
+from typing import Callable

-from adguardhome import AdGuardHomeConnectionError, AdGuardHomeError
+from adguardhome import AdGuardHome, AdGuardHomeConnectionError, AdGuardHomeError

-from homeassistant.components.adguard import AdGuardHomeDeviceEntity
-from homeassistant.components.adguard.const import (
-    DATA_ADGUARD_CLIENT,
-    DATA_ADGUARD_VERION,
-    DOMAIN,
-)
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.typing import HomeAssistantType
+from homeassistant.helpers.entity import Entity
+
+from . import AdGuardHomeDeviceEntity
+from .const import DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERSION, DOMAIN

 _LOGGER = logging.getLogger(__name__)

@@ -22,25 +23,27 @@ PARALLEL_UPDATES = 1


 async def async_setup_entry(
-    hass: HomeAssistantType, entry: ConfigEntry, async_add_entities
+    hass: HomeAssistant,
+    entry: ConfigEntry,
+    async_add_entities: Callable[[list[Entity], bool], None],
 ) -> None:
    """Set up AdGuard Home switch based on a config entry."""
-    adguard = hass.data[DOMAIN][DATA_ADGUARD_CLIENT]
+    adguard = hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_CLIENT]

    try:
        version = await adguard.version()
    except AdGuardHomeConnectionError as exception:
        raise PlatformNotReady from exception

-    hass.data[DOMAIN][DATA_ADGUARD_VERION] = version
+    hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_VERSION] = version

    switches = [
-        AdGuardHomeProtectionSwitch(adguard),
-        AdGuardHomeFilteringSwitch(adguard),
-        AdGuardHomeParentalSwitch(adguard),
-        AdGuardHomeSafeBrowsingSwitch(adguard),
-        AdGuardHomeSafeSearchSwitch(adguard),
-        AdGuardHomeQueryLogSwitch(adguard),
+        AdGuardHomeProtectionSwitch(adguard, entry),
+        AdGuardHomeFilteringSwitch(adguard, entry),
+        AdGuardHomeParentalSwitch(adguard, entry),
+        AdGuardHomeSafeBrowsingSwitch(adguard, entry),
+        AdGuardHomeSafeSearchSwitch(adguard, entry),
+        AdGuardHomeQueryLogSwitch(adguard, entry),
    ]
    async_add_entities(switches, True)

@@ -49,12 +52,18 @@ class AdGuardHomeSwitch(AdGuardHomeDeviceEntity, SwitchEntity):
    """Defines a AdGuard Home switch."""

    def __init__(
-        self, adguard, name: str, icon: str, key: str, enabled_default: bool = True
-    ):
+        self,
+        adguard: AdGuardHome,
+        entry: ConfigEntry,
+        name: str,
+        icon: str,
+        key: str,
+        enabled_default: bool = True,
+    ) -> None:
        """Initialize AdGuard Home switch."""
        self._state = False
        self._key = key
-        super().__init__(adguard, name, icon, enabled_default)
+        super().__init__(adguard, entry, name, icon, enabled_default)

    @property
    def unique_id(self) -> str:
@@ -96,10 +105,10 @@ class AdGuardHomeSwitch(AdGuardHomeDeviceEntity, SwitchEntity):
 class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home protection switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
        super().__init__(
-            adguard, "AdGuard Protection", "mdi:shield-check", "protection"
+            adguard, entry, "AdGuard Protection", "mdi:shield-check", "protection"
        )

    async def _adguard_turn_off(self) -> None:
@@ -118,10 +127,10 @@ class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
 class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home parental control switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
        super().__init__(
-            adguard, "AdGuard Parental Control", "mdi:shield-check", "parental"
+            adguard, entry, "AdGuard Parental Control", "mdi:shield-check", "parental"
        )

    async def _adguard_turn_off(self) -> None:
@@ -140,10 +149,10 @@ class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
 class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home safe search switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
        super().__init__(
-            adguard, "AdGuard Safe Search", "mdi:shield-check", "safesearch"
+            adguard, entry, "AdGuard Safe Search", "mdi:shield-check", "safesearch"
        )

    async def _adguard_turn_off(self) -> None:
@@ -162,10 +171,10 @@ class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
 class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home safe search switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
        super().__init__(
-            adguard, "AdGuard Safe Browsing", "mdi:shield-check", "safebrowsing"
+            adguard, entry, "AdGuard Safe Browsing", "mdi:shield-check", "safebrowsing"
        )

    async def _adguard_turn_off(self) -> None:
@@ -184,9 +193,11 @@ class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
 class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home filtering switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
-        super().__init__(adguard, "AdGuard Filtering", "mdi:shield-check", "filtering")
+        super().__init__(
+            adguard, entry, "AdGuard Filtering", "mdi:shield-check", "filtering"
+        )

    async def _adguard_turn_off(self) -> None:
        """Turn off the switch."""
@@ -204,10 +215,11 @@ class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
 class AdGuardHomeQueryLogSwitch(AdGuardHomeSwitch):
    """Defines a AdGuard Home query log switch."""

-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
        """Initialize AdGuard Home switch."""
        super().__init__(
            adguard,
+            entry,
            "AdGuard Query Log",
            "mdi:shield-check",
            "querylog",
--- a/homeassistant/components/adguard/translations/bg.json
+++ b/homeassistant/components/adguard/translations/bg.json
@@ -6,8 +6,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0442\u0435 Home Assistant \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0437\u0432\u0430 \u0441 AdGuard Home, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0435\u043d \u043e\u0442 Hass.io \u0434\u043e\u0431\u0430\u0432\u043a\u0430\u0442\u0430: {addon} ?",
-                "title": "AdGuard Home \u0447\u0440\u0435\u0437 Hass.io \u0434\u043e\u0431\u0430\u0432\u043a\u0430"
+                "description": "\u0418\u0441\u043a\u0430\u0442\u0435 \u043b\u0438 \u0434\u0430 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0438\u0440\u0430\u0442\u0435 Home Assistant \u0434\u0430 \u0441\u0435 \u0441\u0432\u044a\u0440\u0437\u0432\u0430 \u0441 AdGuard Home, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0435\u043d \u043e\u0442 Supervisor \u0434\u043e\u0431\u0430\u0432\u043a\u0430\u0442\u0430: {addon} ?",
+                "title": "AdGuard Home \u0447\u0440\u0435\u0437 Supervisor \u0434\u043e\u0431\u0430\u0432\u043a\u0430"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/ca.json
+++ b/homeassistant/components/adguard/translations/ca.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "already_configured": "El servei ja est\u00e0 configurat",
            "existing_instance_updated": "S'ha actualitzat la configuraci\u00f3 existent.",
            "single_instance_allowed": "Ja configurat. Nom\u00e9s \u00e9s possible una sola configuraci\u00f3."
        },
@@ -9,8 +10,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "Vols configurar Home Assistant perqu\u00e8 es connecti amb l'AdGuard Home proporcionat pel complement de Hass.io: {addon}?",
-                "title": "AdGuard Home (complement de Hass.io)"
+                "description": "Vols configurar Home Assistant perqu\u00e8 es connecti amb l'AdGuard Home proporcionat pel complement: {addon}?",
+                "title": "AdGuard Home via complement de Home Assistant"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/cs.json
+++ b/homeassistant/components/adguard/translations/cs.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "already_configured": "Slu\u017eba je ji\u017e nastavena",
            "existing_instance_updated": "St\u00e1vaj\u00edc\u00ed nastaven\u00ed aktualizov\u00e1no.",
            "single_instance_allowed": "Ji\u017e nastaveno. Je mo\u017en\u00e1 pouze jedin\u00e1 konfigurace."
        },
@@ -9,8 +10,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "Chcete nakonfigurovat slu\u017ebu Home Assistant pro p\u0159ipojen\u00ed k AddGuard pomoc\u00ed hass.io {addon}?",
-                "title": "AdGuard prost\u0159ednictv\u00edm dopl\u0148ku Hass.io"
+                "description": "Chcete nakonfigurovat slu\u017ebu Home Assistant pro p\u0159ipojen\u00ed k AddGuard pomoc\u00ed Supervisor {addon}?",
+                "title": "AdGuard prost\u0159ednictv\u00edm dopl\u0148ku Supervisor"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/da.json
+++ b/homeassistant/components/adguard/translations/da.json
@@ -6,8 +6,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "Vil du konfigurere Home Assistant til at oprette forbindelse til AdGuard Home leveret af Hass.io-tilf\u00f8jelsen: {addon}?",
-                "title": "AdGuard Home via Hass.io-tilf\u00f8jelse"
+                "description": "Vil du konfigurere Home Assistant til at oprette forbindelse til AdGuard Home leveret af Supervisor-tilf\u00f8jelsen: {addon}?",
+                "title": "AdGuard Home via Supervisor-tilf\u00f8jelse"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/de.json
+++ b/homeassistant/components/adguard/translations/de.json
@@ -9,8 +9,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "M\u00f6chtest du Home Assistant so konfigurieren, dass eine Verbindung mit AdGuard Home als Hass.io-Add-On hergestellt wird: {addon}?",
-                "title": "AdGuard Home \u00fcber das Hass.io Add-on"
+                "description": "M\u00f6chtest du Home Assistant so konfigurieren, dass eine Verbindung mit AdGuard Home als Supervisor-Add-On hergestellt wird: {addon}?",
+                "title": "AdGuard Home \u00fcber das Supervisor Add-on"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/en.json
+++ b/homeassistant/components/adguard/translations/en.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "already_configured": "Service is already configured",
            "existing_instance_updated": "Updated existing configuration.",
            "single_instance_allowed": "Already configured. Only a single configuration possible."
        },
@@ -9,8 +10,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the Hass.io add-on: {addon}?",
-                "title": "AdGuard Home via Hass.io add-on"
+                "description": "Do you want to configure Home Assistant to connect to the AdGuard Home provided by the add-on: {addon}?",
+                "title": "AdGuard Home via Home Assistant add-on"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/es-419.json
+++ b/homeassistant/components/adguard/translations/es-419.json
@@ -6,8 +6,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "\u00bfDesea configurar Home Assistant para conectarse a la p\u00e1gina principal de AdGuard proporcionada por el complemento Hass.io: {addon}?",
-                "title": "AdGuard Home a trav\u00e9s del complemento Hass.io"
+                "description": "\u00bfDesea configurar Home Assistant para conectarse a la p\u00e1gina principal de AdGuard proporcionada por el complemento Supervisor: {addon}?",
+                "title": "AdGuard Home a trav\u00e9s del complemento Supervisor"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/es.json
+++ b/homeassistant/components/adguard/translations/es.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "already_configured": "El servicio ya est\u00e1 configurado",
            "existing_instance_updated": "Se ha actualizado la configuraci\u00f3n existente.",
            "single_instance_allowed": "S\u00f3lo se permite una \u00fanica configuraci\u00f3n de AdGuard Home."
        },
@@ -9,8 +10,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "\u00bfDesea configurar Home Assistant para conectarse al AdGuard Home proporcionado por el complemento Hass.io: {addon} ?",
-                "title": "AdGuard Home a trav\u00e9s del complemento Hass.io"
+                "description": "\u00bfDesea configurar Home Assistant para conectarse al AdGuard Home proporcionado por el complemento Supervisor: {addon} ?",
+                "title": "AdGuard Home a trav\u00e9s del complemento Supervisor"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/et.json
+++ b/homeassistant/components/adguard/translations/et.json
@@ -1,6 +1,7 @@
 {
    "config": {
        "abort": {
+            "already_configured": "Teenus on juba seadistatud",
            "existing_instance_updated": "Olemasolevad seaded v\u00e4rskendatud.",
            "single_instance_allowed": "Juba seadistatud. V\u00f5imalik on ainult \u00fcks seadistamine."
        },
@@ -9,8 +10,8 @@
        },
        "step": {
            "hassio_confirm": {
-                "description": "Kas soovid seadistada Home Assistant-i \u00fchenduse AdGuard Home'iga mida pakub Hass.io lisandmoodul: {addon} ?",
-                "title": "AdGuard Home Hass.io pistikprogrammi kaudu"
+                "description": "Kas soovid seadistada Home Assistant-i \u00fchenduse AdGuard Home'iga mida pakub lisandmoodul: {addon} ?",
+                "title": "AdGuard Home  Home Assistanti lisandmooduli abil"
            },
            "user": {
                "data": {
--- a/homeassistant/components/adguard/translations/he.json
+++ b/homeassistant/components/adguard/translations/he.json
@@ -4,6 +4,7 @@
            "user": {
                "data": {
                    "host": "Host",
+                    "password": "\u05e1\u05d9\u05e1\u05de\u05d4",
                    "port": "\u05e4\u05d5\u05e8\u05d8"
                }
            }
--- a/homeassistant/components/adguard/translations/hu.json
+++ b/homeassistant/components/adguard/translations/hu.json
@@ -1,5 +1,8 @@
 {
    "config": {
+        "abort": {
+            "single_instance_allowed": "M\u00e1r konfigur\u00e1lva van. Csak egy konfigur\u00e1ci\u00f3 lehets\u00e9ges."
+        },
        "error": {
            "cannot_connect": "Sikertelen csatlakoz\u00e1s"
        },
@@ -9,7 +12,9 @@
                    "host": "Hoszt",
                    "password": "Jelsz\u00f3",
                    "port": "Port",
-                    "username": "Felhaszn\u00e1l\u00f3n\u00e9v"
+                    "ssl": "SSL tan\u00fas\u00edtv\u00e1ny haszn\u00e1lata",
+                    "username": "Felhaszn\u00e1l\u00f3n\u00e9v",
+                    "verify_ssl": "SSL-tan\u00fas\u00edtv\u00e1ny ellen\u0151rz\u00e9se"
                }
            }
        }
--- a/homeassistant/components/adguard/translations/id.json
+++ b/homeassistant/components/adguard/translations/id.json
@@ -1,10 +1,27 @@
 {
    "config": {
+        "abort": {
+            "existing_instance_updated": "Memperbarui konfigurasi yang ada.",
+            "single_instance_allowed": "Sudah dikonfigurasi. Hanya satu konfigurasi yang diizinkan."
+        },
+        "error": {
+            "cannot_connect": "Gagal terhubung"
+        },
        "step": {
+            "hassio_confirm": {
+                "description": "Ingin mengonfigurasi Home Assistant untuk terhubung ke AdGuard Home yang disediakan oleh add-on Supervisor {addon}?",
+                "title": "AdGuard Home melalui add-on Home Assistant"
+            },
            "user": {
                "data": {
-                    "password": "Kata sandi"
-                }
+                    "host": "Host",
+                    "password": "Kata Sandi",
+                    "port": "Port",
+                    "ssl": "Menggunakan sertifikat SSL",
+                    "username": "Nama Pengguna",
+                    "verify_ssl": "Verifikasi sertifikat SSL"
+                },
+                "description": "Siapkan instans AdGuard Home Anda untuk pemantauan dan kontrol."
            }
        }
    }
--- a/Show More
+++ b/Show More