Merge pull request #48954 from home-assistant/rc

* Extend media source URL expiry to 12h

closes #46280
After checking out https://github.com/home-assistant/core/pull/48912 I just think why not.

* Update homeassistant/components/cast/media_player.py

Co-authored-by: Erik Montnemery <erik@montnemery.com>

.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
@@ -140,6 +145,7 @@ omit =
     homeassistant/components/clickatell/notify.py
     homeassistant/components/clicksend/notify.py
     homeassistant/components/clicksend_tts/notify.py
+    homeassistant/components/climacell/weather.py
     homeassistant/components/cmus/media_player.py
     homeassistant/components/co2signal/*
     homeassistant/components/coinbase/*
@@ -156,7 +162,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/*
@@ -172,7 +177,6 @@ omit =
     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
@@ -268,6 +273,8 @@ omit =
     homeassistant/components/evohome/*
     homeassistant/components/ezviz/*
     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,7 +315,6 @@ 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
@@ -358,7 +364,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 +377,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 +387,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 +401,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
@@ -463,7 +483,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/*
@@ -485,7 +509,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 +554,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
@@ -560,6 +598,7 @@ 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
@@ -571,11 +610,27 @@ 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/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 +646,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 +665,8 @@ 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/lock.py
     homeassistant/components/nut/sensor.py
     homeassistant/components/nx584/alarm_control_panel.py
@@ -687,19 +732,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
@@ -743,6 +795,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,6 +807,8 @@ omit =
     homeassistant/components/rest/switch.py
     homeassistant/components/ring/camera.py
     homeassistant/components/ripple/sensor.py
+    homeassistant/components/rituals_perfume_genie/switch.py
+    homeassistant/components/rituals_perfume_genie/__init__.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/roomba/binary_sensor.py
     homeassistant/components/roomba/braava.py
@@ -782,6 +837,11 @@ 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/switch.py
     homeassistant/components/scsgate/*
     homeassistant/components/scsgate/cover.py
     homeassistant/components/sendgrid/notify.py
@@ -876,7 +936,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 +1003,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 +1025,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 +1064,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/*
@@ -1043,7 +1120,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 +1132,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 +1190,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:

.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",

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+custom: https://www.nabucasa.com
+github: balloob

.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
-

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -0,0 +1,97 @@
+name: Report an issue with Home Assistant Core
+description: Report an issue with Home Assistant Core.
+title: ""
+issue_body: true
+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: markdown
+    attributes:
+      value: |
+        ## Additional information
+  - type: markdown
+    attributes:
+      value: >
+        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.

.github/workflows/ci.yaml

@@ -12,7 +12,7 @@ on:
 env:
   CACHE_VERSION: 1
   DEFAULT_PYTHON: 3.8
-  PRE_COMMIT_HOME: ~/.cache/pre-commit
+  PRE_COMMIT_CACHE: ~/.cache/pre-commit
 
 jobs:
   # Separate job to pre-populate the base dependency cache
@@ -20,6 +20,9 @@ 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
@@ -28,21 +31,25 @@ jobs:
         uses: actions/setup-python@v2.2.1
         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.4
         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 +57,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.4
         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: |
@@ -79,15 +91,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +103,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -124,15 +131,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +143,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -169,15 +171,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +183,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -236,15 +233,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +245,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -284,15 +276,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +288,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -332,15 +319,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +331,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -377,15 +359,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +371,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -425,15 +402,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +414,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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: |
@@ -481,15 +453,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +465,14 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +495,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.4
         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: |
@@ -560,15 +524,11 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v2
+        uses: actions/cache@v2.1.4
         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 +545,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.4
         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 +597,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.4
         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 +628,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.4
         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 +650,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 +662,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.4
         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,6 +694,7 @@ jobs:
             --test-group-count 4 \
             --test-group=${{ matrix.group }} \
             --cov homeassistant \
+            --cov-report= \
             -o console_output_style=count \
             -p no:sugar \
             tests
@@ -750,7 +710,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 +720,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.4
         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 +739,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.3.1

.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"

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.7.2
+    rev: v2.11.0
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
@@ -23,12 +23,16 @@ repos:
         exclude_types: [csv, json]
         exclude: ^tests/fixtures/
   - repo: https://gitlab.com/pycqa/flake8
-    rev: 3.8.4
+    rev: 3.9.0
     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
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
     rev: 1.7.0
@@ -40,7 +44,7 @@ repos:
           - --configfile=tests/bandit.yaml
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/isort
-    rev: 5.5.3
+    rev: 5.7.0
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks
@@ -59,11 +63,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.2
+    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 +107,4 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(homeassistant/.+/(manifest|strings)\.json|\.coveragerc)$
+        files: ^(homeassistant/.+/(manifest|strings)\.json|\.coveragerc|homeassistant/.+/services\.yaml)$

CODEOWNERS

@@ -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
@@ -35,6 +36,7 @@ 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 +47,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,6 +84,7 @@ 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
@@ -144,6 +147,7 @@ homeassistant/components/esphome/* @OttoWinter
 homeassistant/components/essent/* @TheLastProject
 homeassistant/components/evohome/* @zxdavb
 homeassistant/components/ezviz/* @baqs
+homeassistant/components/faa_delays/* @ntilley905
 homeassistant/components/fastdotcom/* @rohankapoorcom
 homeassistant/components/file/* @fabaff
 homeassistant/components/filter/* @dgomes
@@ -158,7 +162,7 @@ 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/fronius/* @nielstron
 homeassistant/components/frontend/* @home-assistant/frontend
 homeassistant/components/garmin_connect/* @cyberjunky
@@ -177,13 +181,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/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 +197,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
@@ -241,6 +244,7 @@ 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
@@ -250,6 +254,8 @@ 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,8 +266,10 @@ 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
@@ -283,10 +291,12 @@ homeassistant/components/monoprice/* @etsinko @OnFreund
 homeassistant/components/moon/* @fabaff
 homeassistant/components/motion_blinds/* @starkillerOG
 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/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 +320,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
@@ -374,9 +384,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 +402,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
@@ -416,15 +429,16 @@ 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 +454,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 +470,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 +492,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 +500,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 +513,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 +522,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 +541,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

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

azure-pipelines-release.yml

@@ -14,7 +14,7 @@ schedules:
     always: true
 variables:
   - name: versionBuilder
-    value: '2020.11.0'
+    value: '2021.02.0'
   - group: docker
   - group: github
   - group: twine
@@ -114,10 +114,12 @@ stages:
     pool:
       vmImage: 'ubuntu-latest'
     strategy:
-      maxParallel: 15
+      maxParallel: 17
       matrix:
         qemux86-64:
           buildMachine: 'qemux86-64'
+        generic-x86-64:
+          buildMachine: 'generic-x86-64'
         intel-nuc:
           buildMachine: 'intel-nuc'
         qemux86:

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__
 
@@ -206,7 +207,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])

homeassistant/auth/__init__.py

@@ -1,8 +1,10 @@
 """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, Optional, Tuple, cast
 
 import jwt
 
@@ -24,11 +26,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 +78,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 +87,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 +97,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: dict[str, Any]
+    ) -> dict[str, Any]:
         """Return a user as result of login flow."""
         flow = cast(LoginFlow, flow)
 
@@ -96,7 +106,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
 
@@ -120,11 +130,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 +157,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 +180,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 +213,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 +225,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 +294,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 +362,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 +373,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 +427,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 +450,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 +468,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 +535,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,

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()

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
@@ -36,7 +38,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 +68,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 +87,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 +104,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
+    ) -> dict[str, Any]:
         """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 +125,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]

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
+        )

homeassistant/auth/mfa_modules/notify.py

@@ -2,10 +2,12 @@
 
 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
@@ -79,8 +81,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 +94,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 +148,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 +200,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 +260,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 +278,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
+    ) -> dict[str, Any]:
         """Let user select available notify services."""
-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}
 
         hass = self._auth_module.hass
         if user_input:
@@ -306,7 +308,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 +317,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
+    ) -> dict[str, Any]:
         """Verify user can receive one-time password."""
-        errors: Dict[str, str] = {}
+        errors: dict[str, str] = {}
 
         hass = self._auth_module.hass
         if user_input:

homeassistant/auth/mfa_modules/totp.py

@@ -1,7 +1,9 @@
 """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
 
@@ -50,7 +52,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 +71,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 +102,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 +147,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 +183,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
+    ) -> dict[str, Any]:
         """Handle the first step of setup flow.
 
         Return self.async_show_form(step_id='init') if user_input is None.
@@ -195,10 +197,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:

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

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."""

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)
 

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

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()

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)
 

homeassistant/auth/providers/__init__.py

@@ -1,8 +1,10 @@
 """Auth providers for Home Assistant."""
+from __future__ import annotations
+
 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
@@ -16,7 +18,7 @@ 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 +42,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 +50,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 +72,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 +86,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 +94,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 +102,7 @@ class AuthProvider:
         raise NotImplementedError
 
     async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: dict[str, str]
     ) -> Credentials:
         """Get credentials based on the flow result."""
         raise NotImplementedError
@@ -117,9 +119,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 +188,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
+    ) -> dict[str, Any]:
         """Handle the first step of login flow.
 
         Return self.async_show_form(step_id='init') if user_input is None.
@@ -194,8 +207,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
+    ) -> dict[str, Any]:
         """Handle the step of select mfa module."""
         errors = {}
 
@@ -219,9 +232,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
+    ) -> dict[str, Any]:
         """Handle the step of mfa validation."""
+        assert self.credential
         assert self.user
 
         errors = {}
@@ -257,9 +271,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 +285,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) -> dict:
         """Handle the pass of login flow."""
         return self.async_create_entry(title=self._auth_provider.name, data=flow_result)

homeassistant/auth/providers/command_line.py

@@ -1,19 +1,20 @@
 """Auth provider that validates credentials via an external command."""
+from __future__ import annotations
 
 import asyncio.subprocess
 import collections
 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.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 +52,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 +83,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 +100,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: dict[str, str]
     ) -> Credentials:
         """Get credentials based on the flow result."""
         username = flow_result["username"]
@@ -125,8 +126,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
+    ) -> dict[str, Any]:
         """Handle the step of the form."""
         errors = {}
 
@@ -143,7 +144,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
 

homeassistant/auth/providers/homeassistant.py

@@ -1,9 +1,11 @@
 """Home Assistant auth provider."""
+from __future__ import annotations
+
 import asyncio
 import base64
 from collections import OrderedDict
 import logging
-from typing import Any, Dict, List, Optional, Set, cast
+from typing import Any, cast
 
 import bcrypt
 import voluptuous as vol
@@ -19,7 +21,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 +33,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 +62,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 +83,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 +121,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 +220,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 +233,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 +277,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: dict[str, str]
     ) -> Credentials:
         """Get credentials based on the flow result."""
         if self.data is None:
@@ -316,8 +318,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
+    ) -> dict[str, Any]:
         """Handle the step of the form."""
         errors = {}
 
@@ -333,7 +335,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
 

homeassistant/auth/providers/insecure_example.py

@@ -1,7 +1,9 @@
 """Example auth provider."""
+from __future__ import annotations
+
 from collections import OrderedDict
 import hmac
-from typing import Any, Dict, Optional, cast
+from typing import Any, cast
 
 import voluptuous as vol
 
@@ -33,7 +35,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 +62,7 @@ class ExampleAuthProvider(AuthProvider):
             raise InvalidAuthError
 
     async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: dict[str, str]
     ) -> Credentials:
         """Get credentials based on the flow result."""
         username = flow_result["username"]
@@ -94,8 +96,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
+    ) -> dict[str, Any]:
         """Handle the step of the form."""
         errors = {}
 
@@ -111,7 +113,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
 

homeassistant/auth/providers/legacy_api_password.py

@@ -3,18 +3,19 @@ Support Legacy API password auth provider.
 
 It will be removed when auth system production ready
 """
+from __future__ import annotations
+
 import hmac
-from typing import Any, Dict, Optional, cast
+from typing import Any, cast
 
 import voluptuous as vol
 
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import callback
 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 +31,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 +42,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 +57,7 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
             raise InvalidAuthError
 
     async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: dict[str, str]
     ) -> Credentials:
         """Return credentials for this login."""
         credentials = await self.async_credentials()
@@ -97,8 +81,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
+    ) -> dict[str, Any]:
         """Handle the step of the form."""
         errors = {}
 

homeassistant/auth/providers/trusted_networks.py

@@ -3,8 +3,17 @@
 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 ipaddress import (
+    IPv4Address,
+    IPv4Network,
+    IPv6Address,
+    IPv6Network,
+    ip_address,
+    ip_network,
+)
+from typing import Any, Dict, List, Union, cast
 
 import voluptuous as vol
 
@@ -13,7 +22,8 @@ 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 +56,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 +70,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 +84,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 +113,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 +127,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
         )
 
     async def async_get_or_create_credentials(
-        self, flow_result: Dict[str, str]
+        self, flow_result: dict[str, str]
     ) -> Credentials:
         """Get credentials based on the flow result."""
         user_id = flow_result["user"]
@@ -163,6 +169,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 +188,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 +198,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
+    ) -> dict[str, Any]:
         """Handle the step of the form."""
         try:
             cast(

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,6 +19,7 @@ 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.typing import ConfigType
 from homeassistant.setup import (
     DATA_SETUP,
@@ -27,7 +30,6 @@ from homeassistant.setup import (
 from homeassistant.util.async_ import gather_with_concurrency
 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
@@ -74,8 +76,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 +123,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 +190,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 +257,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 +364,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}
@@ -381,7 +381,7 @@ def _get_domains(hass: core.HomeAssistant, config: Dict[str, Any]) -> Set[str]:
 
 
 async def _async_log_pending_setups(
-    hass: core.HomeAssistant, domains: Set[str], setup_started: Dict[str, datetime]
+    hass: core.HomeAssistant, domains: set[str], setup_started: dict[str, datetime]
 ) -> None:
     """Periodic log of setups that are pending for longer than LOG_SLOW_STARTUP_INTERVAL."""
     while True:
@@ -398,9 +398,9 @@ async def _async_log_pending_setups(
 
 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],
+    setup_started: dict[str, datetime],
 ) -> None:
     """Set up multiple domains. Log on failure."""
     futures = {
@@ -424,7 +424,7 @@ 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] = {}
@@ -432,7 +432,7 @@ async def _async_set_up_integrations(
 
     # 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
@@ -510,10 +510,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:

homeassistant/components/abode/__init__.py

@@ -13,6 +13,7 @@ from homeassistant.config_entries import SOURCE_IMPORT, SOURCE_REAUTH
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
     ATTR_DATE,
+    ATTR_DEVICE_ID,
     ATTR_ENTITY_ID,
     ATTR_TIME,
     CONF_PASSWORD,
@@ -32,7 +33,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 +66,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",
@@ -138,7 +138,7 @@ async def async_setup_entry(hass, config_entry):
 
     hass.data[DOMAIN] = AbodeSystem(abode, polling)
 
-    for platform in ABODE_PLATFORMS:
+    for platform in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(config_entry, platform)
         )
@@ -158,7 +158,7 @@ async def async_unload_entry(hass, config_entry):
 
     tasks = []
 
-    for platform in ABODE_PLATFORMS:
+    for platform in PLATFORMS:
         tasks.append(
             hass.config_entries.async_forward_entry_unload(config_entry, platform)
         )
@@ -363,7 +363,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 +411,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"}
 

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,

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)

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):

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"
+                }
+            }
+        }
+    }
+}

homeassistant/components/abode/translations/he.json

@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "username": "\u05e9\u05dd \u05de\u05e9\u05ea\u05de\u05e9"
+                }
+            }
+        }
+    }
+}

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": {

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"
+            }
+        }
+    }
+}

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": {

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",

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": {

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": {

homeassistant/components/accuweather/__init__.py

@@ -8,8 +8,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 +24,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,21 +37,18 @@ 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:
+    for platform in PLATFORMS:
         hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, component)
+            hass.config_entries.async_forward_entry_setup(config_entry, platform)
         )
 
     return True
@@ -70,8 +59,8 @@ async def async_unload_entry(hass, config_entry):
     unload_ok = all(
         await asyncio.gather(
             *[
-                hass.config_entries.async_forward_entry_unload(config_entry, component)
-                for component in PLATFORMS
+                hass.config_entries.async_forward_entry_unload(config_entry, platform)
+                for platform in PLATFORMS
             ]
         )
     )

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):

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"

homeassistant/components/accuweather/manifest.json

@@ -2,7 +2,7 @@
   "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"

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"]:

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": {

homeassistant/components/accuweather/translations/he.json

@@ -0,0 +1,11 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "longitude": "\u05e7\u05d5 \u05d0\u05d5\u05e8\u05da"
+                }
+            }
+        }
+    }
+}

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"
+            }
+        }
+    }
+}

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"
+        }
+    }
+}

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"
+        }
     }
 }

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"
+        }
     }
 }

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"
+        }
+    }
+}

homeassistant/components/accuweather/translations/sensor.id.json

@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "Turun",
+            "rising": "Naik",
+            "steady": "Tetap"
+        }
+    }
+}

homeassistant/components/accuweather/translations/sensor.ko.json

@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "\ud558\uac15",
+            "rising": "\uc0c1\uc2b9",
+            "steady": "\uc548\uc815"
+        }
+    }
+}

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
 

homeassistant/components/acmeda/__init__.py

@@ -11,11 +11,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,9 +23,9 @@ async def async_setup_entry(
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][config_entry.entry_id] = hub
 
-    for component in PLATFORMS:
+    for platform in PLATFORMS:
         hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(config_entry, component)
+            hass.config_entries.async_forward_entry_setup(config_entry, platform)
         )
 
     return True
@@ -45,8 +40,8 @@ async def async_unload_entry(
     unload_ok = all(
         await asyncio.gather(
             *[
-                hass.config_entries.async_forward_entry_unload(config_entry, component)
-                for component in PLATFORMS
+                hass.config_entries.async_forward_entry_unload(config_entry, platform)
+                for platform in PLATFORMS
             ]
         )
     )

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."""

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:

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 = []

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

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"
+        }
+    }
+}

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"
+            }
+        }
+    }
+}

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": {

homeassistant/components/acmeda/translations/nl.json

@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "no_devices_found": "Geen apparaten gevonden op het netwerk"
+        },
         "step": {
             "user": {
                 "data": {

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."""

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
@@ -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(
@@ -69,32 +68,36 @@ async def async_setup_entry(hass: HomeAssistantType, entry: ConfigEntry) -> bool
     except AdGuardHomeConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
-    for component in "sensor", "switch":
+    for platform in PLATFORMS:
         hass.async_create_task(
-            hass.config_entries.async_forward_entry_setup(entry, component)
+            hass.config_entries.async_forward_entry_setup(entry, platform)
         )
 
     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 +118,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,8 +126,8 @@ 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)
+    for platform in PLATFORMS:
+        await hass.config_entries.async_forward_entry_unload(entry, platform)
 
     del hass.data[DOMAIN]
 
@@ -189,7 +192,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": {

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,
@@ -15,9 +18,10 @@ from homeassistant.const import (
 )
 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 +29,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
+    ) -> dict[str, Any]:
         """Show the setup form to the user."""
         return self.async_show_form(
             step_id="user",
@@ -42,7 +48,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
+    ) -> dict[str, Any]:
         """Show the Hass.io confirmation form to the user."""
         return self.async_show_form(
             step_id="hassio_confirm",
@@ -51,7 +59,9 @@ 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
+    ) -> dict[str, Any]:
         """Handle a flow initiated by the user."""
         if self._async_current_entries():
             return self.async_abort(reason="single_instance_allowed")
@@ -91,7 +101,7 @@ class AdGuardHomeFlowHandler(ConfigFlow):
             },
         )
 
-    async def async_step_hassio(self, discovery_info):
+    async def async_step_hassio(self, discovery_info: dict[str, Any]) -> dict[str, Any]:
         """Prepare configuration for a Hass.io AdGuard Home add-on.
 
         This flow is triggered by the discovery component.
@@ -100,6 +110,7 @@ class AdGuardHomeFlowHandler(ConfigFlow):
 
         if not entries:
             self._hassio_discovery = discovery_info
+            await self._async_handle_discovery_without_unique_id()
             return await self.async_step_hassio_confirm()
 
         cur_entry = entries[0]
@@ -129,7 +140,9 @@ class AdGuardHomeFlowHandler(ConfigFlow):
 
         return self.async_abort(reason="existing_instance_updated")
 
-    async def async_step_hassio_confirm(self, user_input=None):
+    async def async_step_hassio_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> dict[str, Any]:
         """Confirm Hass.io discovery."""
         if user_input is None:
             return await self._show_hassio_form()

homeassistant/components/adguard/manifest.json

@@ -3,6 +3,6 @@
   "name": "AdGuard Home",
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/adguard",
-  "requirements": ["adguardhome==0.4.2"],
+  "requirements": ["adguardhome==0.5.0"],
   "codeowners": ["@frenck"]
 }

homeassistant/components/adguard/sensor.py

@@ -1,25 +1,29 @@
 """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_VERION, 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]
@@ -45,12 +49,12 @@ async def async_setup_entry(
     async_add_entities(sensors, True)
 
 
-class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
+class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
     """Defines a AdGuard Home sensor."""
 
     def __init__(
         self,
-        adguard,
+        adguard: AdGuardHome,
         name: str,
         icon: str,
         measurement: str,
@@ -78,12 +82,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,7 +95,7 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity):
 class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home DNS Queries sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard, "AdGuard DNS Queries", "mdi:magnify", "dns_queries", "queries"
@@ -105,7 +109,7 @@ class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
 class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home blocked by filtering sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -124,7 +128,7 @@ class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
 class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home blocked percentage sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -143,7 +147,7 @@ class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home replaced by parental control sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -161,7 +165,7 @@ class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home replaced by safe browsing sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -179,7 +183,7 @@ class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
 class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home replaced by safe search sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -197,7 +201,7 @@ class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
 class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home average processing time sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -216,7 +220,7 @@ class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
 class AdGuardHomeRulesCountSensor(AdGuardHomeSensor):
     """Defines a AdGuard Home rules count sensor."""
 
-    def __init__(self, adguard):
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home sensor."""
         super().__init__(
             adguard,
@@ -229,4 +233,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)

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": {

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_VERION, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -22,7 +23,9 @@ 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]
@@ -49,8 +52,13 @@ 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,
+        name: str,
+        icon: str,
+        key: str,
+        enabled_default: bool = True,
+    ) -> None:
         """Initialize AdGuard Home switch."""
         self._state = False
         self._key = key
@@ -96,7 +104,7 @@ class AdGuardHomeSwitch(AdGuardHomeDeviceEntity, SwitchEntity):
 class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home protection switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(
             adguard, "AdGuard Protection", "mdi:shield-check", "protection"
@@ -118,7 +126,7 @@ class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
 class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home parental control switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(
             adguard, "AdGuard Parental Control", "mdi:shield-check", "parental"
@@ -140,7 +148,7 @@ class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
 class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home safe search switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(
             adguard, "AdGuard Safe Search", "mdi:shield-check", "safesearch"
@@ -162,7 +170,7 @@ class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
 class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home safe search switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(
             adguard, "AdGuard Safe Browsing", "mdi:shield-check", "safebrowsing"
@@ -184,7 +192,7 @@ class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
 class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home filtering switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(adguard, "AdGuard Filtering", "mdi:shield-check", "filtering")
 
@@ -204,7 +212,7 @@ class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
 class AdGuardHomeQueryLogSwitch(AdGuardHomeSwitch):
     """Defines a AdGuard Home query log switch."""
 
-    def __init__(self, adguard) -> None:
+    def __init__(self, adguard: AdGuardHome) -> None:
         """Initialize AdGuard Home switch."""
         super().__init__(
             adguard,

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": {

homeassistant/components/adguard/translations/ca.json

@@ -10,7 +10,7 @@
         "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)"
+                "title": "AdGuard Home via complement de Hass.io"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/cs.json

@@ -9,8 +9,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": {

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": {

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": {

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": {

homeassistant/components/adguard/translations/es.json

@@ -9,8 +9,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": {

homeassistant/components/adguard/translations/et.json

@@ -10,7 +10,7 @@
         "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"
+                "title": "AdGuard Home Hass.io lisandmooduli abil"
             },
             "user": {
                 "data": {

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"
                 }
             }

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"
                 }
             }
         }

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."
             }
         }
     }

homeassistant/components/adguard/translations/it.json

@@ -9,7 +9,7 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Vuoi configurare Home Assistant per connettersi alla AdGuard Home fornita dal componente aggiuntivo di Hass.io: {addon}?",
+                "description": "Vuoi configurare Home Assistant per connettersi ad AdGuard Home fornito dal componente aggiuntivo di Hass.io: {addon}?",
                 "title": "AdGuard Home tramite il componente aggiuntivo di Hass.io"
             },
             "user": {

homeassistant/components/adguard/translations/ko.json

@@ -2,11 +2,14 @@
     "config": {
         "abort": {
             "existing_instance_updated": "\uae30\uc874 \uad6c\uc131\uc744 \uc5c5\ub370\uc774\ud2b8\ud588\uc2b5\ub2c8\ub2e4.",
-            "single_instance_allowed": "\ud558\ub098\uc758 AdGuard Home \ub9cc \uad6c\uc131\ud560 \uc218 \uc788\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"
         },
         "step": {
             "hassio_confirm": {
-                "description": "Hass.io {addon} \uc560\ub4dc\uc628\uc73c\ub85c AdGuard Home \uc5d0 \uc5f0\uacb0\ud558\ub3c4\ub85d Home Assistant \ub97c \uad6c\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
+                "description": "Hass.io {addon} \uc560\ub4dc\uc628\uc73c\ub85c AdGuard Home\uc5d0 \uc5f0\uacb0\ud558\ub3c4\ub85d Home Assistant\ub97c \uad6c\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?",
                 "title": "Hass.io \uc560\ub4dc\uc628\uc758 AdGuard Home"
             },
             "user": {
@@ -14,9 +17,9 @@
                     "host": "\ud638\uc2a4\ud2b8",
                     "password": "\ube44\ubc00\ubc88\ud638",
                     "port": "\ud3ec\ud2b8",
-                    "ssl": "AdGuard Home \uc740 SSL \uc778\uc99d\uc11c\ub97c \uc0ac\uc6a9\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4",
+                    "ssl": "SSL \uc778\uc99d\uc11c \uc0ac\uc6a9",
                     "username": "\uc0ac\uc6a9\uc790 \uc774\ub984",
-                    "verify_ssl": "AdGuard Home \uc740 \uc62c\ubc14\ub978 \uc778\uc99d\uc11c\ub97c \uc0ac\uc6a9\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4"
+                    "verify_ssl": "SSL \uc778\uc99d\uc11c \ud655\uc778"
                 },
                 "description": "\ubaa8\ub2c8\ud130\ub9c1 \ubc0f \uc81c\uc5b4\uac00 \uac00\ub2a5\ud558\ub3c4\ub85d AdGuard Home \uc778\uc2a4\ud134\uc2a4\ub97c \uc124\uc815\ud574\uc8fc\uc138\uc694."
             }

homeassistant/components/adguard/translations/lb.json

@@ -9,8 +9,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "W\u00ebllt dir Home Assistant konfigur\u00e9iere fir sech mam AdGuard Home ze verbannen dee vum hass.io add-on {addon} bereet gestallt g\u00ebtt?",
-                "title": "AdGuard Home via Hass.io add-on"
+                "description": "W\u00ebllt dir Home Assistant konfigur\u00e9iere fir sech mam AdGuard Home ze verbannen dee vum Supervisor add-on {addon} bereet gestallt g\u00ebtt?",
+                "title": "AdGuard Home via Supervisor add-on"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/nl.json

@@ -9,8 +9,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Wilt u Home Assistant configureren om verbinding te maken met AdGuard Home van de Hass.io-add-on: {addon}?",
-                "title": "AdGuard Home via Hass.io add-on"
+                "description": "Wilt u Home Assistant configureren om verbinding te maken met AdGuard Home van de Supervisor-add-on: {addon}?",
+                "title": "AdGuard Home via Supervisor add-on"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/no.json

@@ -9,7 +9,7 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Vil du konfigurere Home Assistant til \u00e5 koble til AdGuard Home gitt av Hass.io-tillegg {addon}?",
+                "description": "Vil du konfigurere Home Assistant for \u00e5 koble til AdGuard Home levert av Hass.io-tillegget: {addon} ?",
                 "title": "AdGuard Home via Hass.io-tillegg"
             },
             "user": {

homeassistant/components/adguard/translations/pl.json

@@ -9,7 +9,7 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Czy chcesz skonfigurowa\u0107 Home Assistanta, aby po\u0142\u0105czy\u0142 si\u0119 z AdGuard Home przez dodatek Hass.io {addon}?",
+                "description": "Czy chcesz skonfigurowa\u0107 Home Assistanta, aby po\u0142\u0105czy\u0142 si\u0119 z AdGuard Home przez dodatek Hass.io: {addon}?",
                 "title": "AdGuard Home przez dodatek Hass.io"
             },
             "user": {

homeassistant/components/adguard/translations/pt-BR.json

@@ -6,8 +6,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Deseja configurar o Home Assistant para se conectar ao AdGuard Home fornecido pelo complemento Hass.io: {addon} ?",
-                "title": "AdGuard Home via add-on Hass.io"
+                "description": "Deseja configurar o Home Assistant para se conectar ao AdGuard Home fornecido pelo complemento Supervisor: {addon} ?",
+                "title": "AdGuard Home via add-on Supervisor"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/pt.json

@@ -8,7 +8,7 @@
         },
         "step": {
             "hassio_confirm": {
-                "title": "AdGuard Home via Hass.io add-on"
+                "title": "AdGuard Home via Supervisor add-on"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/ru.json

@@ -18,7 +18,7 @@
                     "password": "\u041f\u0430\u0440\u043e\u043b\u044c",
                     "port": "\u041f\u043e\u0440\u0442",
                     "ssl": "\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL",
-                    "username": "\u041b\u043e\u0433\u0438\u043d",
+                    "username": "\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f",
                     "verify_ssl": "\u041f\u0440\u043e\u0432\u0435\u0440\u044f\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 SSL"
                 },
                 "description": "\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 Home Assistant \u0434\u043b\u044f \u043c\u043e\u043d\u0438\u0442\u043e\u0440\u0438\u043d\u0433\u0430 \u0438 \u043a\u043e\u043d\u0442\u0440\u043e\u043b\u044f AdGuard Home."

homeassistant/components/adguard/translations/sl.json

@@ -6,8 +6,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "\u017delite konfigurirati Home Assistant-a za povezavo z AdGuard Home, ki ga ponuja Hass.io add-on {addon} ?",
-                "title": "AdGuard Home preko dodatka Hass.io"
+                "description": "\u017delite konfigurirati Home Assistant-a za povezavo z AdGuard Home, ki ga ponuja Supervisor add-on {addon} ?",
+                "title": "AdGuard Home preko dodatka Supervisor"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/sv.json

@@ -6,8 +6,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "Vill du konfigurera Home Assistant f\u00f6r att ansluta till AdGuard Home som tillhandah\u00e5lls av Hass.io Add-on: {addon}?",
-                "title": "AdGuard Home via Hass.io-till\u00e4gget"
+                "description": "Vill du konfigurera Home Assistant f\u00f6r att ansluta till AdGuard Home som tillhandah\u00e5lls av Supervisor Add-on: {addon}?",
+                "title": "AdGuard Home via Supervisor-till\u00e4gget"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/uk.json

@@ -9,8 +9,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "\u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u043f\u0456\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044f \u0434\u043e AdGuard Home (\u0434\u043e\u0434\u0430\u0442\u043e\u043a \u0434\u043b\u044f Hass.io \"{addon}\")?",
-                "title": "AdGuard Home (\u0434\u043e\u0434\u0430\u0442\u043e\u043a \u0434\u043b\u044f Hass.io)"
+                "description": "\u0412\u0438 \u0432\u043f\u0435\u0432\u043d\u0435\u043d\u0456, \u0449\u043e \u0445\u043e\u0447\u0435\u0442\u0435 \u043d\u0430\u043b\u0430\u0448\u0442\u0443\u0432\u0430\u0442\u0438 \u043f\u0456\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u043d\u044f \u0434\u043e AdGuard Home (\u0434\u043e\u0434\u0430\u0442\u043e\u043a \u0434\u043b\u044f Supervisor \"{addon}\")?",
+                "title": "AdGuard Home (\u0434\u043e\u0434\u0430\u0442\u043e\u043a \u0434\u043b\u044f Supervisor)"
             },
             "user": {
                 "data": {

homeassistant/components/adguard/translations/zh-Hant.json

@@ -9,8 +9,8 @@
         },
         "step": {
             "hassio_confirm": {
-                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Home Assistant \u4ee5\u4f7f\u7528 Hass.io \u9644\u52a0\u7d44\u4ef6\uff1a{addon} \u9023\u7dda\u81f3 AdGuard Home\uff1f",
-                "title": "\u4f7f\u7528 Hass.io \u9644\u52a0\u7d44\u4ef6 AdGuard Home"
+                "description": "\u662f\u5426\u8981\u8a2d\u5b9a Home Assistant \u4ee5\u4f7f\u7528 Hass.io \u9644\u52a0\u5143\u4ef6\uff1a{addon} \u9023\u7dda\u81f3 AdGuard Home\uff1f",
+                "title": "\u4f7f\u7528 Hass.io \u9644\u52a0\u5143\u4ef6 AdGuard Home"
             },
             "user": {
                 "data": {

homeassistant/components/ads/sensor.py

@@ -2,7 +2,7 @@
 import voluptuous as vol
 
 from homeassistant.components import ads
-from homeassistant.components.sensor import PLATFORM_SCHEMA
+from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
 from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT
 import homeassistant.helpers.config_validation as cv
 
@@ -43,7 +43,7 @@ def setup_platform(hass, config, add_entities, discovery_info=None):
     add_entities([entity])
 
 
-class AdsSensor(AdsEntity):
+class AdsSensor(AdsEntity, SensorEntity):
     """Representation of an ADS sensor entity."""
 
     def __init__(self, ads_hub, ads_var, ads_type, name, unit_of_measurement, factor):

homeassistant/components/advantage_air/__init__.py

@@ -7,24 +7,17 @@ import logging
 from advantage_air import ApiError, advantage_air
 
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
-from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import ADVANTAGE_AIR_RETRY, DOMAIN
 
 ADVANTAGE_AIR_SYNC_INTERVAL = 15
-ADVANTAGE_AIR_PLATFORMS = ["climate", "cover", "binary_sensor", "sensor", "switch"]
+PLATFORMS = ["climate", "cover", "binary_sensor", "sensor", "switch"]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-async def async_setup(hass, config):
-    """Set up Advantage Air integration."""
-    hass.data[DOMAIN] = {}
-    return True
-
-
 async def async_setup_entry(hass, entry):
     """Set up Advantage Air config."""
     ip_address = entry.data[CONF_IP_ADDRESS]
@@ -57,17 +50,15 @@ async def async_setup_entry(hass, entry):
         except ApiError as err:
             _LOGGER.warning(err)
 
-    await coordinator.async_refresh()
-
-    if not coordinator.data:
-        raise ConfigEntryNotReady
+    await coordinator.async_config_entry_first_refresh()
 
+    hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         "coordinator": coordinator,
         "async_change": async_change,
     }
 
-    for platform in ADVANTAGE_AIR_PLATFORMS:
+    for platform in PLATFORMS:
         hass.async_create_task(
             hass.config_entries.async_forward_entry_setup(entry, platform)
         )
@@ -80,8 +71,8 @@ async def async_unload_entry(hass, entry):
     unload_ok = all(
         await asyncio.gather(
             *[
-                hass.config_entries.async_forward_entry_unload(entry, component)
-                for component in ADVANTAGE_AIR_PLATFORMS
+                hass.config_entries.async_forward_entry_unload(entry, platform)
+                for platform in PLATFORMS
             ]
         )
     )