Add frontend dev proxy for WDS

2025-09-20 18:39:40 +00:00 · 2023-02-27 23:13:58 -05:00
4725 changed files with 77304 additions and 269387 deletions
--- a/.core_files.yaml
+++ b/.core_files.yaml
@@ -20,14 +20,11 @@ base_platforms: &base_platforms
  - homeassistant/components/camera/**
  - homeassistant/components/climate/**
  - homeassistant/components/cover/**
-  - homeassistant/components/date/**
-  - homeassistant/components/datetime/**
  - homeassistant/components/device_tracker/**
  - homeassistant/components/diagnostics/**
  - homeassistant/components/fan/**
  - homeassistant/components/geo_location/**
  - homeassistant/components/humidifier/**
-  - homeassistant/components/image/**
  - homeassistant/components/image_processing/**
  - homeassistant/components/light/**
  - homeassistant/components/lock/**
@@ -42,7 +39,6 @@ base_platforms: &base_platforms
  - homeassistant/components/stt/**
  - homeassistant/components/switch/**
  - homeassistant/components/text/**
-  - homeassistant/components/time/**
  - homeassistant/components/tts/**
  - homeassistant/components/update/**
  - homeassistant/components/vacuum/**
@@ -129,7 +125,6 @@ tests: &tests
  - tests/mock/**
  - tests/pylint/**
  - tests/scripts/**
-  - tests/syrupy.py
  - tests/test_util/**
  - tests/testing_config/**
  - tests/util/**
@@ -141,6 +136,7 @@ other: &other
 requirements: &requirements
  - .github/workflows/**
  - homeassistant/package_constraints.txt
+  - script/pip_check
  - requirements*.txt
  - pyproject.toml

--- a/.coveragerc
+++ b/.coveragerc
@@ -36,7 +36,6 @@ omit =
    homeassistant/components/airnow/__init__.py
    homeassistant/components/airnow/sensor.py
    homeassistant/components/airq/__init__.py
-    homeassistant/components/airq/coordinator.py
    homeassistant/components/airq/sensor.py
    homeassistant/components/airthings/__init__.py
    homeassistant/components/airthings/sensor.py
@@ -90,8 +89,6 @@ omit =
    homeassistant/components/atome/*
    homeassistant/components/aurora/__init__.py
    homeassistant/components/aurora/binary_sensor.py
-    homeassistant/components/aurora/coordinator.py
-    homeassistant/components/aurora/entity.py
    homeassistant/components/aurora/sensor.py
    homeassistant/components/avea/light.py
    homeassistant/components/avion/light.py
@@ -124,6 +121,7 @@ omit =
    homeassistant/components/bluetooth_tracker/*
    homeassistant/components/bmw_connected_drive/__init__.py
    homeassistant/components/bmw_connected_drive/binary_sensor.py
+    homeassistant/components/bmw_connected_drive/button.py
    homeassistant/components/bmw_connected_drive/coordinator.py
    homeassistant/components/bmw_connected_drive/lock.py
    homeassistant/components/bmw_connected_drive/notify.py
@@ -199,13 +197,11 @@ omit =
    homeassistant/components/denonavr/__init__.py
    homeassistant/components/denonavr/media_player.py
    homeassistant/components/denonavr/receiver.py
+    homeassistant/components/devolo_home_control/switch.py
    homeassistant/components/digital_ocean/*
    homeassistant/components/discogs/sensor.py
    homeassistant/components/discord/__init__.py
    homeassistant/components/discord/notify.py
-    homeassistant/components/discovergy/__init__.py
-    homeassistant/components/discovergy/sensor.py
-    homeassistant/components/discovergy/coordinator.py
    homeassistant/components/dlib_face_detect/image_processing.py
    homeassistant/components/dlib_face_identify/image_processing.py
    homeassistant/components/dlink/data.py
@@ -230,8 +226,6 @@ omit =
    homeassistant/components/dublin_bus_transport/sensor.py
    homeassistant/components/dunehd/__init__.py
    homeassistant/components/dunehd/media_player.py
-    homeassistant/components/dwd_weather_warnings/const.py
-    homeassistant/components/dwd_weather_warnings/coordinator.py
    homeassistant/components/dwd_weather_warnings/sensor.py
    homeassistant/components/dweet/*
    homeassistant/components/ebox/sensor.py
@@ -255,8 +249,7 @@ omit =
    homeassistant/components/ecowitt/sensor.py
    homeassistant/components/eddystone_temperature/sensor.py
    homeassistant/components/edimax/switch.py
-    homeassistant/components/edl21/__init__.py
-    homeassistant/components/edl21/sensor.py
+    homeassistant/components/edl21/*
    homeassistant/components/egardia/*
    homeassistant/components/eight_sleep/__init__.py
    homeassistant/components/eight_sleep/binary_sensor.py
@@ -306,10 +299,22 @@ omit =
    homeassistant/components/escea/climate.py
    homeassistant/components/escea/discovery.py
    homeassistant/components/esphome/__init__.py
+    homeassistant/components/esphome/binary_sensor.py
    homeassistant/components/esphome/bluetooth/*
+    homeassistant/components/esphome/button.py
    homeassistant/components/esphome/camera.py
+    homeassistant/components/esphome/climate.py
+    homeassistant/components/esphome/cover.py
    homeassistant/components/esphome/domain_data.py
    homeassistant/components/esphome/entry_data.py
+    homeassistant/components/esphome/fan.py
+    homeassistant/components/esphome/light.py
+    homeassistant/components/esphome/lock.py
+    homeassistant/components/esphome/media_player.py
+    homeassistant/components/esphome/number.py
+    homeassistant/components/esphome/select.py
+    homeassistant/components/esphome/sensor.py
+    homeassistant/components/esphome/switch.py
    homeassistant/components/etherscan/sensor.py
    homeassistant/components/eufy/*
    homeassistant/components/eufylife_ble/__init__.py
@@ -319,13 +324,10 @@ omit =
    homeassistant/components/ezviz/__init__.py
    homeassistant/components/ezviz/binary_sensor.py
    homeassistant/components/ezviz/camera.py
-    homeassistant/components/ezviz/light.py
    homeassistant/components/ezviz/coordinator.py
-    homeassistant/components/ezviz/number.py
    homeassistant/components/ezviz/entity.py
    homeassistant/components/ezviz/sensor.py
    homeassistant/components/ezviz/switch.py
-    homeassistant/components/ezviz/update.py
    homeassistant/components/faa_delays/__init__.py
    homeassistant/components/faa_delays/binary_sensor.py
    homeassistant/components/familyhub/camera.py
@@ -355,13 +357,10 @@ omit =
    homeassistant/components/fitbit/*
    homeassistant/components/fivem/__init__.py
    homeassistant/components/fivem/binary_sensor.py
-    homeassistant/components/fivem/coordinator.py
-    homeassistant/components/fivem/entity.py
    homeassistant/components/fivem/sensor.py
    homeassistant/components/fixer/sensor.py
    homeassistant/components/fjaraskupan/__init__.py
    homeassistant/components/fjaraskupan/binary_sensor.py
-    homeassistant/components/fjaraskupan/coordinator.py
    homeassistant/components/fjaraskupan/fan.py
    homeassistant/components/fjaraskupan/light.py
    homeassistant/components/fjaraskupan/number.py
@@ -385,10 +384,7 @@ omit =
    homeassistant/components/foscam/camera.py
    homeassistant/components/foursquare/*
    homeassistant/components/free_mobile/notify.py
-    homeassistant/components/freebox/camera.py
    homeassistant/components/freebox/device_tracker.py
-    homeassistant/components/freebox/home_base.py
-    homeassistant/components/freebox/router.py
    homeassistant/components/freebox/sensor.py
    homeassistant/components/freebox/switch.py
    homeassistant/components/fritz/common.py
@@ -398,8 +394,7 @@ omit =
    homeassistant/components/fritzbox_callmonitor/__init__.py
    homeassistant/components/fritzbox_callmonitor/base.py
    homeassistant/components/fritzbox_callmonitor/sensor.py
-    homeassistant/components/frontier_silicon/__init__.py
-    homeassistant/components/frontier_silicon/browse_media.py
+    homeassistant/components/frontier_silicon/const.py
    homeassistant/components/frontier_silicon/media_player.py
    homeassistant/components/futurenow/light.py
    homeassistant/components/garadget/cover.py
@@ -416,6 +411,7 @@ omit =
    homeassistant/components/gitlab_ci/sensor.py
    homeassistant/components/gitter/sensor.py
    homeassistant/components/glances/sensor.py
+    homeassistant/components/goalfeed/*
    homeassistant/components/goodwe/__init__.py
    homeassistant/components/goodwe/button.py
    homeassistant/components/goodwe/coordinator.py
@@ -481,6 +477,8 @@ omit =
    homeassistant/components/homematic/sensor.py
    homeassistant/components/homematic/switch.py
    homeassistant/components/homeworks/*
+    homeassistant/components/honeywell/__init__.py
+    homeassistant/components/honeywell/climate.py
    homeassistant/components/horizon/media_player.py
    homeassistant/components/hp_ilo/sensor.py
    homeassistant/components/huawei_lte/__init__.py
@@ -518,6 +516,9 @@ omit =
    homeassistant/components/ifttt/alarm_control_panel.py
    homeassistant/components/iglo/light.py
    homeassistant/components/ihc/*
+    homeassistant/components/imap/__init__.py
+    homeassistant/components/imap/coordinator.py
+    homeassistant/components/imap/sensor.py
    homeassistant/components/imap_email_content/sensor.py
    homeassistant/components/incomfort/*
    homeassistant/components/insteon/binary_sensor.py
@@ -611,6 +612,7 @@ omit =
    homeassistant/components/kwb/sensor.py
    homeassistant/components/lacrosse/sensor.py
    homeassistant/components/lannouncer/notify.py
+    homeassistant/components/lastfm/sensor.py
    homeassistant/components/launch_library/__init__.py
    homeassistant/components/launch_library/sensor.py
    homeassistant/components/lcn/climate.py
@@ -625,6 +627,9 @@ omit =
    homeassistant/components/lg_netcast/media_player.py
    homeassistant/components/lg_soundbar/__init__.py
    homeassistant/components/lg_soundbar/media_player.py
+    homeassistant/components/lidarr/__init__.py
+    homeassistant/components/lidarr/coordinator.py
+    homeassistant/components/lidarr/sensor.py
    homeassistant/components/life360/__init__.py
    homeassistant/components/life360/coordinator.py
    homeassistant/components/life360/device_tracker.py
@@ -635,10 +640,8 @@ omit =
    homeassistant/components/linux_battery/sensor.py
    homeassistant/components/lirc/*
    homeassistant/components/livisi/__init__.py
-    homeassistant/components/livisi/binary_sensor.py
    homeassistant/components/livisi/climate.py
    homeassistant/components/livisi/coordinator.py
-    homeassistant/components/livisi/entity.py
    homeassistant/components/livisi/switch.py
    homeassistant/components/llamalab_automate/notify.py
    homeassistant/components/logi_circle/__init__.py
@@ -671,6 +674,7 @@ omit =
    homeassistant/components/lyric/api.py
    homeassistant/components/lyric/climate.py
    homeassistant/components/lyric/sensor.py
+    homeassistant/components/magicseaweed/sensor.py
    homeassistant/components/mailgun/notify.py
    homeassistant/components/map/*
    homeassistant/components/mastodon/notify.py
@@ -771,11 +775,7 @@ omit =
    homeassistant/components/nexia/climate.py
    homeassistant/components/nexia/entity.py
    homeassistant/components/nexia/switch.py
-    homeassistant/components/nextcloud/__init__.py
-    homeassistant/components/nextcloud/binary_sensor.py
-    homeassistant/components/nextcloud/coordinator.py
-    homeassistant/components/nextcloud/entity.py
-    homeassistant/components/nextcloud/sensor.py
+    homeassistant/components/nextcloud/*
    homeassistant/components/nfandroidtv/__init__.py
    homeassistant/components/nfandroidtv/notify.py
    homeassistant/components/nibe_heatpump/__init__.py
@@ -785,7 +785,6 @@ omit =
    homeassistant/components/nibe_heatpump/select.py
    homeassistant/components/nibe_heatpump/sensor.py
    homeassistant/components/nibe_heatpump/switch.py
-    homeassistant/components/nibe_heatpump/water_heater.py
    homeassistant/components/niko_home_control/light.py
    homeassistant/components/nilu/air_quality.py
    homeassistant/components/nissan_leaf/*
@@ -808,8 +807,6 @@ omit =
    homeassistant/components/nuki/sensor.py
    homeassistant/components/nx584/alarm_control_panel.py
    homeassistant/components/oasa_telematics/sensor.py
-    homeassistant/components/obihai/__init__.py
-    homeassistant/components/obihai/button.py
    homeassistant/components/obihai/connectivity.py
    homeassistant/components/obihai/sensor.py
    homeassistant/components/octoprint/__init__.py
@@ -831,7 +828,6 @@ omit =
    homeassistant/components/onvif/event.py
    homeassistant/components/onvif/parsers.py
    homeassistant/components/onvif/sensor.py
-    homeassistant/components/onvif/util.py
    homeassistant/components/open_meteo/weather.py
    homeassistant/components/opencv/*
    homeassistant/components/openevse/sensor.py
@@ -939,10 +935,7 @@ omit =
    homeassistant/components/pushover/notify.py
    homeassistant/components/pushsafer/notify.py
    homeassistant/components/pyload/sensor.py
-    homeassistant/components/qbittorrent/__init__.py
    homeassistant/components/qbittorrent/sensor.py
-    homeassistant/components/qnap/__init__.py
-    homeassistant/components/qnap/coordinator.py
    homeassistant/components/qnap/sensor.py
    homeassistant/components/qrcode/image_processing.py
    homeassistant/components/quantum_gateway/device_tracker.py
@@ -970,10 +963,6 @@ omit =
    homeassistant/components/rainmachine/switch.py
    homeassistant/components/rainmachine/update.py
    homeassistant/components/rainmachine/util.py
-    homeassistant/components/renson/__init__.py
-    homeassistant/components/renson/const.py
-    homeassistant/components/renson/entity.py
-    homeassistant/components/renson/sensor.py
    homeassistant/components/raspyrfm/*
    homeassistant/components/recollect_waste/sensor.py
    homeassistant/components/recorder/repack.py
@@ -982,28 +971,22 @@ omit =
    homeassistant/components/rejseplanen/sensor.py
    homeassistant/components/remember_the_milk/__init__.py
    homeassistant/components/remote_rpi_gpio/*
+    homeassistant/components/reolink/__init__.py
    homeassistant/components/reolink/binary_sensor.py
-    homeassistant/components/reolink/button.py
    homeassistant/components/reolink/camera.py
    homeassistant/components/reolink/entity.py
    homeassistant/components/reolink/host.py
-    homeassistant/components/reolink/light.py
    homeassistant/components/reolink/number.py
-    homeassistant/components/reolink/select.py
-    homeassistant/components/reolink/siren.py
-    homeassistant/components/reolink/switch.py
    homeassistant/components/reolink/update.py
    homeassistant/components/repetier/__init__.py
    homeassistant/components/repetier/sensor.py
    homeassistant/components/rest/notify.py
    homeassistant/components/rest/switch.py
    homeassistant/components/ridwell/__init__.py
-    homeassistant/components/ridwell/calendar.py
    homeassistant/components/ridwell/coordinator.py
    homeassistant/components/ridwell/switch.py
    homeassistant/components/ring/camera.py
    homeassistant/components/ripple/sensor.py
-    homeassistant/components/roborock/coordinator.py
    homeassistant/components/rocketchat/notify.py
    homeassistant/components/roomba/__init__.py
    homeassistant/components/roomba/binary_sensor.py
@@ -1047,6 +1030,12 @@ omit =
    homeassistant/components/sense/__init__.py
    homeassistant/components/sense/binary_sensor.py
    homeassistant/components/sense/sensor.py
+    homeassistant/components/senseme/__init__.py
+    homeassistant/components/senseme/discovery.py
+    homeassistant/components/senseme/entity.py
+    homeassistant/components/senseme/fan.py
+    homeassistant/components/senseme/light.py
+    homeassistant/components/senseme/switch.py
    homeassistant/components/senz/__init__.py
    homeassistant/components/senz/api.py
    homeassistant/components/senz/climate.py
@@ -1103,9 +1092,7 @@ omit =
    homeassistant/components/sms/notify.py
    homeassistant/components/sms/sensor.py
    homeassistant/components/smtp/notify.py
-    homeassistant/components/snapcast/__init__.py
-    homeassistant/components/snapcast/media_player.py
-    homeassistant/components/snapcast/server.py
+    homeassistant/components/snapcast/*
    homeassistant/components/snmp/device_tracker.py
    homeassistant/components/snmp/sensor.py
    homeassistant/components/snmp/switch.py
@@ -1290,15 +1277,13 @@ omit =
    homeassistant/components/toon/switch.py
    homeassistant/components/torque/sensor.py
    homeassistant/components/totalconnect/__init__.py
+    homeassistant/components/totalconnect/binary_sensor.py
    homeassistant/components/touchline/climate.py
    homeassistant/components/tplink_lte/*
    homeassistant/components/tplink_omada/__init__.py
-    homeassistant/components/tplink_omada/binary_sensor.py
-    homeassistant/components/tplink_omada/controller.py
    homeassistant/components/tplink_omada/coordinator.py
    homeassistant/components/tplink_omada/entity.py
    homeassistant/components/tplink_omada/switch.py
-    homeassistant/components/tplink_omada/update.py
    homeassistant/components/traccar/device_tracker.py
    homeassistant/components/tractive/__init__.py
    homeassistant/components/tractive/binary_sensor.py
@@ -1366,7 +1351,6 @@ omit =
    homeassistant/components/velbus/entity.py
    homeassistant/components/velbus/light.py
    homeassistant/components/velbus/sensor.py
-    homeassistant/components/velbus/select.py
    homeassistant/components/velbus/switch.py
    homeassistant/components/velux/__init__.py
    homeassistant/components/velux/cover.py
@@ -1384,6 +1368,8 @@ omit =
    homeassistant/components/verisure/sensor.py
    homeassistant/components/verisure/switch.py
    homeassistant/components/versasense/*
+    homeassistant/components/vesync/__init__.py
+    homeassistant/components/vesync/common.py
    homeassistant/components/vesync/fan.py
    homeassistant/components/vesync/light.py
    homeassistant/components/vesync/sensor.py
@@ -1439,6 +1425,7 @@ omit =
    homeassistant/components/xbox/media_player.py
    homeassistant/components/xbox/remote.py
    homeassistant/components/xbox/sensor.py
+    homeassistant/components/xbox_live/sensor.py
    homeassistant/components/xeoma/camera.py
    homeassistant/components/xiaomi/camera.py
    homeassistant/components/xiaomi_aqara/__init__.py
@@ -1511,8 +1498,8 @@ omit =
    homeassistant/components/zeversolar/coordinator.py
    homeassistant/components/zeversolar/entity.py
    homeassistant/components/zeversolar/sensor.py
-    homeassistant/components/zha/websocket_api.py
-    homeassistant/components/zha/core/cluster_handlers/*
+    homeassistant/components/zha/api.py
+    homeassistant/components/zha/core/channels/*
    homeassistant/components/zha/core/device.py
    homeassistant/components/zha/core/gateway.py
    homeassistant/components/zha/core/helpers.py
@@ -1533,8 +1520,6 @@ omit =
    homeassistant/components/zwave_me/sensor.py
    homeassistant/components/zwave_me/siren.py
    homeassistant/components/zwave_me/switch.py
-    homeassistant/components/electrasmart/climate.py
-    homeassistant/components/electrasmart/__init__.py

 [report]
 # Regexes for lines to exclude from consideration
--- a/.devcontainer/devcontainer.json
+++ b/.devcontainer/devcontainer.json
@@ -20,6 +20,7 @@
    "python.linting.enabled": true,
    "python.linting.pylintEnabled": true,
    "python.formatting.blackPath": "/usr/local/bin/black",
+    "python.linting.flake8Path": "/usr/local/bin/flake8",
    "python.linting.pycodestylePath": "/usr/local/bin/pycodestyle",
    "python.linting.pydocstylePath": "/usr/local/bin/pydocstyle",
    "python.linting.mypyPath": "/usr/local/bin/mypy",
--- a/.gitattributes
+++ b/.gitattributes
@@ -8,6 +8,5 @@
 *.png binary
 *.zip binary
 *.mp3 binary
-*.pcm binary

 Dockerfile.dev linguist-language=Dockerfile
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -31,9 +31,9 @@ body:
      label: What version of Home Assistant Core has the issue?
      placeholder: core-
      description: >
-        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
+        Can be found in: [Settings -> About](https://my.home-assistant.io/redirect/info/).

-        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+        [![Open your Home Assistant instance and show your Home Assistant version information.](https://my.home-assistant.io/badges/info.svg)](https://my.home-assistant.io/redirect/info/)
  - type: input
    attributes:
      label: What was the last working version of Home Assistant Core?
@@ -46,9 +46,9 @@ body:
    attributes:
      label: What type of installation are you running?
      description: >
-        Can be found in: [Settings ⇒ System ⇒ Repairs ⇒ Three Dots in Upper Right ⇒ System information](https://my.home-assistant.io/redirect/system_health/).
+        Can be found in: [Settings -> System-> Repairs -> Three Dots in Upper Right -> System information](https://my.home-assistant.io/redirect/system_health/).

-        [![Open your Home Assistant instance and show the system information.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
+        [![Open your Home Assistant instance and show health information about your system.](https://my.home-assistant.io/badges/system_health.svg)](https://my.home-assistant.io/redirect/system_health/)
      options:
        - Home Assistant OS
        - Home Assistant Container
--- a/.github/ISSUE_TEMPLATE/config.yml
+++ b/.github/ISSUE_TEMPLATE/config.yml
@@ -1,6 +1,6 @@
 blank_issues_enabled: false
 contact_links:
-  - name: Report a bug with the UI, Frontend or Dashboards
+  - name: Report a bug with the UI, Frontend or Lovelace
    url: https://github.com/home-assistant/frontend/issues
    about: This is the issue tracker for our backend. Please report issues with the UI in the frontend repository.
  - name: Report incorrect or missing information on our website
--- a/.github/PULL_REQUEST_TEMPLATE.md
+++ b/.github/PULL_REQUEST_TEMPLATE.md
@@ -59,7 +59,6 @@
 - [ ] Local tests pass. **Your PR cannot be merged unless tests pass**
 - [ ] There is no commented out code in this PR.
 - [ ] I have followed the [development checklist][dev-checklist]
- [ ] I have followed the [perfect PR recommendations][perfect-pr]
 - [ ] The code has been formatted using Black (`black --fast homeassistant tests`)
 - [ ] Tests have been added to verify that the new code works.

@@ -104,8 +103,7 @@ To help with the load of incoming pull requests:

  Below, some useful links you could explore:
 -->
-[dev-checklist]: https://developers.home-assistant.io/docs/development_checklist/
-[manifest-docs]: https://developers.home-assistant.io/docs/creating_integration_manifest/
-[quality-scale]: https://developers.home-assistant.io/docs/integration_quality_scale_index/
+[dev-checklist]: https://developers.home-assistant.io/docs/en/development_checklist.html
+[manifest-docs]: https://developers.home-assistant.io/docs/en/creating_integration_manifest.html
+[quality-scale]: https://developers.home-assistant.io/docs/en/next/integration_quality_scale_index.html
 [docs-repository]: https://github.com/home-assistant/home-assistant.io
-[perfect-pr]: https://developers.home-assistant.io/docs/review-process/#creating-the-perfect-pr
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -10,7 +10,7 @@ on:

 env:
  BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.11"
+  DEFAULT_PYTHON: "3.10"

 jobs:
  init:
@@ -24,12 +24,12 @@ jobs:
      publish: ${{ steps.version.outputs.publish }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
        with:
          fetch-depth: 0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -48,18 +48,29 @@ jobs:
        with:
          ignore-dev: true

+      - name: Generate meta info
+        shell: bash
+        run: |
+          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > OFFICIAL_IMAGE
+
+      - name: Signing meta info file
+        uses: home-assistant/actions/helpers/codenotary@master
+        with:
+          source: file://${{ github.workspace }}/OFFICIAL_IMAGE
+          asset: OFFICIAL_IMAGE-${{ steps.version.outputs.version }}
+          token: ${{ secrets.CAS_TOKEN }}
+
  build_python:
    name: Build PyPi package
-    environment: ${{ needs.init.outputs.channel }}
-    needs: ["init", "build_base"]
+    needs: init
    runs-on: ubuntu-latest
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -89,16 +100,12 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    needs: init
    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
    strategy:
      matrix:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
@@ -116,7 +123,7 @@ jobs:
        uses: dawidd6/action-download-artifact@v2
        with:
          github_token: ${{secrets.GITHUB_TOKEN}}
-          repo: home-assistant/intents-package
+          repo: home-assistant/intents
          branch: main
          workflow: nightly.yaml
          workflow_conclusion: success
@@ -124,7 +131,7 @@ jobs:

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -133,7 +140,7 @@ jobs:
        shell: bash
        run: |
          python3 -m pip install packaging tomli
-          python3 -m pip install .
+          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
@@ -167,18 +174,6 @@ jobs:
            python -m script.gen_requirements_all
          fi

-      - name: Adjustments for armhf
-        if: matrix.arch == 'armhf'
-        run: |
-          # Pandas has issues building on armhf, it is expected they
-          # will drop the platform in the near future (they consider it
-          # "flimsy" on 386). The following packages depend on pandas,
-          # so we comment them out.
-          sed -i "s|env-canada|# env-canada|g" requirements_all.txt
-          sed -i "s|noaa-coops|# noaa-coops|g" requirements_all.txt
-          sed -i "s|pyezviz|# pyezviz|g" requirements_all.txt
-          sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
-
      - name: Download Translations
        run: python3 -m script.translations download
        env:
@@ -189,20 +184,25 @@ jobs:
        run: |
          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE

+      - name: Login to DockerHub
+        uses: docker/login-action@v2.1.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build base image
-        uses: home-assistant/builder@2023.06.1
+        uses: home-assistant/builder@2022.11.0
        with:
          args: |
            $BUILD_ARGS \
            --${{ matrix.arch }} \
-            --cosign \
            --target /data \
            --generic ${{ needs.init.outputs.version }}
        env:
@@ -224,10 +224,6 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_base"]
    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
    strategy:
      matrix:
        machine:
@@ -236,7 +232,6 @@ jobs:
          - khadas-vim3
          - odroid-c2
          - odroid-c4
-          - odroid-m1
          - odroid-n2
          - odroid-xu
          - qemuarm
@@ -253,7 +248,7 @@ jobs:
          - yellow
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Set build additional args
        run: |
@@ -266,33 +261,37 @@ jobs:
            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
          fi

+      - name: Login to DockerHub
+        uses: docker/login-action@v2.1.0
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build base image
-        uses: home-assistant/builder@2023.06.1
+        uses: home-assistant/builder@2022.11.0
        with:
          args: |
            $BUILD_ARGS \
            --target /data/machine \
-            --cosign \
            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
        env:
          CAS_API_KEY: ${{ secrets.CAS_TOKEN }}

  publish_ha:
    name: Publish version files
-    environment: ${{ needs.init.outputs.channel }}
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_machine"]
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Initialize git
        uses: home-assistant/actions/helpers/git-init@master
@@ -320,36 +319,37 @@ jobs:

  publish_container:
    name: Publish meta container for ${{ matrix.registry }}
-    environment: ${{ needs.init.outputs.channel }}
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_base"]
    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      id-token: write
+    strategy:
+      fail-fast: false
+      matrix:
+        registry:
+          - "ghcr.io/home-assistant"
+          - "homeassistant"
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
-
-      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.1.1
-        with:
-          cosign-release: "v2.0.2"
+        uses: actions/checkout@v3.3.0

      - name: Login to DockerHub
-        uses: docker/login-action@v2.2.0
+        if: matrix.registry == 'homeassistant'
+        uses: docker/login-action@v2.1.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
+        if: matrix.registry == 'ghcr.io/home-assistant'
+        uses: docker/login-action@v2.1.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
          password: ${{ secrets.GITHUB_TOKEN }}

+      - name: Install CAS tools
+        uses: home-assistant/actions/helpers/cas@master
+
      - name: Build Meta Image
        shell: bash
        run: |
@@ -359,78 +359,55 @@ jobs:
            local tag_l=${1}
            local tag_r=${2}

-            for registry in "ghcr.io/home-assistant" "docker.io/homeassistant"
-            do
+            docker manifest create "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
+              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
+              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
+              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
+              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}"

-              docker manifest create "${registry}/home-assistant:${tag_l}" \
-                "${registry}/amd64-homeassistant:${tag_r}" \
-                "${registry}/i386-homeassistant:${tag_r}" \
-                "${registry}/armhf-homeassistant:${tag_r}" \
-                "${registry}/armv7-homeassistant:${tag_r}" \
-                "${registry}/aarch64-homeassistant:${tag_r}"
+            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/amd64-homeassistant:${tag_r}" \
+              --os linux --arch amd64

-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/amd64-homeassistant:${tag_r}" \
-                --os linux --arch amd64
+            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/i386-homeassistant:${tag_r}" \
+              --os linux --arch 386

-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/i386-homeassistant:${tag_r}" \
-                --os linux --arch 386
+            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/armhf-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v6

-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/armhf-homeassistant:${tag_r}" \
-                --os linux --arch arm --variant=v6
+            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/armv7-homeassistant:${tag_r}" \
+              --os linux --arch arm --variant=v7

-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/armv7-homeassistant:${tag_r}" \
-                --os linux --arch arm --variant=v7
+            docker manifest annotate "${{ matrix.registry }}/home-assistant:${tag_l}" \
+              "${{ matrix.registry }}/aarch64-homeassistant:${tag_r}" \
+              --os linux --arch arm64 --variant=v8

-              docker manifest annotate "${registry}/home-assistant:${tag_l}" \
-                "${registry}/aarch64-homeassistant:${tag_r}" \
-                --os linux --arch arm64 --variant=v8
-
-              docker manifest push --purge "${registry}/home-assistant:${tag_l}"
-              cosign sign --yes "${registry}/home-assistant:${tag_l}"
-
-            done
+            docker manifest push --purge "${{ matrix.registry }}/home-assistant:${tag_l}"
          }

          function validate_image() {
            local image=${1}
-            if ! cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp https://github.com/home-assistant/core/.* "${image}"; then
+            if ! cas authenticate --signerID notary@home-assistant.io "docker://${image}"; then
              echo "Invalid signature!"
              exit 1
            fi
          }

-          function push_dockerhub() {
-            local image=${1}
-            local tag=${2}
+          docker pull "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"

-            docker tag "ghcr.io/home-assistant/${image}:${tag}" "docker.io/homeassistant/${image}:${tag}"
-            docker push "docker.io/homeassistant/${image}:${tag}"
-            cosign sign --yes "docker.io/homeassistant/${image}:${tag}"
-          }
-
-          # Pull images from github container registry and verify signature
-          docker pull "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          docker pull "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
-
-          validate_image "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "ghcr.io/home-assistant/i386-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "ghcr.io/home-assistant/armhf-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "ghcr.io/home-assistant/armv7-homeassistant:${{ needs.init.outputs.version }}"
-          validate_image "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
-
-          # Upload images to dockerhub
-          push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "i386-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "armhf-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "armv7-homeassistant" "${{ needs.init.outputs.version }}"
-          push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
+          validate_image "${{ matrix.registry }}/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "${{ matrix.registry }}/i386-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "${{ matrix.registry }}/armhf-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "${{ matrix.registry }}/armv7-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "${{ matrix.registry }}/aarch64-homeassistant:${{ needs.init.outputs.version }}"

          # Create version tag
          create_manifest "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -1,5 +1,4 @@
 name: CI
-run-name: "${{ github.event_name == 'workflow_dispatch' && format('CI: {0}', github.ref_name) || '' }}"

 # yamllint disable-line rule:truthy
 on:
@@ -32,7 +31,7 @@ env:
  CACHE_VERSION: 5
  PIP_CACHE_VERSION: 4
  MYPY_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2023.7
+  HA_SHORT_VERSION: 2023.4
  DEFAULT_PYTHON: "3.10"
  ALL_PYTHON_VERSIONS: "['3.10', '3.11']"
  # 10.3 is the oldest supported version
@@ -41,9 +40,7 @@ env:
  # - 10.6.10 is the version currently shipped with the Add-on (as of 31 Jan 2023)
  # 10.10 is the latest short-term-support
  # - 10.10.3 is the latest (as of 6 Feb 2023)
-  # mysql 8.0.32 does not always behave the same as MariaDB
-  # and some queries that work on MariaDB do not work on MySQL
-  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3','mysql:8.0.32']"
+  MARIADB_VERSIONS: "['mariadb:10.3.32','mariadb:10.6.10','mariadb:10.10.3']"
  # 12 is the oldest supported version
  # - 12.14 is the latest (as of 9 Feb 2023)
  # 15 is the latest version
@@ -82,7 +79,7 @@ jobs:
    runs-on: ubuntu-22.04
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
        run: >-
@@ -206,16 +203,16 @@ jobs:
      - info
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: venv
          key: >-
@@ -230,10 +227,9 @@ jobs:
          pip install "$(cat requirements_test.txt | grep pre-commit)"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
-          lookup-only: true
          key: >-
            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}
@@ -251,16 +247,16 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -269,7 +265,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -289,24 +285,24 @@ jobs:
          shopt -s globstar
          pre-commit run --hook-stage manual black --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure

-  lint-ruff:
-    name: Check ruff
+  lint-flake8:
+    name: Check flake8
    runs-on: ubuntu-22.04
    needs:
      - info
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -315,7 +311,56 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
+        with:
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+              needs.info.outputs.pre-commit_cache_key }}
+      - name: Register flake8 problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/flake8.json"
+      - name: Run flake8 (fully)
+        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.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.info.outputs.integrations_glob }}/{*,**/*}
+
+  lint-ruff:
+    name: Check ruff
+    runs-on: ubuntu-22.04
+    needs:
+      - info
+      - pre-commit
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.3.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v4.5.0
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
+      - name: Restore base Python virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v3.2.6
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
+              needs.info.outputs.pre-commit_cache_key }}
+      - name: Restore pre-commit environment from cache
+        id: cache-precommit
+        uses: actions/cache/restore@v3.2.6
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -338,24 +383,24 @@ jobs:
          shopt -s globstar
          pre-commit run --hook-stage manual ruff --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure

