2022.9.2 (#78169)

* Bump led_ble to 0.8.4

Changelog: https://github.com/Bluetooth-Devices/led-ble/compare/v0.8.3...v0.8.4

* bump again

.core_files.yaml

@@ -52,6 +52,7 @@ components: &components
   - homeassistant/components/auth/**
   - homeassistant/components/automation/**
   - homeassistant/components/backup/**
+  - homeassistant/components/bluetooth/**
   - homeassistant/components/cloud/**
   - homeassistant/components/config/**
   - homeassistant/components/configurator/**
@@ -87,6 +88,7 @@ components: &components
   - homeassistant/components/persistent_notification/**
   - homeassistant/components/person/**
   - homeassistant/components/recorder/**
+  - homeassistant/components/repairs/**
   - homeassistant/components/safe_mode/**
   - homeassistant/components/script/**
   - homeassistant/components/shopping_list/**

.coveragerc

@@ -23,6 +23,7 @@ omit =
     homeassistant/components/adax/climate.py
     homeassistant/components/adguard/__init__.py
     homeassistant/components/adguard/const.py
+    homeassistant/components/adguard/entity.py
     homeassistant/components/adguard/sensor.py
     homeassistant/components/adguard/switch.py
     homeassistant/components/ads/*
@@ -55,7 +56,9 @@ omit =
     homeassistant/components/ambient_station/sensor.py
     homeassistant/components/amcrest/*
     homeassistant/components/ampio/*
-    homeassistant/components/android_ip_webcam/*
+    homeassistant/components/android_ip_webcam/binary_sensor.py
+    homeassistant/components/android_ip_webcam/sensor.py
+    homeassistant/components/android_ip_webcam/switch.py
     homeassistant/components/androidtv/diagnostics.py
     homeassistant/components/anel_pwrctrl/switch.py
     homeassistant/components/anthemav/media_player.py
@@ -136,6 +139,8 @@ omit =
     homeassistant/components/bosch_shc/switch.py
     homeassistant/components/braviatv/__init__.py
     homeassistant/components/braviatv/const.py
+    homeassistant/components/braviatv/coordinator.py
+    homeassistant/components/braviatv/entity.py
     homeassistant/components/braviatv/media_player.py
     homeassistant/components/braviatv/remote.py
     homeassistant/components/broadlink/__init__.py
@@ -210,7 +215,6 @@ omit =
     homeassistant/components/denonavr/media_player.py
     homeassistant/components/denonavr/receiver.py
     homeassistant/components/deutsche_bahn/sensor.py
-    homeassistant/components/devolo_home_control/light.py
     homeassistant/components/devolo_home_control/sensor.py
     homeassistant/components/devolo_home_control/switch.py
     homeassistant/components/digital_ocean/*
@@ -256,6 +260,11 @@ omit =
     homeassistant/components/econet/const.py
     homeassistant/components/econet/sensor.py
     homeassistant/components/econet/water_heater.py
+    homeassistant/components/ecowitt/__init__.py
+    homeassistant/components/ecowitt/binary_sensor.py
+    homeassistant/components/ecowitt/diagnostics.py
+    homeassistant/components/ecowitt/entity.py
+    homeassistant/components/ecowitt/sensor.py
     homeassistant/components/ecovacs/*
     homeassistant/components/edl21/*
     homeassistant/components/eddystone_temperature/sensor.py
@@ -267,6 +276,7 @@ omit =
     homeassistant/components/eliqonline/sensor.py
     homeassistant/components/elkm1/__init__.py
     homeassistant/components/elkm1/alarm_control_panel.py
+    homeassistant/components/elkm1/binary_sensor.py
     homeassistant/components/elkm1/climate.py
     homeassistant/components/elkm1/discovery.py
     homeassistant/components/elkm1/light.py
@@ -276,6 +286,7 @@ omit =
     homeassistant/components/elmax/__init__.py
     homeassistant/components/elmax/common.py
     homeassistant/components/elmax/const.py
+    homeassistant/components/elmax/binary_sensor.py
     homeassistant/components/elmax/switch.py
     homeassistant/components/elv/*
     homeassistant/components/emby/media_player.py
@@ -306,8 +317,12 @@ omit =
     homeassistant/components/epson/media_player.py
     homeassistant/components/epsonworkforce/sensor.py
     homeassistant/components/eq3btsmart/climate.py
+    homeassistant/components/escea/climate.py
+    homeassistant/components/escea/discovery.py
+    homeassistant/components/escea/__init__.py
     homeassistant/components/esphome/__init__.py
     homeassistant/components/esphome/binary_sensor.py
+    homeassistant/components/esphome/bluetooth.py
     homeassistant/components/esphome/button.py
     homeassistant/components/esphome/camera.py
     homeassistant/components/esphome/climate.py
@@ -383,8 +398,11 @@ omit =
     homeassistant/components/flick_electric/sensor.py
     homeassistant/components/flock/notify.py
     homeassistant/components/flume/__init__.py
+    homeassistant/components/flume/coordinator.py
+    homeassistant/components/flume/entity.py
     homeassistant/components/flume/sensor.py
     homeassistant/components/flunearyou/__init__.py
+    homeassistant/components/flunearyou/repairs.py
     homeassistant/components/flunearyou/sensor.py
     homeassistant/components/folder/sensor.py
     homeassistant/components/folder_watcher/*
@@ -428,10 +446,10 @@ omit =
     homeassistant/components/gitlab_ci/sensor.py
     homeassistant/components/gitter/sensor.py
     homeassistant/components/glances/__init__.py
-    homeassistant/components/glances/const.py
     homeassistant/components/glances/sensor.py
     homeassistant/components/goalfeed/*
     homeassistant/components/goodwe/__init__.py
+    homeassistant/components/goodwe/button.py
     homeassistant/components/goodwe/const.py
     homeassistant/components/goodwe/number.py
     homeassistant/components/goodwe/select.py
@@ -439,7 +457,6 @@ omit =
     homeassistant/components/google_cloud/tts.py
     homeassistant/components/google_maps/device_tracker.py
     homeassistant/components/google_pubsub/__init__.py
-    homeassistant/components/gpmdp/media_player.py
     homeassistant/components/gpsd/sensor.py
     homeassistant/components/greenwave/light.py
     homeassistant/components/group/notify.py
@@ -449,6 +466,7 @@ omit =
     homeassistant/components/gtfs/sensor.py
     homeassistant/components/guardian/__init__.py
     homeassistant/components/guardian/binary_sensor.py
+    homeassistant/components/guardian/button.py
     homeassistant/components/guardian/sensor.py
     homeassistant/components/guardian/switch.py
     homeassistant/components/guardian/util.py
@@ -466,7 +484,6 @@ omit =
     homeassistant/components/harmony/remote.py
     homeassistant/components/harmony/util.py
     homeassistant/components/haveibeenpwned/sensor.py
-    homeassistant/components/hdmi_cec/*
     homeassistant/components/heatmiser/climate.py
     homeassistant/components/hikvision/binary_sensor.py
     homeassistant/components/hikvisioncam/switch.py
@@ -555,6 +572,7 @@ omit =
     homeassistant/components/insteon/utils.py
     homeassistant/components/intellifire/__init__.py
     homeassistant/components/intellifire/coordinator.py
+    homeassistant/components/intellifire/climate.py
     homeassistant/components/intellifire/binary_sensor.py
     homeassistant/components/intellifire/sensor.py
     homeassistant/components/intellifire/switch.py
@@ -569,7 +587,7 @@ omit =
     homeassistant/components/iqvia/sensor.py
     homeassistant/components/irish_rail_transport/sensor.py
     homeassistant/components/iss/__init__.py
-    homeassistant/components/iss/binary_sensor.py
+    homeassistant/components/iss/sensor.py
     homeassistant/components/isy994/__init__.py
     homeassistant/components/isy994/binary_sensor.py
     homeassistant/components/isy994/climate.py
@@ -595,6 +613,10 @@ omit =
     homeassistant/components/juicenet/number.py
     homeassistant/components/juicenet/sensor.py
     homeassistant/components/juicenet/switch.py
+    homeassistant/components/justnimbus/const.py
+    homeassistant/components/justnimbus/coordinator.py
+    homeassistant/components/justnimbus/entity.py
+    homeassistant/components/justnimbus/sensor.py
     homeassistant/components/kaiterra/*
     homeassistant/components/kankun/switch.py
     homeassistant/components/keba/*
@@ -625,7 +647,12 @@ omit =
     homeassistant/components/kostal_plenticore/switch.py
     homeassistant/components/kwb/sensor.py
     homeassistant/components/lacrosse/sensor.py
-    homeassistant/components/lametric/*
+    homeassistant/components/lametric/__init__.py
+    homeassistant/components/lametric/button.py
+    homeassistant/components/lametric/coordinator.py
+    homeassistant/components/lametric/entity.py
+    homeassistant/components/lametric/notify.py
+    homeassistant/components/lametric/number.py
     homeassistant/components/lannouncer/notify.py
     homeassistant/components/lastfm/sensor.py
     homeassistant/components/launch_library/__init__.py
@@ -636,15 +663,15 @@ omit =
     homeassistant/components/lcn/helpers.py
     homeassistant/components/lcn/scene.py
     homeassistant/components/lcn/services.py
+    homeassistant/components/led_ble/__init__.py
+    homeassistant/components/led_ble/light.py
+    homeassistant/components/led_ble/util.py
     homeassistant/components/lg_netcast/media_player.py
     homeassistant/components/lg_soundbar/media_player.py
     homeassistant/components/life360/__init__.py
     homeassistant/components/life360/const.py
     homeassistant/components/life360/coordinator.py
     homeassistant/components/life360/device_tracker.py
-    homeassistant/components/lifx/__init__.py
-    homeassistant/components/lifx/const.py
-    homeassistant/components/lifx/light.py
     homeassistant/components/lifx_cloud/scene.py
     homeassistant/components/lightwave/*
     homeassistant/components/limitlessled/light.py
@@ -698,6 +725,10 @@ omit =
     homeassistant/components/melcloud/const.py
     homeassistant/components/melcloud/sensor.py
     homeassistant/components/melcloud/water_heater.py
+    homeassistant/components/melnor/__init__.py
+    homeassistant/components/melnor/const.py
+    homeassistant/components/melnor/models.py
+    homeassistant/components/melnor/switch.py
     homeassistant/components/message_bird/notify.py
     homeassistant/components/met/weather.py
     homeassistant/components/met_eireann/__init__.py
@@ -716,7 +747,6 @@ omit =
     homeassistant/components/microsoft/tts.py
     homeassistant/components/miflora/sensor.py
     homeassistant/components/mikrotik/hub.py
-    homeassistant/components/mikrotik/device_tracker.py
     homeassistant/components/mill/climate.py
     homeassistant/components/mill/const.py
     homeassistant/components/mill/sensor.py
@@ -850,6 +880,8 @@ omit =
     homeassistant/components/open_meteo/weather.py
     homeassistant/components/opencv/*
     homeassistant/components/openevse/sensor.py
+    homeassistant/components/openexchangerates/__init__.py
+    homeassistant/components/openexchangerates/coordinator.py
     homeassistant/components/openexchangerates/sensor.py
     homeassistant/components/opengarage/__init__.py
     homeassistant/components/opengarage/binary_sensor.py
@@ -927,7 +959,6 @@ omit =
     homeassistant/components/plex/cast.py
     homeassistant/components/plex/media_player.py
     homeassistant/components/plex/view.py
-    homeassistant/components/plugwise/select.py
     homeassistant/components/plum_lightpad/light.py
     homeassistant/components/pocketcasts/sensor.py
     homeassistant/components/point/__init__.py
@@ -976,9 +1007,11 @@ omit =
     homeassistant/components/raincloud/*
     homeassistant/components/rainmachine/__init__.py
     homeassistant/components/rainmachine/binary_sensor.py
+    homeassistant/components/rainmachine/button.py
     homeassistant/components/rainmachine/model.py
     homeassistant/components/rainmachine/sensor.py
     homeassistant/components/rainmachine/switch.py
+    homeassistant/components/rainmachine/update.py
     homeassistant/components/rainmachine/util.py
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/__init__.py
@@ -1109,7 +1142,6 @@ omit =
     homeassistant/components/smtp/notify.py
     homeassistant/components/snapcast/*
     homeassistant/components/snmp/*
-    homeassistant/components/sochain/sensor.py
     homeassistant/components/solaredge/__init__.py
     homeassistant/components/solaredge/coordinator.py
     homeassistant/components/solaredge/sensor.py
@@ -1184,6 +1216,7 @@ omit =
     homeassistant/components/switchbot/const.py
     homeassistant/components/switchbot/entity.py
     homeassistant/components/switchbot/cover.py
+    homeassistant/components/switchbot/light.py
     homeassistant/components/switchbot/sensor.py
     homeassistant/components/switchbot/coordinator.py
     homeassistant/components/switchmate/switch.py
@@ -1211,6 +1244,7 @@ omit =
     homeassistant/components/system_bridge/binary_sensor.py
     homeassistant/components/system_bridge/const.py
     homeassistant/components/system_bridge/coordinator.py
+    homeassistant/components/system_bridge/media_source.py
     homeassistant/components/system_bridge/sensor.py
     homeassistant/components/systemmonitor/sensor.py
     homeassistant/components/tado/__init__.py
@@ -1409,7 +1443,14 @@ omit =
     homeassistant/components/volumio/__init__.py
     homeassistant/components/volumio/browse_media.py
     homeassistant/components/volumio/media_player.py
-    homeassistant/components/volvooncall/*
+    homeassistant/components/volvooncall/__init__.py
+    homeassistant/components/volvooncall/binary_sensor.py
+    homeassistant/components/volvooncall/const.py
+    homeassistant/components/volvooncall/device_tracker.py
+    homeassistant/components/volvooncall/errors.py
+    homeassistant/components/volvooncall/lock.py
+    homeassistant/components/volvooncall/sensor.py
+    homeassistant/components/volvooncall/switch.py
     homeassistant/components/vulcan/__init__.py
     homeassistant/components/vulcan/calendar.py
     homeassistant/components/vulcan/fetch_data.py
@@ -1465,12 +1506,17 @@ omit =
     homeassistant/components/xiaomi_miio/light.py
     homeassistant/components/xiaomi_miio/number.py
     homeassistant/components/xiaomi_miio/remote.py
-    homeassistant/components/xiaomi_miio/select.py
     homeassistant/components/xiaomi_miio/sensor.py
     homeassistant/components/xiaomi_miio/switch.py
     homeassistant/components/xiaomi_tv/media_player.py
     homeassistant/components/xmpp/notify.py
     homeassistant/components/xs1/*
+    homeassistant/components/yalexs_ble/__init__.py
+    homeassistant/components/yalexs_ble/binary_sensor.py
+    homeassistant/components/yalexs_ble/entity.py
+    homeassistant/components/yalexs_ble/lock.py
+    homeassistant/components/yalexs_ble/sensor.py
+    homeassistant/components/yalexs_ble/util.py
     homeassistant/components/yale_smart_alarm/__init__.py
     homeassistant/components/yale_smart_alarm/alarm_control_panel.py
     homeassistant/components/yale_smart_alarm/binary_sensor.py
@@ -1494,6 +1540,7 @@ omit =
     homeassistant/components/yolink/climate.py
     homeassistant/components/yolink/const.py
     homeassistant/components/yolink/coordinator.py
+    homeassistant/components/yolink/cover.py
     homeassistant/components/yolink/entity.py
     homeassistant/components/yolink/lock.py
     homeassistant/components/yolink/sensor.py
@@ -1519,9 +1566,7 @@ omit =
     homeassistant/components/zha/core/registries.py
     homeassistant/components/zha/entity.py
     homeassistant/components/zha/light.py
-    homeassistant/components/zha/sensor.py
     homeassistant/components/zhong_hong/climate.py
-    homeassistant/components/xbee/*
     homeassistant/components/ziggo_mediabox_xl/media_player.py
     homeassistant/components/zoneminder/*
     homeassistant/components/supla/*

.github/PULL_REQUEST_TEMPLATE.md

@@ -33,6 +33,7 @@
 - [ ] Bugfix (non-breaking change which fixes an issue)
 - [ ] New integration (thank you!)
 - [ ] New feature (which adds functionality to an existing integration)
+- [ ] Deprecation (breaking change to happen in the future)
 - [ ] Breaking change (fix/feature causing existing functionality to break)
 - [ ] Code quality improvements to existing code or addition of tests
 

.github/workflows/builder.yml

@@ -29,7 +29,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -70,7 +70,7 @@ jobs:
         uses: actions/checkout@v3.0.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -102,9 +102,20 @@ jobs:
       - name: Checkout the repository
         uses: actions/checkout@v3.0.2
 
+      - name: Download nightly wheels of frontend
+        if: needs.init.outputs.channel == 'dev'
+        uses: dawidd6/action-download-artifact@v2
+        with:
+          github_token: ${{secrets.GITHUB_TOKEN}}
+          repo: home-assistant/frontend
+          branch: dev
+          workflow: nightly.yaml
+          workflow_conclusion: success
+          name: wheels
+
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -112,10 +123,23 @@ jobs:
         if: needs.init.outputs.channel == 'dev'
         shell: bash
         run: |
-          python3 -m pip install packaging
+          python3 -m pip install packaging tomli
           python3 -m pip install --use-deprecated=legacy-resolver .
           version="$(python3 script/version_bump.py nightly)"
 
+          if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
+            echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}"
+            frontend_version="${BASH_REMATCH[1]}" yq \
+              --inplace e -o json \
+              '.requirements = ["home-assistant-frontend=="+env(frontend_version)]' \
+              homeassistant/components/frontend/manifest.json
+
+            sed -i "s|home-assistant-frontend==.*|home-assistant-frontend==${BASH_REMATCH[1]}|" \
+              homeassistant/package_constraints.txt
+
+            python -m script.gen_requirements_all
+          fi
+
       - name: Write meta info file
         shell: bash
         run: |
@@ -135,7 +159,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2022.06.2
+        uses: home-assistant/builder@2022.07.0
         with:
           args: |
             $BUILD_ARGS \
@@ -201,7 +225,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2022.06.2
+        uses: home-assistant/builder@2022.07.0
         with:
           args: |
             $BUILD_ARGS \

.github/workflows/ci.yaml

@@ -20,9 +20,9 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 10
-  PIP_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2022.7
+  CACHE_VERSION: 1
+  PIP_CACHE_VERSION: 1
+  HA_SHORT_VERSION: 2022.9
   DEFAULT_PYTHON: 3.9
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
   PIP_CACHE: /tmp/pip-cache
@@ -35,24 +35,38 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  changes:
-    name: Determine what has changed
+  info:
+    name: Collect information & changes data
     outputs:
       # In case of issues with the partial run, use the following line instead:
       # test_full_suite: 'true'
-      test_full_suite: ${{ steps.info.outputs.test_full_suite }}
       core: ${{ steps.core.outputs.changes }}
-      integrations: ${{ steps.integrations.outputs.changes }}
       integrations_glob: ${{ steps.info.outputs.integrations_glob }}
-      tests: ${{ steps.info.outputs.tests }}
-      tests_glob: ${{ steps.info.outputs.tests_glob }}
-      test_groups: ${{ steps.info.outputs.test_groups }}
-      test_group_count: ${{ steps.info.outputs.test_group_count }}
+      integrations: ${{ steps.integrations.outputs.changes }}
+      pre-commit_cache_key: ${{ steps.generate_pre-commit_cache_key.outputs.key }}
+      python_cache_key: ${{ steps.generate_python_cache_key.outputs.key }}
       requirements: ${{ steps.core.outputs.requirements }}
-    runs-on: ubuntu-latest
+      test_full_suite: ${{ steps.info.outputs.test_full_suite }}
+      test_group_count: ${{ steps.info.outputs.test_group_count }}
+      test_groups: ${{ steps.info.outputs.test_groups }}
+      tests_glob: ${{ steps.info.outputs.tests_glob }}
+      tests: ${{ steps.info.outputs.tests }}
+    runs-on: ubuntu-20.04
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
+      - name: Generate partial Python venv restore key
+        id: generate_python_cache_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: Generate partial pre-commit restore key
+        id: generate_pre-commit_cache_key
+        run: >-
+          echo "::set-output name=key::${{ env.CACHE_VERSION }}-${{ env.DEFAULT_PYTHON }}-${{
+            hashFiles('.pre-commit-config.yaml') }}"
       - name: Filter for core changes
         uses: dorny/paths-filter@v2.10.2
         id: core
@@ -79,8 +93,8 @@ jobs:
           # Defaults
           integrations_glob=""
           test_full_suite="true"
-          test_groups="[1, 2, 3, 4, 5, 6]"
-          test_group_count=6
+          test_groups="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"
+          test_group_count=10
           tests="[]"
           tests_glob=""
 
@@ -123,8 +137,8 @@ jobs:
             || [[ "${{ github.event.inputs.full }}" == "true" ]] \
             || [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-full-run') }}" == "true" ]];
           then
-            test_groups="[1, 2, 3, 4, 5, 6]"
-            test_group_count=6
+            test_groups="[1, 2, 3, 4, 5, 6, 7, 8, 9, 10]"
+            test_group_count=10
             test_full_suite="true"
           fi
 
@@ -142,84 +156,39 @@ jobs:
           echo "tests_glob: ${tests_glob}"
           echo "::set-output name=tests_glob::${tests_glob}"
 
-  # Separate job to pre-populate the base dependency cache
-  # This prevent upcoming jobs to do the same individually
-  prepare-base:
-    name: Prepare base dependencies
-    runs-on: ubuntu-latest
-    timeout-minutes: 20
-    outputs:
-      python-key: ${{ steps.generate-python-key.outputs.key }}
-      pre-commit-key: ${{ steps.generate-pre-commit-key.outputs.key }}
+  pre-commit:
+    name: Prepare pre-commit base
+    runs-on: ubuntu-20.04
+    needs:
+      - info
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         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: Generate partial pip restore key
-        id: generate-pip-key
-        run: >-
-          echo "::set-output name=key::base-pip-${{ env.PIP_CACHE_VERSION }}-${{
-            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')"
+          cache: "pip"
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            steps.generate-python-key.outputs.key }}
-          # Temporary disabling the restore of environments when bumping
-          # a dependency. It seems that we are experiencing issues with
-          # restoring environments in GitHub Actions, although unclear why.
-          # First attempt: https://github.com/home-assistant/core/pull/62383
-          #
-          # restore-keys: |
-          #   ${{ 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: Restore pip wheel cache
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v3.0.4
-        with:
-          path: ${{ env.PIP_CACHE }}
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            steps.generate-pip-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-base-pip-${{ env.PIP_CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-
+          key: ${{ runner.os }}-venv-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<22.2" setuptools wheel
-          pip install --cache-dir=$PIP_CACHE -r requirements.txt -r requirements_test.txt --use-deprecated=legacy-resolver
-      - 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') }}"
+          pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
-          key: >-
-            ${{ runner.os }}-${{ steps.generate-pre-commit-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-pre-commit-${{ env.CACHE_VERSION }}-
+          key: ${{ runner.os }}-pre-commit-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Install pre-commit dependencies
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
@@ -228,25 +197,24 @@ jobs:
 
   lint-black:
     name: Check black
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
-      - changes
-      - prepare-base
+      - info
+      - pre-commit
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.prepare-base.outputs.python-key }}
+          key: ${{ runner.os }}-venv-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -254,49 +222,48 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
-          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+          key: ${{ runner.os }}-pre-commit-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if pre-commit cache restore failed
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
           echo "Failed to restore pre-commit environment from cache"
           exit 1
       - name: Run black (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual black --all-files --show-diff-on-failure
       - name: Run black (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           shopt -s globstar
-          pre-commit run --hook-stage manual black --files {homeassistant,tests}/components/${{ needs.changes.outputs.integrations_glob }}/**/* --show-diff-on-failure
+          pre-commit run --hook-stage manual black --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/**/* --show-diff-on-failure
 
   lint-flake8:
     name: Check flake8
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
-      - changes
-      - prepare-base
+      - info
+      - pre-commit
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.prepare-base.outputs.python-key }}
+          key: ${{ runner.os }}-venv-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -304,10 +271,10 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
-          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+          key: ${{ runner.os }}-pre-commit-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if pre-commit cache restore failed
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
@@ -317,37 +284,38 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/flake8.json"
       - name: Run flake8 (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual flake8 --all-files
       - name: Run flake8 (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           shopt -s globstar
-          pre-commit run --hook-stage manual flake8 --files {homeassistant,tests}/components/${{ needs.changes.outputs.integrations_glob }}/**/*
+          pre-commit run --hook-stage manual flake8 --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/**/*
 
   lint-isort:
     name: Check isort
-    runs-on: ubuntu-latest
-    needs: prepare-base
+    runs-on: ubuntu-20.04
+    needs:
+      - info
+      - pre-commit
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.prepare-base.outputs.python-key }}
+          key: ${{ runner.os }}-venv-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -355,10 +323,10 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
-          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+          key: ${{ runner.os }}-pre-commit-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if pre-commit cache restore failed
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
@@ -371,25 +339,24 @@ jobs:
 
   lint-other:
     name: Check other linters
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
-      - changes
-      - prepare-base
+      - info
+      - pre-commit
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.prepare-base.outputs.python-key }}
+          key: ${{ runner.os }}-venv-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -397,10 +364,10 @@ jobs:
           exit 1
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
-          key: ${{ runner.os }}-${{ needs.prepare-base.outputs.pre-commit-key }}
+          key: ${{ runner.os }}-pre-commit-${{ needs.info.outputs.pre-commit_cache_key }}
       - name: Fail job if pre-commit cache restore failed
         if: steps.cache-precommit.outputs.cache-hit != 'true'
         run: |