-  lint-other:
-    name: Check other linters
+  lint-isort:
+    name: Check isort
    runs-on: ubuntu-22.04
    needs:
      - info
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -364,13 +409,64 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
          key: >-
            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}
+      - name: Run isort
+        run: |
+          . venv/bin/activate
+          pre-commit run --hook-stage manual isort --all-files --show-diff-on-failure
+
+  lint-other:
+    name: Check other linters
+    runs-on: ubuntu-22.04
+    needs:
+      - info
+      - pre-commit
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.3.0
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        uses: actions/setup-python@v4.5.0
+        id: python
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
+      - name: Restore base Python virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v3.2.6
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
+              needs.info.outputs.pre-commit_cache_key }}
+      - name: Restore pre-commit environment from cache
+        id: cache-precommit
+        uses: actions/cache/restore@v3.2.6
+        with:
+          path: ${{ env.PRE_COMMIT_CACHE }}
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+              needs.info.outputs.pre-commit_cache_key }}
+
+      - name: Run pyupgrade (fully)
+        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.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.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure

      - name: Register yamllint problem matcher
        run: |
@@ -399,7 +495,6 @@ jobs:
        shell: bash
        run: |
          . venv/bin/activate
-          shopt -s globstar
          pre-commit run --hook-stage manual prettier --files {homeassistant,tests}/components/${{ needs.info.outputs.integrations_glob }}/{*,**/*}

      - name: Register check executables problem matcher
@@ -430,6 +525,19 @@ jobs:
        with:
          args: hadolint Dockerfile.dev

+      - name: Run bandit (fully)
+        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.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.info.outputs.integrations_glob }}/{*,**/*} --show-diff-on-failure
+
  base:
    name: Prepare dependencies
    runs-on: ubuntu-22.04
@@ -440,10 +548,10 @@ jobs:
        python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -454,16 +562,15 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: venv
-          lookup-only: true
          key: >-
            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore pip wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: ${{ env.PIP_CACHE }}
          key: >-
@@ -492,10 +599,10 @@ jobs:
          python -m venv venv
          . venv/bin/activate
          python --version
-          pip install --cache-dir=$PIP_CACHE -U "pip>=21.3.1,<23.2" setuptools wheel
-          pip install --cache-dir=$PIP_CACHE -r requirements_all.txt
-          pip install --cache-dir=$PIP_CACHE -r requirements_test.txt
-          pip install -e . --config-settings editable_mode=compat
+          pip install --cache-dir=$PIP_CACHE -U "pip>=21.0,<23.1" 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
@@ -508,16 +615,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -540,16 +647,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -573,16 +680,16 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -617,10 +724,10 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -633,7 +740,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -641,7 +748,7 @@ jobs:
            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: .mypy_cache
          key: >-
@@ -668,6 +775,42 @@ jobs:
          python --version
          mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}

+  pip-check:
+    runs-on: ubuntu-22.04
+    if: |
+      github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.mypy-only != 'true'
+    needs:
+      - info
+      - base
+    strategy:
+      fail-fast: false
+      matrix:
+        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
+    name: Run pip check ${{ matrix.python-version }}
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v3.3.0
+      - name: Set up Python ${{ matrix.python-version }}
+        id: python
+        uses: actions/setup-python@v4.5.0
+        with:
+          python-version: ${{ matrix.python-version }}
+          check-latest: true
+      - name: Restore full Python ${{ matrix.python-version }} virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v3.2.6
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
+      - name: Run pip check
+        run: |
+          . venv/bin/activate
+          ./script/pip_check $PIP_CACHE
+
  pytest:
    runs-on: ubuntu-22.04
    if: |
@@ -681,6 +824,7 @@ jobs:
      - base
      - gen-requirements-all
      - hassfest
+      - lint-isort
      - lint-other
      - lint-ruff
      - mypy
@@ -699,16 +843,16 @@ jobs:
            bluez \
            ffmpeg
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -805,6 +949,7 @@ jobs:
      - base
      - gen-requirements-all
      - hassfest
+      - lint-isort
      - lint-other
      - lint-ruff
      - mypy
@@ -824,16 +969,16 @@ jobs:
            ffmpeg \
            libmariadb-dev-compat
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -856,10 +1001,6 @@ jobs:
        run: |
          . venv/bin/activate
          pip install mysqlclient sqlalchemy_utils
-      - name: Compile English translations
-        run: |
-          . venv/bin/activate
-          python3 -m script.translations develop --all
      - name: Run pytest (partially)
        timeout-minutes: 20
        shell: bash
@@ -912,6 +1053,7 @@ jobs:
      - base
      - gen-requirements-all
      - hassfest
+      - lint-isort
      - lint-other
      - lint-ruff
      - mypy
@@ -931,16 +1073,16 @@ jobs:
            ffmpeg \
            postgresql-server-dev-14
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache@v3.2.6
        with:
          path: venv
          fail-on-cache-miss: true
@@ -963,10 +1105,6 @@ jobs:
        run: |
          . venv/bin/activate
          pip install psycopg2 sqlalchemy_utils
-      - name: Compile English translations
-        run: |
-          . venv/bin/activate
-          python3 -m script.translations develop --all
      - name: Run pytest (partially)
        timeout-minutes: 20
        shell: bash
@@ -1005,28 +1143,16 @@ jobs:
    needs:
      - info
      - pytest
-    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0
      - name: Download all coverage artifacts
        uses: actions/download-artifact@v3
      - name: Upload coverage to Codecov (full coverage)
        if: needs.info.outputs.test_full_suite == 'true'
-        uses: Wandalen/wretry.action@v1.3.0
+        uses: codecov/codecov-action@v3.1.1
        with:
-          action: codecov/codecov-action@v3.1.3
-          with: |
-            fail_ci_if_error: true
-            flags: full-suite
-          attempt_limit: 5
-          attempt_delay: 30000
+          flags: full-suite
      - name: Upload coverage to Codecov (partial coverage)
        if: needs.info.outputs.test_full_suite == 'false'
-        uses: Wandalen/wretry.action@v1.3.0
-        with:
-          action: codecov/codecov-action@v3.1.3
-          with: |
-            fail_ci_if_error: true
-          attempt_limit: 5
-          attempt_delay: 30000
+        uses: codecov/codecov-action@v3.1.1
--- a/.github/workflows/lock.yml
+++ b/.github/workflows/lock.yml
@@ -10,7 +10,7 @@ jobs:
    if: github.repository_owner == 'home-assistant'
    runs-on: ubuntu-latest
    steps:
-      - uses: dessant/lock-threads@v4.0.1
+      - uses: dessant/lock-threads@v4.0.0
        with:
          github-token: ${{ github.token }}
          issue-inactive-days: "30"
--- a/.github/workflows/matchers/flake8.json
+++ b/.github/workflows/matchers/flake8.json
@@ -0,0 +1,30 @@
+{
+  "problemMatcher": [
+    {
+      "owner": "flake8-error",
+      "severity": "error",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s([EF]\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    },
+    {
+      "owner": "flake8-warning",
+      "severity": "warning",
+      "pattern": [
+        {
+          "regexp": "^(.*):(\\d+):(\\d+):\\s([CDNW]\\d{3}\\s.*)$",
+          "file": 1,
+          "line": 2,
+          "column": 3,
+          "message": 4
+        }
+      ]
+    }
+  ]
+}
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -17,7 +17,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues (-1)
      - name: 90 days stale PRs policy
-        uses: actions/stale@v8.0.0
+        uses: actions/stale@v7.0.0
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 90
@@ -53,7 +53,7 @@ jobs:
      # - No issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: 90 days stale issues
-        uses: actions/stale@v8.0.0
+        uses: actions/stale@v7.0.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          days-before-stale: 90
@@ -83,7 +83,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@v8.0.0
+        uses: actions/stale@v7.0.0
        with:
          repo-token: ${{ steps.token.outputs.token }}
          only-labels: "needs-more-information"
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -10,7 +10,7 @@ on:
      - "**strings.json"

 env:
-  DEFAULT_PYTHON: "3.11"
+  DEFAULT_PYTHON: "3.10"

 jobs:
  upload:
@@ -19,10 +19,10 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v4.6.1
+        uses: actions/setup-python@v4.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -13,10 +13,6 @@ on:
      - "requirements.txt"
      - "requirements_all.txt"

-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref_name}}
-  cancel-in-progress: true
-
 jobs:
  init:
    name: Initialize wheels builder
@@ -26,7 +22,7 @@ jobs:
      architectures: ${{ steps.info.outputs.architectures }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Get information
        id: info
@@ -47,7 +43,10 @@ jobs:
            echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
            echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
            echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
-            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc"
+            # GRPC on armv7 needs -lexecinfo (issue #56669) since home assistant installs
+            # execinfo-dev when building wheels. The setuptools build setup does not have an option for
+            # adding a single LDFLAG so copy all relevant linux flags here (as of 1.43.0)
+            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc -lexecinfo"

            # Fix out of memory issues with rust
            echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
@@ -55,9 +54,6 @@ jobs:
            # OpenCV headless installation
            echo "CI_BUILD=1"
            echo "ENABLE_HEADLESS=1"
-
-            # Use C-Extension for sqlalchemy
-            echo "REQUIRE_SQLALCHEMY_CEXT=1"
          ) > .env_file

      - name: Upload env_file
@@ -73,18 +69,17 @@ jobs:
          path: ./requirements_diff.txt

  core:
-    name: Build Core wheels ${{ matrix.abi }} for ${{ matrix.arch }} (musllinux_1_2)
+    name: Build musllinux wheels with musllinux_1_2 / cp310 at ${{ matrix.arch }} for core
    if: github.repository_owner == 'home-assistant'
    needs: init
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp311"]
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Download env_file
        uses: actions/download-artifact@v3
@@ -97,9 +92,9 @@ jobs:
          name: requirements_diff

      - name: Build wheels
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2022.10.1
        with:
-          abi: ${{ matrix.abi }}
+          abi: cp310
          tag: musllinux_1_2
          arch: ${{ matrix.arch }}
          wheels-key: ${{ secrets.WHEELS_KEY }}
@@ -110,19 +105,18 @@ jobs:
          requirements-diff: "requirements_diff.txt"
          requirements: "requirements.txt"

-  integrations_cp311:
-    name: Build wheels ${{ matrix.abi }} for ${{ matrix.arch }}
+  integrations:
+    name: Build musllinux wheels with musllinux_1_2 / cp310 at ${{ matrix.arch }} for integrations
    if: github.repository_owner == 'home-assistant'
    needs: init
    runs-on: ubuntu-latest
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp311"]
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v3.3.0

      - name: Download env_file
        uses: actions/download-artifact@v3
@@ -134,30 +128,20 @@ jobs:
        with:
          name: requirements_diff

-      - name: (Un)comment packages
+      - name: Uncomment packages
        run: |
          requirement_files="requirements_all.txt requirements_diff.txt"
          for requirement_file in ${requirement_files}; do
+            sed -i "s|# pybluez|pybluez|g" ${requirement_file}
+            sed -i "s|# beacontools|beacontools|g" ${requirement_file}
            sed -i "s|# fritzconnection|fritzconnection|g" ${requirement_file}
            sed -i "s|# pyuserinput|pyuserinput|g" ${requirement_file}
            sed -i "s|# evdev|evdev|g" ${requirement_file}
            sed -i "s|# pycups|pycups|g" ${requirement_file}
            sed -i "s|# homekit|homekit|g" ${requirement_file}
-            sed -i "s|# decora-wifi|decora-wifi|g" ${requirement_file}
+            sed -i "s|# decora_wifi|decora_wifi|g" ${requirement_file}
            sed -i "s|# python-gammu|python-gammu|g" ${requirement_file}
-
-            # Some packages are not buildable on armhf anymore
-            if [ "${{ matrix.arch }}" = "armhf" ]; then
-
-              # Pandas has issues building on armhf, it is expected they
-              # will drop the platform in the near future (they consider it
-              # "flimsy" on 386). The following packages depend on pandas,
-              # so we comment them out.
-              sed -i "s|env-canada|# env-canada|g" ${requirement_file}
-              sed -i "s|noaa-coops|# noaa-coops|g" ${requirement_file}
-              sed -i "s|pyezviz|# pyezviz|g" ${requirement_file}
-              sed -i "s|pykrakenapi|# pykrakenapi|g" ${requirement_file}
-            fi
+            sed -i "s|# opencv-python-headless|opencv-python-headless|g" ${requirement_file}
          done

      - name: Split requirements all
@@ -166,7 +150,7 @@ jobs:
          # This is to prevent the build from running out of memory when
          # resolving packages on 32-bits systems (like armhf, armv7).

-          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all.txt requirements_all.txt
+          split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 2) requirements_all.txt requirements_all.txt

      - name: Adjust build env
        run: |
@@ -174,47 +158,41 @@ jobs:
            echo "NPY_DISABLE_SVML=1" >> .env_file
          fi

+          (
+            # cmake > 3.22.2 have issue on arm
+            # Tested until 3.22.5
+            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 (part 1)
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2022.10.1
        with:
-          abi: ${{ matrix.abi }}
+          abi: cp310
          tag: musllinux_1_2
          arch: ${{ matrix.arch }}
          wheels-key: ${{ secrets.WHEELS_KEY }}
          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          apk: "libexecinfo-dev;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
+          skip-binary: aiohttp;grpcio
+          legacy: true
          constraints: "homeassistant/package_constraints.txt"
          requirements-diff: "requirements_diff.txt"
          requirements: "requirements_all.txtaa"

      - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2022.10.1
        with:
-          abi: ${{ matrix.abi }}
+          abi: cp310
          tag: musllinux_1_2
          arch: ${{ matrix.arch }}
          wheels-key: ${{ secrets.WHEELS_KEY }}
          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          apk: "libexecinfo-dev;bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
+          skip-binary: aiohttp;grpcio
+          legacy: true
          constraints: "homeassistant/package_constraints.txt"
          requirements-diff: "requirements_diff.txt"
          requirements: "requirements_all.txtab"
-
-      - name: Build wheels (part 3)
-        uses: home-assistant/wheels@2023.04.0
-        with:
-          abi: ${{ matrix.abi }}
-          tag: musllinux_1_2
-          arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }}
-          env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
-          constraints: "homeassistant/package_constraints.txt"
-          requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all.txtac"
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -1,12 +1,26 @@
 repos:
  - repo: https://github.com/charliermarsh/ruff-pre-commit
-    rev: v0.0.272
+    rev: v0.0.247
    hooks:
      - id: ruff
        args:
          - --fix
+  - repo: https://github.com/asottile/pyupgrade
+    rev: v3.3.1
+    hooks:
+      - id: pyupgrade
+        args: [--py310-plus]
+        stages: [manual]
+  - repo: https://github.com/PyCQA/autoflake
+    rev: v2.0.0
+    hooks:
+      - id: autoflake
+        args:
+          - --in-place
+          - --remove-all-unused-imports
+        stages: [manual]
  - repo: https://github.com/psf/black
-    rev: 23.3.0
+    rev: 23.1.0
    hooks:
      - id: black
        args:
@@ -22,6 +36,33 @@ repos:
          - --quiet-level=2
        exclude_types: [csv, json]
        exclude: ^tests/fixtures/|homeassistant/generated/
+  - repo: https://github.com/PyCQA/flake8
+    rev: 6.0.0
+    hooks:
+      - id: flake8
+        additional_dependencies:
+          - pycodestyle==2.10.0
+          - pyflakes==3.0.1
+          - flake8-docstrings==1.6.0
+          - pydocstyle==6.2.3
+          - flake8-comprehensions==3.10.1
+          - flake8-noqa==1.3.0
+          - mccabe==0.7.0
+        exclude: docs/source/conf.py
+        stages: [manual]
+  - repo: https://github.com/PyCQA/bandit
+    rev: 1.7.4
+    hooks:
+      - id: bandit
+        args:
+          - --quiet
+          - --format=custom
+          - --configfile=tests/bandit.yaml
+        files: ^(homeassistant|script|tests)/.+\.py$
+  - repo: https://github.com/PyCQA/isort
+    rev: 5.12.0
+    hooks:
+      - id: isort
  - repo: https://github.com/pre-commit/pre-commit-hooks
    rev: v4.4.0
    hooks:
--- a/.prettierignore
+++ b/.prettierignore
@@ -4,5 +4,3 @@ azure-*.yml
 docs/source/_templates/*
 homeassistant/components/*/translations/*.json
 homeassistant/generated/*
-tests/components/lidarr/fixtures/initialize.js
-tests/components/lidarr/fixtures/initialize-wrong.js
--- a/.strict-typing
+++ b/.strict-typing
@@ -49,7 +49,6 @@ homeassistant.components.air_quality.*
 homeassistant.components.airly.*
 homeassistant.components.airvisual.*
 homeassistant.components.airzone.*
-homeassistant.components.airzone_cloud.*
 homeassistant.components.aladdin_connect.*
 homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
@@ -58,12 +57,10 @@ homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
 homeassistant.components.analytics.*
-homeassistant.components.anova.*
 homeassistant.components.anthemav.*
 homeassistant.components.apcupsd.*
 homeassistant.components.aqualogic.*
 homeassistant.components.aseko_pool_live.*
-homeassistant.components.assist_pipeline.*
 homeassistant.components.asuswrt.*
 homeassistant.components.auth.*
 homeassistant.components.automation.*
@@ -87,7 +84,6 @@ homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
-homeassistant.components.cloud.*
 homeassistant.components.configurator.*
 homeassistant.components.cover.*
 homeassistant.components.cpuspeed.*
@@ -107,7 +103,6 @@ homeassistant.components.dormakaba_dkey.*
 homeassistant.components.dsmr.*
 homeassistant.components.dunehd.*
 homeassistant.components.efergy.*
-homeassistant.components.electrasmart.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
@@ -142,7 +137,6 @@ homeassistant.components.hardkernel.*
 homeassistant.components.hardware.*
 homeassistant.components.here_travel_time.*
 homeassistant.components.history.*
-homeassistant.components.homeassistant.exposed_entities
 homeassistant.components.homeassistant.triggers.event
 homeassistant.components.homeassistant_alerts.*
 homeassistant.components.homeassistant_hardware.*
@@ -169,13 +163,10 @@ homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
-homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
-homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
-homeassistant.components.imap.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.integration.*
@@ -183,7 +174,6 @@ homeassistant.components.iqvia.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
 homeassistant.components.jewish_calendar.*
-homeassistant.components.jvc_projector.*
 homeassistant.components.kaleidescape.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
@@ -237,14 +227,12 @@ homeassistant.components.oncue.*
 homeassistant.components.onewire.*
 homeassistant.components.open_meteo.*
 homeassistant.components.openexchangerates.*
-homeassistant.components.opensky.*
 homeassistant.components.openuv.*
 homeassistant.components.otbr.*
 homeassistant.components.overkiz.*
 homeassistant.components.peco.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
-homeassistant.components.ping.*
 homeassistant.components.powerwall.*
 homeassistant.components.proximity.*
 homeassistant.components.prusalink.*
@@ -277,6 +265,7 @@ homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.scrape.*
 homeassistant.components.select.*
+homeassistant.components.senseme.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
 homeassistant.components.sensor.*
@@ -292,7 +281,6 @@ homeassistant.components.smhi.*
 homeassistant.components.snooz.*
 homeassistant.components.sonarr.*
 homeassistant.components.speedtestdotnet.*
-homeassistant.components.sql.*
 homeassistant.components.ssdp.*
 homeassistant.components.statistics.*
 homeassistant.components.steamist.*
@@ -309,8 +297,6 @@ homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tautulli.*
 homeassistant.components.tcp.*
-homeassistant.components.text.*
-homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*
 homeassistant.components.tilt_ble.*
@@ -324,7 +310,7 @@ homeassistant.components.trafikverket_train.*
 homeassistant.components.trafikverket_weatherstation.*
 homeassistant.components.tts.*
 homeassistant.components.twentemilieu.*
-homeassistant.components.unifi.*
+homeassistant.components.unifi.update
 homeassistant.components.unifiprotect.*
 homeassistant.components.upcloud.*
 homeassistant.components.update.*
--- a/.vscode/launch.json
+++ b/.vscode/launch.json
@@ -23,7 +23,7 @@
      "preLaunchTask": "Compile English translations"
    },
    {
-      // Debug by attaching to local Home Assistant server using Remote Python Debugger.
+      // Debug by attaching to local Home Asistant server using Remote Python Debugger.
      // See https://www.home-assistant.io/integrations/debugpy/
      "name": "Home Assistant: Attach Local",
      "type": "python",
@@ -38,7 +38,7 @@
      ]
    },
    {
-      // Debug by attaching to remote Home Assistant server using Remote Python Debugger.
+      // Debug by attaching to remote Home Asistant server using Remote Python Debugger.
      // See https://www.home-assistant.io/integrations/debugpy/
      "name": "Home Assistant: Attach Remote",
      "type": "python",
--- a/.vscode/tasks.json
+++ b/.vscode/tasks.json
@@ -42,6 +42,20 @@
      },
      "problemMatcher": []
    },
+    {
+      "label": "Flake8",
+      "type": "shell",
+      "command": "pre-commit run flake8 --all-files",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    },
    {
      "label": "Ruff",
      "type": "shell",
@@ -103,7 +117,7 @@
    {
      "label": "Install all Requirements",
      "type": "shell",
-      "command": "pip3 install -r requirements_all.txt",
+      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_all.txt",
      "group": {
        "kind": "build",
        "isDefault": true
@@ -117,7 +131,7 @@
    {
      "label": "Install all Test Requirements",
      "type": "shell",
-      "command": "pip3 install -r requirements_test_all.txt",
+      "command": "pip3 install --use-deprecated=legacy-resolver -r requirements_test_all.txt",
      "group": {
        "kind": "build",
        "isDefault": true
@@ -137,26 +151,6 @@
        "kind": "build",
        "isDefault": true
      }
-    },
-    {
-      "label": "Run scaffold",
-      "detail": "Add new functionality to a integration using a scaffold.",
-      "type": "shell",
-      "command": "python3 -m script.scaffold ${input:scaffoldName} --integration ${input:integrationName}",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
-    },
-    {
-      "label": "Create new integration",
-      "detail": "Use the scaffold to create a new integration.",
-      "type": "shell",
-      "command": "python3 -m script.scaffold integration",
-      "group": {
-        "kind": "build",
-        "isDefault": true
-      }
    }
  ],
  "inputs": [
@@ -164,23 +158,6 @@
      "id": "integrationName",
      "type": "promptString",
      "description": "For which integration should the task run?"
-    },
-    {
-      "id": "scaffoldName",
-      "type": "pickString",
-      "options": [
-        "backup",
-        "config_flow",
-        "config_flow_discovery",
-        "config_flow_helper",
-        "config_flow_oauth2",
-        "device_action",
-        "device_condition",
-        "device_trigger",
-        "reproduce_state",
-        "significant_change"
-      ],
-      "description": "Which scaffold should be run?"
    }
  ]
 }
--- a/.yamllint
+++ b/.yamllint
@@ -25,7 +25,7 @@ rules:
  comments:
    level: error
    require-starting-space: true
-    min-spaces-from-content: 1
+    min-spaces-from-content: 2
  comments-indentation:
    level: error
  document-end:
--- a/159
+++ b/159
@@ -59,8 +59,6 @@ build.json @home-assistant/supervisor
 /tests/components/airvisual_pro/ @bachya
 /homeassistant/components/airzone/ @Noltari
 /tests/components/airzone/ @Noltari
-/homeassistant/components/airzone_cloud/ @Noltari
-/tests/components/airzone_cloud/ @Noltari
 /homeassistant/components/aladdin_connect/ @mkmer
 /tests/components/aladdin_connect/ @mkmer
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
@@ -82,10 +80,6 @@ build.json @home-assistant/supervisor
 /tests/components/android_ip_webcam/ @engrbm87
 /homeassistant/components/androidtv/ @JeffLIrion @ollo69
 /tests/components/androidtv/ @JeffLIrion @ollo69
-/homeassistant/components/androidtv_remote/ @tronikos @Drafteed
-/tests/components/androidtv_remote/ @tronikos @Drafteed
-/homeassistant/components/anova/ @Lash-L
-/tests/components/anova/ @Lash-L
 /homeassistant/components/anthemav/ @hyralex
 /tests/components/anthemav/ @hyralex
 /homeassistant/components/apache_kafka/ @bachya
@@ -109,8 +103,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/arris_tg2492lg/ @vanbalken
 /homeassistant/components/aseko_pool_live/ @milanmeu
 /tests/components/aseko_pool_live/ @milanmeu
-/homeassistant/components/assist_pipeline/ @balloob @synesthesiam
-/tests/components/assist_pipeline/ @balloob @synesthesiam
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69
 /tests/components/asuswrt/ @kennedyshead @ollo69
 /homeassistant/components/atag/ @MatsNL
@@ -176,8 +168,6 @@ build.json @home-assistant/supervisor
 /tests/components/broadlink/ @danielhiversen @felipediel @L-I-Am
 /homeassistant/components/brother/ @bieniu
 /tests/components/brother/ @bieniu
-/homeassistant/components/brottsplatskartan/ @gjohansson-ST
-/tests/components/brottsplatskartan/ @gjohansson-ST
 /homeassistant/components/brunt/ @eavanvalkenburg
 /tests/components/brunt/ @eavanvalkenburg
 /homeassistant/components/bsblan/ @liudger
@@ -213,8 +203,6 @@ build.json @home-assistant/supervisor
 /tests/components/color_extractor/ @GenericStudent
 /homeassistant/components/comfoconnect/ @michaelarnauts
 /tests/components/comfoconnect/ @michaelarnauts
-/homeassistant/components/command_line/ @gjohansson-ST
-/tests/components/command_line/ @gjohansson-ST
 /homeassistant/components/compensation/ @Petro31
 /tests/components/compensation/ @Petro31
 /homeassistant/components/config/ @home-assistant/core
@@ -227,6 +215,8 @@ build.json @home-assistant/supervisor
 /tests/components/conversation/ @home-assistant/core @synesthesiam
 /homeassistant/components/coolmaster/ @OnFreund
 /tests/components/coolmaster/ @OnFreund
+/homeassistant/components/coronavirus/ @home-assistant/core
+/tests/components/coronavirus/ @home-assistant/core
 /homeassistant/components/counter/ @fabaff
 /tests/components/counter/ @fabaff
 /homeassistant/components/cover/ @home-assistant/core
@@ -238,10 +228,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/cups/ @fabaff
 /homeassistant/components/daikin/ @fredrike
 /tests/components/daikin/ @fredrike
-/homeassistant/components/date/ @home-assistant/core
-/tests/components/date/ @home-assistant/core
-/homeassistant/components/datetime/ @home-assistant/core
-/tests/components/datetime/ @home-assistant/core
+/homeassistant/components/darksky/ @fabaff
+/tests/components/darksky/ @fabaff
 /homeassistant/components/debugpy/ @frenck
 /tests/components/debugpy/ @frenck
 /homeassistant/components/deconz/ @Kane610
@@ -275,8 +263,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/discogs/ @thibmaek
 /homeassistant/components/discord/ @tkdrob
 /tests/components/discord/ @tkdrob
-/homeassistant/components/discovergy/ @jpbede
-/tests/components/discovergy/ @jpbede
 /homeassistant/components/discovery/ @home-assistant/core
 /tests/components/discovery/ @home-assistant/core
 /homeassistant/components/dlink/ @tkdrob
@@ -291,16 +277,13 @@ build.json @home-assistant/supervisor
 /tests/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /homeassistant/components/dormakaba_dkey/ @emontnemery
 /tests/components/dormakaba_dkey/ @emontnemery
-/homeassistant/components/dremel_3d_printer/ @tkdrob
-/tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/dsmr/ @Robbie1221 @frenck
 /tests/components/dsmr/ @Robbie1221 @frenck
 /homeassistant/components/dsmr_reader/ @depl0y @glodenox
 /tests/components/dsmr_reader/ @depl0y @glodenox
 /homeassistant/components/dunehd/ @bieniu
 /tests/components/dunehd/ @bieniu
-/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95 @andarotajo
-/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95 @andarotajo
+/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @Hummel95
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -319,8 +302,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/egardia/ @jeroenterheerdt
 /homeassistant/components/eight_sleep/ @mezz64 @raman325
 /tests/components/eight_sleep/ @mezz64 @raman325
-/homeassistant/components/electrasmart/ @jafar-atili
-/tests/components/electrasmart/ @jafar-atili
 /homeassistant/components/elgato/ @frenck
 /tests/components/elgato/ @frenck
 /homeassistant/components/elkm1/ @gwww @bdraco
@@ -356,8 +337,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/eq3btsmart/ @rytilahti
 /homeassistant/components/escea/ @lazdavila
 /tests/components/escea/ @lazdavila
-/homeassistant/components/esphome/ @OttoWinter @jesserockz @bdraco
-/tests/components/esphome/ @OttoWinter @jesserockz @bdraco
+/homeassistant/components/esphome/ @OttoWinter @jesserockz
+/tests/components/esphome/ @OttoWinter @jesserockz
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/evil_genius_labs/ @balloob
@@ -420,7 +401,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/frontend/ @home-assistant/frontend
 /tests/components/frontend/ @home-assistant/frontend
 /homeassistant/components/frontier_silicon/ @wlcrs
-/tests/components/frontier_silicon/ @wlcrs
 /homeassistant/components/fully_kiosk/ @cgarwood
 /tests/components/fully_kiosk/ @cgarwood
 /homeassistant/components/garages_amsterdam/ @klaasnicolaas
@@ -452,8 +432,8 @@ build.json @home-assistant/supervisor
 /tests/components/glances/ @engrbm87
 /homeassistant/components/goalzero/ @tkdrob
 /tests/components/goalzero/ @tkdrob
-/homeassistant/components/gogogate2/ @vangorra
-/tests/components/gogogate2/ @vangorra
+/homeassistant/components/gogogate2/ @vangorra @bdraco
+/tests/components/gogogate2/ @vangorra @bdraco
 /homeassistant/components/goodwe/ @mletenay @starkillerOG
 /tests/components/goodwe/ @mletenay @starkillerOG
 /homeassistant/components/google/ @allenporter
@@ -463,8 +443,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/google_assistant_sdk/ @tronikos
 /tests/components/google_assistant_sdk/ @tronikos
 /homeassistant/components/google_cloud/ @lufton
-/homeassistant/components/google_generative_ai_conversation/ @tronikos
-/tests/components/google_generative_ai_conversation/ @tronikos
 /homeassistant/components/google_mail/ @tkdrob
 /tests/components/google_mail/ @tkdrob
 /homeassistant/components/google_sheets/ @tkdrob
@@ -549,7 +527,7 @@ build.json @home-assistant/supervisor
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
-/homeassistant/components/hydrawise/ @dknowles2 @ptcryan
+/homeassistant/components/hydrawise/ @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
 /homeassistant/components/ialarm/ @RyuzakiKK
@@ -563,14 +541,12 @@ build.json @home-assistant/supervisor
 /tests/components/icloud/ @Quentame @nzapponi
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
-/homeassistant/components/image/ @home-assistant/core
-/tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
 /tests/components/image_processing/ @home-assistant/core
 /homeassistant/components/image_upload/ @home-assistant/core
 /tests/components/image_upload/ @home-assistant/core
-/homeassistant/components/imap/ @jbouwh
-/tests/components/imap/ @jbouwh
+/homeassistant/components/imap/ @engrbm87
+/tests/components/imap/ @engrbm87
 /homeassistant/components/incomfort/ @zxdavb
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
@@ -625,8 +601,6 @@ build.json @home-assistant/supervisor
 /tests/components/juicenet/ @jesserockz
 /homeassistant/components/justnimbus/ @kvanzuijlen
 /tests/components/justnimbus/ @kvanzuijlen
-/homeassistant/components/jvc_projector/ @SteveEasley
-/tests/components/jvc_projector/ @SteveEasley
 /homeassistant/components/kaiterra/ @Michsior14
 /homeassistant/components/kaleidescape/ @SteveEasley
 /tests/components/kaleidescape/ @SteveEasley
@@ -661,8 +635,6 @@ build.json @home-assistant/supervisor
 /tests/components/lametric/ @robbiet480 @frenck @bachya
 /homeassistant/components/landisgyr_heat_meter/ @vpathuis
 /tests/components/landisgyr_heat_meter/ @vpathuis
-/homeassistant/components/lastfm/ @joostlek
-/tests/components/lastfm/ @joostlek
 /homeassistant/components/launch_library/ @ludeeus @DurgNomis-drol
 /tests/components/launch_library/ @ludeeus @DurgNomis-drol
 /homeassistant/components/laundrify/ @xLarry
@@ -678,8 +650,8 @@ build.json @home-assistant/supervisor
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/life360/ @pnbruckner
 /tests/components/life360/ @pnbruckner
-/homeassistant/components/lifx/ @bdraco
-/tests/components/lifx/ @bdraco
+/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
@@ -687,8 +659,8 @@ build.json @home-assistant/supervisor
 /tests/components/litejet/ @joncar
 /homeassistant/components/litterrobot/ @natekspencer @tkdrob
 /tests/components/litterrobot/ @natekspencer @tkdrob
-/homeassistant/components/livisi/ @StefanIacobLivisi @planbnet
-/tests/components/livisi/ @StefanIacobLivisi @planbnet
+/homeassistant/components/livisi/ @StefanIacobLivisi
+/tests/components/livisi/ @StefanIacobLivisi
 /homeassistant/components/local_calendar/ @allenporter
 /tests/components/local_calendar/ @allenporter
 /homeassistant/components/local_ip/ @issacg
@@ -703,8 +675,6 @@ build.json @home-assistant/supervisor
 /tests/components/logi_circle/ @evanjd
 /homeassistant/components/lookin/ @ANMalko @bdraco
 /tests/components/lookin/ @ANMalko @bdraco
-/homeassistant/components/loqed/ @mikewoudenberg
-/tests/components/loqed/ @mikewoudenberg
 /homeassistant/components/lovelace/ @home-assistant/frontend
 /tests/components/lovelace/ @home-assistant/frontend
 /homeassistant/components/luci/ @mzdrale
@@ -787,12 +757,11 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
-/homeassistant/components/myq/ @ehendrix23
-/tests/components/myq/ @ehendrix23
+/homeassistant/components/myq/ @bdraco @ehendrix23
+/tests/components/myq/ @bdraco @ehendrix23
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
-/tests/components/mystrom/ @fabaff
 /homeassistant/components/nam/ @bieniu
 /tests/components/nam/ @bieniu
 /homeassistant/components/nanoleaf/ @milanmeu
@@ -809,15 +778,13 @@ build.json @home-assistant/supervisor
 /homeassistant/components/netdata/ @fabaff
 /homeassistant/components/netgear/ @hacf-fr @Quentame @starkillerOG
 /tests/components/netgear/ @hacf-fr @Quentame @starkillerOG
-/homeassistant/components/netgear_lte/ @tkdrob
 /homeassistant/components/network/ @home-assistant/core
 /tests/components/network/ @home-assistant/core
 /homeassistant/components/nexia/ @bdraco
 /tests/components/nexia/ @bdraco
 /homeassistant/components/nextbus/ @vividboarder
 /tests/components/nextbus/ @vividboarder
-/homeassistant/components/nextcloud/ @mib1185
-/tests/components/nextcloud/ @mib1185
+/homeassistant/components/nextcloud/ @meichthys
 /homeassistant/components/nextdns/ @bieniu
 /tests/components/nextdns/ @bieniu
 /homeassistant/components/nfandroidtv/ @tkdrob
@@ -852,8 +819,8 @@ build.json @home-assistant/supervisor
 /tests/components/numato/ @clssn
 /homeassistant/components/number/ @home-assistant/core @Shulyaka
 /tests/components/number/ @home-assistant/core @Shulyaka
-/homeassistant/components/nut/ @bdraco @ollo69 @pestevez
-/tests/components/nut/ @bdraco @ollo69 @pestevez
+/homeassistant/components/nut/ @bdraco @ollo69
+/tests/components/nut/ @bdraco @ollo69
 /homeassistant/components/nws/ @MatthewFlamm @kamiyo
 /tests/components/nws/ @MatthewFlamm @kamiyo
 /homeassistant/components/nzbget/ @chriscla
@@ -887,8 +854,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/opengarage/ @danielhiversen
 /tests/components/opengarage/ @danielhiversen
 /homeassistant/components/openhome/ @bazwilliams
-/tests/components/openhome/ @bazwilliams
-/homeassistant/components/opensky/ @joostlek
 /homeassistant/components/opentherm_gw/ @mvn23
 /tests/components/opentherm_gw/ @mvn23
 /homeassistant/components/openuv/ @bachya
@@ -928,8 +893,8 @@ build.json @home-assistant/supervisor
 /tests/components/plaato/ @JohNan
 /homeassistant/components/plex/ @jjlawren
 /tests/components/plex/ @jjlawren
-/homeassistant/components/plugwise/ @CoMPaTech @bouwew @frenck
-/tests/components/plugwise/ @CoMPaTech @bouwew @frenck
+/homeassistant/components/plugwise/ @CoMPaTech @bouwew @brefra @frenck
+/tests/components/plugwise/ @CoMPaTech @bouwew @brefra @frenck
 /homeassistant/components/plum_lightpad/ @ColinHarrington @prystupa
 /tests/components/plum_lightpad/ @ColinHarrington @prystupa
 /homeassistant/components/point/ @fredrike
@@ -966,13 +931,10 @@ build.json @home-assistant/supervisor
 /homeassistant/components/pvpc_hourly_pricing/ @azogue
 /tests/components/pvpc_hourly_pricing/ @azogue
 /homeassistant/components/qbittorrent/ @geoffreylagaisse
-/tests/components/qbittorrent/ @geoffreylagaisse
 /homeassistant/components/qingping/ @bdraco @skgsergio
 /tests/components/qingping/ @bdraco @skgsergio
 /homeassistant/components/qld_bushfire/ @exxamalte
 /tests/components/qld_bushfire/ @exxamalte
-/homeassistant/components/qnap/ @disforw
-/tests/components/qnap/ @disforw
 /homeassistant/components/qnap_qsw/ @Noltari
 /tests/components/qnap_qsw/ @Noltari
 /homeassistant/components/quantum_gateway/ @cisasteelersfan
@@ -985,8 +947,8 @@ build.json @home-assistant/supervisor
 /tests/components/radarr/ @tkdrob
 /homeassistant/components/radio_browser/ @frenck
 /tests/components/radio_browser/ @frenck
-/homeassistant/components/radiotherm/ @vinnyfuria
-/tests/components/radiotherm/ @vinnyfuria
+/homeassistant/components/radiotherm/ @bdraco @vinnyfuria
+/tests/components/radiotherm/ @bdraco @vinnyfuria
 /homeassistant/components/rainbird/ @konikvranik @allenporter
 /tests/components/rainbird/ @konikvranik @allenporter
 /homeassistant/components/raincloud/ @vanstinator
@@ -996,8 +958,6 @@ build.json @home-assistant/supervisor
 /tests/components/rainmachine/ @bachya
 /homeassistant/components/random/ @fabaff
 /tests/components/random/ @fabaff
-/homeassistant/components/rapt_ble/ @sairon
-/tests/components/rapt_ble/ @sairon
 /homeassistant/components/raspberry_pi/ @home-assistant/core
 /tests/components/raspberry_pi/ @home-assistant/core
 /homeassistant/components/rdw/ @frenck
@@ -1011,15 +971,11 @@ build.json @home-assistant/supervisor
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/renault/ @epenet
 /tests/components/renault/ @epenet
-/homeassistant/components/renson/ @jimmyd-be
-/tests/components/renson/ @jimmyd-be
 /homeassistant/components/reolink/ @starkillerOG
 /tests/components/reolink/ @starkillerOG
 /homeassistant/components/repairs/ @home-assistant/core
 /tests/components/repairs/ @home-assistant/core
 /homeassistant/components/repetier/ @MTrab @ShadowBr0ther
-/homeassistant/components/rest/ @epenet
-/tests/components/rest/ @epenet
 /homeassistant/components/rflink/ @javicalle
 /tests/components/rflink/ @javicalle
 /homeassistant/components/rfxtrx/ @danielhiversen @elupus @RobBie1221
@@ -1030,12 +986,10 @@ build.json @home-assistant/supervisor
 /tests/components/ridwell/ @bachya
 /homeassistant/components/risco/ @OnFreund
 /tests/components/risco/ @OnFreund
-/homeassistant/components/rituals_perfume_genie/ @milanmeu @frenck
-/tests/components/rituals_perfume_genie/ @milanmeu @frenck
+/homeassistant/components/rituals_perfume_genie/ @milanmeu
+/tests/components/rituals_perfume_genie/ @milanmeu
 /homeassistant/components/rmvtransport/ @cgtobi
 /tests/components/rmvtransport/ @cgtobi
-/homeassistant/components/roborock/ @humbertogontijo @Lash-L
-/tests/components/roborock/ @humbertogontijo @Lash-L
 /homeassistant/components/roku/ @ctalkington
 /tests/components/roku/ @ctalkington
 /homeassistant/components/roomba/ @pschmitt @cyr-ius @shenxn
@@ -1082,6 +1036,8 @@ build.json @home-assistant/supervisor
 /tests/components/select/ @home-assistant/core
 /homeassistant/components/sense/ @kbickar
 /tests/components/sense/ @kbickar
+/homeassistant/components/senseme/ @mikelawrence @bdraco
+/tests/components/senseme/ @mikelawrence @bdraco
 /homeassistant/components/sensibo/ @andrey-git @gjohansson-ST
 /tests/components/sensibo/ @andrey-git @gjohansson-ST
 /homeassistant/components/sensirion_ble/ @akx
@@ -1100,8 +1056,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/seven_segments/ @fabaff
 /homeassistant/components/sfr_box/ @epenet
 /tests/components/sfr_box/ @epenet
-/homeassistant/components/sharkiq/ @JeffResc @funkybunch
-/tests/components/sharkiq/ @JeffResc @funkybunch
+/homeassistant/components/sharkiq/ @JeffResc @funkybunch @AritroSaha10
+/tests/components/sharkiq/ @JeffResc @funkybunch @AritroSaha10
 /homeassistant/components/shell_command/ @home-assistant/core
 /tests/components/shell_command/ @home-assistant/core
 /homeassistant/components/shelly/ @balloob @bieniu @thecode @chemelli74 @bdraco
@@ -1124,8 +1080,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/sky_hub/ @rogerselwyn
 /homeassistant/components/skybell/ @tkdrob
 /tests/components/skybell/ @tkdrob
-/homeassistant/components/slack/ @tkdrob
-/tests/components/slack/ @tkdrob
+/homeassistant/components/slack/ @bachya @tkdrob
+/tests/components/slack/ @bachya @tkdrob
 /homeassistant/components/sleepiq/ @mfugate1 @kbickar
 /tests/components/sleepiq/ @mfugate1 @kbickar
 /homeassistant/components/slide/ @ualex73
@@ -1145,8 +1101,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/smhi/ @gjohansson-ST
 /tests/components/smhi/ @gjohansson-ST
 /homeassistant/components/sms/ @ocalvo
-/homeassistant/components/snapcast/ @luar123
-/tests/components/snapcast/ @luar123
 /homeassistant/components/snooz/ @AustinBrunkhorst
 /tests/components/snooz/ @AustinBrunkhorst
 /homeassistant/components/solaredge/ @frenck
@@ -1175,8 +1129,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/splunk/ @Bre77
 /homeassistant/components/spotify/ @frenck
 /tests/components/spotify/ @frenck
-/homeassistant/components/sql/ @gjohansson-ST @dougiteixeira
-/tests/components/sql/ @gjohansson-ST @dougiteixeira
+/homeassistant/components/sql/ @dgomes @gjohansson-ST
+/tests/components/sql/ @dgomes @gjohansson-ST
 /homeassistant/components/squeezebox/ @rajlaud
 /tests/components/squeezebox/ @rajlaud
 /homeassistant/components/srp_energy/ @briglx
@@ -1198,8 +1152,8 @@ build.json @home-assistant/supervisor
 /tests/components/stookwijzer/ @fwestenberg
 /homeassistant/components/stream/ @hunterjm @uvjustin @allenporter
 /tests/components/stream/ @hunterjm @uvjustin @allenporter
-/homeassistant/components/stt/ @home-assistant/core @pvizeli
-/tests/components/stt/ @home-assistant/core @pvizeli
+/homeassistant/components/stt/ @pvizeli
+/tests/components/stt/ @pvizeli
 /homeassistant/components/subaru/ @G-Two
 /tests/components/subaru/ @G-Two
 /homeassistant/components/suez_water/ @ooii
@@ -1218,8 +1172,8 @@ build.json @home-assistant/supervisor
 /tests/components/switchbee/ @jafar-atili
 /homeassistant/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /tests/components/switchbot/ @bdraco @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
-/homeassistant/components/switcher_kis/ @thecode
-/tests/components/switcher_kis/ @thecode
+/homeassistant/components/switcher_kis/ @tomerfi @thecode
+/tests/components/switcher_kis/ @tomerfi @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
 /homeassistant/components/syncthing/ @zhulik
 /tests/components/syncthing/ @zhulik
@@ -1230,8 +1184,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/synology_srm/ @aerialls
 /homeassistant/components/system_bridge/ @timmo001
 /tests/components/system_bridge/ @timmo001
-/homeassistant/components/tado/ @michaelarnauts @chiefdragon
-/tests/components/tado/ @michaelarnauts @chiefdragon
+/homeassistant/components/tado/ @michaelarnauts
+/tests/components/tado/ @michaelarnauts
 /homeassistant/components/tag/ @balloob @dmulcahey
 /tests/components/tag/ @balloob @dmulcahey
 /homeassistant/components/tailscale/ @frenck
@@ -1259,14 +1213,14 @@ build.json @home-assistant/supervisor
 /homeassistant/components/thethingsnetwork/ @fabaff
 /homeassistant/components/thread/ @home-assistant/core
 /tests/components/thread/ @home-assistant/core
+/homeassistant/components/threshold/ @fabaff
+/tests/components/threshold/ @fabaff
 /homeassistant/components/tibber/ @danielhiversen
 /tests/components/tibber/ @danielhiversen
 /homeassistant/components/tile/ @bachya
 /tests/components/tile/ @bachya
 /homeassistant/components/tilt_ble/ @apt-itude
 /tests/components/tilt_ble/ @apt-itude
-/homeassistant/components/time/ @home-assistant/core
-/tests/components/time/ @home-assistant/core
 /homeassistant/components/time_date/ @fabaff
 /tests/components/time_date/ @fabaff
 /homeassistant/components/tmb/ @alemuro
@@ -1296,23 +1250,21 @@ build.json @home-assistant/supervisor
 /tests/components/trafikverket_weatherstation/ @endor-force @gjohansson-ST
 /homeassistant/components/transmission/ @engrbm87 @JPHutchins
 /tests/components/transmission/ @engrbm87 @JPHutchins
-/homeassistant/components/tts/ @home-assistant/core @pvizeli
-/tests/components/tts/ @home-assistant/core @pvizeli
+/homeassistant/components/tts/ @pvizeli
+/tests/components/tts/ @pvizeli
 /homeassistant/components/tuya/ @Tuya @zlinoliver @frenck
 /tests/components/tuya/ @Tuya @zlinoliver @frenck
 /homeassistant/components/twentemilieu/ @frenck
 /tests/components/twentemilieu/ @frenck
 /homeassistant/components/twinkly/ @dr1rrb @Robbie1221
 /tests/components/twinkly/ @dr1rrb @Robbie1221
-/homeassistant/components/twitch/ @joostlek
-/tests/components/twitch/ @joostlek
 /homeassistant/components/ukraine_alarm/ @PaulAnnekov
 /tests/components/ukraine_alarm/ @PaulAnnekov
 /homeassistant/components/unifi/ @Kane610
 /tests/components/unifi/ @Kane610
 /homeassistant/components/unifiled/ @florisvdk
-/homeassistant/components/unifiprotect/ @AngellusMortis @bdraco
-/tests/components/unifiprotect/ @AngellusMortis @bdraco
+/homeassistant/components/unifiprotect/ @briis @AngellusMortis @bdraco
+/tests/components/unifiprotect/ @briis @AngellusMortis @bdraco
 /homeassistant/components/upb/ @gwww
 /tests/components/upb/ @gwww
 /homeassistant/components/upc_connect/ @pvizeli @fabaff
@@ -1341,13 +1293,15 @@ build.json @home-assistant/supervisor
 /homeassistant/components/velux/ @Julius2342
 /homeassistant/components/venstar/ @garbled1
 /tests/components/venstar/ @garbled1
-/homeassistant/components/verisure/ @frenck @niro1987
-/tests/components/verisure/ @frenck @niro1987
+/homeassistant/components/verisure/ @frenck
+/tests/components/verisure/ @frenck
 /homeassistant/components/versasense/ @flamm3blemuff1n
 /homeassistant/components/version/ @ludeeus
 /tests/components/version/ @ludeeus
 /homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey
 /tests/components/vesync/ @markperdue @webdjoe @thegardenmonkey
+/homeassistant/components/vicare/ @oischinger
+/tests/components/vicare/ @oischinger
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
@@ -1355,8 +1309,6 @@ build.json @home-assistant/supervisor
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
-/homeassistant/components/voip/ @balloob @synesthesiam
-/tests/components/voip/ @balloob @synesthesiam
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvooncall/ @molobrakos
@@ -1402,16 +1354,15 @@ build.json @home-assistant/supervisor
 /tests/components/wled/ @frenck
 /homeassistant/components/wolflink/ @adamkrol93
 /tests/components/wolflink/ @adamkrol93
-/homeassistant/components/workday/ @fabaff @gjohansson-ST
-/tests/components/workday/ @fabaff @gjohansson-ST
+/homeassistant/components/workday/ @fabaff
+/tests/components/workday/ @fabaff
 /homeassistant/components/worldclock/ @fabaff
 /tests/components/worldclock/ @fabaff
 /homeassistant/components/ws66i/ @ssaenger
 /tests/components/ws66i/ @ssaenger
-/homeassistant/components/wyoming/ @balloob @synesthesiam
-/tests/components/wyoming/ @balloob @synesthesiam
 /homeassistant/components/xbox/ @hunterjm
 /tests/components/xbox/ @hunterjm
+/homeassistant/components/xbox_live/ @MartinHjelmare
 /homeassistant/components/xiaomi_aqara/ @danielhiversen @syssi
 /tests/components/xiaomi_aqara/ @danielhiversen @syssi
 /homeassistant/components/xiaomi_ble/ @Jc2k @Ernst79
@@ -1436,8 +1387,6 @@ build.json @home-assistant/supervisor
 /tests/components/yolink/ @matrixd2
 /homeassistant/components/youless/ @gjong
 /tests/components/youless/ @gjong
-/homeassistant/components/youtube/ @joostlek
-/tests/components/youtube/ @joostlek
 /homeassistant/components/zamg/ @killer0071234
 /tests/components/zamg/ @killer0071234
 /homeassistant/components/zengge/ @emontnemery
--- a/CODE_OF_CONDUCT.md
+++ b/CODE_OF_CONDUCT.md
@@ -132,8 +132,8 @@ For answers to common questions about this code of conduct, see the FAQ at
 <https://www.contributor-covenant.org/faq>. Translations are available at
 <https://www.contributor-covenant.org/translations>.

-[coc-blog]: https://www.home-assistant.io/blog/2017/01/21/home-assistant-governance/
-[coc2-blog]: https://www.home-assistant.io/blog/2020/05/25/code-of-conduct-updated/
+[coc-blog]: /blog/2017/01/21/home-assistant-governance/
+[coc2-blog]: /blog/2020/05/25/code-of-conduct-updated/
 [email]: mailto:safety@home-assistant.io
 [homepage]: http://contributor-covenant.org
 [mozilla]: https://github.com/mozilla/diversity
--- a/3
+++ b/3
@@ -18,6 +18,7 @@ RUN \
        --no-index \
        --only-binary=:all: \
        --find-links "${WHEELS_LINKS}" \
+        --use-deprecated=legacy-resolver \
        -r homeassistant/requirements.txt

 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
@@ -42,6 +43,7 @@ RUN \
            --no-index \
            --only-binary=:all: \
            --find-links "${WHEELS_LINKS}" \
+            --use-deprecated=legacy-resolver \
            -r homeassistant/requirements_all.txt

 ## Setup Home Assistant Core
@@ -52,6 +54,7 @@ RUN \
        --no-index \
        --only-binary=:all: \
        --find-links "${WHEELS_LINKS}" \
+        --use-deprecated=legacy-resolver \
        -e ./homeassistant \
    && python3 -m compileall \
        homeassistant/homeassistant
--- a/Dockerfile.dev
+++ b/Dockerfile.dev
@@ -1,15 +1,15 @@
-FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.11
+FROM mcr.microsoft.com/vscode/devcontainers/python:0-3.10

 SHELL ["/bin/bash", "-o", "pipefail", "-c"]

 # Uninstall pre-installed formatting and linting tools
 # They would conflict with our pinned versions
-RUN \
-    pipx uninstall black \
-    && pipx uninstall pydocstyle \
-    && pipx uninstall pycodestyle \
-    && pipx uninstall mypy \
-    && pipx uninstall pylint
+RUN pipx uninstall black
+RUN pipx uninstall flake8
+RUN pipx uninstall pydocstyle
+RUN pipx uninstall pycodestyle
+RUN pipx uninstall mypy
+RUN pipx uninstall pylint

 RUN \
    curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
@@ -45,9 +45,9 @@ WORKDIR /workspaces
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements.txt
+RUN pip3 install -r requirements.txt --use-deprecated=legacy-resolver
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN pip3 install -r requirements_test.txt
+RUN pip3 install -r requirements_test.txt --use-deprecated=legacy-resolver
 RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/

 # Set the default shell to bash instead of sh
--- a/README.rst
+++ b/README.rst
@@ -4,7 +4,7 @@ Home Assistant |Chat Status|
 Open source home automation that puts local control and privacy first. Powered by a worldwide community of tinkerers and DIY enthusiasts. Perfect to run on a Raspberry Pi or a local server.

 Check out `home-assistant.io <https://home-assistant.io>`__ for `a
-demo <https://demo.home-assistant.io>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
+demo <https://home-assistant.io/demo/>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
 `tutorials <https://home-assistant.io/getting-started/automation/>`__ and `documentation <https://home-assistant.io/docs/>`__.

 |screenshot-states|
@@ -21,8 +21,8 @@ If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.

 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
-   :target: https://www.home-assistant.io/join-chat/
+   :target: https://discord.gg/c5DvZ4e
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/master/docs/screenshots.png
-   :target: https://demo.home-assistant.io
+   :target: https://home-assistant.io/demo/
 .. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/docs/screenshot-integrations.png
   :target: https://home-assistant.io/integrations/
--- a/build.yaml
+++ b/build.yaml
@@ -1,16 +1,14 @@
-image: ghcr.io/home-assistant/{arch}-homeassistant
+image: homeassistant/{arch}-homeassistant
+shadow_repository: ghcr.io/home-assistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.06.1
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.06.1
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.06.1
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.06.1
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.06.1
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2023.02.0
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2023.02.0
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2023.02.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2023.02.0
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2023.02.0
 codenotary:
  signer: notary@home-assistant.io
  base_image: notary@home-assistant.io
-cosign:
-  base_identity: https://github.com/home-assistant/docker/.*
-  identity: https://github.com/home-assistant/core/.*
 labels:
  io.hass.type: core
  org.opencontainers.image.title: Home Assistant
--- a/docs/screenshot-integrations.png
+++ b/docs/screenshot-integrations.png
--- a/homeassistant/auth/init.py
+++ b/homeassistant/auth/init.py
@@ -14,7 +14,7 @@ from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.util import dt as dt_util

-from . import auth_store, jwt_wrapper, models
+from . import auth_store, models
 from .const import ACCESS_TOKEN_EXPIRATION, GROUP_ID_ADMIN
 from .mfa_modules import MultiFactorAuthModule, auth_mfa_module_from_config
 from .providers import AuthProvider, LoginFlow, auth_provider_from_config
@@ -555,7 +555,9 @@ class AuthManager:
    ) -> models.RefreshToken | None:
        """Return refresh token if an access token is valid."""
        try:
-            unverif_claims = jwt_wrapper.unverified_hs256_token_decode(token)
+            unverif_claims = jwt.decode(
+                token, algorithms=["HS256"], options={"verify_signature": False}
+            )
        except jwt.InvalidTokenError:
            return None

@@ -571,9 +573,7 @@ class AuthManager:
            issuer = refresh_token.id

        try:
-            jwt_wrapper.verify_and_decode(
-                token, jwt_key, leeway=10, issuer=issuer, algorithms=["HS256"]
-            )
+            jwt.decode(token, jwt_key, leeway=10, issuer=issuer, algorithms=["HS256"])
        except jwt.InvalidTokenError:
            return None

--- a/homeassistant/auth/jwt_wrapper.py
+++ b/homeassistant/auth/jwt_wrapper.py
@@ -1,116 +0,0 @@
-"""Provide a wrapper around JWT that caches decoding tokens.
-
-Since we decode the same tokens over and over again
-we can cache the result of the decode of valid tokens
-to speed up the process.
-"""
-from __future__ import annotations
-
-from datetime import timedelta
-from functools import lru_cache, partial
-from typing import Any
-
-from jwt import DecodeError, PyJWS, PyJWT
-
-from homeassistant.util.json import json_loads
-
-JWT_TOKEN_CACHE_SIZE = 16
-MAX_TOKEN_SIZE = 8192
-
-_VERIFY_KEYS = ("signature", "exp", "nbf", "iat", "aud", "iss")
-
-_VERIFY_OPTIONS: dict[str, Any] = {f"verify_{key}": True for key in _VERIFY_KEYS} | {
-    "require": []
-}
-_NO_VERIFY_OPTIONS = {f"verify_{key}": False for key in _VERIFY_KEYS}
-
-
-class _PyJWSWithLoadCache(PyJWS):
-    """PyJWS with a dedicated load implementation."""
-
-    @lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)
-    # We only ever have a global instance of this class
-    # so we do not have to worry about the LRU growing
-    # each time we create a new instance.
-    def _load(self, jwt: str | bytes) -> tuple[bytes, bytes, dict, bytes]:
-        """Load a JWS."""
-        return super()._load(jwt)
-
-
-_jws = _PyJWSWithLoadCache()
-
-
-@lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)
-def _decode_payload(json_payload: str) -> dict[str, Any]:
-    """Decode the payload from a JWS dictionary."""
-    try:
-        payload = json_loads(json_payload)
-    except ValueError as err:
-        raise DecodeError(f"Invalid payload string: {err}") from err
-    if not isinstance(payload, dict):
-        raise DecodeError("Invalid payload string: must be a json object")
-    return payload
-
-
-class _PyJWTWithVerify(PyJWT):
-    """PyJWT with a fast decode implementation."""
-
-    def decode_payload(
-        self, jwt: str, key: str, options: dict[str, Any], algorithms: list[str]
-    ) -> dict[str, Any]:
-        """Decode a JWT's payload."""
-        if len(jwt) > MAX_TOKEN_SIZE:
-            # Avoid caching impossible tokens
-            raise DecodeError("Token too large")
-        return _decode_payload(
-            _jws.decode_complete(
-                jwt=jwt,
-                key=key,
-                algorithms=algorithms,
-                options=options,
-            )["payload"]
-        )
-
-    def verify_and_decode(
-        self,
-        jwt: str,
-        key: str,
-        algorithms: list[str],
-        issuer: str | None = None,
-        leeway: int | float | timedelta = 0,
-        options: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
-        """Verify a JWT's signature and claims."""
-        merged_options = {**_VERIFY_OPTIONS, **(options or {})}
-        payload = self.decode_payload(
-            jwt=jwt,
-            key=key,
-            options=merged_options,
-            algorithms=algorithms,
-        )
-        # These should never be missing since we verify them
-        # but this is an additional safeguard to make sure
-        # nothing slips through.
-        assert "exp" in payload, "exp claim is required"
-        assert "iat" in payload, "iat claim is required"
-        self._validate_claims(
-            payload=payload,
-            options=merged_options,
-            issuer=issuer,
-            leeway=leeway,
-        )
-        return payload
-
-
-_jwt = _PyJWTWithVerify()
-verify_and_decode = _jwt.verify_and_decode
-unverified_hs256_token_decode = lru_cache(maxsize=JWT_TOKEN_CACHE_SIZE)(
-    partial(
-        _jwt.decode_payload, key="", algorithms=["HS256"], options=_NO_VERIFY_OPTIONS
-    )
-)
-
-__all__ = [
-    "unverified_hs256_token_decode",
-    "verify_and_decode",
-]
--- a/homeassistant/auth/permissions/models.py
+++ b/homeassistant/auth/permissions/models.py
@@ -6,12 +6,15 @@ from typing import TYPE_CHECKING
 import attr

 if TYPE_CHECKING:
-    from homeassistant.helpers import device_registry as dr, entity_registry as er
+    from homeassistant.helpers import (
+        device_registry as dev_reg,
+        entity_registry as ent_reg,
+    )


@attr.s(slots=True)
 class PermissionLookup:
    """Class to hold data for permission lookups."""

-    entity_registry: er.EntityRegistry = attr.ib()
-    device_registry: dr.DeviceRegistry = attr.ib()
+    entity_registry: ent_reg.EntityRegistry = attr.ib()
+    device_registry: dev_reg.DeviceRegistry = attr.ib()
--- a/homeassistant/auth/providers/command_line.py
+++ b/homeassistant/auth/providers/command_line.py
@@ -13,8 +13,8 @@ from homeassistant.const import CONF_COMMAND
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError

-from ..models import Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
+from ..models import Credentials, UserMeta

 CONF_ARGS = "args"
 CONF_META = "meta"
--- a/homeassistant/auth/providers/homeassistant.py
+++ b/homeassistant/auth/providers/homeassistant.py
@@ -16,8 +16,8 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.storage import Store

-from ..models import Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
+from ..models import Credentials, UserMeta

 STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"
--- a/homeassistant/auth/providers/insecure_example.py
+++ b/homeassistant/auth/providers/insecure_example.py
@@ -11,8 +11,8 @@ from homeassistant.core import callback
 from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError

-from ..models import Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
+from ..models import Credentials, UserMeta

 USER_SCHEMA = vol.Schema(
    {
--- a/homeassistant/auth/providers/legacy_api_password.py
+++ b/homeassistant/auth/providers/legacy_api_password.py
@@ -15,8 +15,8 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv

-from ..models import Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
+from ..models import Credentials, UserMeta

 AUTH_PROVIDER_TYPE = "legacy_api_password"
 CONF_API_PASSWORD = "api_password"
--- a/homeassistant/auth/providers/trusted_networks.py
+++ b/homeassistant/auth/providers/trusted_networks.py
@@ -23,9 +23,9 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 import homeassistant.helpers.config_validation as cv

+from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from .. import InvalidAuthError
 from ..models import Credentials, RefreshToken, UserMeta
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow

 IPAddress = IPv4Address | IPv6Address
 IPNetwork = IPv4Network | IPv6Network
@@ -46,7 +46,7 @@ CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend(
                    [
                        vol.Or(
                            cv.uuid4_hex,
-                            vol.Schema({vol.Required(CONF_GROUP): str}),
+                            vol.Schema({vol.Required(CONF_GROUP): cv.uuid4_hex}),
                        )
                    ],
                )
--- a/homeassistant/backports/functools.py
+++ b/homeassistant/backports/functools.py
@@ -1,72 +0,0 @@
-"""Functools backports from standard lib."""
-from __future__ import annotations
-
-from collections.abc import Callable
-from types import GenericAlias
-from typing import Any, Generic, TypeVar, overload
-
-from typing_extensions import Self
-
-_T = TypeVar("_T")
-_R = TypeVar("_R")
-
-
-class cached_property(Generic[_T, _R]):  # pylint: disable=invalid-name
-    """Backport of Python 3.12's cached_property.
-
-    Includes https://github.com/python/cpython/pull/101890/files
-    """
-
-    def __init__(self, func: Callable[[_T], _R]) -> None:
-        """Initialize."""
-        self.func = func
-        self.attrname: Any = None
-        self.__doc__ = func.__doc__
-
-    def __set_name__(self, owner: type[_T], name: str) -> None:
-        """Set name."""
-        if self.attrname is None:
-            self.attrname = name
-        elif name != self.attrname:
-            raise TypeError(
-                "Cannot assign the same cached_property to two different names "
-                f"({self.attrname!r} and {name!r})."
-            )
-
-    @overload
-    def __get__(self, instance: None, owner: type[_T]) -> Self:
-        ...
-
-    @overload
-    def __get__(self, instance: _T, owner: type[_T]) -> _R:
-        ...
-
-    def __get__(self, instance: _T | None, owner: type[_T] | None = None) -> _R | Self:
-        """Get."""
-        if instance is None:
-            return self
-        if self.attrname is None:
-            raise TypeError(
-                "Cannot use cached_property instance without calling __set_name__ on it."
-            )
-        try:
-            cache = instance.__dict__
-        # not all objects have __dict__ (e.g. class defines slots)
-        except AttributeError:
-            msg = (
-                f"No '__dict__' attribute on {type(instance).__name__!r} "
-                f"instance to cache {self.attrname!r} property."
-            )
-            raise TypeError(msg) from None
-        val = self.func(instance)
-        try:
-            cache[self.attrname] = val
-        except TypeError:
-            msg = (
-                f"The '__dict__' attribute on {type(instance).__name__!r} instance "
-                f"does not support item assignment for caching {self.attrname!r} property."
-            )
-            raise TypeError(msg) from None
-        return val
-
-    __class_getitem__ = classmethod(GenericAlias)
--- a/homeassistant/block_async_io.py
+++ b/homeassistant/block_async_io.py
@@ -8,7 +8,7 @@ from .util.async_ import protect_loop
 def enable() -> None:
    """Enable the detection of blocking calls in the event loop."""
    # Prevent urllib3 and requests doing I/O in event loop
-    HTTPConnection.putrequest = protect_loop(  # type: ignore[method-assign]
+    HTTPConnection.putrequest = protect_loop(  # type: ignore[assignment]
        HTTPConnection.putrequest
    )

--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -19,7 +19,6 @@ import yarl
 from . import config as conf_util, config_entries, core, loader
 from .components import http
 from .const import (
-    FORMAT_DATETIME,
    REQUIRED_NEXT_PYTHON_HA_RELEASE,
    REQUIRED_NEXT_PYTHON_VER,
    SIGNAL_BOOTSTRAP_INTEGRATIONS,
@@ -32,8 +31,6 @@ from .helpers import (
    entity_registry,
    issue_registry,
    recorder,
-    restore_state,
-    template,
 )
 from .helpers.dispatcher import async_dispatcher_send
 from .helpers.typing import ConfigType
@@ -241,15 +238,12 @@ async def load_registries(hass: core.HomeAssistant) -> None:

    # Load the registries and cache the result of platform.uname().processor
    entity.async_setup(hass)
-    template.async_setup(hass)
    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),
-        template.async_load_custom_templates(hass),
-        restore_state.async_load(hass),
    )


@@ -350,6 +344,7 @@ def async_enable_logging(
    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:
        try:
@@ -364,7 +359,7 @@ def async_enable_logging(
            logging.getLogger().handlers[0].setFormatter(
                ColoredFormatter(
                    colorfmt,
-                    datefmt=FORMAT_DATETIME,
+                    datefmt=datefmt,
                    reset=True,
                    log_colors={
                        "DEBUG": "cyan",
@@ -380,18 +375,12 @@ def async_enable_logging(

    # If the above initialization failed for any reason, setup the default
    # formatting.  If the above succeeds, this will result in a no-op.
-    logging.basicConfig(format=fmt, datefmt=FORMAT_DATETIME, level=logging.INFO)
-
-    # Capture warnings.warn(...) and friends messages in logs.
-    # The standard destination for them is stderr, which may end up unnoticed.
-    # This way they're where other messages are, and can be filtered as usual.
-    logging.captureWarnings(True)
+    logging.basicConfig(format=fmt, datefmt=datefmt, level=logging.INFO)

    # Suppress overly verbose logs from libraries that aren't helpful
    logging.getLogger("requests").setLevel(logging.WARNING)
    logging.getLogger("urllib3").setLevel(logging.WARNING)
    logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
-    logging.getLogger("httpx").setLevel(logging.WARNING)

    sys.excepthook = lambda *args: logging.getLogger(None).exception(
        "Uncaught exception", exc_info=args  # type: ignore[arg-type]
@@ -438,7 +427,7 @@ def async_enable_logging(
            _LOGGER.error("Error rolling over log file: %s", err)

        err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
-        err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
+        err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))

        logger = logging.getLogger("")
        logger.addHandler(err_handler)
@@ -519,20 +508,19 @@ async def async_setup_multi_components(
 ) -> None:
    """Set up multiple domains. Log on failure."""
    futures = {
-        domain: hass.async_create_task(
-            async_setup_component(hass, domain, config), f"setup component {domain}"
-        )
+        domain: hass.async_create_task(async_setup_component(hass, domain, config))
        for domain in domains
    }
-    results = await asyncio.gather(*futures.values(), return_exceptions=True)
-    for idx, domain in enumerate(futures):
-        result = results[idx]
-        if isinstance(result, BaseException):
-            _LOGGER.error(
-                "Error setting up integration %s - received exception",
-                domain,
-                exc_info=(type(result), result, result.__traceback__),
-            )
+    await asyncio.wait(futures.values())
+    errors = [domain for domain in domains if futures[domain].exception()]
+    for domain in errors:
+        exception = futures[domain].exception()
+        assert exception is not None
+        _LOGGER.error(
+            "Error setting up integration %s - received exception",
+            domain,
+            exc_info=(type(exception), exception, exception.__traceback__),
+        )


 async def _async_set_up_integrations(
@@ -637,9 +625,6 @@ async def _async_set_up_integrations(
        - stage_1_domains
    )

-    # Enables after dependencies when setting up stage 1 domains
-    async_set_domains_to_be_loaded(hass, stage_1_domains)
-
    # Start setup
    if stage_1_domains:
        _LOGGER.info("Setting up stage 1: %s", stage_1_domains)
@@ -651,7 +636,7 @@ async def _async_set_up_integrations(
        except asyncio.TimeoutError:
            _LOGGER.warning("Setup timed out for stage 1 - moving forward")

-    # Add after dependencies when setting up stage 2 domains
+    # Enables after dependencies
    async_set_domains_to_be_loaded(hass, stage_2_domains)

    if stage_2_domains:
--- a/homeassistant/brands/airzone.json
+++ b/homeassistant/brands/airzone.json
@@ -1,5 +0,0 @@
-{
-  "domain": "airzone",
-  "name": "Airzone",
-  "integrations": ["airzone", "airzone_cloud"]
-}
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -6,7 +6,6 @@
    "google_assistant_sdk",
    "google_cloud",
    "google_domains",
-    "google_generative_ai_conversation",
    "google_mail",
    "google_maps",
    "google_pubsub",
@@ -17,7 +16,6 @@
    "google",
    "nest",
    "cast",
-    "dialogflow",
-    "youtube"
+    "dialogflow"
  ]
 }
--- a/homeassistant/brands/heltun.json
+++ b/homeassistant/brands/heltun.json
@@ -1,5 +0,0 @@
-{
-  "domain": "heltun",
-  "name": "HELTUN",
-  "iot_standards": ["zwave"]
-}
--- a/homeassistant/brands/homeseer.json
+++ b/homeassistant/brands/homeseer.json
@@ -1,5 +0,0 @@
-{
-  "domain": "homeseer",
-  "name": "HomeSeer",
-  "iot_standards": ["zwave"]
-}
--- a/homeassistant/brands/microsoft.json
+++ b/homeassistant/brands/microsoft.json
@@ -10,6 +10,7 @@
    "microsoft_face",
    "microsoft",
    "msteams",
-    "xbox"
+    "xbox",
+    "xbox_live"
  ]
 }
--- a/homeassistant/brands/yale.json
+++ b/homeassistant/brands/yale.json
@@ -1,5 +1,5 @@
 {
  "domain": "yale",
  "name": "Yale",
-  "integrations": ["august", "yale_smart_alarm", "yalexs_ble", "yale_home"]
+  "integrations": ["august", "yale_smart_alarm", "yalexs_ble"]
 }
--- a/homeassistant/components/init.py
+++ b/homeassistant/components/init.py
@@ -1,4 +1,4 @@
-"""Contains components that can be plugged into Home Assistant.
+"""This package contains components that can be plugged into Home Assistant.

 Component design guidelines:
 - Each component defines a constant DOMAIN that is equal to its filename.
--- a/homeassistant/components/abode/binary_sensor.py
+++ b/homeassistant/components/abode/binary_sensor.py
@@ -42,7 +42,6 @@ async def async_setup_entry(
 class AbodeBinarySensor(AbodeDevice, BinarySensorEntity):
    """A binary sensor implementation for Abode device."""

-    _attr_name = None
    _device: ABBinarySensor

    @property
--- a/homeassistant/components/abode/sensor.py
+++ b/homeassistant/components/abode/sensor.py
@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
    SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import LIGHT_LUX
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

@@ -22,14 +21,17 @@ from .const import DOMAIN
 SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
    SensorEntityDescription(
        key=CONST.TEMP_STATUS_KEY,
+        name="Temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
    ),
    SensorEntityDescription(
        key=CONST.HUMI_STATUS_KEY,
+        name="Humidity",
        device_class=SensorDeviceClass.HUMIDITY,
    ),
    SensorEntityDescription(
        key=CONST.LUX_STATUS_KEY,
+        name="Lux",
        device_class=SensorDeviceClass.ILLUMINANCE,
    ),
 )
@@ -53,7 +55,6 @@ class AbodeSensor(AbodeDevice, SensorEntity):
    """A sensor implementation for Abode devices."""

    _device: AbodeSense
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -70,7 +71,7 @@ class AbodeSensor(AbodeDevice, SensorEntity):
        elif description.key == CONST.HUMI_STATUS_KEY:
            self._attr_native_unit_of_measurement = device.humidity_unit
        elif description.key == CONST.LUX_STATUS_KEY:
-            self._attr_native_unit_of_measurement = LIGHT_LUX
+            self._attr_native_unit_of_measurement = device.lux_unit

    @property
    def native_value(self) -> float | None:
--- a/homeassistant/components/accuweather/init.py
+++ b/homeassistant/components/accuweather/init.py
@@ -10,15 +10,14 @@ from aiohttp import ClientSession
 from aiohttp.client_exceptions import ClientConnectorError
 from async_timeout import timeout

-from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceEntryType
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util.unit_system import METRIC_SYSTEM

 from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN, MANUFACTURER

@@ -50,14 +49,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

-    # Remove ozone sensors from registry if they exist
-    ent_reg = er.async_get(hass)
-    for day in range(0, 5):
-        unique_id = f"{coordinator.location_key}-ozone-{day}"
-        if entity_id := ent_reg.async_get_entity_id(SENSOR_PLATFORM, DOMAIN, unique_id):
-            _LOGGER.debug("Removing ozone sensor entity %s", entity_id)
-            ent_reg.async_remove(entity_id)
-
    return True


@@ -121,12 +112,16 @@ class AccuWeatherDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):

    async def _async_update_data(self) -> dict[str, Any]:
        """Update data via library."""
-        forecast: list[dict[str, Any]] = []
        try:
            async with timeout(10):
                current = await self.accuweather.async_get_current_conditions()
-                if self.forecast:
-                    forecast = await self.accuweather.async_get_daily_forecast()
+                forecast = (
+                    await self.accuweather.async_get_forecast(
+                        metric=self.hass.config.units is METRIC_SYSTEM
+                    )
+                    if self.forecast
+                    else {}
+                )
        except (
            ApiError,
            ClientConnectorError,
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -20,6 +20,7 @@ from homeassistant.components.weather import (
    ATTR_CONDITION_WINDY,
 )

+API_IMPERIAL: Final = "Imperial"
 API_METRIC: Final = "Metric"
 ATTRIBUTION: Final = "Data provided by AccuWeather"
 ATTR_CATEGORY: Final = "Category"
--- a/homeassistant/components/accuweather/manifest.json
+++ b/homeassistant/components/accuweather/manifest.json
@@ -8,5 +8,5 @@
  "iot_class": "cloud_polling",
  "loggers": ["accuweather"],
  "quality_scale": "platinum",
-  "requirements": ["accuweather==1.0.0"]
+  "requirements": ["accuweather==0.5.0"]
 }
--- a/homeassistant/components/accuweather/sensor.py
+++ b/homeassistant/components/accuweather/sensor.py
@@ -16,7 +16,6 @@ from homeassistant.const import (
    CONCENTRATION_PARTS_PER_CUBIC_METER,
    PERCENTAGE,
    UV_INDEX,
-    UnitOfIrradiance,
    UnitOfLength,
    UnitOfSpeed,
    UnitOfTemperature,
@@ -27,9 +26,11 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.util.unit_system import METRIC_SYSTEM

 from . import AccuWeatherDataUpdateCoordinator
 from .const import (
+    API_IMPERIAL,
    API_METRIC,
    ATTR_CATEGORY,
    ATTR_DIRECTION,
@@ -50,7 +51,7 @@ PARALLEL_UPDATES = 1
 class AccuWeatherSensorDescriptionMixin:
    """Mixin for AccuWeather sensor."""

-    value_fn: Callable[[dict[str, Any]], StateType]
+    value_fn: Callable[[dict[str, Any], str], StateType]


@dataclass
@@ -60,25 +61,18 @@ class AccuWeatherSensorDescription(
    """Class describing AccuWeather sensor entities."""

    attr_fn: Callable[[dict[str, Any]], dict[str, StateType]] = lambda _: {}
+    metric_unit: str | None = None
+    us_customary_unit: str | None = None


 FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
-    AccuWeatherSensorDescription(
-        key="AirQuality",
-        icon="mdi:air-filter",
-        name="Air quality",
-        value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
-        device_class=SensorDeviceClass.ENUM,
-        options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
-        translation_key="air_quality",
-    ),
    AccuWeatherSensorDescription(
        key="CloudCoverDay",
        icon="mdi:weather-cloudy",
        name="Cloud cover day",
        entity_registry_enabled_default=False,
        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
    ),
    AccuWeatherSensorDescription(
        key="CloudCoverNight",
@@ -86,7 +80,7 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Cloud cover night",
        entity_registry_enabled_default=False,
        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
    ),
    AccuWeatherSensorDescription(
        key="Grass",
@@ -94,26 +88,15 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Grass pollen",
        entity_registry_enabled_default=False,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="grass_pollen",
    ),
    AccuWeatherSensorDescription(
        key="HoursOfSun",
        icon="mdi:weather-partly-cloudy",
        name="Hours of sun",
        native_unit_of_measurement=UnitOfTime.HOURS,
-        value_fn=lambda data: cast(float, data),
-    ),
-    AccuWeatherSensorDescription(
-        key="LongPhraseDay",
-        name="Condition day",
-        value_fn=lambda data: cast(str, data),
-    ),
-    AccuWeatherSensorDescription(
-        key="LongPhraseNight",
-        name="Condition night",
-        value_fn=lambda data: cast(str, data),
+        value_fn=lambda data, _: cast(float, data),
    ),
    AccuWeatherSensorDescription(
        key="Mold",
@@ -121,9 +104,16 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Mold pollen",
        entity_registry_enabled_default=False,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        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]},
-        translation_key="mold_pollen",
    ),
    AccuWeatherSensorDescription(
        key="Ragweed",
@@ -131,69 +121,56 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Ragweed pollen",
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        entity_registry_enabled_default=False,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="ragweed_pollen",
    ),
    AccuWeatherSensorDescription(
        key="RealFeelTemperatureMax",
        device_class=SensorDeviceClass.TEMPERATURE,
        name="RealFeel temperature max",
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="RealFeelTemperatureMin",
        device_class=SensorDeviceClass.TEMPERATURE,
        name="RealFeel temperature min",
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.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,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.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,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-    ),
-    AccuWeatherSensorDescription(
-        key="SolarIrradianceDay",
-        icon="mdi:weather-sunny",
-        name="Solar irradiance day",
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-    ),
-    AccuWeatherSensorDescription(
-        key="SolarIrradianceNight",
-        icon="mdi:weather-sunny",
-        name="Solar irradiance night",
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, _: cast(float, data[ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="ThunderstormProbabilityDay",
        icon="mdi:weather-lightning",
        name="Thunderstorm probability day",
        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
    ),
    AccuWeatherSensorDescription(
        key="ThunderstormProbabilityNight",
        icon="mdi:weather-lightning",
        name="Thunderstorm probability night",
        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
    ),
    AccuWeatherSensorDescription(
        key="Tree",
@@ -201,26 +178,25 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Tree pollen",
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
        entity_registry_enabled_default=False,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="tree_pollen",
    ),
    AccuWeatherSensorDescription(
        key="UVIndex",
        icon="mdi:weather-sunny",
        name="UV index",
        native_unit_of_measurement=UV_INDEX,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        value_fn=lambda data, _: cast(int, data[ATTR_VALUE]),
        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="uv_index",
    ),
    AccuWeatherSensorDescription(
        key="WindGustDay",
        device_class=SensorDeviceClass.WIND_SPEED,
        name="Wind gust day",
        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.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(
@@ -228,24 +204,27 @@ FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        device_class=SensorDeviceClass.WIND_SPEED,
        name="Wind gust night",
        entity_registry_enabled_default=False,
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.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",
        device_class=SensorDeviceClass.WIND_SPEED,
        name="Wind day",
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.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",
        device_class=SensorDeviceClass.WIND_SPEED,
        name="Wind night",
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
+        value_fn=lambda data, _: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
    ),
 )
@@ -257,8 +236,9 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Apparent temperature",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="Ceiling",
@@ -266,8 +246,9 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        icon="mdi:weather-fog",
        name="Cloud ceiling",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfLength.METERS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfLength.METERS,
+        us_customary_unit=UnitOfLength.FEET,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
        suggested_display_precision=0,
    ),
    AccuWeatherSensorDescription(
@@ -277,7 +258,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
    ),
    AccuWeatherSensorDescription(
        key="DewPoint",
@@ -285,16 +266,18 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Dew point",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.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,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="RealFeelTemperatureShade",
@@ -302,16 +285,18 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="RealFeel temperature shade",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="Precipitation",
        device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
        name="Precipitation",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfVolumetricFlux.MILLIMETERS_PER_HOUR,
+        us_customary_unit=UnitOfVolumetricFlux.INCHES_PER_HOUR,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
        attr_fn=lambda data: {"type": data["PrecipitationType"]},
    ),
    AccuWeatherSensorDescription(
@@ -321,7 +306,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Pressure tendency",
        options=["falling", "rising", "steady"],
        translation_key="pressure_tendency",
-        value_fn=lambda data: cast(str, data["LocalizedText"]).lower(),
+        value_fn=lambda data, _: cast(str, data["LocalizedText"]).lower(),
    ),
    AccuWeatherSensorDescription(
        key="UVIndex",
@@ -329,7 +314,7 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="UV index",
        state_class=SensorStateClass.MEASUREMENT,
        native_unit_of_measurement=UV_INDEX,
-        value_fn=lambda data: cast(int, data),
+        value_fn=lambda data, _: cast(int, data),
        attr_fn=lambda data: {ATTR_LEVEL: data["UVIndexText"]},
    ),
    AccuWeatherSensorDescription(
@@ -338,8 +323,9 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Wet bulb temperature",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="WindChillTemperature",
@@ -347,16 +333,18 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Wind chill temperature",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfTemperature.CELSIUS,
+        us_customary_unit=UnitOfTemperature.FAHRENHEIT,
+        value_fn=lambda data, unit: cast(float, data[unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="Wind",
        device_class=SensorDeviceClass.WIND_SPEED,
        name="Wind",
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
+        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
    ),
    AccuWeatherSensorDescription(
        key="WindGust",
@@ -364,8 +352,9 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
        name="Wind gust",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        value_fn=lambda data: cast(float, data[ATTR_SPEED][API_METRIC][ATTR_VALUE]),
+        metric_unit=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        us_customary_unit=UnitOfSpeed.MILES_PER_HOUR,
+        value_fn=lambda data, unit: cast(float, data[ATTR_SPEED][unit][ATTR_VALUE]),
    ),
 )

@@ -385,7 +374,7 @@ async def async_setup_entry(
        # Some air quality/allergy sensors are only available for certain
        # locations.
        sensors.extend(
-            AccuWeatherSensor(coordinator, description, forecast_day=day)
+            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]
@@ -424,27 +413,34 @@ class AccuWeatherSensor(
            self._attr_unique_id = (
                f"{coordinator.location_key}-{description.key}".lower()
            )
+        self._attr_native_unit_of_measurement = description.native_unit_of_measurement
+        if self.coordinator.hass.config.units is METRIC_SYSTEM:
+            self._unit_system = API_METRIC
+            if metric_unit := description.metric_unit:
+                self._attr_native_unit_of_measurement = metric_unit
+        else:
+            self._unit_system = API_IMPERIAL
+            if us_customary_unit := description.us_customary_unit:
+                self._attr_native_unit_of_measurement = us_customary_unit
        self._attr_device_info = coordinator.device_info
-        self.forecast_day = forecast_day
+        if forecast_day is not None:
+            self.forecast_day = forecast_day

    @property
    def native_value(self) -> StateType:
        """Return the state."""
-        return self.entity_description.value_fn(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:
-            return self.entity_description.attr_fn(self._sensor_data)
-
        return self.entity_description.attr_fn(self.coordinator.data)

    @callback
    def _handle_coordinator_update(self) -> None:
        """Handle data update."""
        self._sensor_data = _get_sensor_data(
-            self.coordinator.data, self.entity_description.key, self.forecast_day
+            self.coordinator.data, self.entity_description.key
        )
        self.async_write_ha_state()

@@ -462,3 +458,20 @@ def _get_sensor_data(
        return sensors["PrecipitationSummary"]["PastHour"]

    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()
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -30,91 +30,6 @@
          "rising": "Rising",
          "falling": "Falling"
        }
-      },
-      "air_quality": {
-        "state": {
-          "good": "Good",
-          "hazardous": "Hazardous",
-          "high": "High",
-          "low": "Low",
-          "moderate": "Moderate",
-          "unhealthy": "Unhealthy"
-        }
-      },
-      "grass_pollen": {
-        "state_attributes": {
-          "level": {
-            "name": "Level",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen": {
-        "state_attributes": {
-          "level": {
-            "name": "Level",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen": {
-        "state_attributes": {
-          "level": {
-            "name": "Level",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen": {
-        "state_attributes": {
-          "level": {
-            "name": "Level",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index": {
-        "state_attributes": {
-          "level": {
-            "name": "Level",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
-            }
-          }
-        }
      }
    }
  },
--- a/homeassistant/components/accuweather/weather.py
+++ b/homeassistant/components/accuweather/weather.py
@@ -1,16 +1,14 @@
 """Support for the AccuWeather service."""
 from __future__ import annotations

-from typing import cast
+from statistics import mean
+from typing import Any, cast

 from homeassistant.components.weather import (
-    ATTR_FORECAST_CLOUD_COVERAGE,
    ATTR_FORECAST_CONDITION,
-    ATTR_FORECAST_NATIVE_APPARENT_TEMP,
    ATTR_FORECAST_NATIVE_PRECIPITATION,
    ATTR_FORECAST_NATIVE_TEMP,
    ATTR_FORECAST_NATIVE_TEMP_LOW,
-    ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
    ATTR_FORECAST_NATIVE_WIND_SPEED,
    ATTR_FORECAST_PRECIPITATION_PROBABILITY,
    ATTR_FORECAST_TIME,
@@ -30,14 +28,13 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
+from homeassistant.util.unit_system import METRIC_SYSTEM

 from . import AccuWeatherDataUpdateCoordinator
 from .const import (
+    API_IMPERIAL,
    API_METRIC,
-    ATTR_DIRECTION,
    ATTR_FORECAST,
-    ATTR_SPEED,
-    ATTR_VALUE,
    ATTRIBUTION,
    CONDITION_CLASSES,
    DOMAIN,
@@ -62,7 +59,6 @@ class AccuWeatherEntity(
    """Define an AccuWeather entity."""

    _attr_has_entity_name = True
-    _attr_name = None

    def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
        """Initialize."""
@@ -70,11 +66,20 @@ class AccuWeatherEntity(
        # 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
-        self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
-        self._attr_native_pressure_unit = UnitOfPressure.HPA
-        self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
-        self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
-        self._attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
+        if coordinator.hass.config.units is METRIC_SYSTEM:
+            self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
+            self._attr_native_pressure_unit = UnitOfPressure.HPA
+            self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
+            self._attr_native_visibility_unit = UnitOfLength.KILOMETERS
+            self._attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
+            self._unit_system = API_METRIC
+        else:
+            self._unit_system = API_IMPERIAL
+            self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.INCHES
+            self._attr_native_pressure_unit = UnitOfPressure.INHG
+            self._attr_native_temperature_unit = UnitOfTemperature.FAHRENHEIT
+            self._attr_native_visibility_unit = UnitOfLength.MILES
+            self._attr_native_wind_speed_unit = UnitOfSpeed.MILES_PER_HOUR
        self._attr_unique_id = coordinator.location_key
        self._attr_attribution = ATTRIBUTION
        self._attr_device_info = coordinator.device_info
@@ -91,61 +96,53 @@ class AccuWeatherEntity(
        except IndexError:
            return None

-    @property
-    def cloud_coverage(self) -> float:
-        """Return the Cloud coverage in %."""
-        return cast(float, self.coordinator.data["CloudCover"])
-
-    @property
-    def native_apparent_temperature(self) -> float:
-        """Return the apparent temperature."""
-        return cast(
-            float, self.coordinator.data["ApparentTemperature"][API_METRIC][ATTR_VALUE]
-        )
-
    @property
    def native_temperature(self) -> float:
        """Return the temperature."""
-        return cast(float, self.coordinator.data["Temperature"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float, self.coordinator.data["Temperature"][self._unit_system]["Value"]
+        )

    @property
    def native_pressure(self) -> float:
        """Return the pressure."""
-        return cast(float, self.coordinator.data["Pressure"][API_METRIC][ATTR_VALUE])
-
-    @property
-    def native_dew_point(self) -> float:
-        """Return the dew point."""
-        return cast(float, self.coordinator.data["DewPoint"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float, self.coordinator.data["Pressure"][self._unit_system]["Value"]
+        )

    @property
    def humidity(self) -> int:
        """Return the humidity."""
        return cast(int, self.coordinator.data["RelativeHumidity"])

-    @property
-    def native_wind_gust_speed(self) -> float:
-        """Return the wind gust speed."""
-        return cast(
-            float, self.coordinator.data["WindGust"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
-        )
-
    @property
    def native_wind_speed(self) -> float:
        """Return the wind speed."""
        return cast(
-            float, self.coordinator.data["Wind"][ATTR_SPEED][API_METRIC][ATTR_VALUE]
+            float, self.coordinator.data["Wind"]["Speed"][self._unit_system]["Value"]
        )

    @property
    def wind_bearing(self) -> int:
        """Return the wind bearing."""
-        return cast(int, self.coordinator.data["Wind"][ATTR_DIRECTION]["Degrees"])
+        return cast(int, self.coordinator.data["Wind"]["Direction"]["Degrees"])

    @property
    def native_visibility(self) -> float:
        """Return the visibility."""
-        return cast(float, self.coordinator.data["Visibility"][API_METRIC][ATTR_VALUE])
+        return cast(
+            float, self.coordinator.data["Visibility"][self._unit_system]["Value"]
+        )
+
+    @property
+    def ozone(self) -> int | None:
+        """Return the ozone level."""
+        # We only have ozone data for certain locations and only in the forecast data.
+        if self.coordinator.forecast and self.coordinator.data[ATTR_FORECAST][0].get(
+            "Ozone"
+        ):
+            return cast(int, self.coordinator.data[ATTR_FORECAST][0]["Ozone"]["Value"])
+        return None

    @property
    def forecast(self) -> list[Forecast] | None:
@@ -156,26 +153,37 @@ class AccuWeatherEntity(
        return [
            {
                ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
-                ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
-                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
-                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
-                ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][
-                    ATTR_VALUE
-                ],
-                ATTR_FORECAST_NATIVE_PRECIPITATION: item["TotalLiquidDay"][ATTR_VALUE],
-                ATTR_FORECAST_PRECIPITATION_PROBABILITY: item[
-                    "PrecipitationProbabilityDay"
-                ],
-                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"][ATTR_SPEED][
-                    ATTR_VALUE
-                ],
-                ATTR_FORECAST_NATIVE_WIND_GUST_SPEED: item["WindGustDay"][ATTR_SPEED][
-                    ATTR_VALUE
-                ],
-                ATTR_FORECAST_WIND_BEARING: item["WindDay"][ATTR_DIRECTION]["Degrees"],
+                ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"]["Value"],
+                ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"]["Value"],
+                ATTR_FORECAST_NATIVE_PRECIPITATION: self._calc_precipitation(item),
+                ATTR_FORECAST_PRECIPITATION_PROBABILITY: round(
+                    mean(
+                        [
+                            item["PrecipitationProbabilityDay"],
+                            item["PrecipitationProbabilityNight"],
+                        ]
+                    )
+                ),
+                ATTR_FORECAST_NATIVE_WIND_SPEED: item["WindDay"]["Speed"]["Value"],
+                ATTR_FORECAST_WIND_BEARING: item["WindDay"]["Direction"]["Degrees"],
                ATTR_FORECAST_CONDITION: [
                    k for k, v in CONDITION_CLASSES.items() if item["IconDay"] in v
                ][0],
            }
            for item in self.coordinator.data[ATTR_FORECAST]
        ]
+
+    @staticmethod
+    def _calc_precipitation(day: dict[str, Any]) -> float:
+        """Return sum of the precipitation."""
+        precip_sum = 0
+        precip_types = ["Rain", "Snow", "Ice"]
+        for precip in precip_types:
+            precip_sum = sum(
+                [
+                    precip_sum,
+                    day[f"{precip}Day"]["Value"],
+                    day[f"{precip}Night"]["Value"],
+                ]
+            )
+        return round(precip_sum, 1)
--- a/homeassistant/components/acmeda/base.py
+++ b/homeassistant/components/acmeda/base.py
@@ -14,7 +14,6 @@ class AcmedaBase(entity.Entity):
    """Base representation of an Acmeda roller."""

    _attr_should_poll = False
-    _attr_has_entity_name = True

    def __init__(self, roller: aiopulse.Roller) -> None:
        """Initialize the roller."""
@@ -73,6 +72,11 @@ class AcmedaBase(entity.Entity):
        """Return the ID of this roller."""
        return self.roller.id

+    @property
+    def name(self) -> str | None:
+        """Return the name of roller."""
+        return self.roller.name
+
    @property
    def device_info(self) -> entity.DeviceInfo:
        """Return the device info."""
--- a/homeassistant/components/acmeda/cover.py
+++ b/homeassistant/components/acmeda/cover.py
@@ -45,9 +45,7 @@ async def async_setup_entry(


 class AcmedaCover(AcmedaBase, CoverEntity):
-    """Representation of an Acmeda cover device."""
-
-    _attr_name = None
+    """Representation of a Acmeda cover device."""

    @property
    def current_cover_position(self) -> int | None:
--- a/homeassistant/components/acmeda/sensor.py
+++ b/homeassistant/components/acmeda/sensor.py
@@ -40,11 +40,16 @@ async def async_setup_entry(


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

    _attr_device_class = SensorDeviceClass.BATTERY
    _attr_native_unit_of_measurement = PERCENTAGE

+    @property
+    def name(self) -> str:
+        """Return the name of roller."""
+        return f"{super().name} Battery"
+
    @property
    def native_value(self) -> float | int | None:
        """Return the state of the device."""
--- a/homeassistant/components/actiontec/device_tracker.py
+++ b/homeassistant/components/actiontec/device_tracker.py
@@ -40,7 +40,7 @@ def get_scanner(


 class ActiontecDeviceScanner(DeviceScanner):
-    """Class which queries an actiontec router for connected devices."""
+    """This class queries an actiontec router for connected devices."""

    def __init__(self, config: ConfigType) -> None:
        """Initialize the scanner."""
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -1,7 +1,7 @@
 """Support for Adax wifi-enabled home heaters."""
 from __future__ import annotations

-from typing import Any, cast
+from typing import Any

 from adax import Adax
 from adax_local import Adax as AdaxLocal
@@ -79,10 +79,7 @@ class AdaxDevice(ClimateEntity):
        self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, heater_data["id"])},
-            # Instead of setting the device name to the entity name, adax
-            # should be updated to set has_entity_name = True, and set the entity
-            # name to None
-            name=cast(str | None, self.name),
+            name=self.name,
            manufacturer="Adax",
        )

--- a/homeassistant/components/adguard/sensor.py
+++ b/homeassistant/components/adguard/sensor.py
@@ -39,56 +39,56 @@ class AdGuardHomeEntityDescription(
 SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
    AdGuardHomeEntityDescription(
        key="dns_queries",
-        translation_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",
-        translation_key="dns_queries_blocked",
+        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",
-        translation_key="dns_queries_blocked_ratio",
+        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",
-        translation_key="parental_control_blocked",
+        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",
-        translation_key="safe_browsing_blocked",
+        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",
-        translation_key="safe_searches_enforced",
+        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",
-        translation_key="average_processing_speed",
+        name="Average processing speed",
        icon="mdi:speedometer",
        native_unit_of_measurement=UnitOfTime.MILLISECONDS,
        value_fn=lambda adguard: adguard.stats.avg_processing_time(),
    ),
    AdGuardHomeEntityDescription(
        key="rules_count",
-        translation_key="rules_count",
+        name="Rules count",
        icon="mdi:counter",
        native_unit_of_measurement="rules",
        value_fn=lambda adguard: adguard.filtering.rules_count(allowlist=False),
--- a/homeassistant/components/adguard/strings.json
+++ b/homeassistant/components/adguard/strings.json
@@ -24,53 +24,5 @@
      "existing_instance_updated": "Updated existing configuration.",
      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]"
    }
-  },
-  "entity": {
-    "sensor": {
-      "dns_queries": {
-        "name": "DNS queries"
-      },
-      "dns_queries_blocked": {
-        "name": "DNS queries blocked"
-      },
-      "dns_queries_blocked_ratio": {
-        "name": "DNS queries blocked ratio"
-      },
-      "parental_control_blocked": {
-        "name": "Parental control blocked"
-      },
-      "safe_browsing_blocked": {
-        "name": "Safe browsing blocked"
-      },
-      "safe_searches_enforced": {
-        "name": "Safe searches enforced"
-      },
-      "average_processing_speed": {
-        "name": "Average processing speed"
-      },
-      "rules_count": {
-        "name": "Rules count"
-      }
-    },
-    "switch": {
-      "protection": {
-        "name": "Protection"
-      },
-      "parental": {
-        "name": "Parental control"
-      },
-      "safe_search": {
-        "name": "Safe search"
-      },
-      "safe_browsing": {
-        "name": "Safe browsing"
-      },
-      "filtering": {
-        "name": "Filtering"
-      },
-      "query_log": {
-        "name": "Query log"
-      }
-    }
  }
 }
--- a/homeassistant/components/adguard/switch.py
+++ b/homeassistant/components/adguard/switch.py
@@ -40,7 +40,7 @@ class AdGuardHomeSwitchEntityDescription(
 SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    AdGuardHomeSwitchEntityDescription(
        key="protection",
-        translation_key="protection",
+        name="Protection",
        icon="mdi:shield-check",
        is_on_fn=lambda adguard: adguard.protection_enabled,
        turn_on_fn=lambda adguard: adguard.enable_protection,
@@ -48,7 +48,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    ),
    AdGuardHomeSwitchEntityDescription(
        key="parental",
-        translation_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,
@@ -56,7 +56,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    ),
    AdGuardHomeSwitchEntityDescription(
        key="safesearch",
-        translation_key="safe_search",
+        name="Safe search",
        icon="mdi:shield-check",
        is_on_fn=lambda adguard: adguard.safesearch.enabled,
        turn_on_fn=lambda adguard: adguard.safesearch.enable,
@@ -64,7 +64,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    ),
    AdGuardHomeSwitchEntityDescription(
        key="safebrowsing",
-        translation_key="safe_browsing",
+        name="Safe browsing",
        icon="mdi:shield-check",
        is_on_fn=lambda adguard: adguard.safebrowsing.enabled,
        turn_on_fn=lambda adguard: adguard.safebrowsing.enable,
@@ -72,7 +72,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    ),
    AdGuardHomeSwitchEntityDescription(
        key="filtering",
-        translation_key="filtering",
+        name="Filtering",
        icon="mdi:shield-check",
        is_on_fn=lambda adguard: adguard.filtering.enabled,
        turn_on_fn=lambda adguard: adguard.filtering.enable,
@@ -80,7 +80,7 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
    ),
    AdGuardHomeSwitchEntityDescription(
        key="querylog",
-        translation_key="query_log",
+        name="Query log",
        icon="mdi:shield-check",
        is_on_fn=lambda adguard: adguard.querylog.enabled,
        turn_on_fn=lambda adguard: adguard.querylog.enable,
--- a/homeassistant/components/ads/sensor.py
+++ b/homeassistant/components/ads/sensor.py
@@ -10,7 +10,6 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType, StateType

-from .. import ads
 from . import (
    ADS_TYPEMAP,
    CONF_ADS_FACTOR,
@@ -19,6 +18,7 @@ from . import (
    STATE_KEY_STATE,
    AdsEntity,
 )
+from .. import ads

 DEFAULT_NAME = "ADS sensor"
 PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
--- a/homeassistant/components/advantage_air/init.py
+++ b/homeassistant/components/advantage_air/init.py
@@ -7,11 +7,11 @@ from advantage_air import ApiError, advantage_air
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .const import ADVANTAGE_AIR_RETRY, DOMAIN
-from .models import AdvantageAirData

 ADVANTAGE_AIR_SYNC_INTERVAL = 15
 PLATFORMS = [
@@ -53,10 +53,29 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
        update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
    )

+    def error_handle_factory(func):
+        """Return the provided API function wrapped.
+
+        Adds an error handler and coordinator refresh.
+        """
+
+        async def error_handle(param):
+            try:
+                if await func(param):
+                    await coordinator.async_refresh()
+            except ApiError as err:
+                raise HomeAssistantError(err) from err
+
+        return error_handle
+
    await coordinator.async_config_entry_first_refresh()

    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = AdvantageAirData(coordinator, api)
+    hass.data[DOMAIN][entry.entry_id] = {
+        "coordinator": coordinator,
+        "aircon": error_handle_factory(api.aircon.async_set),
+        "lights": error_handle_factory(api.lights.async_set),
+    }

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

--- a/homeassistant/components/advantage_air/binary_sensor.py
+++ b/homeassistant/components/advantage_air/binary_sensor.py
@@ -1,6 +1,8 @@
 """Binary Sensor platform for Advantage Air integration."""
 from __future__ import annotations

+from typing import Any
+
 from homeassistant.components.binary_sensor import (
    BinarySensorDeviceClass,
    BinarySensorEntity,
@@ -12,7 +14,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback

 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 PARALLEL_UPDATES = 0

@@ -24,10 +25,10 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir Binary Sensor platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[BinarySensorEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            entities.append(AdvantageAirFilter(instance, ac_key))
            for zone_key, zone in ac_device["zones"].items():
@@ -47,7 +48,7 @@ class AdvantageAirFilter(AdvantageAirAcEntity, BinarySensorEntity):
    _attr_entity_category = EntityCategory.DIAGNOSTIC
    _attr_name = "Filter"

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
        """Initialize an Advantage Air Filter sensor."""
        super().__init__(instance, ac_key)
        self._attr_unique_id += "-filter"
@@ -63,7 +64,7 @@ class AdvantageAirZoneMotion(AdvantageAirZoneEntity, BinarySensorEntity):

    _attr_device_class = BinarySensorDeviceClass.MOTION

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone Motion sensor."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = f'{self._zone["name"]} motion'
@@ -81,7 +82,7 @@ class AdvantageAirZoneMyZone(AdvantageAirZoneEntity, BinarySensorEntity):
    _attr_entity_registry_enabled_default = False
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone MyZone sensor."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = f'{self._zone["name"]} myZone'
--- a/homeassistant/components/advantage_air/climate.py
+++ b/homeassistant/components/advantage_air/climate.py
@@ -5,8 +5,6 @@ import logging
 from typing import Any

 from homeassistant.components.climate import (
-    ATTR_TARGET_TEMP_HIGH,
-    ATTR_TARGET_TEMP_LOW,
    FAN_AUTO,
    FAN_HIGH,
    FAN_LOW,
@@ -28,17 +26,24 @@ from .const import (
    DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_HVAC_MODES = {
    "heat": HVACMode.HEAT,
    "cool": HVACMode.COOL,
    "vent": HVACMode.FAN_ONLY,
    "dry": HVACMode.DRY,
-    "myauto": HVACMode.HEAT_COOL,
+    "myauto": HVACMode.AUTO,
 }
 HASS_HVAC_MODES = {v: k for k, v in ADVANTAGE_AIR_HVAC_MODES.items()}

+AC_HVAC_MODES = [
+    HVACMode.OFF,
+    HVACMode.COOL,
+    HVACMode.HEAT,
+    HVACMode.FAN_ONLY,
+    HVACMode.DRY,
+]
+
 ADVANTAGE_AIR_FAN_MODES = {
    "autoAA": FAN_AUTO,
    "low": FAN_LOW,
@@ -48,14 +53,7 @@ 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_AUTOFAN = "aaAutoFanModeEnabled"
-ADVANTAGE_AIR_MYZONE = "MyZone"
-ADVANTAGE_AIR_MYAUTO = "MyAuto"
-ADVANTAGE_AIR_MYAUTO_ENABLED = "myAutoModeEnabled"
-ADVANTAGE_AIR_MYTEMP = "MyTemp"
-ADVANTAGE_AIR_MYTEMP_ENABLED = "climateControlModeEnabled"
-ADVANTAGE_AIR_HEAT_TARGET = "myAutoHeatTargetTemp"
-ADVANTAGE_AIR_COOL_TARGET = "myAutoCoolTargetTemp"
+ZONE_HVAC_MODES = [HVACMode.OFF, HVACMode.HEAT_COOL]

 PARALLEL_UPDATES = 0

@@ -69,15 +67,15 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir climate platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[ClimateEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            entities.append(AdvantageAirAC(instance, ac_key))
            for zone_key, zone in ac_device["zones"].items():
                # Only add zone climate control when zone is in temperature control
-                if zone["type"] > 0:
+                if zone["type"] != 0:
                    entities.append(AdvantageAirZone(instance, ac_key, zone_key))
    async_add_entities(entities)

@@ -85,44 +83,24 @@ async def async_setup_entry(
 class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
    """AdvantageAir AC unit."""

-    _attr_fan_modes = [FAN_LOW, FAN_MEDIUM, FAN_HIGH]
    _attr_temperature_unit = UnitOfTemperature.CELSIUS
    _attr_target_temperature_step = PRECISION_WHOLE
    _attr_max_temp = 32
    _attr_min_temp = 16
+    _attr_fan_modes = [FAN_AUTO, FAN_LOW, FAN_MEDIUM, FAN_HIGH]
+    _attr_hvac_modes = AC_HVAC_MODES
+    _attr_supported_features = (
+        ClimateEntityFeature.TARGET_TEMPERATURE | ClimateEntityFeature.FAN_MODE
+    )

-    _attr_hvac_modes = [
-        HVACMode.OFF,
-        HVACMode.COOL,
-        HVACMode.HEAT,
-        HVACMode.FAN_ONLY,
-        HVACMode.DRY,
-    ]
-
-    _attr_supported_features = ClimateEntityFeature.FAN_MODE
-
-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
        """Initialize an AdvantageAir AC unit."""
        super().__init__(instance, ac_key)
-
-        # Set supported features and HVAC modes based on current operating mode
-        if self._ac.get(ADVANTAGE_AIR_MYAUTO_ENABLED):
-            # MyAuto
-            self._attr_supported_features |= (
-                ClimateEntityFeature.TARGET_TEMPERATURE
-                | ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-            )
-            self._attr_hvac_modes += [HVACMode.HEAT_COOL]
-        elif not self._ac.get(ADVANTAGE_AIR_MYTEMP_ENABLED):
-            # MyZone
-            self._attr_supported_features |= ClimateEntityFeature.TARGET_TEMPERATURE
-
-        # Add "ezfan" mode if supported
-        if self._ac.get(ADVANTAGE_AIR_AUTOFAN):
-            self._attr_fan_modes += [FAN_AUTO]
+        if self._ac.get("myAutoModeEnabled"):
+            self._attr_hvac_modes = AC_HVAC_MODES + [HVACMode.AUTO]

    @property
-    def target_temperature(self) -> float | None:
+    def target_temperature(self) -> float:
        """Return the current target temperature."""
        return self._ac["setTemp"]

@@ -138,71 +116,53 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
        """Return the current fan modes."""
        return ADVANTAGE_AIR_FAN_MODES.get(self._ac["fan"])

-    @property
-    def target_temperature_high(self) -> float | None:
-        """Return the temperature cool mode is enabled."""
-        return self._ac.get(ADVANTAGE_AIR_COOL_TARGET)
-
-    @property
-    def target_temperature_low(self) -> float | None:
-        """Return the temperature heat mode is enabled."""
-        return self._ac.get(ADVANTAGE_AIR_HEAT_TARGET)
-
-    async def async_turn_on(self) -> None:
-        """Set the HVAC State to on."""
-        await self.async_update_ac({"state": ADVANTAGE_AIR_STATE_ON})
-
-    async def async_turn_off(self) -> None:
-        """Set the HVAC State to off."""
-        await self.async_update_ac(
-            {
-                "state": ADVANTAGE_AIR_STATE_OFF,
-            }
-        )
-
    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_update_ac({"state": ADVANTAGE_AIR_STATE_OFF})
+            await self.aircon(
+                {self.ac_key: {"info": {"state": ADVANTAGE_AIR_STATE_OFF}}}
+            )
        else:
-            await self.async_update_ac(
+            await self.aircon(
                {
-                    "state": ADVANTAGE_AIR_STATE_ON,
-                    "mode": HASS_HVAC_MODES.get(hvac_mode),
+                    self.ac_key: {
+                        "info": {
+                            "state": ADVANTAGE_AIR_STATE_ON,
+                            "mode": HASS_HVAC_MODES.get(hvac_mode),
+                        }
+                    }
                }
            )

    async def async_set_fan_mode(self, fan_mode: str) -> None:
        """Set the Fan Mode."""
-        await self.async_update_ac({"fan": HASS_FAN_MODES.get(fan_mode)})
+        await self.aircon(
+            {self.ac_key: {"info": {"fan": HASS_FAN_MODES.get(fan_mode)}}}
+        )

    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set the Temperature."""
-        if ATTR_TEMPERATURE in kwargs:
-            await self.async_update_ac({"setTemp": kwargs[ATTR_TEMPERATURE]})
-        if ATTR_TARGET_TEMP_LOW in kwargs and ATTR_TARGET_TEMP_HIGH in kwargs:
-            await self.async_update_ac(
-                {
-                    ADVANTAGE_AIR_COOL_TARGET: kwargs[ATTR_TARGET_TEMP_HIGH],
-                    ADVANTAGE_AIR_HEAT_TARGET: kwargs[ATTR_TARGET_TEMP_LOW],
-                }
-            )
+        temp = kwargs.get(ATTR_TEMPERATURE)
+        await self.aircon({self.ac_key: {"info": {"setTemp": temp}}})


 class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
-    """AdvantageAir MyTemp Zone control."""
+    """AdvantageAir Zone control."""

-    _attr_hvac_modes = [HVACMode.OFF, HVACMode.HEAT_COOL]
-    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
    _attr_temperature_unit = UnitOfTemperature.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

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an AdvantageAir Zone control."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = self._zone["name"]
+        self._attr_unique_id = (
+            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}'
+        )

    @property
    def hvac_mode(self) -> HVACMode:
@@ -212,7 +172,7 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
        return HVACMode.OFF

    @property
-    def current_temperature(self) -> float | None:
+    def current_temperature(self) -> float:
        """Return the current temperature."""
        return self._zone["measuredTemp"]

@@ -221,22 +181,26 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
        """Return the target temperature."""
        return self._zone["setTemp"]

-    async def async_turn_on(self) -> None:
-        """Set the HVAC State to on."""
-        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_OPEN})
-
-    async def async_turn_off(self) -> None:
-        """Set the HVAC State to off."""
-        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
-
    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_turn_off()
+            await self.aircon(
+                {
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                    }
+                }
+            )
        else:
-            await self.async_turn_on()
+            await self.aircon(
+                {
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN}}
+                    }
+                }
+            )

    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set the Temperature."""
        temp = kwargs.get(ATTR_TEMPERATURE)
-        await self.async_update_zone({"setTemp": temp})
+        await self.aircon({self.ac_key: {"zones": {self.zone_key: {"setTemp": temp}}}})
--- a/homeassistant/components/advantage_air/cover.py
+++ b/homeassistant/components/advantage_air/cover.py
@@ -16,8 +16,7 @@ from .const import (
    ADVANTAGE_AIR_STATE_OPEN,
    DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirThingEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData
+from .entity import AdvantageAirZoneEntity

 PARALLEL_UPDATES = 0

@@ -29,25 +28,15 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir cover platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[CoverEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            for zone_key, zone in ac_device["zones"].items():
                # Only add zone vent controls when zone in vent control mode.
                if zone["type"] == 0:
                    entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
-    if things := instance.coordinator.data.get("myThings"):
-        for thing in things["things"].values():
-            if thing["channelDipState"] in [1, 2]:  # 1 = "Blind", 2 = "Blind 2"
-                entities.append(
-                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
-                )
-            elif thing["channelDipState"] == 3:  # 3 = "Garage door"
-                entities.append(
-                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
-                )
    async_add_entities(entities)


@@ -61,7 +50,7 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
        | CoverEntityFeature.SET_POSITION
    )

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone Vent."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = self._zone["name"]
@@ -80,52 +69,47 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):

    async def async_open_cover(self, **kwargs: Any) -> None:
        """Fully open zone vent."""
-        await self.async_update_zone(
-            {"state": ADVANTAGE_AIR_STATE_OPEN, "value": 100},
+        await self.aircon(
+            {
+                self.ac_key: {
+                    "zones": {
+                        self.zone_key: {"state": ADVANTAGE_AIR_STATE_OPEN, "value": 100}
+                    }
+                }
+            }
        )

    async def async_close_cover(self, **kwargs: Any) -> None:
        """Fully close zone vent."""
-        await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
+        await self.aircon(
+            {
+                self.ac_key: {
+                    "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                }
+            }
+        )

    async def async_set_cover_position(self, **kwargs: Any) -> None:
        """Change vent position."""
        position = round(kwargs[ATTR_POSITION] / 5) * 5
        if position == 0:
-            await self.async_update_zone({"state": ADVANTAGE_AIR_STATE_CLOSE})
-        else:
-            await self.async_update_zone(
+            await self.aircon(
                {
-                    "state": ADVANTAGE_AIR_STATE_OPEN,
-                    "value": position,
+                    self.ac_key: {
+                        "zones": {self.zone_key: {"state": ADVANTAGE_AIR_STATE_CLOSE}}
+                    }
+                }
+            )
+        else:
+            await self.aircon(
+                {
+                    self.ac_key: {
+                        "zones": {
+                            self.zone_key: {
+                                "state": ADVANTAGE_AIR_STATE_OPEN,
+                                "value": position,
+                            }
+                        }
+                    }
                }
            )
-
-
-class AdvantageAirThingCover(AdvantageAirThingEntity, CoverEntity):
-    """Representation of Advantage Air Cover controlled by MyPlace."""
-
-    _attr_supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
-
-    def __init__(
-        self,
-        instance: AdvantageAirData,
-        thing: dict[str, Any],
-        device_class: CoverDeviceClass,
-    ) -> None:
-        """Initialize an Advantage Air Things Cover."""
-        super().__init__(instance, thing)
-        self._attr_device_class = device_class
-
-    @property
-    def is_closed(self) -> bool:
-        """Return if cover is fully closed."""
-        return self._data["value"] == 0
-
-    async def async_open_cover(self, **kwargs: Any) -> None:
-        """Fully open zone vent."""
-        return await self.async_turn_on()
-
-    async def async_close_cover(self, **kwargs: Any) -> None:
-        """Fully close zone vent."""
-        return await self.async_turn_off()
--- a/homeassistant/components/advantage_air/entity.py
+++ b/homeassistant/components/advantage_air/entity.py
@@ -1,14 +1,11 @@
 """Advantage Air parent entity class."""
+
 from typing import Any

-from advantage_air import ApiError
-
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .const import DOMAIN
-from .models import AdvantageAirData


 class AdvantageAirEntity(CoordinatorEntity):
@@ -16,34 +13,19 @@ class AdvantageAirEntity(CoordinatorEntity):

    _attr_has_entity_name = True

-    def __init__(self, instance: AdvantageAirData) -> None:
+    def __init__(self, instance: dict[str, Any]) -> None:
        """Initialize common aspects of an Advantage Air entity."""
-        super().__init__(instance.coordinator)
+        super().__init__(instance["coordinator"])
        self._attr_unique_id: str = self.coordinator.data["system"]["rid"]

-    def update_handle_factory(self, func, *keys):
-        """Return the provided API function wrapped.
-
-        Adds an error handler and coordinator refresh, and presets keys.
-        """
-
-        async def update_handle(*values):
-            try:
-                if await func(*keys, *values):
-                    await self.coordinator.async_refresh()
-            except ApiError as err:
-                raise HomeAssistantError(err) from err
-
-        return update_handle
-

 class AdvantageAirAcEntity(AdvantageAirEntity):
    """Parent class for Advantage Air AC Entities."""

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
        """Initialize common aspects of an Advantage Air ac entity."""
        super().__init__(instance)
-
+        self.aircon = instance["aircon"]
        self.ac_key: str = ac_key
        self._attr_unique_id += f"-{ac_key}"

@@ -54,9 +36,6 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
            model=self.coordinator.data["system"]["sysType"],
            name=self.coordinator.data["aircons"][self.ac_key]["info"]["name"],
        )
-        self.async_update_ac = self.update_handle_factory(
-            instance.api.aircon.async_update_ac, self.ac_key
-        )

    @property
    def _ac(self) -> dict[str, Any]:
@@ -66,56 +45,12 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
 class AdvantageAirZoneEntity(AdvantageAirAcEntity):
    """Parent class for Advantage Air Zone Entities."""

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize common aspects of an Advantage Air zone entity."""
        super().__init__(instance, ac_key)
-
        self.zone_key: str = zone_key
        self._attr_unique_id += f"-{zone_key}"
-        self.async_update_zone = self.update_handle_factory(
-            instance.api.aircon.async_update_zone, self.ac_key, self.zone_key
-        )

    @property
    def _zone(self) -> dict[str, Any]:
        return self.coordinator.data["aircons"][self.ac_key]["zones"][self.zone_key]
-
-
-class AdvantageAirThingEntity(AdvantageAirEntity):
-    """Parent class for Advantage Air Things Entities."""
-
-    def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
-        """Initialize common aspects of an Advantage Air Things entity."""
-        super().__init__(instance)
-
-        self._id = thing["id"]
-        self._attr_unique_id += f"-{self._id}"
-
-        self._attr_device_info = DeviceInfo(
-            via_device=(DOMAIN, self.coordinator.data["system"]["rid"]),
-            identifiers={(DOMAIN, self._attr_unique_id)},
-            manufacturer="Advantage Air",
-            model="MyPlace",
-            name=thing["name"],
-        )
-        self.async_update_value = self.update_handle_factory(
-            instance.api.things.async_update_value, self._id
-        )
-
-    @property
-    def _data(self) -> dict:
-        """Return the thing data."""
-        return self.coordinator.data["myThings"]["things"][self._id]
-
-    @property
-    def is_on(self):
-        """Return if the thing is considered on."""
-        return self._data["value"] > 0
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the thing on."""
-        await self.async_update_value(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the thing off."""
-        await self.async_update_value(False)
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -7,9 +7,12 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback

-from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
-from .entity import AdvantageAirEntity, AdvantageAirThingEntity
-from .models import AdvantageAirData
+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(
@@ -19,21 +22,15 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir light platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[LightEntity] = []
-    if my_lights := instance.coordinator.data.get("myLights"):
+    if my_lights := instance["coordinator"].data.get("myLights"):
        for light in my_lights["lights"].values():
            if light.get("relay"):
                entities.append(AdvantageAirLight(instance, light))
            else:
                entities.append(AdvantageAirLightDimmable(instance, light))
-    if things := instance.coordinator.data.get("myThings"):
-        for thing in things["things"].values():
-            if thing["channelDipState"] == 4:  # 4 = "Light (on/off)""
-                entities.append(AdvantageAirThingLight(instance, thing))
-            elif thing["channelDipState"] == 5:  # 5 = "Light (Dimmable)""
-                entities.append(AdvantageAirThingLightDimmable(instance, thing))
    async_add_entities(entities)


@@ -42,10 +39,10 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):

    _attr_supported_color_modes = {ColorMode.ONOFF}

-    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
+    def __init__(self, instance: dict[str, Any], light: dict[str, Any]) -> None:
        """Initialize an Advantage Air Light."""
        super().__init__(instance)
-
+        self.lights = instance["lights"]
        self._id: str = light["id"]
        self._attr_unique_id += f"-{self._id}"
        self._attr_device_info = DeviceInfo(
@@ -55,27 +52,24 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
            model=light.get("moduleType"),
            name=light["name"],
        )
-        self.async_update_state = self.update_handle_factory(
-            instance.api.lights.async_update_state, self._id
-        )

    @property
-    def _data(self) -> dict[str, Any]:
+    def _light(self) -> dict[str, Any]:
        """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._data["state"] == ADVANTAGE_AIR_STATE_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_update_state(True)
+        await self.lights({"id": self._id, "state": ADVANTAGE_AIR_STATE_ON})

    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn the light off."""
-        await self.async_update_state(False)
+        await self.lights({"id": self._id, "state": ADVANTAGE_AIR_STATE_OFF})


 class AdvantageAirLightDimmable(AdvantageAirLight):
@@ -83,41 +77,14 @@ class AdvantageAirLightDimmable(AdvantageAirLight):

    _attr_supported_color_modes = {ColorMode.ONOFF, ColorMode.BRIGHTNESS}

-    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
-        """Initialize an Advantage Air Dimmable Light."""
-        super().__init__(instance, light)
-        self.async_update_value = self.update_handle_factory(
-            instance.api.lights.async_update_value, self._id
-        )
-
    @property
    def brightness(self) -> int:
        """Return the brightness of this light between 0..255."""
-        return round(self._data["value"] * 255 / 100)
+        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: dict[str, Any] = {"id": self._id, "state": ADVANTAGE_AIR_STATE_ON}
        if ATTR_BRIGHTNESS in kwargs:
-            return await self.async_update_value(round(kwargs[ATTR_BRIGHTNESS] / 2.55))
-        return await self.async_update_state(True)
-
-
-class AdvantageAirThingLight(AdvantageAirThingEntity, LightEntity):
-    """Representation of Advantage Air Light controlled by myThings."""
-
-    _attr_supported_color_modes = {ColorMode.ONOFF}
-
-
-class AdvantageAirThingLightDimmable(AdvantageAirThingEntity, LightEntity):
-    """Representation of Advantage Air Dimmable Light controlled by myThings."""
-
-    _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._data["value"] * 255 / 100)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the light on by setting the brightness."""
-        await self.async_update_value(round(kwargs.get(ATTR_BRIGHTNESS, 255) / 2.55))
+            data["value"] = round(kwargs[ATTR_BRIGHTNESS] * 100 / 255)
+        await self.lights(data)
--- a/homeassistant/components/advantage_air/manifest.json
+++ b/homeassistant/components/advantage_air/manifest.json
@@ -7,5 +7,5 @@
  "iot_class": "local_polling",
  "loggers": ["advantage_air"],
  "quality_scale": "platinum",
-  "requirements": ["advantage-air==0.4.4"]
+  "requirements": ["advantage_air==0.4.1"]
 }
--- a/homeassistant/components/advantage_air/models.py
+++ b/homeassistant/components/advantage_air/models.py
@@ -1,16 +0,0 @@
-"""The Advantage Air integration models."""
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from advantage_air import advantage_air
-
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-
-@dataclass
-class AdvantageAirData:
-    """Data for the Advantage Air integration."""
-
-    coordinator: DataUpdateCoordinator
-    api: advantage_air
--- a/homeassistant/components/advantage_air/select.py
+++ b/homeassistant/components/advantage_air/select.py
@@ -1,4 +1,5 @@
 """Select platform for Advantage Air integration."""
+from typing import Any

 from homeassistant.components.select import SelectEntity
 from homeassistant.config_entries import ConfigEntry
@@ -7,7 +8,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback

 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_INACTIVE = "Inactive"

@@ -19,10 +19,10 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir select platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[SelectEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key in aircons:
            entities.append(AdvantageAirMyZone(instance, ac_key))
    async_add_entities(entities)
@@ -34,7 +34,7 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
    _attr_icon = "mdi:home-thermometer"
    _attr_name = "MyZone"

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
        """Initialize an Advantage Air MyZone control."""
        super().__init__(instance, ac_key)
        self._attr_unique_id += "-myzone"
@@ -42,12 +42,11 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
        self._number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
        self._name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}

-        if "aircons" in instance.coordinator.data:
-            for zone in instance.coordinator.data["aircons"][ac_key]["zones"].values():
-                if zone["type"] > 0:
-                    self._name_to_number[zone["name"]] = zone["number"]
-                    self._number_to_name[zone["number"]] = zone["name"]
-                    self._attr_options.append(zone["name"])
+        for zone in instance["coordinator"].data["aircons"][ac_key]["zones"].values():
+            if zone["type"] > 0:
+                self._name_to_number[zone["name"]] = zone["number"]
+                self._number_to_name[zone["number"]] = zone["name"]
+                self._attr_options.append(zone["name"])

    @property
    def current_option(self) -> str:
@@ -56,4 +55,6 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):

    async def async_select_option(self, option: str) -> None:
        """Set the MyZone."""
-        await self.async_update_ac({"myZone": self._name_to_number[option]})
+        await self.aircon(
+            {self.ac_key: {"info": {"myZone": self._name_to_number[option]}}}
+        )
--- a/homeassistant/components/advantage_air/sensor.py
+++ b/homeassistant/components/advantage_air/sensor.py
@@ -19,7 +19,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback

 from .const import ADVANTAGE_AIR_STATE_OPEN, DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
-from .models import AdvantageAirData

 ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
 ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
@@ -35,10 +34,10 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir sensor platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[SensorEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            entities.append(AdvantageAirTimeTo(instance, ac_key, "On"))
            entities.append(AdvantageAirTimeTo(instance, ac_key, "Off"))
@@ -66,7 +65,7 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
    _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, action: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, action: str) -> None:
        """Initialize the Advantage Air timer control."""
        super().__init__(instance, ac_key)
        self.action = action
@@ -89,7 +88,7 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
    async def set_time_to(self, **kwargs: Any) -> None:
        """Set the timer value."""
        value = min(720, max(0, int(kwargs[ADVANTAGE_AIR_SET_COUNTDOWN_VALUE])))
-        await self.async_update_ac({self._time_key: value})
+        await self.aircon({self.ac_key: {"info": {self._time_key: value}}})


 class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
@@ -99,7 +98,7 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone Vent Sensor."""
        super().__init__(instance, ac_key, zone_key=zone_key)
        self._attr_name = f'{self._zone["name"]} vent'
@@ -127,7 +126,7 @@ class AdvantageAirZoneSignal(AdvantageAirZoneEntity, SensorEntity):
    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone wireless signal sensor."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = f'{self._zone["name"]} signal'
@@ -161,7 +160,7 @@ class AdvantageAirZoneTemp(AdvantageAirZoneEntity, SensorEntity):
    _attr_entity_registry_enabled_default = False
    _attr_entity_category = EntityCategory.DIAGNOSTIC

-    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str, zone_key: str) -> None:
        """Initialize an Advantage Air Zone Temp Sensor."""
        super().__init__(instance, ac_key, zone_key)
        self._attr_name = f'{self._zone["name"]} temperature'
--- a/homeassistant/components/advantage_air/switch.py
+++ b/homeassistant/components/advantage_air/switch.py
@@ -1,7 +1,7 @@
 """Switch platform for Advantage Air integration."""
 from typing import Any

-from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
+from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
@@ -11,8 +11,7 @@ from .const import (
    ADVANTAGE_AIR_STATE_ON,
    DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
-from .entity import AdvantageAirAcEntity, AdvantageAirThingEntity
-from .models import AdvantageAirData
+from .entity import AdvantageAirAcEntity


 async def async_setup_entry(
@@ -22,17 +21,13 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir switch platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    entities: list[SwitchEntity] = []
-    if aircons := instance.coordinator.data.get("aircons"):
+    if aircons := instance["coordinator"].data.get("aircons"):
        for ac_key, ac_device in aircons.items():
            if ac_device["info"]["freshAirStatus"] != "none":
                entities.append(AdvantageAirFreshAir(instance, ac_key))
-    if things := instance.coordinator.data.get("myThings"):
-        for thing in things["things"].values():
-            if thing["channelDipState"] == 8:  # 8 = Other relay
-                entities.append(AdvantageAirRelay(instance, thing))
    async_add_entities(entities)


@@ -41,9 +36,8 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):

    _attr_icon = "mdi:air-filter"
    _attr_name = "Fresh air"
-    _attr_device_class = SwitchDeviceClass.SWITCH

-    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
+    def __init__(self, instance: dict[str, Any], ac_key: str) -> None:
        """Initialize an Advantage Air fresh air control."""
        super().__init__(instance, ac_key)
        self._attr_unique_id += "-freshair"
@@ -55,14 +49,12 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):

    async def async_turn_on(self, **kwargs: Any) -> None:
        """Turn fresh air on."""
-        await self.async_update_ac({"freshAirStatus": ADVANTAGE_AIR_STATE_ON})
+        await self.aircon(
+            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_ON}}}
+        )

    async def async_turn_off(self, **kwargs: Any) -> None:
        """Turn fresh air off."""
-        await self.async_update_ac({"freshAirStatus": ADVANTAGE_AIR_STATE_OFF})
-
-
-class AdvantageAirRelay(AdvantageAirThingEntity, SwitchEntity):
-    """Representation of Advantage Air Thing."""
-
-    _attr_device_class = SwitchDeviceClass.SWITCH
+        await self.aircon(
+            {self.ac_key: {"info": {"freshAirStatus": ADVANTAGE_AIR_STATE_OFF}}}
+        )
--- a/homeassistant/components/advantage_air/update.py
+++ b/homeassistant/components/advantage_air/update.py
@@ -1,4 +1,5 @@
 """Advantage Air Update platform."""
+from typing import Any

 from homeassistant.components.update import UpdateEntity
 from homeassistant.config_entries import ConfigEntry
@@ -8,7 +9,6 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback

 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity
-from .models import AdvantageAirData


 async def async_setup_entry(
@@ -18,7 +18,7 @@ async def async_setup_entry(
 ) -> None:
    """Set up AdvantageAir update platform."""

-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]

    async_add_entities([AdvantageAirApp(instance)])

@@ -28,7 +28,7 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):

    _attr_name = "App"

-    def __init__(self, instance: AdvantageAirData) -> None:
+    def __init__(self, instance: dict[str, Any]) -> None:
        """Initialize the Advantage Air App."""
        super().__init__(instance)
        self._attr_device_info = DeviceInfo(
--- a/homeassistant/components/aemet/weather_update_coordinator.py
+++ b/homeassistant/components/aemet/weather_update_coordinator.py
@@ -26,7 +26,6 @@ from aemet_opendata.const import (
    AEMET_ATTR_STATION_DATE,
    AEMET_ATTR_STATION_HUMIDITY,
    AEMET_ATTR_STATION_LOCATION,
-    AEMET_ATTR_STATION_PRESSURE,
    AEMET_ATTR_STATION_PRESSURE_SEA,
    AEMET_ATTR_STATION_TEMPERATURE,
    AEMET_ATTR_STORM_PROBABILITY,
@@ -319,8 +318,6 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
                    pressure = format_float(
                        station_data[AEMET_ATTR_STATION_PRESSURE_SEA]
                    )
-                elif AEMET_ATTR_STATION_PRESSURE in station_data:
-                    pressure = format_float(station_data[AEMET_ATTR_STATION_PRESSURE])
                if AEMET_ATTR_STATION_TEMPERATURE in station_data:
                    temperature = format_float(
                        station_data[AEMET_ATTR_STATION_TEMPERATURE]
--- a/homeassistant/components/airly/sensor.py
+++ b/homeassistant/components/airly/sensor.py
@@ -68,7 +68,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_CAQI,
        icon="mdi:air-filter",
-        translation_key="caqi",
+        name=ATTR_API_CAQI,
        native_unit_of_measurement="CAQI",
        suggested_display_precision=0,
        attrs=lambda data: {
@@ -80,6 +80,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM1,
        device_class=SensorDeviceClass.PM1,
+        name="PM1.0",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -87,6 +88,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM25,
        device_class=SensorDeviceClass.PM25,
+        name="PM2.5",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -98,6 +100,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PM10,
        device_class=SensorDeviceClass.PM10,
+        name=ATTR_API_PM10,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -109,6 +112,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_HUMIDITY,
        device_class=SensorDeviceClass.HUMIDITY,
+        name=ATTR_API_HUMIDITY.capitalize(),
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
@@ -116,6 +120,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_PRESSURE,
        device_class=SensorDeviceClass.PRESSURE,
+        name=ATTR_API_PRESSURE.capitalize(),
        native_unit_of_measurement=UnitOfPressure.HPA,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -123,13 +128,14 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_TEMPERATURE,
        device_class=SensorDeviceClass.TEMPERATURE,
+        name=ATTR_API_TEMPERATURE.capitalize(),
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=1,
    ),
    AirlySensorEntityDescription(
        key=ATTR_API_CO,
-        translation_key="co",
+        name="Carbon monoxide",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -141,6 +147,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_NO2,
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
+        name="Nitrogen dioxide",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -152,6 +159,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_SO2,
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
+        name="Sulphur dioxide",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
@@ -163,6 +171,7 @@ SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
    AirlySensorEntityDescription(
        key=ATTR_API_O3,
        device_class=SensorDeviceClass.OZONE,
+        name="Ozone",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=0,
--- a/homeassistant/components/airly/strings.json
+++ b/homeassistant/components/airly/strings.json
@@ -26,15 +26,5 @@
      "requests_remaining": "Remaining allowed requests",
      "requests_per_day": "Allowed requests per day"
    }
-  },
-  "entity": {
-    "sensor": {
-      "caqi": {
-        "name": "Common air quality index"
-      },
-      "co": {
-        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
-      }
-    }
  }
 }
--- a/homeassistant/components/airnow/const.py
+++ b/homeassistant/components/airnow/const.py
@@ -17,3 +17,5 @@ ATTR_API_STATION_LATITUDE = "Latitude"
 ATTR_API_STATION_LONGITUDE = "Longitude"
 DEFAULT_NAME = "AirNow"
 DOMAIN = "airnow"
+SENSOR_AQI_ATTR_DESCR = "description"
+SENSOR_AQI_ATTR_LEVEL = "level"
--- a/homeassistant/components/airnow/sensor.py
+++ b/homeassistant/components/airnow/sensor.py
@@ -1,12 +1,7 @@
 """Support for the AirNow sensor service."""
 from __future__ import annotations

-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Any
-
 from homeassistant.components.sensor import (
-    SensorDeviceClass,
    SensorEntity,
    SensorEntityDescription,
    SensorStateClass,
@@ -17,10 +12,7 @@ from homeassistant.const import (
    CONCENTRATION_PARTS_PER_MILLION,
 )
 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.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from . import AirNowDataUpdateCoordinator
@@ -30,60 +22,36 @@ from .const import (
    ATTR_API_AQI_LEVEL,
    ATTR_API_O3,
    ATTR_API_PM25,
-    DEFAULT_NAME,
    DOMAIN,
+    SENSOR_AQI_ATTR_DESCR,
+    SENSOR_AQI_ATTR_LEVEL,
 )

 ATTRIBUTION = "Data provided by AirNow"

 PARALLEL_UPDATES = 1

-ATTR_DESCR = "description"
-ATTR_LEVEL = "level"
-
-
-@dataclass
-class AirNowEntityDescriptionMixin:
-    """Mixin for required keys."""
-
-    value_fn: Callable[[Any], StateType]
-    extra_state_attributes_fn: Callable[[Any], dict[str, str]] | None
-
-
-@dataclass
-class AirNowEntityDescription(SensorEntityDescription, AirNowEntityDescriptionMixin):
-    """Describes Airnow sensor entity."""
-
-
-SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
-    AirNowEntityDescription(
+SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
        key=ATTR_API_AQI,
        icon="mdi:blur",
+        name=ATTR_API_AQI,
+        native_unit_of_measurement="aqi",
        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.AQI,
-        value_fn=lambda data: data.get(ATTR_API_AQI),
-        extra_state_attributes_fn=lambda data: {
-            ATTR_DESCR: data[ATTR_API_AQI_DESCRIPTION],
-            ATTR_LEVEL: data[ATTR_API_AQI_LEVEL],
-        },
    ),
-    AirNowEntityDescription(
+    SensorEntityDescription(
        key=ATTR_API_PM25,
        icon="mdi:blur",
+        name=ATTR_API_PM25,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
-        device_class=SensorDeviceClass.PM25,
-        value_fn=lambda data: data.get(ATTR_API_PM25),
-        extra_state_attributes_fn=None,
    ),
-    AirNowEntityDescription(
+    SensorEntityDescription(
        key=ATTR_API_O3,
-        translation_key="o3",
        icon="mdi:blur",
+        name=ATTR_API_O3,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.get(ATTR_API_O3),
-        extra_state_attributes_fn=None,
    ),
 )

@@ -105,38 +73,38 @@ class AirNowSensor(CoordinatorEntity[AirNowDataUpdateCoordinator], SensorEntity)
    """Define an AirNow sensor."""

    _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True
-
-    entity_description: AirNowEntityDescription

    def __init__(
        self,
        coordinator: AirNowDataUpdateCoordinator,
-        description: AirNowEntityDescription,
+        description: SensorEntityDescription,
    ) -> None:
        """Initialize."""
        super().__init__(coordinator)
        self.entity_description = description
+        self._state = None
+        self._attrs: dict[str, str] = {}
+        self._attr_name = f"AirNow {description.name}"
        self._attr_unique_id = (
            f"{coordinator.latitude}-{coordinator.longitude}-{description.key.lower()}"
        )
-        self._attr_device_info = DeviceInfo(
-            entry_type=DeviceEntryType.SERVICE,
-            identifiers={(DOMAIN, self._attr_unique_id)},
-            manufacturer=DEFAULT_NAME,
-            name=DEFAULT_NAME,
-        )

    @property
-    def native_value(self) -> StateType:
+    def native_value(self):
        """Return the state."""
-        return self.entity_description.value_fn(self.coordinator.data)
+        self._state = self.coordinator.data.get(self.entity_description.key)
+
+        return self._state

    @property
-    def extra_state_attributes(self) -> dict[str, str] | None:
+    def extra_state_attributes(self):
        """Return the state attributes."""
-        if self.entity_description.extra_state_attributes_fn:
-            return self.entity_description.extra_state_attributes_fn(
-                self.coordinator.data
-            )
-        return None
+        if self.entity_description.key == ATTR_API_AQI:
+            self._attrs[SENSOR_AQI_ATTR_DESCR] = self.coordinator.data[
+                ATTR_API_AQI_DESCRIPTION
+            ]
+            self._attrs[SENSOR_AQI_ATTR_LEVEL] = self.coordinator.data[
+                ATTR_API_AQI_LEVEL
+            ]
+
+        return self._attrs
--- a/homeassistant/components/airnow/strings.json
+++ b/homeassistant/components/airnow/strings.json
@@ -20,12 +20,5 @@
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
-  },
-  "entity": {
-    "sensor": {
-      "o3": {
-        "name": "[%key:component::sensor::entity_component::ozone::name%]"
-      }
-    }
  }
 }
--- a/homeassistant/components/airq/init.py
+++ b/homeassistant/components/airq/init.py
@@ -1,16 +1,58 @@
 """The air-Q integration."""
 from __future__ import annotations

-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
+from datetime import timedelta
+import logging

-from .const import DOMAIN
-from .coordinator import AirQCoordinator
+from aioairq import AirQ
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN, MANUFACTURER, TARGET_ROUTE, UPDATE_INTERVAL
+
+_LOGGER = logging.getLogger(__name__)

 PLATFORMS: list[Platform] = [Platform.SENSOR]


+class AirQCoordinator(DataUpdateCoordinator):
+    """Coordinator is responsible for querying the device at a specified route."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialise a custom coordinator."""
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=UPDATE_INTERVAL),
+        )
+        session = async_get_clientsession(hass)
+        self.airq = AirQ(
+            entry.data[CONF_IP_ADDRESS], entry.data[CONF_PASSWORD], session
+        )
+        self.device_id = entry.unique_id
+        assert self.device_id is not None
+        self.device_info = DeviceInfo(
+            manufacturer=MANUFACTURER,
+            identifiers={(DOMAIN, self.device_id)},
+        )
+        self.device_info.update(entry.data["device_info"])
+
+    async def _async_update_data(self) -> dict:
+        """Fetch the data from the device."""
+        data = await self.airq.get(TARGET_ROUTE)
+        return self.airq.drop_uncertainties_from_data(data)
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Set up air-Q from a config entry."""

--- a/homeassistant/components/airq/config_flow.py
+++ b/homeassistant/components/airq/config_flow.py
@@ -74,11 +74,12 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                )

                device_info = await airq.fetch_device_info()
-                await self.async_set_unique_id(device_info["id"])
+                await self.async_set_unique_id(device_info.pop("id"))
                self._abort_if_unique_id_configured()

                return self.async_create_entry(
-                    title=device_info["name"], data=user_input
+                    title=device_info["name"],
+                    data=user_input | {"device_info": device_info},
                )

        return self.async_show_form(
--- a/homeassistant/components/airq/coordinator.py
+++ b/homeassistant/components/airq/coordinator.py
@@ -1,61 +0,0 @@
-"""The air-Q integration."""
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from aioairq import AirQ
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity import DeviceInfo
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-from .const import DOMAIN, MANUFACTURER, TARGET_ROUTE, UPDATE_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class AirQCoordinator(DataUpdateCoordinator):
-    """Coordinator is responsible for querying the device at a specified route."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: ConfigEntry,
-    ) -> None:
-        """Initialise a custom coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_interval=timedelta(seconds=UPDATE_INTERVAL),
-        )
-        session = async_get_clientsession(hass)
-        self.airq = AirQ(
-            entry.data[CONF_IP_ADDRESS], entry.data[CONF_PASSWORD], session
-        )
-        self.device_id = entry.unique_id
-        assert self.device_id is not None
-        self.device_info = DeviceInfo(
-            manufacturer=MANUFACTURER,
-            identifiers={(DOMAIN, self.device_id)},
-        )
-
-    async def _async_update_data(self) -> dict:
-        """Fetch the data from the device."""
-        if "name" not in self.device_info:
-            info = await self.airq.fetch_device_info()
-            self.device_info.update(
-                DeviceInfo(
-                    name=info["name"],
-                    model=info["model"],
-                    sw_version=info["sw_version"],
-                    hw_version=info["hw_version"],
-                )
-            )
-
-        data = await self.airq.get(TARGET_ROUTE)
-        return self.airq.drop_uncertainties_from_data(data)
--- a/homeassistant/components/airq/sensor.py
+++ b/homeassistant/components/airq/sensor.py
@@ -51,79 +51,39 @@ class AirQEntityDescription(SensorEntityDescription, AirQEntityDescriptionMixin)

 # Keys must match those in the data dictionary
 SENSOR_TYPES: list[AirQEntityDescription] = [
-    AirQEntityDescription(
-        key="c2h4o",
-        translation_key="acetaldehyde",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("c2h4o"),
-    ),
    AirQEntityDescription(
        key="nh3_MR100",
-        translation_key="ammonia",
+        name="Ammonia",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("nh3_MR100"),
    ),
-    AirQEntityDescription(
-        key="ash3",
-        translation_key="arsine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("ash3"),
-    ),
-    AirQEntityDescription(
-        key="br2",
-        translation_key="bromine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("br2"),
-    ),
-    AirQEntityDescription(
-        key="ch4s",
-        translation_key="methanethiol",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("ch4s"),
-    ),
    AirQEntityDescription(
        key="cl2_M20",
-        translation_key="chlorine",
+        name="Chlorine",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("cl2_M20"),
    ),
-    AirQEntityDescription(
-        key="clo2",
-        translation_key="chlorine_dioxide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("clo2"),
-    ),
    AirQEntityDescription(
        key="co",
-        translation_key="carbon_monoxide",
+        name="CO",
+        device_class=SensorDeviceClass.CO,
        native_unit_of_measurement=CONCENTRATION_MILLIGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("co"),
    ),
    AirQEntityDescription(
        key="co2",
+        name="CO2",
        device_class=SensorDeviceClass.CO2,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("co2"),
    ),
-    AirQEntityDescription(
-        key="cs2",
-        translation_key="carbon_disulfide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("cs2"),
-    ),
    AirQEntityDescription(
        key="dewpt",
-        translation_key="dew_point",
+        name="Dew point",
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("dewpt"),
@@ -131,63 +91,28 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="ethanol",
-        translation_key="ethanol",
+        name="Ethanol",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ethanol"),
    ),
-    AirQEntityDescription(
-        key="c2h4",
-        translation_key="ethylene",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("c2h4"),
-    ),
    AirQEntityDescription(
        key="ch2o_M10",
-        translation_key="formaldehyde",
+        name="Formaldehyde",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ch2o_M10"),
    ),
-    AirQEntityDescription(
-        key="f2",
-        translation_key="fluorine",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("f2"),
-    ),
    AirQEntityDescription(
        key="h2s",
-        translation_key="hydrogen_sulfide",
+        name="H2S",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("h2s"),
    ),
-    AirQEntityDescription(
-        key="hcl",
-        translation_key="hydrochloric_acid",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("hcl"),
-    ),
-    AirQEntityDescription(
-        key="hcn",
-        translation_key="hydrogen_cyanide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("hcn"),
-    ),
-    AirQEntityDescription(
-        key="hf",
-        translation_key="hydrogen_fluoride",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("hf"),
-    ),
    AirQEntityDescription(
        key="health",
-        translation_key="health_index",
+        name="Health Index",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        icon="mdi:heart-pulse",
@@ -195,6 +120,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="humidity",
+        name="Humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
@@ -202,7 +128,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="humidity_abs",
-        translation_key="absolute_humidity",
+        name="Absolute humidity",
        native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("humidity_abs"),
@@ -210,27 +136,21 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="h2_M1000",
-        translation_key="hydrogen",
+        name="Hydrogen",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("h2_M1000"),
    ),
-    AirQEntityDescription(
-        key="h2o2",
-        translation_key="hydrogen_peroxide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("h2o2"),
-    ),
    AirQEntityDescription(
        key="ch4_MIPEX",
-        translation_key="methane",
+        name="Methane",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("ch4_MIPEX"),
    ),
    AirQEntityDescription(
        key="n2o",
+        name="N2O",
        device_class=SensorDeviceClass.NITROUS_OXIDE,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -238,6 +158,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="no_M250",
+        name="NO",
        device_class=SensorDeviceClass.NITROGEN_MONOXIDE,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -245,50 +166,39 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="no2",
+        name="NO2",
        device_class=SensorDeviceClass.NITROGEN_DIOXIDE,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("no2"),
    ),
-    AirQEntityDescription(
-        key="acid_M100",
-        translation_key="organic_acid",
-        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("acid_M100"),
-    ),
-    AirQEntityDescription(
-        key="oxygen",
-        translation_key="oxygen",
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("oxygen"),
-        icon="mdi:leaf",
-    ),
    AirQEntityDescription(
        key="o3",
+        name="Ozone",
        device_class=SensorDeviceClass.OZONE,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("o3"),
    ),
+    AirQEntityDescription(
+        key="oxygen",
+        name="Oxygen",
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=SensorStateClass.MEASUREMENT,
+        value=lambda data: data.get("oxygen"),
+        icon="mdi:leaf",
+    ),
    AirQEntityDescription(
        key="performance",
-        translation_key="performance_index",
+        name="Performance Index",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        icon="mdi:head-check",
        value=lambda data: data.get("performance", 0.0) / 10.0,
    ),
-    AirQEntityDescription(
-        key="ph3",
-        translation_key="hydrogen_phosphide",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("ph3"),
-    ),
    AirQEntityDescription(
        key="pm1",
+        name="PM1",
        device_class=SensorDeviceClass.PM1,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -297,6 +207,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="pm2_5",
+        name="PM2.5",
        device_class=SensorDeviceClass.PM25,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -305,6 +216,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="pm10",
+        name="PM10",
        device_class=SensorDeviceClass.PM10,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -313,6 +225,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="pressure",
+        name="Pressure",
        device_class=SensorDeviceClass.PRESSURE,
        native_unit_of_measurement=UnitOfPressure.HPA,
        state_class=SensorStateClass.MEASUREMENT,
@@ -320,7 +233,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="pressure_rel",
-        translation_key="relative_pressure",
+        name="Relative pressure",
        native_unit_of_measurement=UnitOfPressure.HPA,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("pressure_rel"),
@@ -328,27 +241,14 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="c3h8_MIPEX",
-        translation_key="propane",
+        name="Propane",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("c3h8_MIPEX"),
    ),
-    AirQEntityDescription(
-        key="refigerant",
-        translation_key="refigerant",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("refigerant"),
-    ),
-    AirQEntityDescription(
-        key="sih4",
-        translation_key="silicon_hydride",
-        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=SensorStateClass.MEASUREMENT,
-        value=lambda data: data.get("sih4"),
-    ),
    AirQEntityDescription(
        key="so2",
+        name="SO2",
        device_class=SensorDeviceClass.SULPHUR_DIOXIDE,
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
@@ -356,7 +256,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="sound",
-        translation_key="noise",
+        name="Noise",
        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("sound"),
@@ -364,7 +264,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="sound_max",
-        translation_key="maximum_noise",
+        name="Noise (Maximum)",
        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("sound_max"),
@@ -372,7 +272,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="radon",
-        translation_key="radon",
+        name="Radon",
        native_unit_of_measurement=ACTIVITY_BECQUEREL_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("radon"),
@@ -380,6 +280,7 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="temperature",
+        name="Temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
        state_class=SensorStateClass.MEASUREMENT,
@@ -387,27 +288,20 @@ SENSOR_TYPES: list[AirQEntityDescription] = [
    ),
    AirQEntityDescription(
        key="tvoc",
-        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+        name="VOC",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("tvoc"),
    ),
    AirQEntityDescription(
        key="tvoc_ionsc",
-        translation_key="industrial_volatile_organic_compounds",
-        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+        name="VOC (Industrial)",
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
        state_class=SensorStateClass.MEASUREMENT,
        value=lambda data: data.get("tvoc_ionsc"),
    ),
-    AirQEntityDescription(
-        key="virus",
-        translation_key="virus_index",
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        icon="mdi:virus-off",
-        value=lambda data: data.get("virus", 0.0),
-    ),
 ]


--- a/homeassistant/components/airq/strings.json
+++ b/homeassistant/components/airq/strings.json
@@ -18,117 +18,5 @@
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    }
-  },
-  "entity": {
-    "sensor": {
-      "acetaldehyde": {
-        "name": "Acetaldehyde"
-      },
-      "ammonia": {
-        "name": "Ammonia"
-      },
-      "arsine": {
-        "name": "Arsine"
-      },
-      "bromine": {
-        "name": "Bromine"
-      },
-      "methanethiol": {
-        "name": "Methanethiol"
-      },
-      "chlorine": {
-        "name": "Chlorine"
-      },
-      "chlorine_dioxide": {
-        "name": "Chlorine dioxide"
-      },
-      "carbon_disulfide": {
-        "name": "Carbon disulfide"
-      },
-      "carbon_monoxide": {
-        "name": "[%key:component::sensor::entity_component::carbon_monoxide::name%]"
-      },
-      "dew_point": {
-        "name": "Dew point"
-      },
-      "ethanol": {
-        "name": "Ethanol"
-      },
-      "ethylene": {
-        "name": "Ethylene"
-      },
-      "formaldehyde": {
-        "name": "Formaldehyde"
-      },
-      "fluorine": {
-        "name": "Fluorine"
-      },
-      "hydrogen_sulfide": {
-        "name": "Hydrogen sulfide"
-      },
-      "hydrochloric_acid": {
-        "name": "Hydrochloric acid"
-      },
-      "hydrogen_cyanide": {
-        "name": "Hydrogen cyanide"
-      },
-      "hydrogen_fluoride": {
-        "name": "Hydrogen fluoride"
-      },
-      "health_index": {
-        "name": "Health Index"
-      },
-      "absolute_humidity": {
-        "name": "Absolute humidity"
-      },
-      "hydrogen": {
-        "name": "Hydrogen"
-      },
-      "hydrogen_peroxide": {
-        "name": "Hydrogen peroxide"
-      },
-      "methane": {
-        "name": "Methane"
-      },
-      "organic_acid": {
-        "name": "Organic acid"
-      },
-      "oxygen": {
-        "name": "Oxygen"
-      },
-      "performance_index": {
-        "name": "Performance Index"
-      },
-      "hydrogen_phosphide": {
-        "name": "Hydrogen Phosphide"
-      },
-      "relative_pressure": {
-        "name": "Relative pressure"
-      },
-      "propane": {
-        "name": "Propane"
-      },
-      "refigerant": {
-        "name": "Refrigerant"
-      },
-      "silicon_hydride": {
-        "name": "Silicon Hydride"
-      },
-      "noise": {
-        "name": "Noise"
-      },
-      "maximum_noise": {
-        "name": "Noise (Maximum)"
-      },
-      "radon": {
-        "name": "Radon"
-      },
-      "industrial_volatile_organic_compounds": {
-        "name": "VOCs (Industrial)"
-      },
-      "virus_index": {
-        "name": "Virus Index"
-      }
-    }
  }
 }
--- a/homeassistant/components/airthings/manifest.json
+++ b/homeassistant/components/airthings/manifest.json
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airthings",
  "iot_class": "cloud_polling",
  "loggers": ["airthings"],
-  "requirements": ["airthings-cloud==0.1.0"]
+  "requirements": ["airthings_cloud==0.1.0"]
 }
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -35,56 +35,62 @@ SENSORS: dict[str, SensorEntityDescription] = {
    "radonShortTermAvg": SensorEntityDescription(
        key="radonShortTermAvg",
        native_unit_of_measurement="Bq/m³",
-        translation_key="radon",
+        name="Radon",
    ),
    "temp": SensorEntityDescription(
        key="temp",
        device_class=SensorDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        name="Temperature",
    ),
    "humidity": SensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        native_unit_of_measurement=PERCENTAGE,
+        name="Humidity",
    ),
    "pressure": SensorEntityDescription(
        key="pressure",
        device_class=SensorDeviceClass.PRESSURE,
        native_unit_of_measurement=UnitOfPressure.MBAR,
+        name="Pressure",
    ),
    "battery": SensorEntityDescription(
        key="battery",
        device_class=SensorDeviceClass.BATTERY,
        native_unit_of_measurement=PERCENTAGE,
        entity_category=EntityCategory.DIAGNOSTIC,
+        name="Battery",
    ),
    "co2": SensorEntityDescription(
        key="co2",
        device_class=SensorDeviceClass.CO2,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+        name="CO2",
    ),
    "voc": SensorEntityDescription(
        key="voc",
-        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
+        name="VOC",
    ),
    "light": SensorEntityDescription(
        key="light",
        native_unit_of_measurement=PERCENTAGE,
-        translation_key="light",
+        name="Light",
    ),
    "virusRisk": SensorEntityDescription(
        key="virusRisk",
-        translation_key="virus_risk",
+        name="Virus Risk",
    ),
    "mold": SensorEntityDescription(
        key="mold",
-        translation_key="mold",
+        name="Mold",
    ),
    "rssi": SensorEntityDescription(
        key="rssi",
        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        name="RSSI",
        entity_registry_enabled_default=False,
        entity_category=EntityCategory.DIAGNOSTIC,
    ),
@@ -92,11 +98,13 @@ SENSORS: dict[str, SensorEntityDescription] = {
        key="pm1",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM1,
+        name="PM1",
    ),
    "pm25": SensorEntityDescription(
        key="pm25",
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        device_class=SensorDeviceClass.PM25,
+        name="PM25",
    ),
 }

@@ -126,7 +134,6 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):
    """Representation of a Airthings Sensor device."""

    _attr_state_class = SensorStateClass.MEASUREMENT
-    _attr_has_entity_name = True

    def __init__(
        self,
@@ -139,17 +146,14 @@ class AirthingsHeaterEnergySensor(CoordinatorEntity, SensorEntity):

        self.entity_description = entity_description

+        self._attr_name = f"{airthings_device.name} {entity_description.name}"
        self._attr_unique_id = f"{airthings_device.device_id}_{entity_description.key}"
        self._id = airthings_device.device_id
        self._attr_device_info = DeviceInfo(
-            configuration_url=(
-                "https://dashboard.airthings.com/devices/"
-                f"{airthings_device.device_id}"
-            ),
+            configuration_url="https://dashboard.airthings.com/",
            identifiers={(DOMAIN, airthings_device.device_id)},
            name=airthings_device.name,
            manufacturer="Airthings",
-            model=airthings_device.device_type.replace("_", " ").lower().title(),
        )

    @property
--- a/homeassistant/components/airthings/strings.json
+++ b/homeassistant/components/airthings/strings.json
@@ -17,21 +17,5 @@
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]"
    }
-  },
-  "entity": {
-    "sensor": {
-      "radon": {
-        "name": "Radon"
-      },
-      "light": {
-        "name": "Light"
-      },
-      "virus_risk": {
-        "name": "Virus Risk"
-      },
-      "mold": {
-        "name": "Mold"
-      }
-    }
  }
 }
--- a/homeassistant/components/airthings_ble/sensor.py
+++ b/homeassistant/components/airthings_ble/sensor.py
@@ -39,71 +39,71 @@ _LOGGER = logging.getLogger(__name__)
 SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
    "radon_1day_avg": SensorEntityDescription(
        key="radon_1day_avg",
-        translation_key="radon_1day_avg",
        native_unit_of_measurement=VOLUME_BECQUEREL,
+        name="Radon 1-day average",
        state_class=SensorStateClass.MEASUREMENT,
        icon="mdi:radioactive",
    ),
    "radon_longterm_avg": SensorEntityDescription(
        key="radon_longterm_avg",
-        translation_key="radon_longterm_avg",
        native_unit_of_measurement=VOLUME_BECQUEREL,
+        name="Radon longterm average",
        state_class=SensorStateClass.MEASUREMENT,
        icon="mdi:radioactive",
    ),
    "radon_1day_level": SensorEntityDescription(
        key="radon_1day_level",
-        translation_key="radon_1day_level",
+        name="Radon 1-day level",
        icon="mdi:radioactive",
    ),
    "radon_longterm_level": SensorEntityDescription(
        key="radon_longterm_level",
-        translation_key="radon_longterm_level",
+        name="Radon longterm level",
        icon="mdi:radioactive",
    ),
    "temperature": SensorEntityDescription(
        key="temperature",
        device_class=SensorDeviceClass.TEMPERATURE,
        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="Temperature",
    ),
    "humidity": SensorEntityDescription(
        key="humidity",
        device_class=SensorDeviceClass.HUMIDITY,
        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="Humidity",
    ),
    "pressure": SensorEntityDescription(
        key="pressure",
        device_class=SensorDeviceClass.PRESSURE,
        native_unit_of_measurement=UnitOfPressure.MBAR,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="Pressure",
    ),
    "battery": SensorEntityDescription(
        key="battery",
        device_class=SensorDeviceClass.BATTERY,
        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
        entity_category=EntityCategory.DIAGNOSTIC,
+        name="Battery",
    ),
    "co2": SensorEntityDescription(
        key="co2",
        device_class=SensorDeviceClass.CO2,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="co2",
    ),
    "voc": SensorEntityDescription(
        key="voc",
-        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS,
+        device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
        native_unit_of_measurement=CONCENTRATION_PARTS_PER_BILLION,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="VOC",
        icon="mdi:cloud",
    ),
    "illuminance": SensorEntityDescription(
        key="illuminance",
        device_class=SensorDeviceClass.ILLUMINANCE,
        native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
+        name="Illuminance",
    ),
 }

@@ -150,6 +150,7 @@ class AirthingsSensor(
 ):
    """Airthings BLE sensors for the device."""

+    _attr_state_class = SensorStateClass.MEASUREMENT
    _attr_has_entity_name = True

    def __init__(
--- a/homeassistant/components/airthings_ble/strings.json
+++ b/homeassistant/components/airthings_ble/strings.json
@@ -19,21 +19,5 @@
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "unknown": "[%key:common::config_flow::error::unknown%]"
    }
-  },
-  "entity": {
-    "sensor": {
-      "radon_1day_avg": {
-        "name": "Radon 1-day average"
-      },
-      "radon_longterm_avg": {
-        "name": "Radon longterm average"
-      },
-      "radon_1day_level": {
-        "name": "Radon 1-day level"
-      },
-      "radon_longterm_level": {
-        "name": "Radon longterm level"
-      }
-    }
  }
 }
--- a/homeassistant/components/airvisual/init.py
+++ b/homeassistant/components/airvisual/init.py
@@ -380,6 +380,7 @@ async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
                )
        else:
            entry.version = version
+            hass.config_entries.async_update_entry(entry)

    LOGGER.info("Migration to version %s successful", version)

--- a/homeassistant/components/airvisual/strings.json
+++ b/homeassistant/components/airvisual/strings.json
@@ -17,7 +17,7 @@
          "api_key": "[%key:common::config_flow::data::api_key%]",
          "city": "City",
          "country": "Country",
-          "state": "State"
+          "state": "state"
        }
      },
      "reauth_confirm": {
--- a/homeassistant/components/airzone/climate.py
+++ b/homeassistant/components/airzone/climate.py
@@ -3,26 +3,18 @@ from __future__ import annotations

 from typing import Any, Final

-from aioairzone.common import OperationAction, OperationMode
+from aioairzone.common import OperationMode
 from aioairzone.const import (
-    API_COOL_SET_POINT,
-    API_HEAT_SET_POINT,
    API_MODE,
    API_ON,
    API_SET_POINT,
-    API_SPEED,
-    AZD_ACTION,
-    AZD_COOL_TEMP_SET,
-    AZD_DOUBLE_SET_POINT,
-    AZD_HEAT_TEMP_SET,
+    AZD_DEMAND,
    AZD_HUMIDITY,
    AZD_MASTER,
    AZD_MODE,
    AZD_MODES,
    AZD_NAME,
    AZD_ON,
-    AZD_SPEED,
-    AZD_SPEEDS,
    AZD_TEMP,
    AZD_TEMP_MAX,
    AZD_TEMP_MIN,
@@ -32,12 +24,6 @@ from aioairzone.const import (
 )

 from homeassistant.components.climate import (
-    ATTR_TARGET_TEMP_HIGH,
-    ATTR_TARGET_TEMP_LOW,
-    FAN_AUTO,
-    FAN_HIGH,
-    FAN_LOW,
-    FAN_MEDIUM,
    ClimateEntity,
    ClimateEntityFeature,
    HVACAction,
@@ -53,29 +39,12 @@ from .const import API_TEMPERATURE_STEP, DOMAIN, TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneZoneEntity

-BASE_FAN_SPEEDS: Final[dict[int, str]] = {
-    0: FAN_AUTO,
-    1: FAN_LOW,
-}
-FAN_SPEED_MAPS: Final[dict[int, dict[int, str]]] = {
-    2: BASE_FAN_SPEEDS
-    | {
-        2: FAN_HIGH,
-    },
-    3: BASE_FAN_SPEEDS
-    | {
-        2: FAN_MEDIUM,
-        3: FAN_HIGH,
-    },
-}
-
-HVAC_ACTION_LIB_TO_HASS: Final[dict[OperationAction, HVACAction]] = {
-    OperationAction.COOLING: HVACAction.COOLING,
-    OperationAction.DRYING: HVACAction.DRYING,
-    OperationAction.FAN: HVACAction.FAN,
-    OperationAction.HEATING: HVACAction.HEATING,
-    OperationAction.IDLE: HVACAction.IDLE,
-    OperationAction.OFF: HVACAction.OFF,
+HVAC_ACTION_LIB_TO_HASS: Final[dict[OperationMode, HVACAction]] = {
+    OperationMode.STOP: HVACAction.OFF,
+    OperationMode.COOLING: HVACAction.COOLING,
+    OperationMode.HEATING: HVACAction.HEATING,
+    OperationMode.FAN: HVACAction.FAN,
+    OperationMode.DRY: HVACAction.DRYING,
 }
 HVAC_MODE_LIB_TO_HASS: Final[dict[OperationMode, HVACMode]] = {
    OperationMode.STOP: HVACMode.OFF,
@@ -114,9 +83,6 @@ async def async_setup_entry(
 class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
    """Define an Airzone sensor."""

-    _speeds: dict[int, str] = {}
-    _speeds_reverse: dict[str, int] = {}
-
    def __init__(
        self,
        coordinator: AirzoneUpdateCoordinator,
@@ -131,45 +97,16 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
        self._attr_unique_id = f"{self._attr_unique_id}_{system_zone_id}"
        self._attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
        self._attr_target_temperature_step = API_TEMPERATURE_STEP
+        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
+        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
        self._attr_temperature_unit = TEMP_UNIT_LIB_TO_HASS[
            self.get_airzone_value(AZD_TEMP_UNIT)
        ]
        self._attr_hvac_modes = [
            HVAC_MODE_LIB_TO_HASS[mode] for mode in self.get_airzone_value(AZD_MODES)
        ]
-        if (
-            self.get_airzone_value(AZD_SPEED) is not None
-            and self.get_airzone_value(AZD_SPEEDS) is not None
-        ):
-            self._set_fan_speeds()
-        if self.get_airzone_value(AZD_DOUBLE_SET_POINT):
-            self._attr_supported_features |= (
-                ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
-            )
-
        self._async_update_attrs()

-    def _set_fan_speeds(self) -> None:
-        self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
-
-        speeds = self.get_airzone_value(AZD_SPEEDS)
-        max_speed = max(speeds)
-        if _speeds := FAN_SPEED_MAPS.get(max_speed):
-            self._speeds = _speeds
-        else:
-            for speed in speeds:
-                if speed == 0:
-                    self._speeds[speed] = FAN_AUTO
-                else:
-                    self._speeds[speed] = f"{int(round((speed * 100) / max_speed, 0))}%"
-
-            self._speeds[1] = FAN_LOW
-            self._speeds[int(round((max_speed + 1) / 2, 0))] = FAN_MEDIUM
-            self._speeds[max_speed] = FAN_HIGH
-
-        self._speeds_reverse = {v: k for k, v in self._speeds.items()}
-        self._attr_fan_modes = list(self._speeds_reverse)
-
    async def async_turn_on(self) -> None:
        """Turn the entity on."""
        params = {
@@ -184,17 +121,8 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
        }
        await self._async_update_hvac_params(params)

-    async def async_set_fan_mode(self, fan_mode: str) -> None:
-        """Set fan mode."""
-        params = {
-            API_SPEED: self._speeds_reverse.get(fan_mode),
-        }
-        await self._async_update_hvac_params(params)
-
    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
        """Set hvac mode."""
-        slave_raise = False
-
        params = {}
        if hvac_mode == HVACMode.OFF:
            params[API_ON] = 0
@@ -204,21 +132,17 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
                if self.get_airzone_value(AZD_MASTER):
                    params[API_MODE] = mode
                else:
-                    slave_raise = True
+                    raise HomeAssistantError(
+                        f"Mode can't be changed on slave zone {self.name}"
+                    )
            params[API_ON] = 1
        await self._async_update_hvac_params(params)

-        if slave_raise:
-            raise HomeAssistantError(f"Mode can't be changed on slave zone {self.name}")
-
    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set new target temperature."""
-        params = {}
-        if ATTR_TEMPERATURE in kwargs:
-            params[API_SET_POINT] = kwargs[ATTR_TEMPERATURE]
-        if ATTR_TARGET_TEMP_LOW in kwargs and ATTR_TARGET_TEMP_HIGH in kwargs:
-            params[API_COOL_SET_POINT] = kwargs[ATTR_TARGET_TEMP_LOW]
-            params[API_HEAT_SET_POINT] = kwargs[ATTR_TARGET_TEMP_HIGH]
+        params = {
+            API_SET_POINT: kwargs.get(ATTR_TEMPERATURE),
+        }
        await self._async_update_hvac_params(params)

    @callback
@@ -232,24 +156,14 @@ class AirzoneClimate(AirzoneZoneEntity, ClimateEntity):
        """Update climate attributes."""
        self._attr_current_temperature = self.get_airzone_value(AZD_TEMP)
        self._attr_current_humidity = self.get_airzone_value(AZD_HUMIDITY)
-        self._attr_hvac_action = HVAC_ACTION_LIB_TO_HASS[
-            self.get_airzone_value(AZD_ACTION)
-        ]
        if self.get_airzone_value(AZD_ON):
-            self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[
-                self.get_airzone_value(AZD_MODE)
-            ]
+            mode = self.get_airzone_value(AZD_MODE)
+            self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[mode]
+            if self.get_airzone_value(AZD_DEMAND):
+                self._attr_hvac_action = HVAC_ACTION_LIB_TO_HASS[mode]
+            else:
+                self._attr_hvac_action = HVACAction.IDLE
        else:
+            self._attr_hvac_action = HVACAction.OFF
            self._attr_hvac_mode = HVACMode.OFF
-        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_MAX)
-        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_MIN)
        self._attr_target_temperature = self.get_airzone_value(AZD_TEMP_SET)
-        if self.supported_features & ClimateEntityFeature.FAN_MODE:
-            self._attr_fan_mode = self._speeds.get(self.get_airzone_value(AZD_SPEED))
-        if self.supported_features & ClimateEntityFeature.TARGET_TEMPERATURE_RANGE:
-            self._attr_target_temperature_high = self.get_airzone_value(
-                AZD_HEAT_TEMP_SET
-            )
-            self._attr_target_temperature_low = self.get_airzone_value(
-                AZD_COOL_TEMP_SET
-            )
--- a/homeassistant/components/airzone/entity.py
+++ b/homeassistant/components/airzone/entity.py
@@ -7,7 +7,6 @@ from typing import Any
 from aioairzone.const import (
    API_SYSTEM_ID,
    API_ZONE_ID,
-    AZD_AVAILABLE,
    AZD_FIRMWARE,
    AZD_FULL_NAME,
    AZD_ID,
@@ -67,11 +66,6 @@ class AirzoneSystemEntity(AirzoneEntity):
        )
        self._attr_unique_id = entry.unique_id or entry.entry_id

-    @property
-    def available(self) -> bool:
-        """Return system availability."""
-        return super().available and self.get_airzone_value(AZD_AVAILABLE)
-
    def get_airzone_value(self, key: str) -> Any:
        """Return system value by key."""
        value = None
@@ -136,11 +130,6 @@ class AirzoneZoneEntity(AirzoneEntity):
        )
        self._attr_unique_id = entry.unique_id or entry.entry_id

-    @property
-    def available(self) -> bool:
-        """Return zone availability."""
-        return super().available and self.get_airzone_value(AZD_AVAILABLE)
-
    def get_airzone_value(self, key: str) -> Any:
        """Return zone value by key."""
        value = None
--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==0.6.4"]
+  "requirements": ["aioairzone==0.5.2"]
 }
--- a/homeassistant/components/airzone/select.py
+++ b/homeassistant/components/airzone/select.py
@@ -1,7 +1,7 @@
 """Support for the Airzone sensors."""
 from __future__ import annotations

-from dataclasses import dataclass
+from dataclasses import dataclass, replace
 from typing import Any, Final

 from aioairzone.common import GrilleAngle, SleepTimeout
@@ -41,14 +41,14 @@ class AirzoneSelectDescription(SelectEntityDescription, AirzoneSelectDescription


 GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
-    "90deg": GrilleAngle.DEG_90,
-    "50deg": GrilleAngle.DEG_50,
-    "45deg": GrilleAngle.DEG_45,
-    "40deg": GrilleAngle.DEG_40,
+    "90º": GrilleAngle.DEG_90,
+    "50º": GrilleAngle.DEG_50,
+    "45º": GrilleAngle.DEG_45,
+    "40º": GrilleAngle.DEG_40,
 }

 SLEEP_DICT: Final[dict[str, int]] = {
-    "off": SleepTimeout.SLEEP_OFF,
+    "Off": SleepTimeout.SLEEP_OFF,
    "30m": SleepTimeout.SLEEP_30,
    "60m": SleepTimeout.SLEEP_60,
    "90m": SleepTimeout.SLEEP_90,
@@ -61,27 +61,21 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
        entity_category=EntityCategory.CONFIG,
        key=AZD_COLD_ANGLE,
        name="Cold Angle",
-        options=list(GRILLE_ANGLE_DICT),
        options_dict=GRILLE_ANGLE_DICT,
-        translation_key="grille_angles",
    ),
    AirzoneSelectDescription(
        api_param=API_HEAT_ANGLE,
        entity_category=EntityCategory.CONFIG,
        key=AZD_HEAT_ANGLE,
        name="Heat Angle",
-        options=list(GRILLE_ANGLE_DICT),
        options_dict=GRILLE_ANGLE_DICT,
-        translation_key="grille_angles",
    ),
    AirzoneSelectDescription(
        api_param=API_SLEEP,
        entity_category=EntityCategory.CONFIG,
        key=AZD_SLEEP,
        name="Sleep",
-        options=list(SLEEP_DICT),
        options_dict=SLEEP_DICT,
-        translation_key="sleep_times",
    ),
 )

@@ -97,10 +91,14 @@ async def async_setup_entry(
    for system_zone_id, zone_data in coordinator.data[AZD_ZONES].items():
        for description in ZONE_SELECT_TYPES:
            if description.key in zone_data:
+                _desc = replace(
+                    description,
+                    options=list(description.options_dict.keys()),
+                )
                entities.append(
                    AirzoneZoneSelect(
                        coordinator,
-                        description,
+                        _desc,
                        entry,
                        system_zone_id,
                        zone_data,
--- a/homeassistant/components/airzone/strings.json
+++ b/homeassistant/components/airzone/strings.json
@@ -23,25 +23,5 @@
        }
      }
    }
-  },
-  "entity": {
-    "select": {
-      "grille_angles": {
-        "state": {
-          "90deg": "90°",
-          "50deg": "50°",
-          "45deg": "45°",
-          "40deg": "40°"
-        }
-      },
-      "sleep_times": {
-        "state": {
-          "off": "[%key:common::state::off%]",
-          "30m": "30 minutes",
-          "60m": "60 minutes",
-          "90m": "90 minutes"
-        }
-      }
-    }
  }
 }
--- a/homeassistant/components/airzone_cloud/init.py
+++ b/homeassistant/components/airzone_cloud/init.py
@@ -1,51 +0,0 @@
-"""The Airzone Cloud integration."""
-from __future__ import annotations
-
-from aioairzone_cloud.cloudapi import AirzoneCloudApi
-from aioairzone_cloud.common import ConnectionOptions
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client
-
-from .const import DOMAIN
-from .coordinator import AirzoneUpdateCoordinator
-
-PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
-    Platform.SENSOR,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Set up Airzone Cloud from a config entry."""
-    options = ConnectionOptions(
-        entry.data[CONF_USERNAME],
-        entry.data[CONF_PASSWORD],
-    )
-
-    airzone = AirzoneCloudApi(aiohttp_client.async_get_clientsession(hass), options)
-    await airzone.login()
-    inst_list = await airzone.list_installations()
-    for inst in inst_list:
-        if inst.get_id() == entry.data[CONF_ID]:
-            airzone.select_installation(inst)
-            await airzone.update_installation(inst)
-
-    coordinator = AirzoneUpdateCoordinator(hass, airzone)
-    await coordinator.async_config_entry_first_refresh()
-
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
--- a/homeassistant/components/airzone_cloud/binary_sensor.py
+++ b/homeassistant/components/airzone_cloud/binary_sensor.py
@@ -1,106 +0,0 @@
-"""Support for the Airzone Cloud binary sensors."""
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Any, Final
-
-from aioairzone_cloud.const import AZD_PROBLEMS, AZD_WARNINGS, AZD_ZONES
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .const import DOMAIN
-from .coordinator import AirzoneUpdateCoordinator
-from .entity import AirzoneEntity, AirzoneZoneEntity
-
-
-@dataclass
-class AirzoneBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """A class that describes Airzone Cloud binary sensor entities."""
-
-    attributes: dict[str, str] | None = None
-
-
-ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]] = (
-    AirzoneBinarySensorEntityDescription(
-        attributes={
-            "warnings": AZD_WARNINGS,
-        },
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        key=AZD_PROBLEMS,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
-) -> None:
-    """Add Airzone Cloud binary sensors from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
-
-    binary_sensors: list[AirzoneBinarySensor] = []
-
-    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
-        for description in ZONE_BINARY_SENSOR_TYPES:
-            if description.key in zone_data:
-                binary_sensors.append(
-                    AirzoneZoneBinarySensor(
-                        coordinator,
-                        description,
-                        zone_id,
-                        zone_data,
-                    )
-                )
-
-    async_add_entities(binary_sensors)
-
-
-class AirzoneBinarySensor(AirzoneEntity, BinarySensorEntity):
-    """Define an Airzone Cloud binary sensor."""
-
-    entity_description: AirzoneBinarySensorEntityDescription
-
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Update attributes when the coordinator updates."""
-        self._async_update_attrs()
-        super()._handle_coordinator_update()
-
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update binary sensor attributes."""
-        self._attr_is_on = self.get_airzone_value(self.entity_description.key)
-        if self.entity_description.attributes:
-            self._attr_extra_state_attributes = {
-                key: self.get_airzone_value(val)
-                for key, val in self.entity_description.attributes.items()
-            }
-
-
-class AirzoneZoneBinarySensor(AirzoneZoneEntity, AirzoneBinarySensor):
-    """Define an Airzone Cloud Zone binary sensor."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AirzoneUpdateCoordinator,
-        description: AirzoneBinarySensorEntityDescription,
-        zone_id: str,
-        zone_data: dict[str, Any],
-    ) -> None:
-        """Initialize."""
-        super().__init__(coordinator, zone_id, zone_data)
-
-        self._attr_unique_id = f"{zone_id}_{description.key}"
-        self.entity_description = description
-
-        self._async_update_attrs()
--- a/homeassistant/components/airzone_cloud/config_flow.py
+++ b/homeassistant/components/airzone_cloud/config_flow.py
@@ -1,116 +0,0 @@
-"""Config flow for Airzone Cloud."""
-from __future__ import annotations
-
-from typing import Any
-
-from aioairzone_cloud.cloudapi import AirzoneCloudApi
-from aioairzone_cloud.common import ConnectionOptions
-from aioairzone_cloud.const import AZD_ID, AZD_NAME, AZD_WEBSERVERS
-from aioairzone_cloud.exceptions import AirzoneCloudError, LoginError
-import voluptuous as vol
-
-from homeassistant import config_entries
-from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.data_entry_flow import FlowResult
-from homeassistant.helpers import aiohttp_client
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-)
-
-from .const import DOMAIN
-
-
-class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
-    """Handle config flow for an Airzone Cloud device."""
-
-    airzone: AirzoneCloudApi
-
-    async def async_step_inst_pick(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle the installation selection."""
-        errors = {}
-        options: dict[str, str] = {}
-
-        inst_desc = None
-        inst_id = None
-        if user_input is not None:
-            inst_id = user_input[CONF_ID]
-
-        try:
-            inst_list = await self.airzone.list_installations()
-        except AirzoneCloudError:
-            errors["base"] = "cannot_connect"
-        else:
-            for inst in inst_list:
-                _data = inst.data()
-                _id = _data[AZD_ID]
-                options[_id] = f"{_data[AZD_NAME]} {_data[AZD_WEBSERVERS][0]} ({_id})"
-                if _id is not None and _id == inst_id:
-                    inst_desc = options[_id]
-
-        if user_input is not None and inst_desc is not None:
-            await self.async_set_unique_id(inst_id)
-            self._abort_if_unique_id_configured()
-
-            user_input[CONF_USERNAME] = self.airzone.options.username
-            user_input[CONF_PASSWORD] = self.airzone.options.password
-
-            return self.async_create_entry(title=inst_desc, data=user_input)
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_ID): SelectSelector(
-                        SelectSelectorConfig(
-                            options=[
-                                SelectOptionDict(value=k, label=v)
-                                for k, v in options.items()
-                            ],
-                            mode=SelectSelectorMode.DROPDOWN,
-                        )
-                    ),
-                }
-            ),
-            errors=errors,
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> FlowResult:
-        """Handle the initial step."""
-        errors = {}
-
-        if user_input is not None:
-            if CONF_ID in user_input:
-                return await self.async_step_inst_pick(user_input)
-
-            self.airzone = AirzoneCloudApi(
-                aiohttp_client.async_get_clientsession(self.hass),
-                ConnectionOptions(
-                    user_input[CONF_USERNAME],
-                    user_input[CONF_PASSWORD],
-                ),
-            )
-
-            try:
-                await self.airzone.login()
-            except (AirzoneCloudError, LoginError):
-                errors["base"] = "cannot_connect"
-            else:
-                return await self.async_step_inst_pick()
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_USERNAME): str,
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
-            errors=errors,
-        )
--- a/Show More
+++ b/Show More