@@ -408,17 +375,17 @@ jobs:
           exit 1
 
       - name: Run pyupgrade (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual pyupgrade --all-files --show-diff-on-failure
       - name: Run pyupgrade (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           shopt -s globstar
-          pre-commit run --hook-stage manual pyupgrade --files {homeassistant,tests}/components/${{ needs.changes.outputs.integrations_glob }}/**/* --show-diff-on-failure
+          pre-commit run --hook-stage manual pyupgrade --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/**/* --show-diff-on-failure
 
       - name: Register yamllint problem matcher
         run: |
@@ -437,17 +404,17 @@ jobs:
           pre-commit run --hook-stage manual check-json --all-files
 
       - name: Run prettier (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual prettier --all-files
 
       - name: Run prettier (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
-          pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.changes.outputs.integrations_glob }}/**/*
+          pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/**/*
 
       - name: Register check executables problem matcher
         run: |
@@ -478,36 +445,105 @@ jobs:
           args: hadolint Dockerfile.dev
 
       - name: Run bandit (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual bandit --all-files --show-diff-on-failure
       - name: Run bandit (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           shopt -s globstar
-          pre-commit run --hook-stage manual bandit --files {homeassistant,tests}/components/${{ needs.changes.outputs.integrations_glob }}/**/* --show-diff-on-failure
+          pre-commit run --hook-stage manual bandit --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/**/* --show-diff-on-failure
 
-  hassfest:
-    name: Check hassfest
-    runs-on: ubuntu-latest
-    needs: prepare-tests
+  base:
+    name: Prepare dependencies
+    runs-on: ubuntu-20.04
+    needs: info
+    timeout-minutes: 60
     strategy:
       matrix:
-        python-version: [3.9]
-    container: homeassistant/ci-azure:${{ matrix.python-version }}
+        python-version: ["3.9", "3.10"]
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ matrix.python-version }}
+      - name: Generate partial pip restore key
+        id: generate-pip-key
+        run: >-
+          echo "::set-output name=key::pip-${{ env.PIP_CACHE_VERSION }}-${{
+            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')"
+      - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
-            needs.prepare-tests.outputs.python-key }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
+      - name: Restore pip wheel cache
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        uses: actions/cache@v3.0.8
+        with:
+          path: ${{ env.PIP_CACHE }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            steps.generate-pip-key.outputs.key }}
+          restore-keys: |
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-pip-${{ env.PIP_CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-
+      - name: Install additional OS dependencies
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install \
+            bluez \
+            ffmpeg \
+            libavcodec-dev \
+            libavdevice-dev \
+            libavfilter-dev \
+            libavformat-dev \
+            libavutil-dev \
+            libswresample-dev \
+            libswscale-dev \
+            libudev-dev
+      - name: Create Python virtual environment
+        if: steps.cache-venv.outputs.cache-hit != 'true'
+        run: |
+          python -m venv venv
+          . venv/bin/activate
+          python --version
+          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<22.3" setuptools wheel
+          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt --use-deprecated=legacy-resolver
+          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt --use-deprecated=legacy-resolver
+          pip install -e .
+
+  hassfest:
+    name: Check hassfest
+    runs-on: ubuntu-20.04
+    needs:
+      - info
+      - base
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.0.2
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
+        id: cache-venv
+        uses: actions/cache@v3.0.8
+        with:
+          path: venv
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -520,23 +556,26 @@ jobs:
 
   gen-requirements-all:
     name: Check all requirements
-    runs-on: ubuntu-latest
-    needs: prepare-base
+    runs-on: ubuntu-20.04
+    needs:
+      - info
+      - base
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
         id: python
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.prepare-base.outputs.python-key }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -547,94 +586,29 @@ jobs:
           . venv/bin/activate
           python -m script.gen_requirements_all validate
 
-  prepare-tests:
-    name: Prepare tests for Python ${{ matrix.python-version }}
-    runs-on: ubuntu-latest
-    timeout-minutes: 60
-    strategy:
-      matrix:
-        python-version: ["3.9", "3.10"]
-    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@v3.0.2
-      - 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: Generate partial pip restore key
-        id: generate-pip-key
-        run: >-
-          echo "::set-output name=key::pip-${{ env.PIP_CACHE_VERSION }}-${{
-            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')"
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
-        id: cache-venv
-        uses: actions/cache@v3.0.4
-        with:
-          path: venv
-          key: >-
-            ${{ runner.os }}-${{ matrix.python-version }}-${{
-            steps.generate-python-key.outputs.key }}
-          # Temporary disabling the restore of environments when bumping
-          # a dependency. It seems that we are experiencing issues with
-          # restoring environments in GitHub Actions, although unclear why.
-          # First attempt: https://github.com/home-assistant/core/pull/62383
-          #
-          # restore-keys: |
-          #   ${{ 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: Restore pip wheel cache
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v3.0.4
-        with:
-          path: ${{ env.PIP_CACHE }}
-          key: >-
-            ${{ runner.os }}-${{ matrix.python-version }}-${{
-            steps.generate-pip-key.outputs.key }}
-          restore-keys: |
-            ${{ runner.os }}-${{ matrix.python-version }}-pip-${{ env.PIP_CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-
-      - name: Create full Python ${{ matrix.python-version }} virtual environment
-        if: steps.cache-venv.outputs.cache-hit != 'true'
-        run: |
-          # Temporary addition of cmake, needed to build some Python 3.9 packages
-          apt-get update
-          apt-get -y install cmake
-
-          python -m venv venv
-          . venv/bin/activate
-          python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<22.2" setuptools wheel
-          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt --use-deprecated=legacy-resolver
-          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt --use-deprecated=legacy-resolver
-          pip install -e .
-
   pylint:
     name: Check pylint
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     timeout-minutes: 20
     needs:
-      - changes
-      - prepare-tests
-    strategy:
-      matrix:
-        python-version: [3.9]
-    container: homeassistant/ci-azure:${{ matrix.python-version }}
+      - info
+      - base
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
-            needs.prepare-tests.outputs.python-key }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -644,39 +618,41 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pylint.json"
       - name: Run pylint (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           python --version
-          pylint homeassistant
+          pylint --ignore-missing-annotations=y homeassistant
       - name: Run pylint (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           python --version
-          pylint homeassistant/components/${{ needs.changes.outputs.integrations_glob }}
+          pylint --ignore-missing-annotations=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
   mypy:
     name: Check mypy
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
-      - changes
-      - prepare-tests
-    strategy:
-      matrix:
-        python-version: [3.9]
-    container: homeassistant/ci-azure:${{ matrix.python-version }}
+      - info
+      - base
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
-            needs.prepare-tests.outputs.python-key }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -686,41 +662,45 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/mypy.json"
       - name: Run mypy (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         run: |
           . venv/bin/activate
           python --version
           mypy homeassistant pylint
       - name: Run mypy (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           python --version
-          mypy homeassistant/components/${{ needs.changes.outputs.integrations_glob }}
+          mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
   pip-check:
-    runs-on: ubuntu-latest
-    if: needs.changes.outputs.requirements == 'true' || github.event.inputs.full == 'true'
+    runs-on: ubuntu-20.04
     needs:
-      - changes
-      - prepare-tests
+      - info
+      - base
     strategy:
       fail-fast: false
       matrix:
-        python-version: [3.9]
+        python-version: ["3.9", "3.10"]
     name: Run pip check ${{ matrix.python-version }}
-    container: homeassistant/ci-azure:${{ matrix.python-version }}
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
-            needs.prepare-tests.outputs.python-key }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -732,38 +712,48 @@ jobs:
           ./script/pip_check $PIP_CACHE
 
   pytest:
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
-      && (needs.changes.outputs.test_full_suite == 'true' || needs.changes.outputs.tests_glob)
+      && (needs.info.outputs.test_full_suite == 'true' || needs.info.outputs.tests_glob)
     needs:
-      - changes
+      - info
+      - base
       - gen-requirements-all
       - hassfest
       - lint-black
       - lint-other
       - lint-isort
       - mypy
-      - prepare-tests
     strategy:
       fail-fast: false
       matrix:
-        group: ${{ fromJson(needs.changes.outputs.test_groups) }}
+        group: ${{ fromJson(needs.info.outputs.test_groups) }}
         python-version: ["3.9", "3.10"]
     name: >-
       Run tests Python ${{ matrix.python-version }} (${{ matrix.group }})
-    container: homeassistant/ci-azure:${{ matrix.python-version }}
     steps:
+      - name: Install additional OS dependencies
+        run: |
+          sudo apt-get update
+          sudo apt-get -y install \
+            bluez \
+            ffmpeg
       - name: Check out code from GitHub
         uses: actions/checkout@v3.0.2
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v4.1.0
+        with:
+          python-version: ${{ matrix.python-version }}
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache@v3.0.4
+        uses: actions/cache@v3.0.8
         with:
           path: venv
-          key: ${{ runner.os }}-${{ matrix.python-version }}-${{
-            needs.prepare-tests.outputs.python-key }}
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
       - name: Fail job if Python cache restore failed
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
@@ -783,7 +773,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Run pytest (fully)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         timeout-minutes: 60
         run: |
           . venv/bin/activate
@@ -794,7 +784,7 @@ jobs:
             --durations=10 \
             -n auto \
             --dist=loadfile \
-            --test-group-count ${{ needs.changes.outputs.test_group_count }} \
+            --test-group-count ${{ needs.info.outputs.test_group_count }} \
             --test-group=${{ matrix.group }} \
             --cov="homeassistant" \
             --cov-report=xml \
@@ -802,8 +792,8 @@ jobs:
             -p no:sugar \
             tests
       - name: Run pytest (partially)
-        if: needs.changes.outputs.test_full_suite == 'false'
-        timeout-minutes: 20
+        if: needs.info.outputs.test_full_suite == 'false'
+        timeout-minutes: 10
         shell: bash
         run: |
           . venv/bin/activate
@@ -838,9 +828,9 @@ jobs:
 
   coverage:
     name: Upload test coverage to Codecov
-    runs-on: ubuntu-latest
+    runs-on: ubuntu-20.04
     needs:
-      - changes
+      - info
       - pytest
     steps:
       - name: Check out code from GitHub
@@ -848,10 +838,10 @@ jobs:
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v3
       - name: Upload coverage to Codecov (full coverage)
-        if: needs.changes.outputs.test_full_suite == 'true'
+        if: needs.info.outputs.test_full_suite == 'true'
         uses: codecov/codecov-action@v3.1.0
         with:
           flags: full-suite
       - name: Upload coverage to Codecov (partial coverage)
-        if: needs.changes.outputs.test_full_suite == 'false'
+        if: needs.info.outputs.test_full_suite == 'false'
         uses: codecov/codecov-action@v3.1.0

.github/workflows/translations.yaml

@@ -24,7 +24,7 @@ jobs:
         uses: actions/checkout@v3.0.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -43,7 +43,7 @@ jobs:
         uses: actions/checkout@v3.0.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.0.0
+        uses: actions/setup-python@v4.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -157,6 +157,9 @@ jobs:
             echo "cmake==3.22.2"
           ) >> homeassistant/package_constraints.txt
 
+          # Do not pin numpy in wheels building
+          sed -i "/numpy/d" homeassistant/package_constraints.txt
+
       - name: Build wheels
         uses: home-assistant/wheels@2022.06.7
         with:

.ignore

@@ -1,6 +0,0 @@
-# Patterns matched in this file will be ignored by supported search utilities
-
-# Ignore generated html and javascript files
-/homeassistant/components/frontend/www_static/*.html
-/homeassistant/components/frontend/www_static/*.js
-/homeassistant/components/frontend/www_static/panels/*.html

.pre-commit-config.yaml

@@ -1,11 +1,11 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.34.0
+    rev: v2.37.3
     hooks:
       - id: pyupgrade
         args: [--py39-plus]
   - repo: https://github.com/psf/black
-    rev: 22.3.0
+    rev: 22.6.0
     hooks:
       - id: black
         args:
@@ -21,7 +21,7 @@ repos:
           - --skip="./.*,*.csv,*.json"
           - --quiet-level=2
         exclude_types: [csv, json]
-        exclude: ^tests/fixtures/
+        exclude: ^tests/fixtures/|homeassistant/generated/
   - repo: https://github.com/PyCQA/flake8
     rev: 4.0.1
     hooks:
@@ -31,8 +31,8 @@ repos:
           - pyflakes==2.4.0
           - flake8-docstrings==1.6.0
           - pydocstyle==6.1.1
-          - flake8-comprehensions==3.8.0
-          - flake8-noqa==1.2.1
+          - flake8-comprehensions==3.10.0
+          - flake8-noqa==1.2.8
           - mccabe==0.6.1
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/bandit
@@ -61,7 +61,7 @@ repos:
           - --branch=master
           - --branch=rc
   - repo: https://github.com/adrienverge/yamllint.git
-    rev: v1.26.3
+    rev: v1.27.1
     hooks:
       - id: yamllint
   - repo: https://github.com/pre-commit/mirrors-prettier
@@ -96,7 +96,7 @@ repos:
         files: ^(homeassistant|pylint)/.+\.py$
       - id: pylint
         name: pylint
-        entry: script/run-in-env.sh pylint -j 0
+        entry: script/run-in-env.sh pylint -j 0 --ignore-missing-annotations=y
         language: script
         types: [python]
         files: ^homeassistant/.+\.py$

.prettierignore

@@ -1,4 +1,5 @@
 *.md
+.strict-typing
 azure-*.yml
 docs/source/_templates/*
 homeassistant/components/*/translations/*.json

.strict-typing

@@ -15,12 +15,17 @@ homeassistant.auth.auth_store
 homeassistant.auth.providers.*
 homeassistant.helpers.area_registry
 homeassistant.helpers.condition
+homeassistant.helpers.debounce
+homeassistant.helpers.deprecation
 homeassistant.helpers.discovery
+homeassistant.helpers.dispatcher
 homeassistant.helpers.entity
+homeassistant.helpers.entity_platform
 homeassistant.helpers.entity_values
 homeassistant.helpers.event
 homeassistant.helpers.reload
 homeassistant.helpers.script_variables
+homeassistant.helpers.singleton
 homeassistant.helpers.sun
 homeassistant.helpers.translation
 homeassistant.util.async_
@@ -51,12 +56,16 @@ homeassistant.components.ambee.*
 homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
+homeassistant.components.anthemav.*
 homeassistant.components.aseko_pool_live.*
 homeassistant.components.asuswrt.*
+homeassistant.components.auth.*
 homeassistant.components.automation.*
+homeassistant.components.awair.*
 homeassistant.components.backup.*
 homeassistant.components.baf.*
 homeassistant.components.binary_sensor.*
+homeassistant.components.bluetooth.*
 homeassistant.components.bluetooth_tracker.*
 homeassistant.components.bmw_connected_drive.*
 homeassistant.components.bond.*
@@ -89,6 +98,8 @@ homeassistant.components.energy.*
 homeassistant.components.evil_genius_labs.*
 homeassistant.components.fan.*
 homeassistant.components.fastdotcom.*
+homeassistant.components.feedreader.*
+homeassistant.components.file_upload.*
 homeassistant.components.filesize.*
 homeassistant.components.fitbit.*
 homeassistant.components.flunearyou.*
@@ -99,6 +110,7 @@ homeassistant.components.fritzbox_callmonitor.*
 homeassistant.components.fronius.*
 homeassistant.components.frontend.*
 homeassistant.components.fritz.*
+homeassistant.components.fully_kiosk.*
 homeassistant.components.geo_location.*
 homeassistant.components.geocaching.*
 homeassistant.components.gios.*
@@ -109,6 +121,7 @@ homeassistant.components.group.*
 homeassistant.components.guardian.*
 homeassistant.components.history.*
 homeassistant.components.homeassistant.triggers.event
+homeassistant.components.homeassistant_alerts.*
 homeassistant.components.homekit
 homeassistant.components.homekit.accessories
 homeassistant.components.homekit.aidmanager
@@ -121,6 +134,7 @@ homeassistant.components.homekit.util
 homeassistant.components.homekit_controller
 homeassistant.components.homekit_controller.alarm_control_panel
 homeassistant.components.homekit_controller.button
+homeassistant.components.homekit_controller.config_flow
 homeassistant.components.homekit_controller.const
 homeassistant.components.homekit_controller.lock
 homeassistant.components.homekit_controller.select
@@ -141,10 +155,13 @@ homeassistant.components.jewish_calendar.*
 homeassistant.components.kaleidescape.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
+homeassistant.components.lacrosse_view.*
 homeassistant.components.lametric.*
 homeassistant.components.laundrify.*
 homeassistant.components.lcn.*
 homeassistant.components.light.*
+homeassistant.components.lifx.*
+homeassistant.components.litterrobot.*
 homeassistant.components.local_ip.*
 homeassistant.components.lock.*
 homeassistant.components.logbook.*
@@ -153,6 +170,8 @@ homeassistant.components.luftdaten.*
 homeassistant.components.mailbox.*
 homeassistant.components.media_player.*
 homeassistant.components.media_source.*
+homeassistant.components.metoffice.*
+homeassistant.components.mikrotik.*
 homeassistant.components.mjpeg.*
 homeassistant.components.modbus.*
 homeassistant.components.modem_callerid.*
@@ -174,6 +193,7 @@ homeassistant.components.nut.*
 homeassistant.components.oncue.*
 homeassistant.components.onewire.*
 homeassistant.components.open_meteo.*
+homeassistant.components.openexchangerates.*
 homeassistant.components.openuv.*
 homeassistant.components.peco.*
 homeassistant.components.overkiz.*
@@ -181,6 +201,7 @@ homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
 homeassistant.components.powerwall.*
 homeassistant.components.proximity.*
+homeassistant.components.prusalink.*
 homeassistant.components.pvoutput.*
 homeassistant.components.pure_energie.*
 homeassistant.components.qnap_qsw.*
@@ -190,6 +211,8 @@ homeassistant.components.recollect_waste.*
 homeassistant.components.recorder.*
 homeassistant.components.remote.*
 homeassistant.components.renault.*
+homeassistant.components.repairs.*
+homeassistant.components.rhasspy.*
 homeassistant.components.ridwell.*
 homeassistant.components.rituals_perfume_genie.*
 homeassistant.components.roku.*
@@ -197,6 +220,7 @@ homeassistant.components.rpi_power.*
 homeassistant.components.rtsp_to_webrtc.*
 homeassistant.components.samsungtv.*
 homeassistant.components.scene.*
+homeassistant.components.schedule.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensor.*

.vscode/launch.json

@@ -12,6 +12,14 @@
       "justMyCode": false,
       "args": ["--debug", "-c", "config"]
     },
+    {
+      "name": "Home Assistant (skip pip)",
+      "type": "python",
+      "request": "launch",
+      "module": "homeassistant",
+      "justMyCode": false,
+      "args": ["--debug", "-c", "config", "--skip-pip"]
+    },
     {
       // Debug by attaching to local Home Asistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/

CODEOWNERS

@@ -72,8 +72,12 @@ build.json @home-assistant/supervisor
 /homeassistant/components/amcrest/ @flacjacket
 /homeassistant/components/analytics/ @home-assistant/core @ludeeus
 /tests/components/analytics/ @home-assistant/core @ludeeus
+/homeassistant/components/android_ip_webcam/ @engrbm87
+/tests/components/android_ip_webcam/ @engrbm87
 /homeassistant/components/androidtv/ @JeffLIrion @ollo69
 /tests/components/androidtv/ @JeffLIrion @ollo69
+/homeassistant/components/anthemav/ @hyralex
+/tests/components/anthemav/ @hyralex
 /homeassistant/components/apache_kafka/ @bachya
 /tests/components/apache_kafka/ @bachya
 /homeassistant/components/api/ @home-assistant/core
@@ -129,13 +133,17 @@ build.json @home-assistant/supervisor
 /homeassistant/components/binary_sensor/ @home-assistant/core
 /tests/components/binary_sensor/ @home-assistant/core
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
-/homeassistant/components/blebox/ @bbx-a @bbx-jp @riokuu
-/tests/components/blebox/ @bbx-a @bbx-jp @riokuu
+/homeassistant/components/blebox/ @bbx-a @riokuu
+/tests/components/blebox/ @bbx-a @riokuu
 /homeassistant/components/blink/ @fronzbot
 /tests/components/blink/ @fronzbot
+/homeassistant/components/bluemaestro/ @bdraco
+/tests/components/bluemaestro/ @bdraco
 /homeassistant/components/blueprint/ @home-assistant/core
 /tests/components/blueprint/ @home-assistant/core
 /homeassistant/components/bluesound/ @thrawnarn
+/homeassistant/components/bluetooth/ @bdraco
+/tests/components/bluetooth/ @bdraco
 /homeassistant/components/bmw_connected_drive/ @gerard33 @rikroe
 /tests/components/bmw_connected_drive/ @gerard33 @rikroe
 /homeassistant/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
@@ -153,6 +161,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/bsblan/ @liudger
 /tests/components/bsblan/ @liudger
 /homeassistant/components/bt_smarthub/ @jxwolstenholme
+/homeassistant/components/bthome/ @Ernst79
+/tests/components/bthome/ @Ernst79
 /homeassistant/components/buienradar/ @mjj4791 @ties @Robbie1221
 /tests/components/buienradar/ @mjj4791 @ties @Robbie1221
 /homeassistant/components/button/ @home-assistant/core
@@ -267,7 +277,9 @@ build.json @home-assistant/supervisor
 /tests/components/ecobee/ @marthoc
 /homeassistant/components/econet/ @vangorra @w1ll1am23
 /tests/components/econet/ @vangorra @w1ll1am23
-/homeassistant/components/ecovacs/ @OverloadUT
+/homeassistant/components/ecovacs/ @OverloadUT @mib1185
+/homeassistant/components/ecowitt/ @pvizeli
+/tests/components/ecowitt/ @pvizeli
 /homeassistant/components/edl21/ @mtdcr
 /homeassistant/components/efergy/ @tkdrob
 /tests/components/efergy/ @tkdrob
@@ -305,6 +317,8 @@ build.json @home-assistant/supervisor
 /tests/components/epson/ @pszafer
 /homeassistant/components/epsonworkforce/ @ThaStealth
 /homeassistant/components/eq3btsmart/ @rytilahti
+/homeassistant/components/escea/ @lazdavila
+/tests/components/escea/ @lazdavila
 /homeassistant/components/esphome/ @OttoWinter @jesserockz
 /tests/components/esphome/ @OttoWinter @jesserockz
 /homeassistant/components/evil_genius_labs/ @balloob
@@ -321,6 +335,8 @@ build.json @home-assistant/supervisor
 /tests/components/fibaro/ @rappenze
 /homeassistant/components/file/ @fabaff
 /tests/components/file/ @fabaff
+/homeassistant/components/file_upload/ @home-assistant/core
+/tests/components/file_upload/ @home-assistant/core
 /homeassistant/components/filesize/ @gjohansson-ST
 /tests/components/filesize/ @gjohansson-ST
 /homeassistant/components/filter/ @dgomes
@@ -339,8 +355,8 @@ build.json @home-assistant/supervisor
 /tests/components/flipr/ @cnico
 /homeassistant/components/flo/ @dmulcahey
 /tests/components/flo/ @dmulcahey
-/homeassistant/components/flume/ @ChrisMandich @bdraco
-/tests/components/flume/ @ChrisMandich @bdraco
+/homeassistant/components/flume/ @ChrisMandich @bdraco @jeeftor
+/tests/components/flume/ @ChrisMandich @bdraco @jeeftor
 /homeassistant/components/flunearyou/ @bachya
 /tests/components/flunearyou/ @bachya
 /homeassistant/components/flux_led/ @icemanch @bdraco
@@ -367,6 +383,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/frontend/ @home-assistant/frontend
 /tests/components/frontend/ @home-assistant/frontend
 /homeassistant/components/frontier_silicon/ @wlcrs
+/homeassistant/components/fully_kiosk/ @cgarwood
+/tests/components/fully_kiosk/ @cgarwood
 /homeassistant/components/garages_amsterdam/ @klaasnicolaas
 /tests/components/garages_amsterdam/ @klaasnicolaas
 /homeassistant/components/gdacs/ @exxamalte
@@ -407,6 +425,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/google_cloud/ @lufton
 /homeassistant/components/google_travel_time/ @eifinger
 /tests/components/google_travel_time/ @eifinger
+/homeassistant/components/govee_ble/ @bdraco
+/tests/components/govee_ble/ @bdraco
 /homeassistant/components/gpsd/ @fabaff
 /homeassistant/components/gree/ @cmroche
 /tests/components/gree/ @cmroche
@@ -428,6 +448,8 @@ build.json @home-assistant/supervisor
 /tests/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
 /homeassistant/components/hassio/ @home-assistant/supervisor
 /tests/components/hassio/ @home-assistant/supervisor
+/homeassistant/components/hdmi_cec/ @inytar
+/tests/components/hdmi_cec/ @inytar
 /homeassistant/components/heatmiser/ @andylockran
 /homeassistant/components/heos/ @andrewsayre
 /tests/components/heos/ @andrewsayre
@@ -449,6 +471,10 @@ build.json @home-assistant/supervisor
 /tests/components/home_plus_control/ @chemaaa
 /homeassistant/components/homeassistant/ @home-assistant/core
 /tests/components/homeassistant/ @home-assistant/core
+/homeassistant/components/homeassistant_alerts/ @home-assistant/core
+/tests/components/homeassistant_alerts/ @home-assistant/core
+/homeassistant/components/homeassistant_sky_connect/ @home-assistant/core
+/tests/components/homeassistant_sky_connect/ @home-assistant/core
 /homeassistant/components/homeassistant_yellow/ @home-assistant/core
 /tests/components/homeassistant_yellow/ @home-assistant/core
 /homeassistant/components/homekit/ @bdraco
@@ -494,6 +520,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
+/homeassistant/components/inkbird/ @bdraco
+/tests/components/inkbird/ @bdraco
 /homeassistant/components/input_boolean/ @home-assistant/core
 /tests/components/input_boolean/ @home-assistant/core
 /homeassistant/components/input_button/ @home-assistant/core
@@ -541,6 +569,8 @@ build.json @home-assistant/supervisor
 /tests/components/jewish_calendar/ @tsvi
 /homeassistant/components/juicenet/ @jesserockz
 /tests/components/juicenet/ @jesserockz
+/homeassistant/components/justnimbus/ @kvanzuijlen
+/tests/components/justnimbus/ @kvanzuijlen
 /homeassistant/components/kaiterra/ @Michsior14
 /homeassistant/components/kaleidescape/ @SteveEasley
 /tests/components/kaleidescape/ @SteveEasley
@@ -563,24 +593,32 @@ build.json @home-assistant/supervisor
 /tests/components/kraken/ @eifinger
 /homeassistant/components/kulersky/ @emlove
 /tests/components/kulersky/ @emlove
+/homeassistant/components/lacrosse_view/ @IceBotYT
+/tests/components/lacrosse_view/ @IceBotYT
 /homeassistant/components/lametric/ @robbiet480 @frenck
+/tests/components/lametric/ @robbiet480 @frenck
+/homeassistant/components/landisgyr_heat_meter/ @vpathuis
+/tests/components/landisgyr_heat_meter/ @vpathuis
 /homeassistant/components/launch_library/ @ludeeus @DurgNomis-drol
 /tests/components/launch_library/ @ludeeus @DurgNomis-drol
 /homeassistant/components/laundrify/ @xLarry
 /tests/components/laundrify/ @xLarry
 /homeassistant/components/lcn/ @alengwenus
 /tests/components/lcn/ @alengwenus
+/homeassistant/components/led_ble/ @bdraco
+/tests/components/led_ble/ @bdraco
 /homeassistant/components/lg_netcast/ @Drafteed
 /homeassistant/components/life360/ @pnbruckner
 /tests/components/life360/ @pnbruckner
-/homeassistant/components/lifx/ @Djelibeybi
+/homeassistant/components/lifx/ @bdraco @Djelibeybi
+/tests/components/lifx/ @bdraco @Djelibeybi
 /homeassistant/components/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linux_battery/ @fabaff
 /homeassistant/components/litejet/ @joncar
 /tests/components/litejet/ @joncar
-/homeassistant/components/litterrobot/ @natekspencer
-/tests/components/litterrobot/ @natekspencer
+/homeassistant/components/litterrobot/ @natekspencer @tkdrob
+/tests/components/litterrobot/ @natekspencer @tkdrob
 /homeassistant/components/local_ip/ @issacg
 /tests/components/local_ip/ @issacg
 /homeassistant/components/lock/ @home-assistant/core
@@ -600,8 +638,8 @@ build.json @home-assistant/supervisor
 /tests/components/luftdaten/ @fabaff @frenck
 /homeassistant/components/lupusec/ @majuss
 /homeassistant/components/lutron/ @JonGilmore
-/homeassistant/components/lutron_caseta/ @swails @bdraco
-/tests/components/lutron_caseta/ @swails @bdraco
+/homeassistant/components/lutron_caseta/ @swails @bdraco @danaues
+/tests/components/lutron_caseta/ @swails @bdraco @danaues
 /homeassistant/components/lyric/ @timmo001
 /tests/components/lyric/ @timmo001
 /homeassistant/components/mastodon/ @fabaff
@@ -619,6 +657,8 @@ build.json @home-assistant/supervisor
 /tests/components/melcloud/ @vilppuvuorinen
 /homeassistant/components/melissa/ @kennedyshead
 /tests/components/melissa/ @kennedyshead
+/homeassistant/components/melnor/ @vanstinator
+/tests/components/melnor/ @vanstinator
 /homeassistant/components/met/ @danielhiversen @thimic
 /tests/components/met/ @danielhiversen @thimic
 /homeassistant/components/met_eireann/ @DylanGore
@@ -628,8 +668,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/meteoalarm/ @rolfberkenbosch
 /homeassistant/components/meteoclimatic/ @adrianmo
 /tests/components/meteoclimatic/ @adrianmo
-/homeassistant/components/metoffice/ @MrHarcombe
-/tests/components/metoffice/ @MrHarcombe
+/homeassistant/components/metoffice/ @MrHarcombe @avee87
+/tests/components/metoffice/ @MrHarcombe @avee87
 /homeassistant/components/miflora/ @danielhiversen @basnijholt
 /homeassistant/components/mikrotik/ @engrbm87
 /tests/components/mikrotik/ @engrbm87
@@ -641,6 +681,8 @@ build.json @home-assistant/supervisor
 /tests/components/minecraft_server/ @elmurato
 /homeassistant/components/minio/ @tkislan
 /tests/components/minio/ @tkislan
+/homeassistant/components/moat/ @bdraco
+/tests/components/moat/ @bdraco
 /homeassistant/components/mobile_app/ @home-assistant/core
 /tests/components/mobile_app/ @home-assistant/core
 /homeassistant/components/modbus/ @adamchengtkc @janiversen @vzahradnik
@@ -696,6 +738,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/nextbus/ @vividboarder
 /tests/components/nextbus/ @vividboarder
 /homeassistant/components/nextcloud/ @meichthys
+/homeassistant/components/nextdns/ @bieniu
+/tests/components/nextdns/ @bieniu
 /homeassistant/components/nfandroidtv/ @tkdrob
 /tests/components/nfandroidtv/ @tkdrob
 /homeassistant/components/nightscout/ @marciogranzotto
@@ -749,6 +793,8 @@ build.json @home-assistant/supervisor
 /tests/components/open_meteo/ @frenck
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
+/homeassistant/components/openexchangerates/ @MartinHjelmare
+/tests/components/openexchangerates/ @MartinHjelmare
 /homeassistant/components/opengarage/ @danielhiversen
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
@@ -806,17 +852,23 @@ build.json @home-assistant/supervisor
 /homeassistant/components/prosegur/ @dgomes
 /tests/components/prosegur/ @dgomes
 /homeassistant/components/proxmoxve/ @jhollowe @Corbeno
+/homeassistant/components/prusalink/ @balloob
+/tests/components/prusalink/ @balloob
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pure_energie/ @klaasnicolaas
 /tests/components/pure_energie/ @klaasnicolaas
 /homeassistant/components/push/ @dgomes
 /tests/components/push/ @dgomes
+/homeassistant/components/pushover/ @engrbm87
+/tests/components/pushover/ @engrbm87
 /homeassistant/components/pvoutput/ @frenck
 /tests/components/pvoutput/ @frenck
 /homeassistant/components/pvpc_hourly_pricing/ @azogue
 /tests/components/pvpc_hourly_pricing/ @azogue
 /homeassistant/components/qbittorrent/ @geoffreylagaisse
+/homeassistant/components/qingping/ @bdraco
+/tests/components/qingping/ @bdraco
 /homeassistant/components/qld_bushfire/ @exxamalte
 /tests/components/qld_bushfire/ @exxamalte
 /homeassistant/components/qnap_qsw/ @Noltari
@@ -852,11 +904,15 @@ build.json @home-assistant/supervisor
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
+/homeassistant/components/repairs/ @home-assistant/core
+/tests/components/repairs/ @home-assistant/core
 /homeassistant/components/repetier/ @MTrab @ShadowBr0ther
 /homeassistant/components/rflink/ @javicalle
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
 /tests/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
+/homeassistant/components/rhasspy/ @balloob @synesthesiam
+/tests/components/rhasspy/ @balloob @synesthesiam
 /homeassistant/components/ridwell/ @bachya
 /tests/components/ridwell/ @bachya
 /homeassistant/components/ring/ @balloob
@@ -890,6 +946,8 @@ build.json @home-assistant/supervisor
 /tests/components/samsungtv/ @chemelli74 @epenet
 /homeassistant/components/scene/ @home-assistant/core
 /tests/components/scene/ @home-assistant/core
+/homeassistant/components/schedule/ @home-assistant/core
+/tests/components/schedule/ @home-assistant/core
 /homeassistant/components/schluter/ @prairieapps
 /homeassistant/components/scrape/ @fabaff
 /tests/components/scrape/ @fabaff
@@ -911,6 +969,10 @@ build.json @home-assistant/supervisor
 /tests/components/sensibo/ @andrey-git @gjohansson-ST
 /homeassistant/components/sensor/ @home-assistant/core
 /tests/components/sensor/ @home-assistant/core
+/homeassistant/components/sensorpro/ @bdraco
+/tests/components/sensorpro/ @bdraco
+/homeassistant/components/sensorpush/ @bdraco
+/tests/components/sensorpush/ @bdraco
 /homeassistant/components/sentry/ @dcramer @frenck
 /tests/components/sentry/ @dcramer @frenck
 /homeassistant/components/senz/ @milanmeu
@@ -977,6 +1039,8 @@ build.json @home-assistant/supervisor
 /tests/components/songpal/ @rytilahti @shenxn
 /homeassistant/components/sonos/ @cgtobi @jjlawren
 /tests/components/sonos/ @cgtobi @jjlawren
+/homeassistant/components/soundtouch/ @kroimon
+/tests/components/soundtouch/ @kroimon
 /homeassistant/components/spaceapi/ @fabaff
 /tests/components/spaceapi/ @fabaff
 /homeassistant/components/speedtestdotnet/ @rohankapoorcom @engrbm87
@@ -1021,11 +1085,11 @@ build.json @home-assistant/supervisor
 /tests/components/switch/ @home-assistant/core
 /homeassistant/components/switch_as_x/ @home-assistant/core
 /tests/components/switch_as_x/ @home-assistant/core
-/homeassistant/components/switchbot/ @danielhiversen @RenierM26
-/tests/components/switchbot/ @danielhiversen @RenierM26
+/homeassistant/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston
+/tests/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston
 /homeassistant/components/switcher_kis/ @tomerfi @thecode
 /tests/components/switcher_kis/ @tomerfi @thecode
-/homeassistant/components/switchmate/ @danielhiversen
+/homeassistant/components/switchmate/ @danielhiversen @qiz-li
 /homeassistant/components/syncthing/ @zhulik
 /tests/components/syncthing/ @zhulik
 /homeassistant/components/syncthru/ @nielstron
@@ -1055,6 +1119,10 @@ build.json @home-assistant/supervisor
 /homeassistant/components/tesla_wall_connector/ @einarhauks
 /tests/components/tesla_wall_connector/ @einarhauks
 /homeassistant/components/tfiac/ @fredrike @mellado
+/homeassistant/components/thermobeacon/ @bdraco
+/tests/components/thermobeacon/ @bdraco
+/homeassistant/components/thermopro/ @bdraco
+/tests/components/thermopro/ @bdraco
 /homeassistant/components/thethingsnetwork/ @fabaff
 /homeassistant/components/threshold/ @fabaff
 /tests/components/threshold/ @fabaff
@@ -1150,7 +1218,8 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
-/homeassistant/components/volvooncall/ @molobrakos @decompil3d
+/homeassistant/components/volvooncall/ @molobrakos
+/tests/components/volvooncall/ @molobrakos
 /homeassistant/components/vulcan/ @Antoni-Czaplicki
 /tests/components/vulcan/ @Antoni-Czaplicki
 /homeassistant/components/wake_on_lan/ @ntilley905
@@ -1203,12 +1272,16 @@ build.json @home-assistant/supervisor
 /homeassistant/components/xbox_live/ @MartinHjelmare
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
 /tests/components/xiaomi_aqara/ @danielhiversen @syssi
+/homeassistant/components/xiaomi_ble/ @Jc2k @Ernst79
+/tests/components/xiaomi_ble/ @Jc2k @Ernst79
 /homeassistant/components/xiaomi_miio/ @rytilahti @syssi @starkillerOG @bieniu
 /tests/components/xiaomi_miio/ @rytilahti @syssi @starkillerOG @bieniu
 /homeassistant/components/xiaomi_tv/ @simse
 /homeassistant/components/xmpp/ @fabaff @flowolf
 /homeassistant/components/yale_smart_alarm/ @gjohansson-ST
 /tests/components/yale_smart_alarm/ @gjohansson-ST
+/homeassistant/components/yalexs_ble/ @bdraco
+/tests/components/yalexs_ble/ @bdraco
 /homeassistant/components/yamaha_musiccast/ @vigonotion @micha91
 /tests/components/yamaha_musiccast/ @vigonotion @micha91
 /homeassistant/components/yandex_transport/ @rishatik92 @devbis
@@ -1226,8 +1299,8 @@ build.json @home-assistant/supervisor
 /tests/components/zeroconf/ @bdraco
 /homeassistant/components/zerproc/ @emlove
 /tests/components/zerproc/ @emlove
-/homeassistant/components/zha/ @dmulcahey @adminiuga
-/tests/components/zha/ @dmulcahey @adminiuga
+/homeassistant/components/zha/ @dmulcahey @adminiuga @puddly
+/tests/components/zha/ @dmulcahey @adminiuga @puddly
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core

Dockerfile

@@ -13,9 +13,12 @@ COPY homeassistant/package_constraints.txt homeassistant/homeassistant/
 RUN \
     pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
     -r homeassistant/requirements.txt --use-deprecated=legacy-resolver
-COPY requirements_all.txt homeassistant/
+COPY requirements_all.txt home_assistant_frontend-* homeassistant/
 RUN \
-    pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
+    if ls homeassistant/home_assistant_frontend*.whl 1> /dev/null 2>&1; then \
+        pip3 install --no-cache-dir --no-index homeassistant/home_assistant_frontend-*.whl; \
+    fi \
+    && pip3 install --no-cache-dir --no-index --only-binary=:all: --find-links "${WHEELS_LINKS}" \
     -r homeassistant/requirements_all.txt --use-deprecated=legacy-resolver
 
 ## Setup Home Assistant Core

README.rst

@@ -12,7 +12,7 @@ demo <https://home-assistant.io/demo/>`__, `installation instructions <https://h
 Featured integrations
 ---------------------
 
-|screenshot-components|
+|screenshot-integrations|
 
 The system is built using a modular approach so support for other devices or actions can be implemented easily. See also the `section on architecture <https://developers.home-assistant.io/docs/architecture_index/>`__ and the `section on creating your own
 components <https://developers.home-assistant.io/docs/creating_component_index/>`__.
@@ -24,5 +24,5 @@ of a component, check the `Home Assistant help section <https://home-assistant.i
    :target: https://discord.gg/c5DvZ4e
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/master/docs/screenshots.png
    :target: https://home-assistant.io/demo/
-.. |screenshot-components| image:: https://raw.githubusercontent.com/home-assistant/core/dev/docs/screenshot-components.png
+.. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/docs/screenshot-integrations.png
    :target: https://home-assistant.io/integrations/

build.yaml

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

homeassistant/auth/auth_store.py

@@ -46,7 +46,7 @@ class AuthStore:
         self._users: dict[str, models.User] | None = None
         self._groups: dict[str, models.Group] | None = None
         self._perm_lookup: PermissionLookup | None = None
-        self._store = Store(
+        self._store = Store[dict[str, list[dict[str, Any]]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
         self._lock = asyncio.Lock()
@@ -483,9 +483,10 @@ 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"),
             )
+            if "credential_id" in rt_dict:
+                token.credential = credentials.get(rt_dict["credential_id"])
             users[rt_dict["user_id"]].refresh_tokens[token.id] = token
 
         self._groups = groups

homeassistant/auth/mfa_modules/notify.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 import asyncio
 from collections import OrderedDict
 import logging
-from typing import Any
+from typing import Any, cast
 
 import attr
 import voluptuous as vol
@@ -100,7 +100,7 @@ class NotifyAuthModule(MultiFactorAuthModule):
         """Initialize the user data store."""
         super().__init__(hass, config)
         self._user_settings: _UsersDict | None = None
-        self._user_store = Store(
+        self._user_store = Store[dict[str, dict[str, Any]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
         self._include = config.get(CONF_INCLUDE, [])
@@ -119,10 +119,8 @@ class NotifyAuthModule(MultiFactorAuthModule):
             if self._user_settings is not None:
                 return
 
-            if (data := await self._user_store.async_load()) is None or not isinstance(
-                data, dict
-            ):
-                data = {STORAGE_USERS: {}}
+            if (data := await self._user_store.async_load()) is None:
+                data = cast(dict[str, dict[str, Any]], {STORAGE_USERS: {}})
 
             self._user_settings = {
                 user_id: NotifySetting(**setting)
@@ -322,6 +320,7 @@ class NotifySetupFlow(SetupFlow):
         errors: dict[str, str] = {}
 
         hass = self._auth_module.hass
+        assert self._secret and self._count
         if user_input:
             verified = await hass.async_add_executor_job(
                 _verify_otp, self._secret, user_input["code"], self._count
@@ -336,7 +335,6 @@ class NotifySetupFlow(SetupFlow):
             errors["base"] = "invalid_code"
 
         # generate code every time, no retry logic
-        assert self._secret and self._count
         code = await hass.async_add_executor_job(
             _generate_otp, self._secret, self._count
         )

homeassistant/auth/mfa_modules/totp.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 import asyncio
 from io import BytesIO
-from typing import Any
+from typing import Any, cast
 
 import voluptuous as vol
 
@@ -77,7 +77,7 @@ class TotpAuthModule(MultiFactorAuthModule):
         """Initialize the user data store."""
         super().__init__(hass, config)
         self._users: dict[str, str] | None = None
-        self._user_store = Store(
+        self._user_store = Store[dict[str, dict[str, str]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
         self._init_lock = asyncio.Lock()
@@ -93,16 +93,14 @@ class TotpAuthModule(MultiFactorAuthModule):
             if self._users is not None:
                 return
 
-            if (data := await self._user_store.async_load()) is None or not isinstance(
-                data, dict
-            ):
-                data = {STORAGE_USERS: {}}
+            if (data := await self._user_store.async_load()) is None:
+                data = cast(dict[str, dict[str, str]], {STORAGE_USERS: {}})
 
             self._users = data.get(STORAGE_USERS, {})
 
     async def _async_save(self) -> None:
         """Save data."""
-        await self._user_store.async_save({STORAGE_USERS: self._users})
+        await self._user_store.async_save({STORAGE_USERS: self._users or {}})
 
     def _add_ota_secret(self, user_id: str, secret: str | None = None) -> str:
         """Create a ota_secret for user."""

homeassistant/auth/providers/homeassistant.py

@@ -61,10 +61,10 @@ class Data:
     def __init__(self, hass: HomeAssistant) -> None:
         """Initialize the user data store."""
         self.hass = hass
-        self._store = Store(
+        self._store = Store[dict[str, list[dict[str, str]]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
-        self._data: dict[str, Any] | None = None
+        self._data: dict[str, list[dict[str, str]]] | 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.
@@ -80,10 +80,8 @@ class Data:
 
     async def async_load(self) -> None:
         """Load stored data."""
-        if (data := await self._store.async_load()) is None or not isinstance(
-            data, dict
-        ):
-            data = {"users": []}
+        if (data := await self._store.async_load()) is None:
+            data = cast(dict[str, list[dict[str, str]]], {"users": []})
 
         seen: set[str] = set()
 
@@ -123,7 +121,8 @@ class Data:
     @property
     def users(self) -> list[dict[str, str]]:
         """Return users."""
-        return self._data["users"]  # type: ignore[index,no-any-return]
+        assert self._data is not None
+        return self._data["users"]
 
     def validate_login(self, username: str, password: str) -> None:
         """Validate a username and password.

homeassistant/backports/enum.py

@@ -4,15 +4,15 @@ from __future__ import annotations
 from enum import Enum
 from typing import Any, TypeVar
 
-_StrEnumT = TypeVar("_StrEnumT", bound="StrEnum")
+_StrEnumSelfT = TypeVar("_StrEnumSelfT", bound="StrEnum")
 
 
 class StrEnum(str, Enum):
     """Partial backport of Python 3.11's StrEnum for our basic use cases."""
 
     def __new__(
-        cls: type[_StrEnumT], value: str, *args: Any, **kwargs: Any
-    ) -> _StrEnumT:
+        cls: type[_StrEnumSelfT], value: str, *args: Any, **kwargs: Any
+    ) -> _StrEnumSelfT:
         """Create a new StrEnum instance."""
         if not isinstance(value, str):
             raise TypeError(f"{value!r} is not a string")

homeassistant/bootstrap.py

@@ -24,7 +24,13 @@ from .const import (
     SIGNAL_BOOTSTRAP_INTEGRATONS,
 )
 from .exceptions import HomeAssistantError
-from .helpers import area_registry, device_registry, entity_registry
+from .helpers import (
+    area_registry,
+    device_registry,
+    entity_registry,
+    issue_registry,
+    recorder,
+)
 from .helpers.dispatcher import async_dispatcher_send
 from .helpers.typing import ConfigType
 from .setup import (
@@ -35,7 +41,6 @@ from .setup import (
     async_setup_component,
 )
 from .util import dt as dt_util
-from .util.async_ import gather_with_concurrency
 from .util.logging import async_activate_log_queue_handler
 from .util.package import async_get_user_site, is_virtual_env
 
@@ -67,10 +72,19 @@ LOGGING_INTEGRATIONS = {
     # Error logging
     "system_log",
     "sentry",
+}
+FRONTEND_INTEGRATIONS = {
+    # Get the frontend up and running as soon as possible so problem
+    # integrations can be removed and database migration status is
+    # visible in frontend
+    "frontend",
+}
+RECORDER_INTEGRATIONS = {
+    # Setup after frontend
     # To record data
     "recorder",
 }
-DISCOVERY_INTEGRATIONS = ("dhcp", "ssdp", "usb", "zeroconf")
+DISCOVERY_INTEGRATIONS = ("bluetooth", "dhcp", "ssdp", "usb", "zeroconf")
 STAGE_1_INTEGRATIONS = {
     # We need to make sure discovery integrations
     # update their deps before stage 2 integrations
@@ -84,10 +98,6 @@ STAGE_1_INTEGRATIONS = {
     "cloud",
     # Ensure supervisor is available
     "hassio",
-    # Get the frontend up and running as soon
-    # as possible so problem integrations can
-    # be removed
-    "frontend",
 }
 
 
@@ -285,7 +295,9 @@ def async_enable_logging(
 
     This method must be run in the event loop.
     """
-    fmt = "%(asctime)s %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
+    fmt = (
+        "%(asctime)s.%(msecs)03d %(levelname)s (%(threadName)s) [%(name)s] %(message)s"
+    )
     datefmt = "%Y-%m-%d %H:%M:%S"
 
     if not log_no_color:
@@ -477,14 +489,9 @@ async def _async_set_up_integrations(
 
         integrations_to_process = [
             int_or_exc
-            for int_or_exc in await gather_with_concurrency(
-                loader.MAX_LOAD_CONCURRENTLY,
-                *(
-                    loader.async_get_integration(hass, domain)
-                    for domain in old_to_resolve
-                ),
-                return_exceptions=True,
-            )
+            for int_or_exc in (
+                await loader.async_get_integrations(hass, old_to_resolve)
+            ).values()
             if isinstance(int_or_exc, loader.Integration)
         ]
         resolve_dependencies_tasks = [
@@ -508,11 +515,44 @@ async def _async_set_up_integrations(
 
     _LOGGER.info("Domains to be set up: %s", domains_to_setup)
 
+    def _cache_uname_processor() -> None:
+        """Cache the result of platform.uname().processor in the executor.
+
+        Multiple modules call this function at startup which
+        executes a blocking subprocess call. This is a problem for the
+        asyncio event loop. By primeing the cache of uname we can
+        avoid the blocking call in the event loop.
+        """
+        platform.uname().processor  # pylint: disable=expression-not-assigned
+
+    # Load the registries and cache the result of platform.uname().processor
+    await asyncio.gather(
+        area_registry.async_load(hass),
+        device_registry.async_load(hass),
+        entity_registry.async_load(hass),
+        issue_registry.async_load(hass),
+        hass.async_add_executor_job(_cache_uname_processor),
+    )
+
+    # Initialize recorder
+    if "recorder" in domains_to_setup:
+        recorder.async_initialize_recorder(hass)
+
     # Load logging as soon as possible
     if logging_domains := domains_to_setup & LOGGING_INTEGRATIONS:
         _LOGGER.info("Setting up logging: %s", logging_domains)
         await async_setup_multi_components(hass, logging_domains, config)
 
+    # Setup frontend
+    if frontend_domains := domains_to_setup & FRONTEND_INTEGRATIONS:
+        _LOGGER.info("Setting up frontend: %s", frontend_domains)
+        await async_setup_multi_components(hass, frontend_domains, config)
+
+    # Setup recorder
+    if recorder_domains := domains_to_setup & RECORDER_INTEGRATIONS:
+        _LOGGER.info("Setting up recorder: %s", recorder_domains)
+        await async_setup_multi_components(hass, recorder_domains, config)
+
     # Start up debuggers. Start these first in case they want to wait.
     if debuggers := domains_to_setup & DEBUGGER_INTEGRATIONS:
         _LOGGER.debug("Setting up debuggers: %s", debuggers)
@@ -522,7 +562,8 @@ async def _async_set_up_integrations(
     stage_1_domains: set[str] = set()
 
     # Find all dependencies of any dependency of any stage 1 integration that
-    # we plan on loading and promote them to stage 1
+    # we plan on loading and promote them to stage 1. This is done only to not
+    # get misleading log messages
     deps_promotion: set[str] = STAGE_1_INTEGRATIONS
     while deps_promotion:
         old_deps_promotion = deps_promotion
@@ -539,24 +580,13 @@ async def _async_set_up_integrations(
 
             deps_promotion.update(dep_itg.all_dependencies)
 
-    stage_2_domains = domains_to_setup - logging_domains - debuggers - stage_1_domains
-
-    def _cache_uname_processor() -> None:
-        """Cache the result of platform.uname().processor in the executor.
-
-        Multiple modules call this function at startup which
-        executes a blocking subprocess call. This is a problem for the
-        asyncio event loop. By primeing the cache of uname we can
-        avoid the blocking call in the event loop.
-        """
-        platform.uname().processor  # pylint: disable=expression-not-assigned
-
-    # Load the registries
-    await asyncio.gather(
-        device_registry.async_load(hass),
-        entity_registry.async_load(hass),
-        area_registry.async_load(hass),
-        hass.async_add_executor_job(_cache_uname_processor),
+    stage_2_domains = (
+        domains_to_setup
+        - logging_domains
+        - frontend_domains
+        - recorder_domains
+        - debuggers
+        - stage_1_domains
     )
 
     # Start setup

homeassistant/components/abode/__init__.py

@@ -103,7 +103,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     hass.data[DOMAIN] = AbodeSystem(abode, polling)
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     await setup_hass_events(hass)
     await hass.async_add_executor_job(setup_hass_services, hass)
@@ -248,6 +248,7 @@ class AbodeEntity(entity.Entity):
     """Representation of an Abode entity."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
 
     def __init__(self, data: AbodeSystem) -> None:
         """Initialize Abode entity."""
@@ -283,7 +284,6 @@ class AbodeDevice(AbodeEntity):
         """Initialize Abode device."""
         super().__init__(data)
         self._device = device
-        self._attr_name = device.name
         self._attr_unique_id = device.device_uuid
 
     async def async_added_to_hass(self) -> None:

homeassistant/components/abode/binary_sensor.py

@@ -30,12 +30,10 @@ async def async_setup_entry(
         CONST.TYPE_OPENING,
     ]
 
-    entities = []
-
-    for device in data.abode.get_devices(generic_type=device_types):
-        entities.append(AbodeBinarySensor(data, device))
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeBinarySensor(data, device)
+        for device in data.abode.get_devices(generic_type=device_types)
+    )
 
 
 class AbodeBinarySensor(AbodeDevice, BinarySensorEntity):

homeassistant/components/abode/camera.py

@@ -28,12 +28,11 @@ async def async_setup_entry(
 ) -> None:
     """Set up Abode camera devices."""
     data: AbodeSystem = hass.data[DOMAIN]
-    entities = []
 
-    for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA):
-        entities.append(AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE))
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE)
+        for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA)
+    )
 
 
 class AbodeCamera(AbodeDevice, Camera):
@@ -75,7 +74,9 @@ class AbodeCamera(AbodeDevice, Camera):
         """Attempt to download the most recent capture."""
         if self._device.image_url:
             try:
-                self._response = requests.get(self._device.image_url, stream=True)
+                self._response = requests.get(
+                    self._device.image_url, stream=True, timeout=10
+                )
 
                 self._response.raise_for_status()
             except requests.HTTPError as err:

homeassistant/components/abode/cover.py

@@ -19,12 +19,10 @@ async def async_setup_entry(
     """Set up Abode cover devices."""
     data: AbodeSystem = hass.data[DOMAIN]
 
-    entities = []
-
-    for device in data.abode.get_devices(generic_type=CONST.TYPE_COVER):
-        entities.append(AbodeCover(data, device))
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeCover(data, device)
+        for device in data.abode.get_devices(generic_type=CONST.TYPE_COVER)
+    )
 
 
 class AbodeCover(AbodeDevice, CoverEntity):

homeassistant/components/abode/light.py

@@ -32,12 +32,10 @@ async def async_setup_entry(
     """Set up Abode light devices."""
     data: AbodeSystem = hass.data[DOMAIN]
 
-    entities = []
-
-    for device in data.abode.get_devices(generic_type=CONST.TYPE_LIGHT):
-        entities.append(AbodeLight(data, device))
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeLight(data, device)
+        for device in data.abode.get_devices(generic_type=CONST.TYPE_LIGHT)
+    )
 
 
 class AbodeLight(AbodeDevice, LightEntity):

homeassistant/components/abode/lock.py

@@ -19,12 +19,10 @@ async def async_setup_entry(
     """Set up Abode lock devices."""
     data: AbodeSystem = hass.data[DOMAIN]
 
-    entities = []
-
-    for device in data.abode.get_devices(generic_type=CONST.TYPE_LOCK):
-        entities.append(AbodeLock(data, device))
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeLock(data, device)
+        for device in data.abode.get_devices(generic_type=CONST.TYPE_LOCK)
+    )
 
 
 class AbodeLock(AbodeDevice, LockEntity):

homeassistant/components/abode/sensor.py

@@ -42,19 +42,12 @@ async def async_setup_entry(
     """Set up Abode sensor devices."""
     data: AbodeSystem = hass.data[DOMAIN]
 
-    entities = []
-
-    for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR):
-        conditions = device.get_value(CONST.STATUSES_KEY)
-        entities.extend(
-            [
-                AbodeSensor(data, device, description)
-                for description in SENSOR_TYPES
-                if description.key in conditions
-            ]
-        )
-
-    async_add_entities(entities)
+    async_add_entities(
+        AbodeSensor(data, device, description)
+        for description in SENSOR_TYPES
+        for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR)
+        if description.key in device.get_value(CONST.STATUSES_KEY)
+    )
 
 
 class AbodeSensor(AbodeDevice, SensorEntity):
@@ -71,7 +64,6 @@ class AbodeSensor(AbodeDevice, SensorEntity):
         """Initialize a sensor for an Abode device."""
         super().__init__(data, device)
         self.entity_description = description
-        self._attr_name = f"{device.name} {description.name}"
         self._attr_unique_id = f"{device.device_uuid}-{description.key}"
         if description.key == CONST.TEMP_STATUS_KEY:
             self._attr_native_unit_of_measurement = device.temp_unit

homeassistant/components/abode/switch.py

@@ -25,14 +25,16 @@ async def async_setup_entry(
     """Set up Abode switch devices."""
     data: AbodeSystem = hass.data[DOMAIN]
 
-    entities: list[SwitchEntity] = []
+    entities: list[SwitchEntity] = [
+        AbodeSwitch(data, device)
+        for device_type in DEVICE_TYPES
+        for device in data.abode.get_devices(generic_type=device_type)
+    ]
 
-    for device_type in DEVICE_TYPES:
-        for device in data.abode.get_devices(generic_type=device_type):
-            entities.append(AbodeSwitch(data, device))
-
-    for automation in data.abode.get_automations():
-        entities.append(AbodeAutomationSwitch(data, automation))
+    entities.extend(
+        AbodeAutomationSwitch(data, automation)
+        for automation in data.abode.get_automations()
+    )
 
     async_add_entities(entities)
 

homeassistant/components/abode/translations/es.json

@@ -7,7 +7,7 @@
         "error": {
             "cannot_connect": "No se pudo conectar",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida",
-            "invalid_mfa_code": "C\u00f3digo MFA inv\u00e1lido"
+            "invalid_mfa_code": "C\u00f3digo MFA no v\u00e1lido"
         },
         "step": {
             "mfa": {
@@ -21,14 +21,14 @@
                     "password": "Contrase\u00f1a",
                     "username": "Correo electr\u00f3nico"
                 },
-                "title": "Rellene su informaci\u00f3n de inicio de sesi\u00f3n de Abode"
+                "title": "Completa tu informaci\u00f3n de inicio de sesi\u00f3n de Abode"
             },
             "user": {
                 "data": {
                     "password": "Contrase\u00f1a",
                     "username": "Correo electr\u00f3nico"
                 },
-                "title": "Rellene la informaci\u00f3n de acceso Abode"
+                "title": "Completa tu informaci\u00f3n de inicio de sesi\u00f3n de Abode"
             }
         }
     }

homeassistant/components/abode/translations/ja.json

@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "reauth_successful": "\u518d\u8a8d\u8a3c\u306b\u6210\u529f\u3057\u307e\u3057\u305f",
-            "single_instance_allowed": "\u3059\u3067\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u5358\u4e00\u306e\u8a2d\u5b9a\u3057\u304b\u3067\u304d\u307e\u305b\u3093\u3002"
+            "single_instance_allowed": "\u3059\u3067\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u8a2d\u5b9a\u3067\u304d\u308b\u306e\u306f1\u3064\u3060\u3051\u3067\u3059\u3002"
         },
         "error": {
             "cannot_connect": "\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f",

homeassistant/components/abode/translations/pt.json

@@ -18,7 +18,7 @@
             "user": {
                 "data": {
                     "password": "Palavra-passe",
-                    "username": "Endere\u00e7o de e-mail"
+                    "username": "Email"
                 }
             }
         }

homeassistant/components/abode/translations/sv.json

@@ -1,13 +1,27 @@
 {
     "config": {
         "abort": {
+            "reauth_successful": "\u00c5terautentisering lyckades",
             "single_instance_allowed": "Endast en enda konfiguration av Abode \u00e4r till\u00e5ten."
         },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta.",
+            "invalid_auth": "Ogiltig autentisering",
+            "invalid_mfa_code": "Ogiltig MFA-kod"
+        },
         "step": {
+            "mfa": {
+                "data": {
+                    "mfa_code": "MFA-kod (6 siffror)"
+                },
+                "title": "Ange din MFA-kod f\u00f6r Abode"
+            },
             "reauth_confirm": {
                 "data": {
+                    "password": "L\u00f6senord",
                     "username": "E-postadress"
-                }
+                },
+                "title": "Fyll i din Abode-inloggningsinformation"
             },
             "user": {
                 "data": {

homeassistant/components/accuweather/__init__.py

@@ -11,12 +11,14 @@ from aiohttp.client_exceptions import ClientConnectorError
 from async_timeout import timeout
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN
+from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN, MANUFACTURER
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -26,6 +28,7 @@ PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up AccuWeather as config entry."""
     api_key: str = entry.data[CONF_API_KEY]
+    name: str = entry.data[CONF_NAME]
     assert entry.unique_id is not None
     location_key = entry.unique_id
     forecast: bool = entry.options.get(CONF_FORECAST, False)
@@ -35,7 +38,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     websession = async_get_clientsession(hass)
 
     coordinator = AccuWeatherDataUpdateCoordinator(
-        hass, websession, api_key, location_key, forecast
+        hass, websession, api_key, location_key, forecast, name
     )
     await coordinator.async_config_entry_first_refresh()
 
@@ -43,7 +46,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
@@ -73,12 +76,26 @@ class AccuWeatherDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
         api_key: str,
         location_key: str,
         forecast: bool,
+        name: str,
     ) -> None:
         """Initialize."""
         self.location_key = location_key
         self.forecast = forecast
-        self.is_metric = hass.config.units.is_metric
-        self.accuweather = AccuWeather(api_key, session, location_key=self.location_key)
+        self.accuweather = AccuWeather(api_key, session, location_key=location_key)
+        self.device_info = DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, location_key)},
+            manufacturer=MANUFACTURER,
+            name=name,
+            # You don't need to provide specific details for the URL,
+            # so passing in _ characters is fine if the location key
+            # is correct
+            configuration_url=(
+                "http://accuweather.com/en/"
+                f"_/_/{location_key}/"
+                f"weather-forecast/{location_key}/"
+            ),
+        )
 
         # Enabling the forecast download increases the number of requests per data
         # update, we use 40 minutes for current condition only and 80 minutes for
@@ -98,7 +115,9 @@ class AccuWeatherDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
             async with timeout(10):
                 current = await self.accuweather.async_get_current_conditions()
                 forecast = (
-                    await self.accuweather.async_get_forecast(metric=self.is_metric)
+                    await self.accuweather.async_get_forecast(
+                        metric=self.hass.config.units.is_metric
+                    )
                     if self.forecast
                     else {}
                 )

homeassistant/components/accuweather/const.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 from typing import Final
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorStateClass
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_CLOUDY,
@@ -20,32 +19,21 @@ from homeassistant.components.weather import (
     ATTR_CONDITION_SUNNY,
     ATTR_CONDITION_WINDY,
 )
-from homeassistant.const import (
-    CONCENTRATION_PARTS_PER_CUBIC_METER,
-    LENGTH_FEET,
-    LENGTH_INCHES,
-    LENGTH_METERS,
-    LENGTH_MILLIMETERS,
-    PERCENTAGE,
-    SPEED_KILOMETERS_PER_HOUR,
-    SPEED_MILES_PER_HOUR,
-    TEMP_CELSIUS,
-    TEMP_FAHRENHEIT,
-    TIME_HOURS,
-    UV_INDEX,
-)
-
-from .model import AccuWeatherSensorDescription
 
 API_IMPERIAL: Final = "Imperial"
 API_METRIC: Final = "Metric"
 ATTRIBUTION: Final = "Data provided by AccuWeather"
+ATTR_CATEGORY: Final = "Category"
+ATTR_DIRECTION: Final = "Direction"
+ATTR_ENGLISH: Final = "English"
+ATTR_LEVEL: Final = "level"
 ATTR_FORECAST: Final = "forecast"
+ATTR_SPEED: Final = "Speed"
+ATTR_VALUE: Final = "Value"
 CONF_FORECAST: Final = "forecast"
 DOMAIN: Final = "accuweather"
 MANUFACTURER: Final = "AccuWeather, Inc."
 MAX_FORECAST_DAYS: Final = 4
-NAME: Final = "AccuWeather"
 
 CONDITION_CLASSES: Final[dict[str, list[int]]] = {
     ATTR_CONDITION_CLEAR_NIGHT: [33, 34, 37],
@@ -63,264 +51,3 @@ CONDITION_CLASSES: Final[dict[str, list[int]]] = {
     ATTR_CONDITION_SUNNY: [1, 2, 5],
     ATTR_CONDITION_WINDY: [32],
 }
-
-FORECAST_SENSOR_TYPES: Final[tuple[AccuWeatherSensorDescription, ...]] = (
-    AccuWeatherSensorDescription(
-        key="CloudCoverDay",
-        icon="mdi:weather-cloudy",
-        name="Cloud Cover Day",
-        unit_metric=PERCENTAGE,
-        unit_imperial=PERCENTAGE,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="CloudCoverNight",
-        icon="mdi:weather-cloudy",
-        name="Cloud Cover Night",
-        unit_metric=PERCENTAGE,
-        unit_imperial=PERCENTAGE,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="Grass",
-        icon="mdi:grass",
-        name="Grass Pollen",
-        unit_metric=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        unit_imperial=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="HoursOfSun",
-        icon="mdi:weather-partly-cloudy",
-        name="Hours Of Sun",
-        unit_metric=TIME_HOURS,
-        unit_imperial=TIME_HOURS,
-    ),
-    AccuWeatherSensorDescription(
-        key="Mold",
-        icon="mdi:blur",
-        name="Mold Pollen",
-        unit_metric=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        unit_imperial=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="Ozone",
-        icon="mdi:vector-triangle",
-        name="Ozone",
-        unit_metric=None,
-        unit_imperial=None,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="Ragweed",
-        icon="mdi:sprout",
-        name="Ragweed Pollen",
-        unit_metric=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        unit_imperial=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureMax",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature Max",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureMin",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature Min",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureShadeMax",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature Shade Max",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureShadeMin",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature Shade Min",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="ThunderstormProbabilityDay",
-        icon="mdi:weather-lightning",
-        name="Thunderstorm Probability Day",
-        unit_metric=PERCENTAGE,
-        unit_imperial=PERCENTAGE,
-    ),
-    AccuWeatherSensorDescription(
-        key="ThunderstormProbabilityNight",
-        icon="mdi:weather-lightning",
-        name="Thunderstorm Probability Night",
-        unit_metric=PERCENTAGE,
-        unit_imperial=PERCENTAGE,
-    ),
-    AccuWeatherSensorDescription(
-        key="Tree",
-        icon="mdi:tree-outline",
-        name="Tree Pollen",
-        unit_metric=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        unit_imperial=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="UVIndex",
-        icon="mdi:weather-sunny",
-        name="UV Index",
-        unit_metric=UV_INDEX,
-        unit_imperial=UV_INDEX,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindGustDay",
-        icon="mdi:weather-windy",
-        name="Wind Gust Day",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindGustNight",
-        icon="mdi:weather-windy",
-        name="Wind Gust Night",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-        entity_registry_enabled_default=False,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindDay",
-        icon="mdi:weather-windy",
-        name="Wind Day",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindNight",
-        icon="mdi:weather-windy",
-        name="Wind Night",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-    ),
-)
-
-SENSOR_TYPES: Final[tuple[AccuWeatherSensorDescription, ...]] = (
-    AccuWeatherSensorDescription(
-        key="ApparentTemperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="Apparent Temperature",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="Ceiling",
-        icon="mdi:weather-fog",
-        name="Cloud Ceiling",
-        unit_metric=LENGTH_METERS,
-        unit_imperial=LENGTH_FEET,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="CloudCover",
-        icon="mdi:weather-cloudy",
-        name="Cloud Cover",
-        unit_metric=PERCENTAGE,
-        unit_imperial=PERCENTAGE,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="DewPoint",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="Dew Point",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureShade",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel Temperature Shade",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="Precipitation",
-        icon="mdi:weather-rainy",
-        name="Precipitation",
-        unit_metric=LENGTH_MILLIMETERS,
-        unit_imperial=LENGTH_INCHES,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="PressureTendency",
-        device_class="accuweather__pressure_tendency",
-        icon="mdi:gauge",
-        name="Pressure Tendency",
-        unit_metric=None,
-        unit_imperial=None,
-    ),
-    AccuWeatherSensorDescription(
-        key="UVIndex",
-        icon="mdi:weather-sunny",
-        name="UV Index",
-        unit_metric=UV_INDEX,
-        unit_imperial=UV_INDEX,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="WetBulbTemperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="Wet Bulb Temperature",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindChillTemperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="Wind Chill Temperature",
-        unit_metric=TEMP_CELSIUS,
-        unit_imperial=TEMP_FAHRENHEIT,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="Wind",
-        icon="mdi:weather-windy",
-        name="Wind",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    AccuWeatherSensorDescription(
-        key="WindGust",
-        icon="mdi:weather-windy",
-        name="Wind Gust",
-        unit_metric=SPEED_KILOMETERS_PER_HOUR,
-        unit_imperial=SPEED_MILES_PER_HOUR,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-)

homeassistant/components/accuweather/manifest.json

@@ -2,7 +2,7 @@
   "domain": "accuweather",
   "name": "AccuWeather",
   "documentation": "https://www.home-assistant.io/integrations/accuweather/",
-  "requirements": ["accuweather==0.3.0"],
+  "requirements": ["accuweather==0.4.0"],
   "codeowners": ["@bieniu"],
   "config_flow": true,
   "quality_scale": "platinum",

homeassistant/components/accuweather/model.py

@@ -1,14 +0,0 @@
-"""Type definitions for AccuWeather integration."""
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from homeassistant.components.sensor import SensorEntityDescription
-
-
-@dataclass
-class AccuWeatherSensorDescription(SensorEntityDescription):
-    """Class describing AccuWeather sensor entities."""
-
-    unit_metric: str | None = None
-    unit_imperial: str | None = None

homeassistant/components/accuweather/sensor.py

@@ -1,14 +1,32 @@
 """Support for the AccuWeather service."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from dataclasses import dataclass
 from typing import Any, cast
 
-from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
+from homeassistant.components.sensor import (
+    SensorDeviceClass,
+    SensorEntity,
+    SensorEntityDescription,
+    SensorStateClass,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_NAME
+from homeassistant.const import (
+    CONCENTRATION_PARTS_PER_CUBIC_METER,
+    LENGTH_FEET,
+    LENGTH_INCHES,
+    LENGTH_METERS,
+    LENGTH_MILLIMETERS,
+    PERCENTAGE,
+    SPEED_KILOMETERS_PER_HOUR,
+    SPEED_MILES_PER_HOUR,
+    TEMP_CELSIUS,
+    TEMP_FAHRENHEIT,
+    TIME_HOURS,
+    UV_INDEX,
+)
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -17,43 +35,342 @@ from . import AccuWeatherDataUpdateCoordinator
 from .const import (
     API_IMPERIAL,
     API_METRIC,
+    ATTR_CATEGORY,
+    ATTR_DIRECTION,
+    ATTR_ENGLISH,
     ATTR_FORECAST,
+    ATTR_LEVEL,
+    ATTR_SPEED,
+    ATTR_VALUE,
     ATTRIBUTION,
     DOMAIN,
-    FORECAST_SENSOR_TYPES,
-    MANUFACTURER,
     MAX_FORECAST_DAYS,
-    NAME,
-    SENSOR_TYPES,
 )
-from .model import AccuWeatherSensorDescription
 
 PARALLEL_UPDATES = 1
 
 
+@dataclass
+class AccuWeatherSensorDescriptionMixin:
+    """Mixin for AccuWeather sensor."""
+
+    value_fn: Callable[[dict[str, Any], str], StateType]
+
+
+@dataclass
+class AccuWeatherSensorDescription(
+    SensorEntityDescription, AccuWeatherSensorDescriptionMixin
+):
+    """Class describing AccuWeather sensor entities."""
+
+    attr_fn: Callable[[dict[str, Any]], dict[str, StateType]] = lambda _: {}
+    unit_fn: Callable[[bool], str | None] = lambda _: None
+
+
+FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
+    AccuWeatherSensorDescription(
+        key="CloudCoverDay",
+        icon="mdi:weather-cloudy",
+        name="Cloud cover day",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda _: PERCENTAGE,
+        value_fn=lambda data, _: cast(int, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="CloudCoverNight",
+        icon="mdi:weather-cloudy",
+        name="Cloud cover night",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda _: PERCENTAGE,
+        value_fn=lambda data, _: cast(int, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="Grass",
+        icon="mdi:grass",
+        name="Grass pollen",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda _: CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="HoursOfSun",
+        icon="mdi:weather-partly-cloudy",
+        name="Hours of sun",
+        unit_fn=lambda _: TIME_HOURS,
+        value_fn=lambda data, _: cast(float, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="Mold",
+        icon="mdi:blur",
+        name="Mold pollen",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda _: CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="Ozone",
+        icon="mdi:vector-triangle",
+        name="Ozone",
+        entity_registry_enabled_default=False,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="Ragweed",
+        icon="mdi:sprout",
+        name="Ragweed pollen",
+        unit_fn=lambda _: CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature max",
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature min",
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature shade max",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature shade min",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityDay",
+        icon="mdi:weather-lightning",
+        name="Thunderstorm probability day",
+        unit_fn=lambda _: PERCENTAGE,
+        value_fn=lambda data, _: cast(int, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityNight",
+        icon="mdi:weather-lightning",
+        name="Thunderstorm probability night",
+        unit_fn=lambda _: PERCENTAGE,
+        value_fn=lambda data, _: cast(int, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="Tree",
+        icon="mdi:tree-outline",
+        name="Tree pollen",
+        unit_fn=lambda _: CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="UVIndex",
+        icon="mdi:weather-sunny",
+        name="UV index",
+        unit_fn=lambda _: UV_INDEX,
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+    ),
+    AccuWeatherSensorDescription(
+        key="WindGustDay",
+        icon="mdi:weather-windy",
+        name="Wind gust day",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    ),
+    AccuWeatherSensorDescription(
+        key="WindGustNight",
+        icon="mdi:weather-windy",
+        name="Wind gust night",
+        entity_registry_enabled_default=False,
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    ),
+    AccuWeatherSensorDescription(
+        key="WindDay",
+        icon="mdi:weather-windy",
+        name="Wind day",
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    ),
+    AccuWeatherSensorDescription(
+        key="WindNight",
+        icon="mdi:weather-windy",
+        name="Wind night",
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    ),
+)
+
+SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
+    AccuWeatherSensorDescription(
+        key="ApparentTemperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="Apparent temperature",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="Ceiling",
+        icon="mdi:weather-fog",
+        name="Cloud ceiling",
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: LENGTH_METERS if metric else LENGTH_FEET,
+        value_fn=lambda data, unit: round(data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="CloudCover",
+        icon="mdi:weather-cloudy",
+        name="Cloud cover",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda _: PERCENTAGE,
+        value_fn=lambda data, _: cast(int, data),
+    ),
+    AccuWeatherSensorDescription(
+        key="DewPoint",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="Dew point",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature",
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShade",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="RealFeel temperature shade",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="Precipitation",
+        icon="mdi:weather-rainy",
+        name="Precipitation",
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: LENGTH_MILLIMETERS if metric else LENGTH_INCHES,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+        attr_fn=lambda data: {"type": data["PrecipitationType"]},
+    ),
+    AccuWeatherSensorDescription(
+        key="PressureTendency",
+        device_class="accuweather__pressure_tendency",
+        icon="mdi:gauge",
+        name="Pressure tendency",
+        value_fn=lambda data, _: cast(str, data["LocalizedText"]).lower(),
+    ),
+    AccuWeatherSensorDescription(
+        key="UVIndex",
+        icon="mdi:weather-sunny",
+        name="UV index",
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda _: UV_INDEX,
+        value_fn=lambda data, _: cast(int, data),
+        attr_fn=lambda data: {ATTR_LEVEL: data["UVIndexText"]},
+    ),
+    AccuWeatherSensorDescription(
+        key="WetBulbTemperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="Wet bulb temperature",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="WindChillTemperature",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        name="Wind chill temperature",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: TEMP_CELSIUS if metric else TEMP_FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="Wind",
+        icon="mdi:weather-windy",
+        name="Wind",
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
+    ),
+    AccuWeatherSensorDescription(
+        key="WindGust",
+        icon="mdi:weather-windy",
+        name="Wind gust",
+        entity_registry_enabled_default=False,
+        state_class=SensorStateClass.MEASUREMENT,
+        unit_fn=lambda metric: SPEED_KILOMETERS_PER_HOUR
+        if metric
+        else SPEED_MILES_PER_HOUR,
+        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Add AccuWeather entities from a config_entry."""
-    name: str = entry.data[CONF_NAME]
 
     coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
 
-    sensors: list[AccuWeatherSensor] = []
-    for description in SENSOR_TYPES:
-        sensors.append(AccuWeatherSensor(name, coordinator, description))
+    sensors = [
+        AccuWeatherSensor(coordinator, description) for description in SENSOR_TYPES
+    ]
 
     if coordinator.forecast:
-        for description in FORECAST_SENSOR_TYPES:
-            for day in range(MAX_FORECAST_DAYS + 1):
-                # Some air quality/allergy sensors are only available for certain
-                # locations.
-                if description.key in coordinator.data[ATTR_FORECAST][0]:
-                    sensors.append(
-                        AccuWeatherSensor(
-                            name, coordinator, description, forecast_day=day
-                        )
-                    )
+        # Some air quality/allergy sensors are only available for certain
+        # locations.
+        sensors.extend(
+            AccuWeatherForecastSensor(coordinator, description, forecast_day=day)
+            for day in range(MAX_FORECAST_DAYS + 1)
+            for description in FORECAST_SENSOR_TYPES
+            if description.key in coordinator.data[ATTR_FORECAST][0]
+        )
 
     async_add_entities(sensors)
 
@@ -64,11 +381,11 @@ class AccuWeatherSensor(
     """Define an AccuWeather entity."""
 
     _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
     entity_description: AccuWeatherSensorDescription
 
     def __init__(
         self,
-        name: str,
         coordinator: AccuWeatherDataUpdateCoordinator,
         description: AccuWeatherSensorDescription,
         forecast_day: int | None = None,
@@ -77,100 +394,51 @@ class AccuWeatherSensor(
         super().__init__(coordinator)
         self.entity_description = description
         self._sensor_data = _get_sensor_data(
-            coordinator.data, forecast_day, description.key
+            coordinator.data, description.key, forecast_day
         )
-        self._attrs: dict[str, Any] = {}
         if forecast_day is not None:
-            self._attr_name = f"{name} {description.name} {forecast_day}d"
+            self._attr_name = f"{description.name} {forecast_day}d"
             self._attr_unique_id = (
                 f"{coordinator.location_key}-{description.key}-{forecast_day}".lower()
             )
         else:
-            self._attr_name = f"{name} {description.name}"
             self._attr_unique_id = (
                 f"{coordinator.location_key}-{description.key}".lower()
             )
-        if coordinator.is_metric:
+        if self.coordinator.hass.config.units.is_metric:
             self._unit_system = API_METRIC
-            self._attr_native_unit_of_measurement = description.unit_metric
         else:
             self._unit_system = API_IMPERIAL
-            self._attr_native_unit_of_measurement = description.unit_imperial
-        self._attr_device_info = DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, coordinator.location_key)},
-            manufacturer=MANUFACTURER,
-            name=NAME,
+        self._attr_native_unit_of_measurement = self.entity_description.unit_fn(
+            self.coordinator.hass.config.units.is_metric
         )
-        self.forecast_day = forecast_day
+        self._attr_device_info = coordinator.device_info
+        if forecast_day is not None:
+            self.forecast_day = forecast_day
 
     @property
     def native_value(self) -> StateType:
         """Return the state."""
-        if self.forecast_day is not None:
-            if self.entity_description.device_class == SensorDeviceClass.TEMPERATURE:
-                return cast(float, self._sensor_data["Value"])
-            if self.entity_description.key == "UVIndex":
-                return cast(int, self._sensor_data["Value"])
-        if self.entity_description.key in ("Grass", "Mold", "Ragweed", "Tree", "Ozone"):
-            return cast(int, self._sensor_data["Value"])
-        if self.entity_description.key == "Ceiling":
-            return round(self._sensor_data[self._unit_system]["Value"])
-        if self.entity_description.key == "PressureTendency":
-            return cast(str, self._sensor_data["LocalizedText"].lower())
-        if self.entity_description.device_class == SensorDeviceClass.TEMPERATURE:
-            return cast(float, self._sensor_data[self._unit_system]["Value"])
-        if self.entity_description.key == "Precipitation":
-            return cast(float, self._sensor_data[self._unit_system]["Value"])
-        if self.entity_description.key in ("Wind", "WindGust"):
-            return cast(float, self._sensor_data["Speed"][self._unit_system]["Value"])
-        if self.entity_description.key in (
-            "WindDay",
-            "WindNight",
-            "WindGustDay",
-            "WindGustNight",
-        ):
-            return cast(StateType, self._sensor_data["Speed"]["Value"])
-        return cast(StateType, self._sensor_data)
+        return self.entity_description.value_fn(self._sensor_data, self._unit_system)
 
     @property
     def extra_state_attributes(self) -> dict[str, Any]:
         """Return the state attributes."""
-        if self.forecast_day is not None:
-            if self.entity_description.key in (
-                "WindDay",
-                "WindNight",
-                "WindGustDay",
-                "WindGustNight",
-            ):
-                self._attrs["direction"] = self._sensor_data["Direction"]["English"]
-            elif self.entity_description.key in (
-                "Grass",
-                "Mold",
-                "Ozone",
-                "Ragweed",
-                "Tree",
-                "UVIndex",
-            ):
-                self._attrs["level"] = self._sensor_data["Category"]
-            return self._attrs
-        if self.entity_description.key == "UVIndex":
-            self._attrs["level"] = self.coordinator.data["UVIndexText"]
-        elif self.entity_description.key == "Precipitation":
-            self._attrs["type"] = self.coordinator.data["PrecipitationType"]
-        return self._attrs
+        return self.entity_description.attr_fn(self.coordinator.data)
 
     @callback
     def _handle_coordinator_update(self) -> None:
         """Handle data update."""
         self._sensor_data = _get_sensor_data(
-            self.coordinator.data, self.forecast_day, self.entity_description.key
+            self.coordinator.data, self.entity_description.key
         )
         self.async_write_ha_state()
 
 
 def _get_sensor_data(
-    sensors: dict[str, Any], forecast_day: int | None, kind: str
+    sensors: dict[str, Any],
+    kind: str,
+    forecast_day: int | None = None,
 ) -> Any:
     """Get sensor data."""
     if forecast_day is not None:
@@ -180,3 +448,20 @@ def _get_sensor_data(
         return sensors["PrecipitationSummary"][kind]
 
     return sensors[kind]
+
+
+class AccuWeatherForecastSensor(AccuWeatherSensor):
+    """Define an AccuWeather forecast entity."""
+
+    @property
+    def extra_state_attributes(self) -> dict[str, Any]:
+        """Return the state attributes."""
+        return self.entity_description.attr_fn(self._sensor_data)
+
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle data update."""
+        self._sensor_data = _get_sensor_data(
+            self.coordinator.data, self.entity_description.key, self.forecast_day
+        )
+        self.async_write_ha_state()

homeassistant/components/accuweather/translations/es-419.json

@@ -3,6 +3,9 @@
         "abort": {
             "single_instance_allowed": "Ya configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
+        "create_entry": {
+            "default": "Algunos sensores no est\u00e1n habilitados de forma predeterminada. Puede habilitarlos en el registro de la entidad despu\u00e9s de la configuraci\u00f3n de la integraci\u00f3n. \nEl pron\u00f3stico del tiempo no est\u00e1 habilitado de forma predeterminada. Puedes habilitarlo en las opciones de integraci\u00f3n."
+        },
         "error": {
             "cannot_connect": "No se pudo conectar",
             "invalid_api_key": "Clave de API no v\u00e1lida",
@@ -21,6 +24,7 @@
     },
     "system_health": {
         "info": {
+            "can_reach_server": "Llegar al servidor de AccuWeather",
             "remaining_requests": "Solicitudes permitidas restantes"
         }
     }

homeassistant/components/accuweather/translations/es.json

@@ -4,7 +4,7 @@
             "single_instance_allowed": "Ya est\u00e1 configurado. Solo es posible una \u00fanica configuraci\u00f3n."
         },
         "create_entry": {
-            "default": "Algunos sensores no est\u00e1n habilitados de forma predeterminada. Puede habilitarlos en el registro de la entidad despu\u00e9s de la configuraci\u00f3n de la integraci\u00f3n.\n El pron\u00f3stico del tiempo no est\u00e1 habilitado de forma predeterminada. Puedes habilitarlo en las opciones de integraci\u00f3n."
+            "default": "Algunos sensores no est\u00e1n habilitados de forma predeterminada. Puedes habilitarlos en el registro de la entidad despu\u00e9s de la configuraci\u00f3n de la integraci\u00f3n.\nEl pron\u00f3stico del tiempo no est\u00e1 habilitado de forma predeterminada. Puedes habilitarlo en las opciones de integraci\u00f3n."
         },
         "error": {
             "cannot_connect": "No se pudo conectar",
@@ -28,13 +28,13 @@
                 "data": {
                     "forecast": "Pron\u00f3stico del tiempo"
                 },
-                "description": "Debido a las limitaciones de la versi\u00f3n gratuita de la clave API de AccuWeather, cuando habilitas el pron\u00f3stico del tiempo, las actualizaciones de datos se realizar\u00e1n cada 64 minutos en lugar de cada 32 minutos."
+                "description": "Debido a las limitaciones de la versi\u00f3n gratuita de la clave API de AccuWeather, cuando habilitas el pron\u00f3stico del tiempo, las actualizaciones de datos se realizar\u00e1n cada 80 minutos en lugar de cada 40 minutos."
             }
         }
     },
     "system_health": {
         "info": {
-            "can_reach_server": "Alcanzar el servidor AccuWeather",
+            "can_reach_server": "Se puede llegar al servidor AccuWeather",
             "remaining_requests": "Solicitudes permitidas restantes"
         }
     }

homeassistant/components/accuweather/translations/ja.json

@@ -1,10 +1,10 @@
 {
     "config": {
         "abort": {
-            "single_instance_allowed": "\u3059\u3067\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u5358\u4e00\u306e\u8a2d\u5b9a\u3057\u304b\u3067\u304d\u307e\u305b\u3093\u3002"
+            "single_instance_allowed": "\u3059\u3067\u306b\u8a2d\u5b9a\u3055\u308c\u3066\u3044\u307e\u3059\u3002\u8a2d\u5b9a\u3067\u304d\u308b\u306e\u306f1\u3064\u3060\u3051\u3067\u3059\u3002"
         },
         "create_entry": {
-            "default": "\u4e00\u90e8\u306e\u30bb\u30f3\u30b5\u30fc\u306f\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u69cb\u6210\u5f8c\u3001\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30ec\u30b8\u30b9\u30c8\u30ea\u3067\u305d\u308c\u3089\u3092\u6709\u52b9\u306b\u3067\u304d\u307e\u3059\u3002\n\u5929\u6c17\u4e88\u5831\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u305b\u3093\u3002\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u6709\u52b9\u306b\u3067\u304d\u307e\u3059\u3002"
+            "default": "\u4e00\u90e8\u306e\u30bb\u30f3\u30b5\u30fc\u306f\u3001\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u305b\u3093\u3002\u7d71\u5408\u306e\u69cb\u6210\u5f8c\u3001\u30a8\u30f3\u30c6\u30a3\u30c6\u30a3\u30ec\u30b8\u30b9\u30c8\u30ea\u3067\u305d\u308c\u3089\u3092\u6709\u52b9\u306b\u3067\u304d\u307e\u3059\u3002\n\u5929\u6c17\u4e88\u5831\u306f\u30c7\u30d5\u30a9\u30eb\u30c8\u3067\u306f\u6709\u52b9\u306b\u306a\u3063\u3066\u3044\u307e\u305b\u3093\u3002\u7d71\u5408\u306e\u30aa\u30d7\u30b7\u30e7\u30f3\u3067\u6709\u52b9\u306b\u3067\u304d\u307e\u3059\u3002"
         },
         "error": {
             "cannot_connect": "\u63a5\u7d9a\u306b\u5931\u6557\u3057\u307e\u3057\u305f",

homeassistant/components/accuweather/translations/pl.json

@@ -34,7 +34,7 @@
     },
     "system_health": {
         "info": {
-            "can_reach_server": "Dost\u0119p do serwera AccuWeather",
+            "can_reach_server": "Dost\u0119p do serwera",
             "remaining_requests": "Pozosta\u0142o dozwolonych \u017c\u0105da\u0144"
         }
     }

homeassistant/components/accuweather/translations/pt.json

@@ -3,6 +3,9 @@
         "abort": {
             "single_instance_allowed": "J\u00e1 configurado. Apenas uma \u00fanica configura\u00e7\u00e3o \u00e9 poss\u00edvel."
         },
+        "create_entry": {
+            "default": "Alguns sensores n\u00e3o s\u00e3o ativados por defeito. Podem ser ativados no registo da entidade ap\u00f3s a configura\u00e7\u00e3o da integra\u00e7\u00e3o.\nA previs\u00e3o do tempo n\u00e3o est\u00e1 ativada por defeito. Pode ativ\u00e1-la nas op\u00e7\u00f5es de integra\u00e7\u00e3o."
+        },
         "error": {
             "cannot_connect": "Falha na liga\u00e7\u00e3o",
             "invalid_api_key": "Chave de API inv\u00e1lida"

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

@@ -2,7 +2,8 @@
     "state": {
         "accuweather__pressure_tendency": {
             "falling": "Fallande",
-            "rising": "Stigande"
+            "rising": "Stigande",
+            "steady": "Stadig"
         }
     }
 }

homeassistant/components/accuweather/translations/sv.json

@@ -1,11 +1,41 @@
 {
     "config": {
+        "abort": {
+            "single_instance_allowed": "Redan konfigurerad. Endast en konfiguration m\u00f6jlig."
+        },
+        "create_entry": {
+            "default": "Vissa sensorer \u00e4r inte aktiverade som standard. Du kan aktivera dem i entitetsregistret efter integrationskonfigurationen.\n V\u00e4derprognos \u00e4r inte aktiverat som standard. Du kan aktivera det i integrationsalternativen."
+        },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta.",
+            "invalid_api_key": "Ogiltig API-nyckel",
+            "requests_exceeded": "Det till\u00e5tna antalet f\u00f6rfr\u00e5gningar till Accuweather API har \u00f6verskridits. Du m\u00e5ste v\u00e4nta eller \u00e4ndra API-nyckel."
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API-nyckel"
+                    "api_key": "API-nyckel",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud",
+                    "name": "Namn"
                 }
             }
         }
+    },
+    "options": {
+        "step": {
+            "user": {
+                "data": {
+                    "forecast": "V\u00e4derprognos"
+                },
+                "description": "P\u00e5 grund av begr\u00e4nsningarna f\u00f6r den kostnadsfria versionen av AccuWeather API-nyckeln, n\u00e4r du aktiverar v\u00e4derprognos, kommer datauppdateringar att utf\u00f6ras var 80:e minut ist\u00e4llet f\u00f6r var 40:e minut."
+            }
+        }
+    },
+    "system_health": {
+        "info": {
+            "can_reach_server": "N\u00e5 AccuWeather-servern",
+            "remaining_requests": "\u00c5terst\u00e5ende till\u00e5tna f\u00f6rfr\u00e5gningar"
+        }
     }
 }

homeassistant/components/accuweather/weather.py

@@ -18,7 +18,6 @@ from homeassistant.components.weather import (
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
-    CONF_NAME,
     LENGTH_INCHES,
     LENGTH_KILOMETERS,
     LENGTH_MILES,
@@ -31,8 +30,6 @@ from homeassistant.const import (
     TEMP_FAHRENHEIT,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
@@ -45,8 +42,6 @@ from .const import (
     ATTRIBUTION,
     CONDITION_CLASSES,
     DOMAIN,
-    MANUFACTURER,
-    NAME,
 )
 
 PARALLEL_UPDATES = 1
@@ -56,11 +51,10 @@ async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
     """Add a AccuWeather weather entity from a config_entry."""
-    name: str = entry.data[CONF_NAME]
 
     coordinator: AccuWeatherDataUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
 
-    async_add_entities([AccuWeatherEntity(name, coordinator)])
+    async_add_entities([AccuWeatherEntity(coordinator)])
 
 
 class AccuWeatherEntity(
@@ -68,15 +62,15 @@ class AccuWeatherEntity(
 ):
     """Define an AccuWeather entity."""
 
-    def __init__(
-        self, name: str, coordinator: AccuWeatherDataUpdateCoordinator
-    ) -> None:
+    _attr_has_entity_name = True
+
+    def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
         """Initialize."""
         super().__init__(coordinator)
         # Coordinator data is used also for sensors which don't have units automatically
         # converted, hence the weather entity's native units follow the configured unit
         # system
-        if coordinator.is_metric:
+        if coordinator.hass.config.units.is_metric:
             self._attr_native_precipitation_unit = LENGTH_MILLIMETERS
             self._attr_native_pressure_unit = PRESSURE_HPA
             self._attr_native_temperature_unit = TEMP_CELSIUS
@@ -90,21 +84,9 @@ class AccuWeatherEntity(
             self._attr_native_temperature_unit = TEMP_FAHRENHEIT
             self._attr_native_visibility_unit = LENGTH_MILES
             self._attr_native_wind_speed_unit = SPEED_MILES_PER_HOUR
-        self._attr_name = name
         self._attr_unique_id = coordinator.location_key
         self._attr_attribution = ATTRIBUTION
-        self._attr_device_info = DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, coordinator.location_key)},
-            manufacturer=MANUFACTURER,
-            name=NAME,
-            # You don't need to provide specific details for the URL,
-            # so passing in _ characters is fine if the location key
-            # is correct
-            configuration_url="http://accuweather.com/en/"
-            f"_/_/{coordinator.location_key}/"
-            f"weather-forecast/{coordinator.location_key}/",
-        )
+        self._attr_device_info = coordinator.device_info
 
     @property
     def condition(self) -> str | None:

homeassistant/components/acmeda/__init__.py

@@ -19,7 +19,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         return False
 
     hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = hub
-    hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 

homeassistant/components/acmeda/base.py

@@ -1,4 +1,6 @@
 """Base class for Acmeda Roller Blinds."""
+from __future__ import annotations
+
 import aiopulse
 
 from homeassistant.core import callback
@@ -11,11 +13,13 @@ from .const import ACMEDA_ENTITY_REMOVE, DOMAIN, LOGGER
 class AcmedaBase(entity.Entity):
     """Base representation of an Acmeda roller."""
 
+    _attr_should_poll = False
+
     def __init__(self, roller: aiopulse.Roller) -> None:
         """Initialize the roller."""
         self.roller = roller
 
-    async def async_remove_and_unregister(self):
+    async def async_remove_and_unregister(self) -> None:
         """Unregister from entity and device registry and call entity remove function."""
         LOGGER.error("Removing %s %s", self.__class__.__name__, self.unique_id)
 
@@ -25,14 +29,18 @@ class AcmedaBase(entity.Entity):
 
         dev_registry = dr.async_get(self.hass)
         device = dev_registry.async_get_device(identifiers={(DOMAIN, self.unique_id)})
-        if device is not None:
+        if (
+            device is not None
+            and self.registry_entry is not None
+            and self.registry_entry.config_entry_id is not None
+        ):
             dev_registry.async_update_device(
                 device.id, remove_config_entry_id=self.registry_entry.config_entry_id
             )
 
         await self.async_remove(force_remove=True)
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Entity has been added to hass."""
         self.roller.callback_subscribe(self.notify_update)
 
@@ -44,33 +52,28 @@ class AcmedaBase(entity.Entity):
             )
         )
 
-    async def async_will_remove_from_hass(self):
+    async def async_will_remove_from_hass(self) -> None:
         """Entity being removed from hass."""
         self.roller.callback_unsubscribe(self.notify_update)
 
     @callback
-    def notify_update(self):
+    def notify_update(self) -> None:
         """Write updated device state information."""
         LOGGER.debug("Device update notification received: %s", self.name)
         self.async_write_ha_state()
 
     @property
-    def should_poll(self):
-        """Report that Acmeda entities do not need polling."""
-        return False
-
-    @property
-    def unique_id(self):
+    def unique_id(self) -> str:
         """Return the unique ID of this roller."""
         return self.roller.id
 
     @property
-    def device_id(self):
+    def device_id(self) -> str:
         """Return the ID of this roller."""
         return self.roller.id
 
     @property
-    def name(self):
+    def name(self) -> str | None:
         """Return the name of roller."""
         return self.roller.name
 

homeassistant/components/acmeda/cover.py

@@ -16,6 +16,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from .base import AcmedaBase
 from .const import ACMEDA_HUB_UPDATE, DOMAIN
 from .helpers import async_add_acmeda_entities
+from .hub import PulseHub
 
 
 async def async_setup_entry(
@@ -24,7 +25,7 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
 
     current: set[int] = set()
 
@@ -122,6 +123,6 @@ class AcmedaCover(AcmedaBase, CoverEntity):
         """Stop the roller."""
         await self.roller.move_stop()
 
-    async def async_set_cover_tilt(self, **kwargs):
+    async def async_set_cover_tilt_position(self, **kwargs: Any) -> None:
         """Tilt the roller shutter to a specific position."""
         await self.roller.move_to(100 - kwargs[ATTR_POSITION])

homeassistant/components/acmeda/sensor.py

@@ -11,6 +11,7 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from .base import AcmedaBase
 from .const import ACMEDA_HUB_UPDATE, DOMAIN
 from .helpers import async_add_acmeda_entities
+from .hub import PulseHub
 
 
 async def async_setup_entry(
@@ -19,7 +20,7 @@ async def async_setup_entry(
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
 
     current: set[int] = set()
 
@@ -41,15 +42,15 @@ async def async_setup_entry(
 class AcmedaBattery(AcmedaBase, SensorEntity):
     """Representation of a Acmeda cover device."""
 
-    device_class = SensorDeviceClass.BATTERY
+    _attr_device_class = SensorDeviceClass.BATTERY
     _attr_native_unit_of_measurement = PERCENTAGE
 
     @property
-    def name(self):
+    def name(self) -> str:
         """Return the name of roller."""
         return f"{super().name} Battery"
 
     @property
-    def native_value(self):
+    def native_value(self) -> float | int | None:
         """Return the state of the device."""
         return self.roller.battery

homeassistant/components/acmeda/translations/es.json

@@ -8,7 +8,7 @@
                 "data": {
                     "id": "ID de host"
                 },
-                "title": "Elige un hub para a\u00f1adir"
+                "title": "Elige un concentrador para a\u00f1adir"
             }
         }
     }

homeassistant/components/acmeda/translations/sv.json

@@ -0,0 +1,15 @@
+{
+    "config": {
+        "abort": {
+            "no_devices_found": "Inga enheter hittades i n\u00e4tverket"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "id": "V\u00e4rd-ID"
+                },
+                "title": "V\u00e4lj en hubb att l\u00e4gga till"
+            }
+        }
+    }
+}

homeassistant/components/adax/__init__.py

@@ -10,7 +10,7 @@ PLATFORMS = [Platform.CLIMATE]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Adax from a config entry."""
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 

homeassistant/components/adax/climate.py

@@ -80,7 +80,7 @@ class AdaxDevice(ClimateEntity):
             manufacturer="Adax",
         )
 
-    async def async_set_hvac_mode(self, hvac_mode: str) -> None:
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
         if hvac_mode == HVACMode.HEAT:
             temperature = max(self.min_temp, self.target_temperature or self.min_temp)
@@ -140,7 +140,7 @@ class LocalAdaxDevice(ClimateEntity):
             manufacturer="Adax",
         )
 
-    async def async_set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
             return

homeassistant/components/adax/translations/es.json

@@ -2,8 +2,8 @@
     "config": {
         "abort": {
             "already_configured": "El dispositivo ya est\u00e1 configurado",
-            "heater_not_available": "Calentador no disponible. Intente restablecer el calentador pulsando + y OK durante algunos segundos.",
-            "heater_not_found": "No se encuentra el calefactor. Intente acercar el calefactor al ordenador del Asistente de Hogar.",
+            "heater_not_available": "Calefactor no disponible. Intenta reiniciar el calentador presionando + y OK durante unos segundos.",
+            "heater_not_found": "No se encontr\u00f3 el calentador. Intenta acercar el calentador al ordenador con Home Assistant.",
             "invalid_auth": "Autenticaci\u00f3n no v\u00e1lida"
         },
         "error": {
@@ -21,13 +21,13 @@
                     "wifi_pswd": "Contrase\u00f1a Wi-Fi",
                     "wifi_ssid": "SSID Wi-Fi"
                 },
-                "description": "Reinicie el calentador presionando + y OK hasta que la pantalla muestre 'Reiniciar'. Luego presione y mantenga presionado el bot\u00f3n OK en el calentador hasta que el LED azul comience a parpadear antes de presionar Enviar. La configuraci\u00f3n del calentador puede llevar algunos minutos."
+                "description": "Reinicia el calentador pulsando + y OK hasta que la pantalla muestre 'Restablecer'. Luego mant\u00e9n pulsado el bot\u00f3n OK en el calentador hasta que el led azul comience a parpadear antes de pulsar Enviar. La configuraci\u00f3n del calentador puede tardar algunos minutos."
             },
             "user": {
                 "data": {
-                    "connection_type": "Seleccione el tipo de conexi\u00f3n"
+                    "connection_type": "Selecciona el tipo de conexi\u00f3n"
                 },
-                "description": "Seleccione el tipo de conexi\u00f3n. Local requiere calentadores con bluetooth"
+                "description": "Selecciona el tipo de conexi\u00f3n. Local requiere calefactores con bluetooth"
             }
         }
     }

homeassistant/components/adax/translations/pt.json

@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "invalid_auth": "Autentica\u00e7\u00e3o inv\u00e1lida"
+        },
+        "error": {
+            "cannot_connect": "Falha na liga\u00e7\u00e3o"
+        },
+        "step": {
+            "cloud": {
+                "data": {
+                    "password": "Palavra-passe"
+                }
+            }
+        }
+    }
+}

homeassistant/components/adax/translations/sv.json

@@ -0,0 +1,34 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten \u00e4r redan konfigurerad",
+            "heater_not_available": "V\u00e4rmare inte tillg\u00e4nglig. F\u00f6rs\u00f6k att \u00e5terst\u00e4lla v\u00e4rmaren genom att trycka p\u00e5 + och OK i n\u00e5gra sekunder.",
+            "heater_not_found": "V\u00e4rmare hittades inte. F\u00f6rs\u00f6k att flytta v\u00e4rmaren n\u00e4rmare Home Assistant-datorn.",
+            "invalid_auth": "Ogiltig autentisering"
+        },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta."
+        },
+        "step": {
+            "cloud": {
+                "data": {
+                    "account_id": "Konto-ID",
+                    "password": "L\u00f6senord"
+                }
+            },
+            "local": {
+                "data": {
+                    "wifi_pswd": "Wi-Fi l\u00f6senord",
+                    "wifi_ssid": "Wi-Fi SSID"
+                },
+                "description": "\u00c5terst\u00e4ll v\u00e4rmaren genom att trycka p\u00e5 + och OK tills displayen visar 'Reset'. Tryck sedan och h\u00e5ll ner OK-knappen p\u00e5 v\u00e4rmaren tills den bl\u00e5 lysdioden b\u00f6rjar blinka innan du trycker p\u00e5 Skicka. Det kan ta n\u00e5gra minuter att konfigurera v\u00e4rmaren."
+            },
+            "user": {
+                "data": {
+                    "connection_type": "V\u00e4lj anslutningstyp"
+                },
+                "description": "V\u00e4lj anslutningstyp. Lokalt kr\u00e4ver v\u00e4rmare med bluetooth"
+            }
+        }
+    }
+}

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

@@ -27,7 +27,7 @@
                 "data": {
                     "connection_type": "\u9078\u64c7\u9023\u7dda\u985e\u5225"
                 },
-                "description": "\u9078\u64c7\u9023\u7dda\u985e\u5225\u3002\u672c\u5730\u7aef\u5c07\u9700\u8981\u5177\u5099\u85cd\u82bd\u52a0\u71b1\u5668"
+                "description": "\u9078\u64c7\u9023\u7dda\u985e\u5225\u3002\u672c\u5730\u7aef\u5c07\u9700\u8981\u5177\u5099\u85cd\u7259\u52a0\u71b1\u5668"
             }
         }
     }

homeassistant/components/adguard/__init__.py

@@ -1,12 +1,10 @@
 """Support for AdGuard Home."""
 from __future__ import annotations
 
-import logging
-
-from adguardhome import AdGuardHome, AdGuardHomeConnectionError, AdGuardHomeError
+from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
-from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_NAME,
@@ -22,13 +20,10 @@ from homeassistant.core import HomeAssistant, ServiceCall
 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.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo, Entity
 
 from .const import (
     CONF_FORCE,
     DATA_ADGUARD_CLIENT,
-    DATA_ADGUARD_VERSION,
     DOMAIN,
     SERVICE_ADD_URL,
     SERVICE_DISABLE_URL,
@@ -37,8 +32,6 @@ from .const import (
     SERVICE_REMOVE_URL,
 )
 
-_LOGGER = logging.getLogger(__name__)
-
 SERVICE_URL_SCHEMA = vol.Schema({vol.Required(CONF_URL): cv.url})
 SERVICE_ADD_URL_SCHEMA = vol.Schema(
     {vol.Required(CONF_NAME): cv.string, vol.Required(CONF_URL): cv.url}
@@ -70,7 +63,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except AdGuardHomeConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     async def add_url(call: ServiceCall) -> None:
         """Service call to add a new filter subscription to AdGuard Home."""
@@ -127,91 +120,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         del hass.data[DOMAIN]
 
     return unload_ok
-
-
-class AdGuardHomeEntity(Entity):
-    """Defines a base AdGuard Home entity."""
-
-    def __init__(
-        self,
-        adguard: AdGuardHome,
-        entry: ConfigEntry,
-        name: str,
-        icon: str,
-        enabled_default: bool = True,
-    ) -> None:
-        """Initialize the AdGuard Home entity."""
-        self._available = True
-        self._enabled_default = enabled_default
-        self._icon = icon
-        self._name = name
-        self._entry = entry
-        self.adguard = adguard
-
-    @property
-    def name(self) -> str:
-        """Return the name of the entity."""
-        return self._name
-
-    @property
-    def icon(self) -> str:
-        """Return the mdi icon of the entity."""
-        return self._icon
-
-    @property
-    def entity_registry_enabled_default(self) -> bool:
-        """Return if the entity should be enabled when first added to the entity registry."""
-        return self._enabled_default
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return self._available
-
-    async def async_update(self) -> None:
-        """Update AdGuard Home entity."""
-        if not self.enabled:
-            return
-
-        try:
-            await self._adguard_update()
-            self._available = True
-        except AdGuardHomeError:
-            if self._available:
-                _LOGGER.debug(
-                    "An error occurred while updating AdGuard Home sensor",
-                    exc_info=True,
-                )
-            self._available = False
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        raise NotImplementedError()
-
-
-class AdGuardHomeDeviceEntity(AdGuardHomeEntity):
-    """Defines a AdGuard Home device entity."""
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device information about this AdGuard Home instance."""
-        if self._entry.source == SOURCE_HASSIO:
-            config_url = "homeassistant://hassio/ingress/a0d7b954_adguard"
-        else:
-            if self.adguard.tls:
-                config_url = f"https://{self.adguard.host}:{self.adguard.port}"
-            else:
-                config_url = f"http://{self.adguard.host}:{self.adguard.port}"
-
-        return DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={
-                (DOMAIN, self.adguard.host, self.adguard.port, self.adguard.base_path)  # type: ignore[arg-type]
-            },
-            manufacturer="AdGuard Team",
-            name="AdGuard Home",
-            sw_version=self.hass.data[DOMAIN][self._entry.entry_id].get(
-                DATA_ADGUARD_VERSION
-            ),
-            configuration_url=config_url,
-        )

homeassistant/components/adguard/const.py

@@ -1,7 +1,10 @@
 """Constants for the AdGuard Home integration."""
+import logging
 
 DOMAIN = "adguard"
 
+LOGGER = logging.getLogger(__package__)
+
 DATA_ADGUARD_CLIENT = "adguard_client"
 DATA_ADGUARD_VERSION = "adguard_version"
 

homeassistant/components/adguard/entity.py

@@ -0,0 +1,69 @@
+"""AdGuard Home base entity."""
+from __future__ import annotations
+
+from adguardhome import AdGuardHome, AdGuardHomeError
+
+from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
+from homeassistant.helpers.device_registry import DeviceEntryType
+from homeassistant.helpers.entity import DeviceInfo, Entity
+
+from .const import DATA_ADGUARD_VERSION, DOMAIN, LOGGER
+
+
+class AdGuardHomeEntity(Entity):
+    """Defines a base AdGuard Home entity."""
+
+    _attr_has_entity_name = True
+    _attr_available = True
+
+    def __init__(
+        self,
+        adguard: AdGuardHome,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize the AdGuard Home entity."""
+        self._entry = entry
+        self.adguard = adguard
+
+    async def async_update(self) -> None:
+        """Update AdGuard Home entity."""
+        if not self.enabled:
+            return
+
+        try:
+            await self._adguard_update()
+            self._attr_available = True
+        except AdGuardHomeError:
+            if self._attr_available:
+                LOGGER.debug(
+                    "An error occurred while updating AdGuard Home sensor",
+                    exc_info=True,
+                )
+            self._attr_available = False
+
+    async def _adguard_update(self) -> None:
+        """Update AdGuard Home entity."""
+        raise NotImplementedError()
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device information about this AdGuard Home instance."""
+        if self._entry.source == SOURCE_HASSIO:
+            config_url = "homeassistant://hassio/ingress/a0d7b954_adguard"
+        elif self.adguard.tls:
+            config_url = f"https://{self.adguard.host}:{self.adguard.port}"
+        else:
+            config_url = f"http://{self.adguard.host}:{self.adguard.port}"
+
+        return DeviceInfo(
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={
+                (DOMAIN, self.adguard.host, self.adguard.port, self.adguard.base_path)  # type: ignore[arg-type]
+            },
+            manufacturer="AdGuard Team",
+            name="AdGuard Home",
+            sw_version=self.hass.data[DOMAIN][self._entry.entry_id].get(
+                DATA_ADGUARD_VERSION
+            ),
+            configuration_url=config_url,
+        )

homeassistant/components/adguard/sensor.py

@@ -1,24 +1,102 @@
 """Support for AdGuard Home sensors."""
 from __future__ import annotations
 
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
 from datetime import timedelta
+from typing import Any
 
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 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.entity_platform import AddEntitiesCallback
 
-from . import AdGuardHomeDeviceEntity
 from .const import DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERSION, DOMAIN
+from .entity import AdGuardHomeEntity
 
 SCAN_INTERVAL = timedelta(seconds=300)
 PARALLEL_UPDATES = 4
 
 
+@dataclass
+class AdGuardHomeEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    value_fn: Callable[[AdGuardHome], Coroutine[Any, Any, int | float]]
+
+
+@dataclass
+class AdGuardHomeEntityDescription(
+    SensorEntityDescription, AdGuardHomeEntityDescriptionMixin
+):
+    """Describes AdGuard Home sensor entity."""
+
+
+SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
+    AdGuardHomeEntityDescription(
+        key="dns_queries",
+        name="DNS queries",
+        icon="mdi:magnify",
+        native_unit_of_measurement="queries",
+        value_fn=lambda adguard: adguard.stats.dns_queries(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="blocked_filtering",
+        name="DNS queries blocked",
+        icon="mdi:magnify-close",
+        native_unit_of_measurement="queries",
+        value_fn=lambda adguard: adguard.stats.blocked_filtering(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="blocked_percentage",
+        name="DNS queries blocked ratio",
+        icon="mdi:magnify-close",
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda adguard: adguard.stats.blocked_percentage(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="blocked_parental",
+        name="Parental control blocked",
+        icon="mdi:human-male-girl",
+        native_unit_of_measurement="requests",
+        value_fn=lambda adguard: adguard.stats.replaced_parental(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="blocked_safebrowsing",
+        name="Safe browsing blocked",
+        icon="mdi:shield-half-full",
+        native_unit_of_measurement="requests",
+        value_fn=lambda adguard: adguard.stats.replaced_safebrowsing(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="enforced_safesearch",
+        name="Safe searches enforced",
+        icon="mdi:shield-search",
+        native_unit_of_measurement="requests",
+        value_fn=lambda adguard: adguard.stats.replaced_safesearch(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="average_speed",
+        name="Average processing speed",
+        icon="mdi:speedometer",
+        native_unit_of_measurement=TIME_MILLISECONDS,
+        value_fn=lambda adguard: adguard.stats.avg_processing_time(),
+    ),
+    AdGuardHomeEntityDescription(
+        key="rules_count",
+        name="Rules count",
+        icon="mdi:counter",
+        native_unit_of_measurement="rules",
+        value_fn=lambda adguard: adguard.filtering.rules_count(allowlist=False),
+        entity_registry_enabled_default=False,
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
@@ -34,215 +112,39 @@ async def async_setup_entry(
 
     hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_VERSION] = version
 
-    sensors = [
-        AdGuardHomeDNSQueriesSensor(adguard, entry),
-        AdGuardHomeBlockedFilteringSensor(adguard, entry),
-        AdGuardHomePercentageBlockedSensor(adguard, entry),
-        AdGuardHomeReplacedParentalSensor(adguard, entry),
-        AdGuardHomeReplacedSafeBrowsingSensor(adguard, entry),
-        AdGuardHomeReplacedSafeSearchSensor(adguard, entry),
-        AdGuardHomeAverageProcessingTimeSensor(adguard, entry),
-        AdGuardHomeRulesCountSensor(adguard, entry),
-    ]
-
-    async_add_entities(sensors, True)
+    async_add_entities(
+        [AdGuardHomeSensor(adguard, entry, description) for description in SENSORS],
+        True,
+    )
 
 
-class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
+class AdGuardHomeSensor(AdGuardHomeEntity, SensorEntity):
     """Defines a AdGuard Home sensor."""
 
+    entity_description: AdGuardHomeEntityDescription
+
     def __init__(
         self,
         adguard: AdGuardHome,
         entry: ConfigEntry,
-        name: str,
-        icon: str,
-        measurement: str,
-        unit_of_measurement: str,
-        enabled_default: bool = True,
+        description: AdGuardHomeEntityDescription,
     ) -> None:
         """Initialize AdGuard Home sensor."""
-        self._state: int | str | None = None
-        self._unit_of_measurement = unit_of_measurement
-        self.measurement = measurement
-
-        super().__init__(adguard, entry, name, icon, enabled_default)
-
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this sensor."""
-        return "_".join(
+        super().__init__(adguard, entry)
+        self.entity_description = description
+        self._attr_unique_id = "_".join(
             [
                 DOMAIN,
-                self.adguard.host,
-                str(self.adguard.port),
+                adguard.host,
+                str(adguard.port),
                 "sensor",
-                self.measurement,
+                description.key,
             ]
         )
 
-    @property
-    def native_value(self) -> int | str | None:
-        """Return the state of the sensor."""
-        return self._state
-
-    @property
-    def native_unit_of_measurement(self) -> str | None:
-        """Return the unit this state is expressed in."""
-        return self._unit_of_measurement
-
-
-class AdGuardHomeDNSQueriesSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home DNS Queries sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard DNS Queries",
-            "mdi:magnify",
-            "dns_queries",
-            "queries",
-        )
-
     async def _adguard_update(self) -> None:
         """Update AdGuard Home entity."""
-        self._state = await self.adguard.stats.dns_queries()
-
-
-class AdGuardHomeBlockedFilteringSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home blocked by filtering sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard DNS Queries Blocked",
-            "mdi:magnify-close",
-            "blocked_filtering",
-            "queries",
-            enabled_default=False,
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.stats.blocked_filtering()
-
-
-class AdGuardHomePercentageBlockedSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home blocked percentage sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard DNS Queries Blocked Ratio",
-            "mdi:magnify-close",
-            "blocked_percentage",
-            PERCENTAGE,
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        percentage = await self.adguard.stats.blocked_percentage()
-        self._state = f"{percentage:.2f}"
-
-
-class AdGuardHomeReplacedParentalSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home replaced by parental control sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Parental Control Blocked",
-            "mdi:human-male-girl",
-            "blocked_parental",
-            "requests",
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.stats.replaced_parental()
-
-
-class AdGuardHomeReplacedSafeBrowsingSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home replaced by safe browsing sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Safe Browsing Blocked",
-            "mdi:shield-half-full",
-            "blocked_safebrowsing",
-            "requests",
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.stats.replaced_safebrowsing()
-
-
-class AdGuardHomeReplacedSafeSearchSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home replaced by safe search sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Safe Searches Enforced",
-            "mdi:shield-search",
-            "enforced_safesearch",
-            "requests",
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.stats.replaced_safesearch()
-
-
-class AdGuardHomeAverageProcessingTimeSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home average processing time sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Average Processing Speed",
-            "mdi:speedometer",
-            "average_speed",
-            TIME_MILLISECONDS,
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        average = await self.adguard.stats.avg_processing_time()
-        self._state = f"{average:.2f}"
-
-
-class AdGuardHomeRulesCountSensor(AdGuardHomeSensor):
-    """Defines a AdGuard Home rules count sensor."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home sensor."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Rules Count",
-            "mdi:counter",
-            "rules_count",
-            "rules",
-            enabled_default=False,
-        )
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.filtering.rules_count(allowlist=False)
+        value = await self.entity_description.value_fn(self.adguard)
+        self._attr_native_value = value
+        if isinstance(value, float):
+            self._attr_native_value = f"{value:.2f}"

homeassistant/components/adguard/switch.py

@@ -1,27 +1,94 @@
 """Support for AdGuard Home switches."""
 from __future__ import annotations
 
+from collections.abc import Callable, Coroutine
+from dataclasses import dataclass
 from datetime import timedelta
-import logging
 from typing import Any
 
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError, AdGuardHomeError
 
-from homeassistant.components.switch import SwitchEntity
+from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import PlatformNotReady
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AdGuardHomeDeviceEntity
-from .const import DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERSION, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
+from .const import DATA_ADGUARD_CLIENT, DATA_ADGUARD_VERSION, DOMAIN, LOGGER
+from .entity import AdGuardHomeEntity
 
 SCAN_INTERVAL = timedelta(seconds=10)
 PARALLEL_UPDATES = 1
 
 
+@dataclass
+class AdGuardHomeSwitchEntityDescriptionMixin:
+    """Mixin for required keys."""
+
+    is_on_fn: Callable[[AdGuardHome], Callable[[], Coroutine[Any, Any, bool]]]
+    turn_on_fn: Callable[[AdGuardHome], Callable[[], Coroutine[Any, Any, None]]]
+    turn_off_fn: Callable[[AdGuardHome], Callable[[], Coroutine[Any, Any, None]]]
+
+
+@dataclass
+class AdGuardHomeSwitchEntityDescription(
+    SwitchEntityDescription, AdGuardHomeSwitchEntityDescriptionMixin
+):
+    """Describes AdGuard Home switch entity."""
+
+
+SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
+    AdGuardHomeSwitchEntityDescription(
+        key="protection",
+        name="Protection",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.protection_enabled,
+        turn_on_fn=lambda adguard: adguard.enable_protection,
+        turn_off_fn=lambda adguard: adguard.disable_protection,
+    ),
+    AdGuardHomeSwitchEntityDescription(
+        key="parental",
+        name="Parental control",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.parental.enabled,
+        turn_on_fn=lambda adguard: adguard.parental.enable,
+        turn_off_fn=lambda adguard: adguard.parental.disable,
+    ),
+    AdGuardHomeSwitchEntityDescription(
+        key="safesearch",
+        name="Safe search",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.safesearch.enabled,
+        turn_on_fn=lambda adguard: adguard.safesearch.enable,
+        turn_off_fn=lambda adguard: adguard.safesearch.disable,
+    ),
+    AdGuardHomeSwitchEntityDescription(
+        key="safebrowsing",
+        name="Safe browsing",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.safebrowsing.enabled,
+        turn_on_fn=lambda adguard: adguard.safebrowsing.enable,
+        turn_off_fn=lambda adguard: adguard.safebrowsing.disable,
+    ),
+    AdGuardHomeSwitchEntityDescription(
+        key="filtering",
+        name="Filtering",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.filtering.enabled,
+        turn_on_fn=lambda adguard: adguard.filtering.enable,
+        turn_off_fn=lambda adguard: adguard.filtering.disable,
+    ),
+    AdGuardHomeSwitchEntityDescription(
+        key="querylog",
+        name="Query log",
+        icon="mdi:shield-check",
+        is_on_fn=lambda adguard: adguard.querylog.enabled,
+        turn_on_fn=lambda adguard: adguard.querylog.enable,
+        turn_off_fn=lambda adguard: adguard.querylog.disable,
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
     entry: ConfigEntry,
@@ -37,203 +104,46 @@ async def async_setup_entry(
 
     hass.data[DOMAIN][entry.entry_id][DATA_ADGUARD_VERSION] = version
 
-    switches = [
-        AdGuardHomeProtectionSwitch(adguard, entry),
-        AdGuardHomeFilteringSwitch(adguard, entry),
-        AdGuardHomeParentalSwitch(adguard, entry),
-        AdGuardHomeSafeBrowsingSwitch(adguard, entry),
-        AdGuardHomeSafeSearchSwitch(adguard, entry),
-        AdGuardHomeQueryLogSwitch(adguard, entry),
-    ]
-    async_add_entities(switches, True)
+    async_add_entities(
+        [AdGuardHomeSwitch(adguard, entry, description) for description in SWITCHES],
+        True,
+    )
 
 
-class AdGuardHomeSwitch(AdGuardHomeDeviceEntity, SwitchEntity):
+class AdGuardHomeSwitch(AdGuardHomeEntity, SwitchEntity):
     """Defines a AdGuard Home switch."""
 
+    entity_description: AdGuardHomeSwitchEntityDescription
+
     def __init__(
         self,
         adguard: AdGuardHome,
         entry: ConfigEntry,
-        name: str,
-        icon: str,
-        key: str,
-        enabled_default: bool = True,
+        description: AdGuardHomeSwitchEntityDescription,
     ) -> None:
         """Initialize AdGuard Home switch."""
-        self._state = False
-        self._key = key
-        super().__init__(adguard, entry, name, icon, enabled_default)
-
-    @property
-    def unique_id(self) -> str:
-        """Return the unique ID for this sensor."""
-        return "_".join(
-            [DOMAIN, self.adguard.host, str(self.adguard.port), "switch", self._key]
+        super().__init__(adguard, entry)
+        self.entity_description = description
+        self._attr_unique_id = "_".join(
+            [DOMAIN, adguard.host, str(adguard.port), "switch", description.key]
         )
 
-    @property
-    def is_on(self) -> bool:
-        """Return the state of the switch."""
-        return self._state
-
     async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn off the switch."""
         try:
-            await self._adguard_turn_off()
+            await self.entity_description.turn_off_fn(self.adguard)()
         except AdGuardHomeError:
-            _LOGGER.error("An error occurred while turning off AdGuard Home switch")
-            self._available = False
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        raise NotImplementedError()
+            LOGGER.error("An error occurred while turning off AdGuard Home switch")
+            self._attr_available = False
 
     async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn on the switch."""
         try:
-            await self._adguard_turn_on()
+            await self.entity_description.turn_on_fn(self.adguard)()
         except AdGuardHomeError:
-            _LOGGER.error("An error occurred while turning on AdGuard Home switch")
-            self._available = False
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        raise NotImplementedError()
-
-
-class AdGuardHomeProtectionSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home protection switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard, entry, "AdGuard Protection", "mdi:shield-check", "protection"
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.disable_protection()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.enable_protection()
+            LOGGER.error("An error occurred while turning on AdGuard Home switch")
+            self._attr_available = False
 
     async def _adguard_update(self) -> None:
         """Update AdGuard Home entity."""
-        self._state = await self.adguard.protection_enabled()
-
-
-class AdGuardHomeParentalSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home parental control switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard, entry, "AdGuard Parental Control", "mdi:shield-check", "parental"
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.parental.disable()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.parental.enable()
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.parental.enabled()
-
-
-class AdGuardHomeSafeSearchSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home safe search switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard, entry, "AdGuard Safe Search", "mdi:shield-check", "safesearch"
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.safesearch.disable()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.safesearch.enable()
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.safesearch.enabled()
-
-
-class AdGuardHomeSafeBrowsingSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home safe search switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard, entry, "AdGuard Safe Browsing", "mdi:shield-check", "safebrowsing"
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.safebrowsing.disable()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.safebrowsing.enable()
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.safebrowsing.enabled()
-
-
-class AdGuardHomeFilteringSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home filtering switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard, entry, "AdGuard Filtering", "mdi:shield-check", "filtering"
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.filtering.disable()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.filtering.enable()
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.filtering.enabled()
-
-
-class AdGuardHomeQueryLogSwitch(AdGuardHomeSwitch):
-    """Defines a AdGuard Home query log switch."""
-
-    def __init__(self, adguard: AdGuardHome, entry: ConfigEntry) -> None:
-        """Initialize AdGuard Home switch."""
-        super().__init__(
-            adguard,
-            entry,
-            "AdGuard Query Log",
-            "mdi:shield-check",
-            "querylog",
-            enabled_default=False,
-        )
-
-    async def _adguard_turn_off(self) -> None:
-        """Turn off the switch."""
-        await self.adguard.querylog.disable()
-
-    async def _adguard_turn_on(self) -> None:
-        """Turn on the switch."""
-        await self.adguard.querylog.enable()
-
-    async def _adguard_update(self) -> None:
-        """Update AdGuard Home entity."""
-        self._state = await self.adguard.querylog.enabled()
+        self._attr_is_on = await self.entity_description.is_on_fn(self.adguard)()

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 Supervisor: {addon} ?",
-                "title": "AdGuard Home v\u00eda complemento de Home Assistant"
+                "description": "\u00bfQuieres configurar Home Assistant para conectarse al AdGuard Home proporcionado por el complemento: {addon}?",
+                "title": "AdGuard Home a trav\u00e9s del complemento Home Assistant"
             },
             "user": {
                 "data": {
@@ -18,10 +18,10 @@
                     "password": "Contrase\u00f1a",
                     "port": "Puerto",
                     "ssl": "Utiliza un certificado SSL",
-                    "username": "Usuario",
-                    "verify_ssl": "Verificar certificado SSL"
+                    "username": "Nombre de usuario",
+                    "verify_ssl": "Verificar el certificado SSL"
                 },
-                "description": "Configure su instancia de AdGuard Home para permitir la supervisi\u00f3n y el control."
+                "description": "Configura tu instancia AdGuard Home para permitir la supervisi\u00f3n y el control."
             }
         }
     }

homeassistant/components/adguard/translations/hu.json

@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "already_configured": "A szolg\u00e1ltat\u00e1s m\u00e1r konfigur\u00e1lva van",
-            "existing_instance_updated": "Friss\u00edtette a megl\u00e9v\u0151 konfigur\u00e1ci\u00f3t."
+            "existing_instance_updated": "A megl\u00e9v\u0151 konfigur\u00e1ci\u00f3 friss\u00edtve."
         },
         "error": {
             "cannot_connect": "Sikertelen csatlakoz\u00e1s"

homeassistant/components/adguard/translations/pt.json

@@ -1,5 +1,8 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "O servi\u00e7o j\u00e1 est\u00e1 configurado"
+        },
         "error": {
             "cannot_connect": "Falha na liga\u00e7\u00e3o"
         },
@@ -14,7 +17,7 @@
                     "port": "Porta",
                     "ssl": "Utiliza um certificado SSL",
                     "username": "Nome de Utilizador",
-                    "verify_ssl": "Verificar certificado SSL"
+                    "verify_ssl": "Verificar o certificado SSL"
                 }
             }
         }

homeassistant/components/adguard/translations/sv.json

@@ -1,8 +1,12 @@
 {
     "config": {
         "abort": {
+            "already_configured": "Tj\u00e4nsten \u00e4r redan konfigurerad",
             "existing_instance_updated": "Uppdaterade existerande konfiguration."
         },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta."
+        },
         "step": {
             "hassio_confirm": {
                 "description": "Vill du konfigurera Home Assistant f\u00f6r att ansluta till AdGuard Home som tillhandah\u00e5lls av Supervisor Add-on: {addon}?",
@@ -10,7 +14,9 @@
             },
             "user": {
                 "data": {
+                    "host": "V\u00e4rd",
                     "password": "L\u00f6senord",
+                    "port": "Port",
                     "ssl": "AdGuard Home anv\u00e4nder ett SSL-certifikat",
                     "username": "Anv\u00e4ndarnamn",
                     "verify_ssl": "AdGuard Home anv\u00e4nder ett korrekt certifikat"

homeassistant/components/ads/binary_sensor.py

@@ -53,7 +53,7 @@ class AdsBinarySensor(AdsEntity, BinarySensorEntity):
         super().__init__(ads_hub, name, ads_var)
         self._attr_device_class = device_class or BinarySensorDeviceClass.MOVING
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register device notification."""
         await self.async_initialize_device(self._ads_var, pyads.PLCTYPE_BOOL)
 

homeassistant/components/ads/light.py

@@ -1,6 +1,8 @@
 """Support for ADS light sources."""
 from __future__ import annotations
 
+from typing import Any
+
 import pyads
 import voluptuous as vol
 
@@ -66,7 +68,7 @@ class AdsLight(AdsEntity, LightEntity):
             self._attr_color_mode = ColorMode.ONOFF
             self._attr_supported_color_modes = {ColorMode.ONOFF}
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register device notification."""
         await self.async_initialize_device(self._ads_var, pyads.PLCTYPE_BOOL)
 
@@ -87,7 +89,7 @@ class AdsLight(AdsEntity, LightEntity):
         """Return True if the entity is on."""
         return self._state_dict[STATE_KEY_STATE]
 
-    def turn_on(self, **kwargs):
+    def turn_on(self, **kwargs: Any) -> None:
         """Turn the light on or set a specific dimmer value."""
         brightness = kwargs.get(ATTR_BRIGHTNESS)
         self._ads_hub.write_by_name(self._ads_var, True, pyads.PLCTYPE_BOOL)
@@ -97,6 +99,6 @@ class AdsLight(AdsEntity, LightEntity):
                 self._ads_var_brightness, brightness, pyads.PLCTYPE_UINT
             )
 
-    def turn_off(self, **kwargs):
+    def turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
         self._ads_hub.write_by_name(self._ads_var, False, pyads.PLCTYPE_BOOL)

homeassistant/components/ads/sensor.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components import ads
 from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
 from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
@@ -19,6 +18,7 @@ from . import (
     STATE_KEY_STATE,
     AdsEntity,
 )
+from .. import ads
 
 DEFAULT_NAME = "ADS sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
@@ -70,7 +70,7 @@ class AdsSensor(AdsEntity, SensorEntity):
         self._ads_type = ads_type
         self._factor = factor
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register device notification."""
         await self.async_initialize_device(
             self._ads_var,

homeassistant/components/ads/switch.py

@@ -1,6 +1,8 @@
 """Support for ADS switch platform."""
 from __future__ import annotations
 
+from typing import Any
+
 import pyads
 import voluptuous as vol
 
@@ -41,7 +43,7 @@ def setup_platform(
 class AdsSwitch(AdsEntity, SwitchEntity):
     """Representation of an ADS switch device."""
 
-    async def async_added_to_hass(self):
+    async def async_added_to_hass(self) -> None:
         """Register device notification."""
         await self.async_initialize_device(self._ads_var, pyads.PLCTYPE_BOOL)
 
@@ -50,10 +52,10 @@ class AdsSwitch(AdsEntity, SwitchEntity):
         """Return True if the entity is on."""
         return self._state_dict[STATE_KEY_STATE]
 
-    def turn_on(self, **kwargs):
+    def turn_on(self, **kwargs: Any) -> None:
         """Turn the switch on."""
         self._ads_hub.write_by_name(self._ads_var, True, pyads.PLCTYPE_BOOL)
 
-    def turn_off(self, **kwargs):
+    def turn_off(self, **kwargs: Any) -> None:
         """Turn the switch off."""
         self._ads_hub.write_by_name(self._ads_var, False, pyads.PLCTYPE_BOOL)

homeassistant/components/advantage_air/__init__.py

@@ -20,6 +20,8 @@ PLATFORMS = [
     Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.UPDATE,
+    Platform.LIGHT,
 ]
 
 _LOGGER = logging.getLogger(__name__)
@@ -50,22 +52,28 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
     )
 
-    async def async_change(change):
-        try:
-            if await api.async_change(change):
-                await coordinator.async_refresh()
-        except ApiError as err:
-            _LOGGER.warning(err)
+    def error_handle_factory(func):
+        """Return the provided API function wrapped in an error handler and coordinator refresh."""
+
+        async def error_handle(param):
+            try:
+                if await func(param):
+                    await coordinator.async_refresh()
+            except ApiError as err:
+                _LOGGER.warning(err)
+
+        return error_handle
 
     await coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = {
         "coordinator": coordinator,
-        "async_change": async_change,
+        "async_change": error_handle_factory(api.aircon.async_set),
+        "async_set_light": error_handle_factory(api.lights.async_set),
     }
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 

homeassistant/components/advantage_air/binary_sensor.py

@@ -11,7 +11,7 @@ from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 
 PARALLEL_UPDATES = 0
 
@@ -21,13 +21,13 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up AdvantageAir motion platform."""
+    """Set up AdvantageAir Binary Sensor platform."""
 
     instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
     entities: list[BinarySensorEntity] = []
     for ac_key, ac_device in instance["coordinator"].data["aircons"].items():
-        entities.append(AdvantageAirZoneFilter(instance, ac_key))
+        entities.append(AdvantageAirFilter(instance, ac_key))
         for zone_key, zone in ac_device["zones"].items():
             # Only add motion sensor when motion is enabled
             if zone["motionConfig"] >= 2:
@@ -38,19 +38,17 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class AdvantageAirZoneFilter(AdvantageAirEntity, BinarySensorEntity):
-    """Advantage Air Filter."""
+class AdvantageAirFilter(AdvantageAirAcEntity, BinarySensorEntity):
+    """Advantage Air Filter sensor."""
 
     _attr_device_class = BinarySensorDeviceClass.PROBLEM
     _attr_entity_category = EntityCategory.DIAGNOSTIC
+    _attr_name = "Filter"
 
     def __init__(self, instance, ac_key):
-        """Initialize an Advantage Air Filter."""
+        """Initialize an Advantage Air Filter sensor."""
         super().__init__(instance, ac_key)
-        self._attr_name = f'{self._ac["name"]} Filter'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-filter'
-        )
+        self._attr_unique_id += "-filter"
 
     @property
     def is_on(self):
@@ -58,18 +56,16 @@ class AdvantageAirZoneFilter(AdvantageAirEntity, BinarySensorEntity):
         return self._ac["filterCleanStatus"]
 
 
-class AdvantageAirZoneMotion(AdvantageAirEntity, BinarySensorEntity):
-    """Advantage Air Zone Motion."""
+class AdvantageAirZoneMotion(AdvantageAirZoneEntity, BinarySensorEntity):
+    """Advantage Air Zone Motion sensor."""
 
     _attr_device_class = BinarySensorDeviceClass.MOTION
 
     def __init__(self, instance, ac_key, zone_key):
-        """Initialize an Advantage Air Zone Motion."""
+        """Initialize an Advantage Air Zone Motion sensor."""
         super().__init__(instance, ac_key, zone_key)
-        self._attr_name = f'{self._zone["name"]} Motion'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-motion'
-        )
+        self._attr_name = f'{self._zone["name"]} motion'
+        self._attr_unique_id += "-motion"
 
     @property
     def is_on(self):
@@ -77,19 +73,17 @@ class AdvantageAirZoneMotion(AdvantageAirEntity, BinarySensorEntity):
         return self._zone["motion"] == 20
 
 
-class AdvantageAirZoneMyZone(AdvantageAirEntity, BinarySensorEntity):
-    """Advantage Air Zone MyZone."""
+class AdvantageAirZoneMyZone(AdvantageAirZoneEntity, BinarySensorEntity):
+    """Advantage Air Zone MyZone sensor."""
 
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
     def __init__(self, instance, ac_key, zone_key):
-        """Initialize an Advantage Air Zone MyZone."""
+        """Initialize an Advantage Air Zone MyZone sensor."""
         super().__init__(instance, ac_key, zone_key)
-        self._attr_name = f'{self._zone["name"]} MyZone'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-myzone'
-        )
+        self._attr_name = f'{self._zone["name"]} myZone'
+        self._attr_unique_id += "-myzone"
 
     @property
     def is_on(self):

homeassistant/components/advantage_air/climate.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 import logging
+from typing import Any
 
 from homeassistant.components.climate import ClimateEntity
 from homeassistant.components.climate.const import (
@@ -15,7 +16,6 @@ from homeassistant.components.climate.const import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, TEMP_CELSIUS
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import (
@@ -25,7 +25,7 @@ from .const import (
     ADVANTAGE_AIR_STATE_OPEN,
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 
 ADVANTAGE_AIR_HVAC_MODES = {
     "heat": HVACMode.HEAT,
@@ -45,7 +45,7 @@ AC_HVAC_MODES = [
 ]
 
 ADVANTAGE_AIR_FAN_MODES = {
-    "auto": FAN_AUTO,
+    "autoAA": FAN_AUTO,
     "low": FAN_LOW,
     "medium": FAN_MEDIUM,
     "high": FAN_HIGH,
@@ -53,7 +53,6 @@ ADVANTAGE_AIR_FAN_MODES = {
 HASS_FAN_MODES = {v: k for k, v in ADVANTAGE_AIR_FAN_MODES.items()}
 FAN_SPEEDS = {FAN_LOW: 30, FAN_MEDIUM: 60, FAN_HIGH: 100}
 
-ADVANTAGE_AIR_SERVICE_SET_MYZONE = "set_myzone"
 ZONE_HVAC_MODES = [HVACMode.OFF, HVACMode.HEAT_COOL]
 
 PARALLEL_UPDATES = 0
@@ -79,26 +78,14 @@ async def async_setup_entry(
                 entities.append(AdvantageAirZone(instance, ac_key, zone_key))
     async_add_entities(entities)
 
-    platform = entity_platform.async_get_current_platform()
-    platform.async_register_entity_service(
-        ADVANTAGE_AIR_SERVICE_SET_MYZONE,
-        {},
-        "set_myzone",
-    )
 
-
-class AdvantageAirClimateEntity(AdvantageAirEntity, ClimateEntity):
-    """AdvantageAir Climate class."""
+class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
+    """AdvantageAir AC unit."""
 
     _attr_temperature_unit = TEMP_CELSIUS
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_max_temp = 32
     _attr_min_temp = 16
-
-
-class AdvantageAirAC(AdvantageAirClimateEntity):
-    """AdvantageAir AC unit."""
-
     _attr_fan_modes = [FAN_AUTO, FAN_LOW, FAN_MEDIUM, FAN_HIGH]
     _attr_hvac_modes = AC_HVAC_MODES
     _attr_supported_features = (
@@ -108,8 +95,6 @@ class AdvantageAirAC(AdvantageAirClimateEntity):
     def __init__(self, instance, ac_key):
         """Initialize an AdvantageAir AC unit."""
         super().__init__(instance, ac_key)
-        self._attr_name = self._ac["name"]
-        self._attr_unique_id = f'{self.coordinator.data["system"]["rid"]}-{ac_key}'
         if self._ac.get("myAutoModeEnabled"):
             self._attr_hvac_modes = AC_HVAC_MODES + [HVACMode.AUTO]
 
@@ -130,7 +115,7 @@ class AdvantageAirAC(AdvantageAirClimateEntity):
         """Return the current fan modes."""
         return ADVANTAGE_AIR_FAN_MODES.get(self._ac["fan"])
 
-    async def async_set_hvac_mode(self, hvac_mode):
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC Mode and State."""
         if hvac_mode == HVACMode.OFF:
             await self.async_change(
@@ -148,21 +133,25 @@ class AdvantageAirAC(AdvantageAirClimateEntity):
                 }
             )
 
-    async def async_set_fan_mode(self, fan_mode):
+    async def async_set_fan_mode(self, fan_mode: str) -> None:
         """Set the Fan Mode."""
         await self.async_change(
             {self.ac_key: {"info": {"fan": HASS_FAN_MODES.get(fan_mode)}}}
         )
 
-    async def async_set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the Temperature."""
         temp = kwargs.get(ATTR_TEMPERATURE)
         await self.async_change({self.ac_key: {"info": {"setTemp": temp}}})
 
 
-class AdvantageAirZone(AdvantageAirClimateEntity):
+class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
     """AdvantageAir Zone control."""
 
+    _attr_temperature_unit = TEMP_CELSIUS
+    _attr_target_temperature_step = PRECISION_WHOLE
+    _attr_max_temp = 32
+    _attr_min_temp = 16
     _attr_hvac_modes = ZONE_HVAC_MODES
     _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
 
@@ -191,7 +180,7 @@ class AdvantageAirZone(AdvantageAirClimateEntity):
         """Return the target temperature."""
         return self._zone["setTemp"]
 
-    async def async_set_hvac_mode(self, hvac_mode):
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC Mode and State."""
         if hvac_mode == HVACMode.OFF:
             await self.async_change(
@@ -210,18 +199,9 @@ class AdvantageAirZone(AdvantageAirClimateEntity):
                 }
             )
 
-    async def async_set_temperature(self, **kwargs):
+    async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set the Temperature."""
         temp = kwargs.get(ATTR_TEMPERATURE)
         await self.async_change(
             {self.ac_key: {"zones": {self.zone_key: {"setTemp": temp}}}}
         )
-
-    async def set_myzone(self, **kwargs):
-        """Set this zone as the 'MyZone'."""
-        _LOGGER.warning(
-            "The advantage_air.set_myzone service has been deprecated and will be removed in a future version, please use the select.select_option service on the MyZone entity"
-        )
-        await self.async_change(
-            {self.ac_key: {"info": {"myZone": self._zone["number"]}}}
-        )

homeassistant/components/advantage_air/cover.py

@@ -16,7 +16,7 @@ from .const import (
     ADVANTAGE_AIR_STATE_OPEN,
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirZoneEntity
 
 PARALLEL_UPDATES = 0
 
@@ -39,8 +39,8 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class AdvantageAirZoneVent(AdvantageAirEntity, CoverEntity):
-    """Advantage Air Cover Class."""
+class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
+    """Advantage Air Zone Vent."""
 
     _attr_device_class = CoverDeviceClass.DAMPER
     _attr_supported_features = (
@@ -50,12 +50,9 @@ class AdvantageAirZoneVent(AdvantageAirEntity, CoverEntity):
     )
 
     def __init__(self, instance, ac_key, zone_key):
-        """Initialize an Advantage Air Cover Class."""
+        """Initialize an Advantage Air Zone Vent."""
         super().__init__(instance, ac_key, zone_key)
-        self._attr_name = f'{self._zone["name"]}'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}'
-        )
+        self._attr_name = self._zone["name"]
 
     @property
     def is_closed(self) -> bool:

homeassistant/components/advantage_air/entity.py

@@ -9,24 +9,46 @@ from .const import DOMAIN
 class AdvantageAirEntity(CoordinatorEntity):
     """Parent class for Advantage Air Entities."""
 
-    def __init__(self, instance, ac_key, zone_key=None):
-        """Initialize common aspects of an Advantage Air sensor."""
+    _attr_has_entity_name = True
+
+    def __init__(self, instance):
+        """Initialize common aspects of an Advantage Air entity."""
         super().__init__(instance["coordinator"])
+        self._attr_unique_id = self.coordinator.data["system"]["rid"]
+
+
+class AdvantageAirAcEntity(AdvantageAirEntity):
+    """Parent class for Advantage Air AC Entities."""
+
+    def __init__(self, instance, ac_key):
+        """Initialize common aspects of an Advantage Air ac entity."""
+        super().__init__(instance)
         self.async_change = instance["async_change"]
         self.ac_key = ac_key
-        self.zone_key = zone_key
+        self._attr_unique_id += f"-{ac_key}"
+
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.data["system"]["rid"])},
+            via_device=(DOMAIN, self.coordinator.data["system"]["rid"]),
+            identifiers={(DOMAIN, self._attr_unique_id)},
             manufacturer="Advantage Air",
             model=self.coordinator.data["system"]["sysType"],
-            name=self.coordinator.data["system"]["name"],
-            sw_version=self.coordinator.data["system"]["myAppRev"],
+            name=self.coordinator.data["aircons"][self.ac_key]["info"]["name"],
         )
 
     @property
     def _ac(self):
         return self.coordinator.data["aircons"][self.ac_key]["info"]
 
+
+class AdvantageAirZoneEntity(AdvantageAirAcEntity):
+    """Parent class for Advantage Air Zone Entities."""
+
+    def __init__(self, instance, ac_key, zone_key):
+        """Initialize common aspects of an Advantage Air zone entity."""
+        super().__init__(instance, ac_key)
+        self.zone_key = zone_key
+        self._attr_unique_id += f"-{zone_key}"
+
     @property
     def _zone(self):
         return self.coordinator.data["aircons"][self.ac_key]["zones"][self.zone_key]

homeassistant/components/advantage_air/light.py

@@ -0,0 +1,90 @@
+"""Light platform for Advantage Air integration."""
+from typing import Any
+
+from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import (
+    ADVANTAGE_AIR_STATE_OFF,
+    ADVANTAGE_AIR_STATE_ON,
+    DOMAIN as ADVANTAGE_AIR_DOMAIN,
+)
+from .entity import AdvantageAirEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up AdvantageAir light platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    entities = []
+    if "myLights" in instance["coordinator"].data:
+        for light in instance["coordinator"].data["myLights"]["lights"].values():
+            if light.get("relay"):
+                entities.append(AdvantageAirLight(instance, light))
+            else:
+                entities.append(AdvantageAirLightDimmable(instance, light))
+    async_add_entities(entities)
+
+
+class AdvantageAirLight(AdvantageAirEntity, LightEntity):
+    """Representation of Advantage Air Light."""
+
+    _attr_supported_color_modes = {ColorMode.ONOFF}
+
+    def __init__(self, instance, light):
+        """Initialize an Advantage Air Light."""
+        super().__init__(instance)
+        self.async_set_light = instance["async_set_light"]
+        self._id = light["id"]
+        self._attr_unique_id += f"-{self._id}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(ADVANTAGE_AIR_DOMAIN, self._attr_unique_id)},
+            via_device=(ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"]),
+            manufacturer="Advantage Air",
+            model=light.get("moduleType"),
+            name=light["name"],
+        )
+
+    @property
+    def _light(self):
+        """Return the light object."""
+        return self.coordinator.data["myLights"]["lights"][self._id]
+
+    @property
+    def is_on(self) -> bool:
+        """Return if the light is on."""
+        return self._light["state"] == ADVANTAGE_AIR_STATE_ON
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the light on."""
+        await self.async_set_light({"id": self._id, "state": ADVANTAGE_AIR_STATE_ON})
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the light off."""
+        await self.async_set_light({"id": self._id, "state": ADVANTAGE_AIR_STATE_OFF})
+
+
+class AdvantageAirLightDimmable(AdvantageAirLight):
+    """Representation of Advantage Air Dimmable Light."""
+
+    _attr_supported_color_modes = {ColorMode.ONOFF, ColorMode.BRIGHTNESS}
+
+    @property
+    def brightness(self) -> int:
+        """Return the brightness of this light between 0..255."""
+        return round(self._light["value"] * 255 / 100)
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the light on and optionally set the brightness."""
+        data = {"id": self._id, "state": ADVANTAGE_AIR_STATE_ON}
+        if ATTR_BRIGHTNESS in kwargs:
+            data["value"] = round(kwargs[ATTR_BRIGHTNESS] * 100 / 255)
+        await self.async_set_light(data)

homeassistant/components/advantage_air/manifest.json

@@ -4,7 +4,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/advantage_air",
   "codeowners": ["@Bre77"],
-  "requirements": ["advantage_air==0.3.1"],
+  "requirements": ["advantage_air==0.4.1"],
   "quality_scale": "platinum",
   "iot_class": "local_polling",
   "loggers": ["advantage_air"]

homeassistant/components/advantage_air/select.py

@@ -5,7 +5,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirAcEntity
 
 ADVANTAGE_AIR_INACTIVE = "Inactive"
 
@@ -15,7 +15,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up AdvantageAir toggle platform."""
+    """Set up AdvantageAir select platform."""
 
     instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
@@ -25,21 +25,19 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class AdvantageAirMyZone(AdvantageAirEntity, SelectEntity):
+class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
     """Representation of Advantage Air MyZone control."""
 
     _attr_icon = "mdi:home-thermometer"
-    _attr_options = [ADVANTAGE_AIR_INACTIVE]
-    _number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
-    _name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}
+    _attr_name = "MyZone"
 
     def __init__(self, instance, ac_key):
         """Initialize an Advantage Air MyZone control."""
         super().__init__(instance, ac_key)
-        self._attr_name = f'{self._ac["name"]} MyZone'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-myzone'
-        )
+        self._attr_unique_id += "-myzone"
+        self._attr_options = [ADVANTAGE_AIR_INACTIVE]
+        self._number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
+        self._name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}
 
         for zone in instance["coordinator"].data["aircons"][ac_key]["zones"].values():
             if zone["type"] > 0:
@@ -48,11 +46,11 @@ class AdvantageAirMyZone(AdvantageAirEntity, SelectEntity):
                 self._attr_options.append(zone["name"])
 
     @property
-    def current_option(self):
-        """Return the fresh air status."""
+    def current_option(self) -> str:
+        """Return the current MyZone."""
         return self._number_to_name[self._ac["myZone"]]
 
-    async def async_select_option(self, option):
+    async def async_select_option(self, option: str) -> None:
         """Set the MyZone."""
         await self.async_change(
             {self.ac_key: {"info": {"myZone": self._name_to_number[option]}}}

homeassistant/components/advantage_air/sensor.py

@@ -16,7 +16,7 @@ from homeassistant.helpers.entity import EntityCategory
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import ADVANTAGE_AIR_STATE_OPEN, DOMAIN as ADVANTAGE_AIR_DOMAIN
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 
 ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
 ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
@@ -56,7 +56,7 @@ async def async_setup_entry(
     )
 
 
-class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
+class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
     """Representation of Advantage Air timer control."""
 
     _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
@@ -67,10 +67,8 @@ class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
         super().__init__(instance, ac_key)
         self.action = action
         self._time_key = f"countDownTo{action}"
-        self._attr_name = f'{self._ac["name"]} Time To {action}'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-timeto{action}'
-        )
+        self._attr_name = f"Time to {action}"
+        self._attr_unique_id += f"-timeto{action}"
 
     @property
     def native_value(self):
@@ -90,7 +88,7 @@ class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
         await self.async_change({self.ac_key: {"info": {self._time_key: value}}})
 
 
-class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
+class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
     """Representation of Advantage Air Zone Vent Sensor."""
 
     _attr_native_unit_of_measurement = PERCENTAGE
@@ -100,10 +98,8 @@ class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
     def __init__(self, instance, ac_key, zone_key):
         """Initialize an Advantage Air Zone Vent Sensor."""
         super().__init__(instance, ac_key, zone_key=zone_key)
-        self._attr_name = f'{self._zone["name"]} Vent'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-vent'
-        )
+        self._attr_name = f'{self._zone["name"]} vent'
+        self._attr_unique_id += "-vent"
 
     @property
     def native_value(self):
@@ -120,7 +116,7 @@ class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
         return "mdi:fan-off"
 
 
-class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
+class AdvantageAirZoneSignal(AdvantageAirZoneEntity, SensorEntity):
     """Representation of Advantage Air Zone wireless signal sensor."""
 
     _attr_native_unit_of_measurement = PERCENTAGE
@@ -130,10 +126,8 @@ class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
     def __init__(self, instance, ac_key, zone_key):
         """Initialize an Advantage Air Zone wireless signal sensor."""
         super().__init__(instance, ac_key, zone_key)
-        self._attr_name = f'{self._zone["name"]} Signal'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-signal'
-        )
+        self._attr_name = f'{self._zone["name"]} signal'
+        self._attr_unique_id += "-signal"
 
     @property
     def native_value(self):
@@ -154,7 +148,7 @@ class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
         return "mdi:wifi-strength-outline"
 
 
-class AdvantageAirZoneTemp(AdvantageAirEntity, SensorEntity):
+class AdvantageAirZoneTemp(AdvantageAirZoneEntity, SensorEntity):
     """Representation of Advantage Air Zone temperature sensor."""
 
     _attr_native_unit_of_measurement = TEMP_CELSIUS
@@ -166,10 +160,8 @@ class AdvantageAirZoneTemp(AdvantageAirEntity, SensorEntity):
     def __init__(self, instance, ac_key, zone_key):
         """Initialize an Advantage Air Zone Temp Sensor."""
         super().__init__(instance, ac_key, zone_key)
-        self._attr_name = f'{self._zone["name"]} Temperature'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-temp'
-        )
+        self._attr_name = f'{self._zone["name"]} temperature'
+        self._attr_unique_id += "-temp"
 
     @property
     def native_value(self):

homeassistant/components/advantage_air/services.yaml

@@ -15,11 +15,3 @@ set_time_to:
           min: 0
           max: 1440
           unit_of_measurement: minutes
-
-set_myzone:
-  name: Set MyZone
-  description: Change which zone is set as the reference for temperature control (deprecated)
-  target:
-    entity:
-      integration: advantage_air
-      domain: climate

homeassistant/components/advantage_air/switch.py

@@ -1,4 +1,6 @@
 """Switch platform for Advantage Air integration."""
+from typing import Any
+
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -9,7 +11,7 @@ from .const import (
     ADVANTAGE_AIR_STATE_ON,
     DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirEntity
+from .entity import AdvantageAirAcEntity
 
 
 async def async_setup_entry(
@@ -17,7 +19,7 @@ async def async_setup_entry(
     config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
-    """Set up AdvantageAir toggle platform."""
+    """Set up AdvantageAir switch platform."""
 
     instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
 
@@ -28,31 +30,29 @@ async def async_setup_entry(
     async_add_entities(entities)
 
 
-class AdvantageAirFreshAir(AdvantageAirEntity, SwitchEntity):
+class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):
     """Representation of Advantage Air fresh air control."""
 
     _attr_icon = "mdi:air-filter"
+    _attr_name = "Fresh air"
 
     def __init__(self, instance, ac_key):
         """Initialize an Advantage Air fresh air control."""
         super().__init__(instance, ac_key)
-        self._attr_name = f'{self._ac["name"]} Fresh Air'
-        self._attr_unique_id = (
-            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-freshair'
-        )
+        self._attr_unique_id += "-freshair"
 
     @property
     def is_on(self):
         """Return the fresh air status."""
         return self._ac["freshAirStatus"] == ADVANTAGE_AIR_STATE_ON
 
-    async def async_turn_on(self, **kwargs):
+    async def async_turn_on(self, **kwargs: Any) -> None:
         """Turn fresh air on."""
         await self.async_change(
             {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_ON}}}
         )
 
-    async def async_turn_off(self, **kwargs):
+    async def async_turn_off(self, **kwargs: Any) -> None:
         """Turn fresh air off."""
         await self.async_change(
             {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_OFF}}}

homeassistant/components/advantage_air/translations/sv.json

@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten \u00e4r redan konfigurerad"
+        },
+        "error": {
+            "cannot_connect": "Det gick inte att ansluta."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "ip_address": "IP-adress",
+                    "port": "Port"
+                },
+                "description": "Anslut till API:et f\u00f6r din Advantage Air v\u00e4ggmonterade surfplatta.",
+                "title": "Anslut"
+            }
+        }
+    }
+}

homeassistant/components/advantage_air/update.py

@@ -0,0 +1,52 @@
+"""Advantage Air Update platform."""
+from homeassistant.components.update import UpdateEntity
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from .entity import AdvantageAirEntity
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up AdvantageAir update platform."""
+
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+
+    async_add_entities([AdvantageAirApp(instance)])
+
+
+class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
+    """Representation of Advantage Air App."""
+
+    _attr_name = "App"
+
+    def __init__(self, instance):
+        """Initialize the Advantage Air App."""
+        super().__init__(instance)
+        self._attr_device_info = DeviceInfo(
+            identifiers={
+                (ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"])
+            },
+            manufacturer="Advantage Air",
+            model=self.coordinator.data["system"]["sysType"],
+            name=self.coordinator.data["system"]["name"],
+            sw_version=self.coordinator.data["system"]["myAppRev"],
+        )
+
+    @property
+    def installed_version(self):
+        """Return the current app version."""
+        return self.coordinator.data["system"]["myAppRev"]
+
+    @property
+    def latest_version(self):
+        """Return if there is an update."""
+        if self.coordinator.data["system"]["needsUpdate"]:
+            return "Needs Update"
+        return self.installed_version

homeassistant/components/aemet/__init__.py

@@ -40,7 +40,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         ENTRY_WEATHER_COORDINATOR: weather_coordinator,
     }
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     entry.async_on_unload(entry.add_update_listener(async_update_options))
 

homeassistant/components/aemet/sensor.py

@@ -3,7 +3,6 @@ from __future__ import annotations
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -63,7 +62,7 @@ async def async_setup_entry(
 class AbstractAemetSensor(CoordinatorEntity[WeatherUpdateCoordinator], SensorEntity):
     """Abstract class for an AEMET OpenData sensor."""
 
-    _attr_extra_state_attributes = {ATTR_ATTRIBUTION: ATTRIBUTION}
+    _attr_attribution = ATTRIBUTION
 
     def __init__(
         self,

homeassistant/components/aemet/translations/es.json

@@ -14,7 +14,7 @@
                     "longitude": "Longitud",
                     "name": "Nombre de la integraci\u00f3n"
                 },
-                "description": "Configurar la integraci\u00f3n de AEMET OpenData. Para generar la clave API, ve a https://opendata.aemet.es/centrodedescargas/altaUsuario"
+                "description": "Para generar la clave API, ve a https://opendata.aemet.es/centrodedescargas/altaUsuario"
             }
         }
     },

homeassistant/components/aemet/translations/ja.json

@@ -12,9 +12,9 @@
                     "api_key": "API\u30ad\u30fc",
                     "latitude": "\u7def\u5ea6",
                     "longitude": "\u7d4c\u5ea6",
-                    "name": "\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u306e\u540d\u524d"
+                    "name": "\u7d71\u5408\u306e\u540d\u524d"
                 },
-                "description": "AEMET OpenData\u30a4\u30f3\u30c6\u30b0\u30ec\u30fc\u30b7\u30e7\u30f3\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u307e\u3059\u3002 API\u30ad\u30fc\u3092\u751f\u6210\u3059\u308b\u306b\u306f\u3001https://opendata.aemet.es/centrodedescargas/altaUsuario \u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044"
+                "description": "AEMET OpenData\u7d71\u5408\u3092\u30bb\u30c3\u30c8\u30a2\u30c3\u30d7\u3057\u307e\u3059\u3002 API\u30ad\u30fc\u3092\u751f\u6210\u3059\u308b\u306b\u306f\u3001https://opendata.aemet.es/centrodedescargas/altaUsuario \u306b\u30a2\u30af\u30bb\u30b9\u3057\u3066\u304f\u3060\u3055\u3044"
             }
         }
     },

homeassistant/components/aemet/translations/pt.json

@@ -0,0 +1,7 @@
+{
+    "config": {
+        "error": {
+            "invalid_api_key": "Chave de API inv\u00e1lida"
+        }
+    }
+}

homeassistant/components/aemet/translations/sv.json

@@ -1,9 +1,28 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "Platsen \u00e4r redan konfigurerad"
+        },
+        "error": {
+            "invalid_api_key": "Ogiltig API-nyckel"
+        },
         "step": {
             "user": {
                 "data": {
-                    "api_key": "API-nyckel"
+                    "api_key": "API-nyckel",
+                    "latitude": "Latitud",
+                    "longitude": "Longitud",
+                    "name": "Integrationens namn"
+                },
+                "description": "F\u00f6r att generera API-nyckel g\u00e5 till https://opendata.aemet.es/centrodedescargas/altaUsuario"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "station_updates": "Samla data fr\u00e5n AEMET v\u00e4derstationer"
                 }
             }
         }

homeassistant/components/agent_dvr/__init__.py

@@ -48,7 +48,7 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
         sw_version=agent_client.version,
     )
 
-    hass.config_entries.async_setup_platforms(config_entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 

homeassistant/components/agent_dvr/camera.py

@@ -7,7 +7,6 @@ from agent import AgentError
 from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import (
@@ -70,6 +69,8 @@ async def async_setup_entry(
 class AgentCamera(MjpegCamera):
     """Representation of an Agent Device Stream."""
 
+    _attr_attribution = ATTRIBUTION
+    _attr_should_poll = True  # Cameras default to False
     _attr_supported_features = CameraEntityFeature.ON_OFF
 
     def __init__(self, device):
@@ -91,7 +92,7 @@ class AgentCamera(MjpegCamera):
             sw_version=device.client.version,
         )
 
-    async def async_update(self):
+    async def async_update(self) -> None:
         """Update our state from the Agent API."""
         try:
             await self.device.update()
@@ -108,7 +109,6 @@ class AgentCamera(MjpegCamera):
             self._attr_icon = "mdi:camcorder"
         self._attr_available = self.device.client.is_available
         self._attr_extra_state_attributes = {
-            ATTR_ATTRIBUTION: ATTRIBUTION,
             "editable": False,
             "enabled": self.is_on,
             "connected": self.connected,
@@ -118,11 +118,6 @@ class AgentCamera(MjpegCamera):
             "alerts_enabled": self.device.alerts_active,
         }
 
-    @property
-    def should_poll(self) -> bool:
-        """Update the state periodically."""
-        return True
-
     @property
     def is_recording(self) -> bool:
         """Return whether the monitor is recording."""
@@ -149,7 +144,7 @@ class AgentCamera(MjpegCamera):
         return self.device.online
 
     @property
-    def motion_detection_enabled(self):
+    def motion_detection_enabled(self) -> bool:
         """Return the camera motion detection status."""
         return self.device.detector_active
 
@@ -161,11 +156,11 @@ class AgentCamera(MjpegCamera):
         """Disable alerts."""
         await self.device.alerts_off()
 
-    async def async_enable_motion_detection(self):
+    async def async_enable_motion_detection(self) -> None:
         """Enable motion detection."""
         await self.device.detector_on()
 
-    async def async_disable_motion_detection(self):
+    async def async_disable_motion_detection(self) -> None:
         """Disable motion detection."""
         await self.device.detector_off()
 
@@ -177,7 +172,7 @@ class AgentCamera(MjpegCamera):
         """Stop recording."""
         await self.device.record_stop()
 
-    async def async_turn_on(self):
+    async def async_turn_on(self) -> None:
         """Enable the camera."""
         await self.device.enable()
 
@@ -185,6 +180,6 @@ class AgentCamera(MjpegCamera):
         """Take a snapshot."""
         await self.device.snapshot()
 
-    async def async_turn_off(self):
+    async def async_turn_off(self) -> None:
         """Disable the camera."""
         await self.device.disable()

homeassistant/components/agent_dvr/translations/es.json

@@ -4,7 +4,7 @@
             "already_configured": "El dispositivo ya est\u00e1 configurado"
         },
         "error": {
-            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en proceso",
+            "already_in_progress": "El flujo de configuraci\u00f3n ya est\u00e1 en curso",
             "cannot_connect": "No se pudo conectar"
         },
         "step": {
@@ -13,7 +13,7 @@
                     "host": "Host",
                     "port": "Puerto"
                 },
-                "title": "Configurar el Agente de DVR"
+                "title": "Configurar Agent DVR"
             }
         }
     }

homeassistant/components/agent_dvr/translations/he.json

@@ -11,7 +11,7 @@
             "user": {
                 "data": {
                     "host": "\u05de\u05d0\u05e8\u05d7",
-                    "port": "\u05e4\u05d5\u05e8\u05d8"
+                    "port": "\u05e4\u05ea\u05d7\u05d4"
                 }
             }
         }

homeassistant/components/agent_dvr/translations/sv.json

@@ -4,7 +4,8 @@
             "already_configured": "Enheten \u00e4r redan konfigurerad"
         },
         "error": {
-            "already_in_progress": "Konfigurationsfl\u00f6de f\u00f6r enhet p\u00e5g\u00e5r redan."
+            "already_in_progress": "Konfigurationsfl\u00f6de f\u00f6r enhet p\u00e5g\u00e5r redan.",
+            "cannot_connect": "Det gick inte att ansluta."
         },
         "step": {
             "user": {

homeassistant/components/airly/__init__.py

@@ -110,7 +110,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = coordinator
 
-    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     # Remove air_quality entities from registry if they exist
     ent_reg = er.async_get(hass)

homeassistant/components/airly/const.py

@@ -25,7 +25,6 @@ SUFFIX_LIMIT: Final = "LIMIT"
 
 ATTRIBUTION: Final = "Data provided by Airly"
 CONF_USE_NEAREST: Final = "use_nearest"
-DEFAULT_NAME: Final = "Airly"
 DOMAIN: Final = "airly"
 LABEL_ADVICE: Final = "advice"
 MANUFACTURER: Final = "Airly sp. z o.o."