Bumped version to 2023.10.0b9

Increase update interval of firmware platform

.core_files.yaml

@@ -30,6 +30,7 @@ base_platforms: &base_platforms
   - homeassistant/components/humidifier/**
   - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
+  - homeassistant/components/lawn_mower/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**
   - homeassistant/components/media_player/**
@@ -54,6 +55,7 @@ base_platforms: &base_platforms
 components: &components
   - homeassistant/components/alexa/**
   - homeassistant/components/application_credentials/**
+  - homeassistant/components/assist_pipeline/**
   - homeassistant/components/auth/**
   - homeassistant/components/automation/**
   - homeassistant/components/backup/**
@@ -86,6 +88,7 @@ components: &components
   - homeassistant/components/lovelace/**
   - homeassistant/components/media_source/**
   - homeassistant/components/mjpeg/**
+  - homeassistant/components/modbus/**
   - homeassistant/components/mqtt/**
   - homeassistant/components/network/**
   - homeassistant/components/onboarding/**

.coveragerc

@@ -29,11 +29,13 @@ omit =
     homeassistant/components/adguard/switch.py
     homeassistant/components/ads/*
     homeassistant/components/aemet/weather_update_coordinator.py
-    homeassistant/components/aftership/*
+    homeassistant/components/aftership/__init__.py
+    homeassistant/components/aftership/sensor.py
     homeassistant/components/agent_dvr/alarm_control_panel.py
     homeassistant/components/agent_dvr/camera.py
     homeassistant/components/agent_dvr/helpers.py
     homeassistant/components/airnow/__init__.py
+    homeassistant/components/airnow/coordinator.py
     homeassistant/components/airnow/sensor.py
     homeassistant/components/airq/__init__.py
     homeassistant/components/airq/coordinator.py
@@ -44,6 +46,7 @@ omit =
     homeassistant/components/airthings_ble/sensor.py
     homeassistant/components/airtouch4/__init__.py
     homeassistant/components/airtouch4/climate.py
+    homeassistant/components/airtouch4/coordinator.py
     homeassistant/components/airvisual/__init__.py
     homeassistant/components/airvisual/sensor.py
     homeassistant/components/airvisual_pro/__init__.py
@@ -57,6 +60,7 @@ omit =
     homeassistant/components/ambiclimate/climate.py
     homeassistant/components/ambient_station/__init__.py
     homeassistant/components/ambient_station/binary_sensor.py
+    homeassistant/components/ambient_station/entity.py
     homeassistant/components/ambient_station/sensor.py
     homeassistant/components/amcrest/*
     homeassistant/components/ampio/*
@@ -99,6 +103,7 @@ omit =
     homeassistant/components/azure_devops/__init__.py
     homeassistant/components/azure_devops/sensor.py
     homeassistant/components/azure_service_bus/*
+    homeassistant/components/awair/coordinator.py
     homeassistant/components/baf/__init__.py
     homeassistant/components/baf/climate.py
     homeassistant/components/baf/entity.py
@@ -168,12 +173,18 @@ omit =
     homeassistant/components/cmus/media_player.py
     homeassistant/components/coinbase/sensor.py
     homeassistant/components/comed_hourly_pricing/sensor.py
+    homeassistant/components/comelit/__init__.py
+    homeassistant/components/comelit/const.py
+    homeassistant/components/comelit/cover.py
+    homeassistant/components/comelit/coordinator.py
+    homeassistant/components/comelit/light.py
     homeassistant/components/comfoconnect/fan.py
     homeassistant/components/concord232/alarm_control_panel.py
     homeassistant/components/concord232/binary_sensor.py
     homeassistant/components/control4/__init__.py
     homeassistant/components/control4/director_utils.py
     homeassistant/components/control4/light.py
+    homeassistant/components/coolmaster/coordinator.py
     homeassistant/components/cppm_tracker/device_tracker.py
     homeassistant/components/crownstone/__init__.py
     homeassistant/components/crownstone/devices.py
@@ -212,10 +223,12 @@ omit =
     homeassistant/components/dominos/*
     homeassistant/components/doods/*
     homeassistant/components/doorbird/__init__.py
-    homeassistant/components/doorbird/button.py
     homeassistant/components/doorbird/camera.py
+    homeassistant/components/doorbird/button.py
+    homeassistant/components/doorbird/device.py
     homeassistant/components/doorbird/entity.py
     homeassistant/components/doorbird/util.py
+    homeassistant/components/doorbird/view.py
     homeassistant/components/dormakaba_dkey/__init__.py
     homeassistant/components/dormakaba_dkey/binary_sensor.py
     homeassistant/components/dormakaba_dkey/entity.py
@@ -234,6 +247,9 @@ omit =
     homeassistant/components/duotecno/entity.py
     homeassistant/components/duotecno/switch.py
     homeassistant/components/duotecno/cover.py
+    homeassistant/components/duotecno/light.py
+    homeassistant/components/duotecno/climate.py
+    homeassistant/components/duotecno/binary_sensor.py
     homeassistant/components/dwd_weather_warnings/const.py
     homeassistant/components/dwd_weather_warnings/coordinator.py
     homeassistant/components/dwd_weather_warnings/sensor.py
@@ -247,6 +263,12 @@ omit =
     homeassistant/components/ecobee/notify.py
     homeassistant/components/ecobee/sensor.py
     homeassistant/components/ecobee/weather.py
+    homeassistant/components/ecoforest/__init__.py
+    homeassistant/components/ecoforest/coordinator.py
+    homeassistant/components/ecoforest/entity.py
+    homeassistant/components/ecoforest/number.py
+    homeassistant/components/ecoforest/sensor.py
+    homeassistant/components/ecoforest/switch.py
     homeassistant/components/econet/__init__.py
     homeassistant/components/econet/binary_sensor.py
     homeassistant/components/econet/climate.py
@@ -268,8 +290,8 @@ omit =
     homeassistant/components/electric_kiwi/__init__.py
     homeassistant/components/electric_kiwi/api.py
     homeassistant/components/electric_kiwi/oauth2.py
-    homeassistant/components/electric_kiwi/sensor.py
     homeassistant/components/electric_kiwi/coordinator.py
+    homeassistant/components/electric_kiwi/select.py
     homeassistant/components/eliqonline/sensor.py
     homeassistant/components/elkm1/__init__.py
     homeassistant/components/elkm1/alarm_control_panel.py
@@ -282,7 +304,8 @@ omit =
     homeassistant/components/elmax/alarm_control_panel.py
     homeassistant/components/elmax/binary_sensor.py
     homeassistant/components/elmax/common.py
-    homeassistant/components/elmax/binary_sensor.py
+    homeassistant/components/elmax/const.py
+    homeassistant/components/elmax/cover.py
     homeassistant/components/elmax/switch.py
     homeassistant/components/elv/*
     homeassistant/components/emby/media_player.py
@@ -299,7 +322,13 @@ omit =
     homeassistant/components/enocean/sensor.py
     homeassistant/components/enocean/switch.py
     homeassistant/components/enphase_envoy/__init__.py
+    homeassistant/components/enphase_envoy/binary_sensor.py
+    homeassistant/components/enphase_envoy/coordinator.py
+    homeassistant/components/enphase_envoy/entity.py
+    homeassistant/components/enphase_envoy/number.py
+    homeassistant/components/enphase_envoy/select.py
     homeassistant/components/enphase_envoy/sensor.py
+    homeassistant/components/enphase_envoy/switch.py
     homeassistant/components/entur_public_transport/*
     homeassistant/components/environment_canada/__init__.py
     homeassistant/components/environment_canada/camera.py
@@ -334,10 +363,12 @@ omit =
     homeassistant/components/ezviz/entity.py
     homeassistant/components/ezviz/select.py
     homeassistant/components/ezviz/sensor.py
+    homeassistant/components/ezviz/siren.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/faa_delays/coordinator.py
     homeassistant/components/familyhub/camera.py
     homeassistant/components/fastdotcom/*
     homeassistant/components/ffmpeg/camera.py
@@ -362,7 +393,6 @@ omit =
     homeassistant/components/firmata/pin.py
     homeassistant/components/firmata/sensor.py
     homeassistant/components/firmata/switch.py
-    homeassistant/components/fitbit/*
     homeassistant/components/fivem/__init__.py
     homeassistant/components/fivem/binary_sensor.py
     homeassistant/components/fivem/coordinator.py
@@ -399,7 +429,6 @@ omit =
     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
     homeassistant/components/fritz/device_tracker.py
@@ -415,6 +444,7 @@ omit =
     homeassistant/components/garadget/cover.py
     homeassistant/components/garages_amsterdam/__init__.py
     homeassistant/components/garages_amsterdam/binary_sensor.py
+    homeassistant/components/garages_amsterdam/entity.py
     homeassistant/components/garages_amsterdam/sensor.py
     homeassistant/components/gc100/*
     homeassistant/components/geniushub/*
@@ -511,7 +541,12 @@ omit =
     homeassistant/components/hvv_departures/__init__.py
     homeassistant/components/hvv_departures/binary_sensor.py
     homeassistant/components/hvv_departures/sensor.py
-    homeassistant/components/hydrawise/*
+    homeassistant/components/hydrawise/__init__.py
+    homeassistant/components/hydrawise/binary_sensor.py
+    homeassistant/components/hydrawise/const.py
+    homeassistant/components/hydrawise/coordinator.py
+    homeassistant/components/hydrawise/sensor.py
+    homeassistant/components/hydrawise/switch.py
     homeassistant/components/ialarm/alarm_control_panel.py
     homeassistant/components/iammeter/sensor.py
     homeassistant/components/iaqualink/binary_sensor.py
@@ -637,6 +672,7 @@ omit =
     homeassistant/components/lg_soundbar/__init__.py
     homeassistant/components/lg_soundbar/media_player.py
     homeassistant/components/life360/__init__.py
+    homeassistant/components/life360/button.py
     homeassistant/components/life360/coordinator.py
     homeassistant/components/life360/device_tracker.py
     homeassistant/components/lightwave/*
@@ -686,11 +722,13 @@ omit =
     homeassistant/components/mailgun/notify.py
     homeassistant/components/map/*
     homeassistant/components/mastodon/notify.py
-    homeassistant/components/matrix/*
+    homeassistant/components/matrix/__init__.py
+    homeassistant/components/matrix/notify.py
     homeassistant/components/matter/__init__.py
     homeassistant/components/meater/__init__.py
     homeassistant/components/meater/sensor.py
-    homeassistant/components/media_extractor/*
+    homeassistant/components/medcom_ble/__init__.py
+    homeassistant/components/medcom_ble/sensor.py
     homeassistant/components/mediaroom/media_player.py
     homeassistant/components/melcloud/__init__.py
     homeassistant/components/melcloud/climate.py
@@ -708,14 +746,13 @@ omit =
     homeassistant/components/meteoclimatic/__init__.py
     homeassistant/components/meteoclimatic/sensor.py
     homeassistant/components/meteoclimatic/weather.py
-    homeassistant/components/metoffice/sensor.py
-    homeassistant/components/metoffice/weather.py
     homeassistant/components/microsoft/tts.py
     homeassistant/components/mikrotik/hub.py
     homeassistant/components/mill/climate.py
     homeassistant/components/mill/sensor.py
     homeassistant/components/minecraft_server/__init__.py
     homeassistant/components/minecraft_server/binary_sensor.py
+    homeassistant/components/minecraft_server/coordinator.py
     homeassistant/components/minecraft_server/entity.py
     homeassistant/components/minecraft_server/sensor.py
     homeassistant/components/minio/minio_helper.py
@@ -731,7 +768,9 @@ omit =
     homeassistant/components/moehlenhoff_alpha2/climate.py
     homeassistant/components/moehlenhoff_alpha2/sensor.py
     homeassistant/components/motion_blinds/__init__.py
+    homeassistant/components/motion_blinds/coordinator.py
     homeassistant/components/motion_blinds/cover.py
+    homeassistant/components/motion_blinds/entity.py
     homeassistant/components/motion_blinds/sensor.py
     homeassistant/components/mpd/media_player.py
     homeassistant/components/mqtt_room/sensor.py
@@ -764,15 +803,18 @@ omit =
     homeassistant/components/neato/__init__.py
     homeassistant/components/neato/api.py
     homeassistant/components/neato/camera.py
+    homeassistant/components/neato/entity.py
     homeassistant/components/neato/hub.py
     homeassistant/components/neato/sensor.py
     homeassistant/components/neato/switch.py
     homeassistant/components/neato/vacuum.py
+    homeassistant/components/neato/button.py
     homeassistant/components/nederlandse_spoorwegen/sensor.py
     homeassistant/components/netdata/sensor.py
     homeassistant/components/netgear/__init__.py
     homeassistant/components/netgear/button.py
     homeassistant/components/netgear/device_tracker.py
+    homeassistant/components/netgear/entity.py
     homeassistant/components/netgear/router.py
     homeassistant/components/netgear/sensor.py
     homeassistant/components/netgear/switch.py
@@ -825,6 +867,7 @@ omit =
     homeassistant/components/obihai/connectivity.py
     homeassistant/components/obihai/sensor.py
     homeassistant/components/octoprint/__init__.py
+    homeassistant/components/octoprint/coordinator.py
     homeassistant/components/oem/climate.py
     homeassistant/components/ohmconnect/sensor.py
     homeassistant/components/ombi/*
@@ -855,11 +898,11 @@ omit =
     homeassistant/components/opengarage/cover.py
     homeassistant/components/opengarage/entity.py
     homeassistant/components/opengarage/sensor.py
+    homeassistant/components/openhardwaremonitor/sensor.py
     homeassistant/components/openhome/__init__.py
     homeassistant/components/openhome/const.py
     homeassistant/components/openhome/media_player.py
     homeassistant/components/opensensemap/air_quality.py
-    homeassistant/components/opensky/sensor.py
     homeassistant/components/opentherm_gw/__init__.py
     homeassistant/components/opentherm_gw/binary_sensor.py
     homeassistant/components/opentherm_gw/climate.py
@@ -937,6 +980,8 @@ omit =
     homeassistant/components/point/sensor.py
     homeassistant/components/poolsense/__init__.py
     homeassistant/components/poolsense/binary_sensor.py
+    homeassistant/components/poolsense/coordinator.py
+    homeassistant/components/poolsense/entity.py
     homeassistant/components/poolsense/sensor.py
     homeassistant/components/powerwall/__init__.py
     homeassistant/components/progettihwsw/__init__.py
@@ -987,8 +1032,13 @@ omit =
     homeassistant/components/rainmachine/util.py
     homeassistant/components/renson/__init__.py
     homeassistant/components/renson/const.py
+    homeassistant/components/renson/coordinator.py
     homeassistant/components/renson/entity.py
     homeassistant/components/renson/sensor.py
+    homeassistant/components/renson/button.py
+    homeassistant/components/renson/fan.py
+    homeassistant/components/renson/binary_sensor.py
+    homeassistant/components/renson/number.py
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/sensor.py
     homeassistant/components/recorder/repack.py
@@ -1049,9 +1099,10 @@ omit =
     homeassistant/components/saj/sensor.py
     homeassistant/components/satel_integra/*
     homeassistant/components/schluter/*
-    homeassistant/components/screenlogic/__init__.py
     homeassistant/components/screenlogic/binary_sensor.py
     homeassistant/components/screenlogic/climate.py
+    homeassistant/components/screenlogic/coordinator.py
+    homeassistant/components/screenlogic/const.py
     homeassistant/components/screenlogic/entity.py
     homeassistant/components/screenlogic/light.py
     homeassistant/components/screenlogic/number.py
@@ -1115,6 +1166,7 @@ omit =
     homeassistant/components/smarty/*
     homeassistant/components/sms/__init__.py
     homeassistant/components/sms/const.py
+    homeassistant/components/sms/coordinator.py
     homeassistant/components/sms/gateway.py
     homeassistant/components/sms/notify.py
     homeassistant/components/sms/sensor.py
@@ -1131,6 +1183,7 @@ omit =
     homeassistant/components/solaredge_local/sensor.py
     homeassistant/components/solarlog/__init__.py
     homeassistant/components/solarlog/sensor.py
+    homeassistant/components/solarlog/coordinator.py
     homeassistant/components/solax/__init__.py
     homeassistant/components/solax/sensor.py
     homeassistant/components/soma/__init__.py
@@ -1167,7 +1220,13 @@ omit =
     homeassistant/components/squeezebox/__init__.py
     homeassistant/components/squeezebox/browse_media.py
     homeassistant/components/squeezebox/media_player.py
+    homeassistant/components/starlink/__init__.py
+    homeassistant/components/starlink/binary_sensor.py
+    homeassistant/components/starlink/button.py
     homeassistant/components/starlink/coordinator.py
+    homeassistant/components/starlink/device_tracker.py
+    homeassistant/components/starlink/sensor.py
+    homeassistant/components/starlink/switch.py
     homeassistant/components/starline/__init__.py
     homeassistant/components/starline/account.py
     homeassistant/components/starline/binary_sensor.py
@@ -1217,6 +1276,9 @@ omit =
     homeassistant/components/switchbot/sensor.py
     homeassistant/components/switchbot/switch.py
     homeassistant/components/switchbot/lock.py
+    homeassistant/components/switchbot_cloud/coordinator.py
+    homeassistant/components/switchbot_cloud/entity.py
+    homeassistant/components/switchbot_cloud/switch.py
     homeassistant/components/switchmate/switch.py
     homeassistant/components/syncthing/__init__.py
     homeassistant/components/syncthing/sensor.py
@@ -1239,6 +1301,7 @@ omit =
     homeassistant/components/system_bridge/__init__.py
     homeassistant/components/system_bridge/binary_sensor.py
     homeassistant/components/system_bridge/coordinator.py
+    homeassistant/components/system_bridge/notify.py
     homeassistant/components/system_bridge/sensor.py
     homeassistant/components/systemmonitor/sensor.py
     homeassistant/components/tado/__init__.py
@@ -1250,6 +1313,8 @@ omit =
     homeassistant/components/tank_utility/sensor.py
     homeassistant/components/tankerkoenig/__init__.py
     homeassistant/components/tankerkoenig/binary_sensor.py
+    homeassistant/components/tankerkoenig/coordinator.py
+    homeassistant/components/tankerkoenig/entity.py
     homeassistant/components/tankerkoenig/sensor.py
     homeassistant/components/tapsaff/binary_sensor.py
     homeassistant/components/tautulli/__init__.py
@@ -1311,9 +1376,6 @@ omit =
     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
@@ -1333,9 +1395,11 @@ omit =
     homeassistant/components/trafikverket_train/__init__.py
     homeassistant/components/trafikverket_train/coordinator.py
     homeassistant/components/trafikverket_train/sensor.py
+    homeassistant/components/trafikverket_train/util.py
     homeassistant/components/trafikverket_weatherstation/__init__.py
     homeassistant/components/trafikverket_weatherstation/coordinator.py
     homeassistant/components/trafikverket_weatherstation/sensor.py
+    homeassistant/components/transmission/__init__.py
     homeassistant/components/transmission/sensor.py
     homeassistant/components/transmission/switch.py
     homeassistant/components/travisci/sensor.py
@@ -1418,6 +1482,12 @@ omit =
     homeassistant/components/vlc/media_player.py
     homeassistant/components/vlc_telnet/__init__.py
     homeassistant/components/vlc_telnet/media_player.py
+    homeassistant/components/vodafone_station/__init__.py
+    homeassistant/components/vodafone_station/button.py
+    homeassistant/components/vodafone_station/const.py
+    homeassistant/components/vodafone_station/coordinator.py
+    homeassistant/components/vodafone_station/device_tracker.py
+    homeassistant/components/vodafone_station/sensor.py
     homeassistant/components/volkszaehler/sensor.py
     homeassistant/components/volumio/__init__.py
     homeassistant/components/volumio/browse_media.py
@@ -1438,11 +1508,15 @@ omit =
     homeassistant/components/watson_tts/tts.py
     homeassistant/components/watttime/__init__.py
     homeassistant/components/watttime/sensor.py
+    homeassistant/components/weatherflow/__init__.py
+    homeassistant/components/weatherflow/const.py
+    homeassistant/components/weatherflow/sensor.py
     homeassistant/components/wiffi/__init__.py
     homeassistant/components/wiffi/binary_sensor.py
     homeassistant/components/wiffi/sensor.py
     homeassistant/components/wiffi/wiffi_strings.py
     homeassistant/components/wirelesstag/*
+    homeassistant/components/withings/api.py
     homeassistant/components/wolflink/__init__.py
     homeassistant/components/wolflink/sensor.py
     homeassistant/components/worldtidesinfo/sensor.py
@@ -1487,7 +1561,6 @@ omit =
     homeassistant/components/yale_smart_alarm/alarm_control_panel.py
     homeassistant/components/yale_smart_alarm/binary_sensor.py
     homeassistant/components/yale_smart_alarm/button.py
-    homeassistant/components/yale_smart_alarm/coordinator.py
     homeassistant/components/yale_smart_alarm/entity.py
     homeassistant/components/yale_smart_alarm/lock.py
     homeassistant/components/yalexs_ble/__init__.py
@@ -1502,6 +1575,9 @@ omit =
     homeassistant/components/yamaha_musiccast/select.py
     homeassistant/components/yamaha_musiccast/switch.py
     homeassistant/components/yandex_transport/sensor.py
+    homeassistant/components/yardian/__init__.py
+    homeassistant/components/yardian/coordinator.py
+    homeassistant/components/yardian/switch.py
     homeassistant/components/yeelightsunflower/light.py
     homeassistant/components/yi/camera.py
     homeassistant/components/yolink/__init__.py

.github/workflows/builder.yml

@@ -24,7 +24,7 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
         with:
           fetch-depth: 0
 
@@ -56,7 +56,7 @@ jobs:
     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@v4.1.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.7.0
@@ -98,7 +98,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -190,14 +190,14 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.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@2023.09.0
         with:
           args: |
             $BUILD_ARGS \
@@ -205,8 +205,6 @@ jobs:
             --cosign \
             --target /data \
             --generic ${{ needs.init.outputs.version }}
-        env:
-          CAS_API_KEY: ${{ secrets.CAS_TOKEN }}
 
       - name: Archive translations
         shell: bash
@@ -251,9 +249,10 @@ jobs:
           - raspberrypi4-64
           - tinker
           - yellow
+          - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Set build additional args
         run: |
@@ -267,22 +266,20 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.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@2023.09.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
@@ -292,7 +289,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -330,21 +327,21 @@ jobs:
       id-token: write
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.1.1
+        uses: sigstore/cosign-installer@v3.1.2
         with:
           cosign-release: "v2.0.2"
 
       - name: Login to DockerHub
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.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@v3.0.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}

.github/workflows/ci.yaml

@@ -19,6 +19,10 @@ on:
         description: "Skip pytest"
         default: false
         type: boolean
+      skip-coverage:
+        description: "Skip coverage"
+        default: false
+        type: boolean
       pylint-only:
         description: "Only run pylint"
         default: false
@@ -31,8 +35,9 @@ on:
 env:
   CACHE_VERSION: 5
   PIP_CACHE_VERSION: 4
-  MYPY_CACHE_VERSION: 4
-  HA_SHORT_VERSION: 2023.8
+  MYPY_CACHE_VERSION: 5
+  BLACK_CACHE_VERSION: 1
+  HA_SHORT_VERSION: "2023.10"
   DEFAULT_PYTHON: "3.11"
   ALL_PYTHON_VERSIONS: "['3.11']"
   # 10.3 is the oldest supported version
@@ -51,6 +56,7 @@ env:
   POSTGRESQL_VERSIONS: "['postgres:12.14','postgres:15.2']"
   PRE_COMMIT_CACHE: ~/.cache/pre-commit
   PIP_CACHE: /tmp/pip-cache
+  BLACK_CACHE: /tmp/black-cache
   SQLALCHEMY_WARN_20: 1
   PYTHONASYNCIODEBUG: 1
   HASS_CI: 1
@@ -79,10 +85,11 @@ jobs:
       test_groups: ${{ steps.info.outputs.test_groups }}
       tests_glob: ${{ steps.info.outputs.tests_glob }}
       tests: ${{ steps.info.outputs.tests }}
+      skip_coverage: ${{ steps.info.outputs.skip_coverage }}
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: >-
@@ -127,6 +134,7 @@ jobs:
           test_group_count=10
           tests="[]"
           tests_glob=""
+          skip_coverage=""
 
           if [[ "${{ steps.integrations.outputs.changes }}" != "[]" ]];
           then
@@ -176,6 +184,12 @@ jobs:
             test_full_suite="true"
           fi
 
+          if [[ "${{ github.event.inputs.skip-coverage }}" == "true" ]] \
+            || [[ "${{ contains(github.event.pull_request.labels.*.name, 'ci-skip-coverage') }}" == "true" ]];
+          then
+            skip_coverage="true"
+          fi
+
           # Output & sent to GitHub Actions
           echo "mariadb_groups: ${mariadb_groups}"
           echo "mariadb_groups=${mariadb_groups}" >> $GITHUB_OUTPUT
@@ -195,6 +209,8 @@ jobs:
           echo "tests=${tests}" >> $GITHUB_OUTPUT
           echo "tests_glob: ${tests_glob}"
           echo "tests_glob=${tests_glob}" >> $GITHUB_OUTPUT
+          echo "skip_coverage: ${skip_coverage}"
+          echo "skip_coverage=${skip_coverage}" >> $GITHUB_OUTPUT
 
   pre-commit:
     name: Prepare pre-commit base
@@ -206,7 +222,7 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -215,7 +231,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v3.3.1
+        uses: actions/cache@v3.3.2
         with:
           path: venv
           key: >-
@@ -230,7 +246,7 @@ 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.3.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -251,16 +267,23 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.7.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
+      - name: Generate partial black restore key
+        id: generate-black-key
+        run: |
+          black_version=$(cat requirements_test_pre_commit.txt | grep black | cut -d '=' -f 3)
+          echo "version=$black_version" >> $GITHUB_OUTPUT
+          echo "key=black-${{ env.BLACK_CACHE_VERSION }}-$black_version-${{
+            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -269,21 +292,36 @@ 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.3.2
         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: Restore black cache
+        uses: actions/cache@v3.3.2
+        with:
+          path: ${{ env.BLACK_CACHE }}
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            steps.generate-black-key.outputs.key }}
+          restore-keys: |
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-black-${{
+            env.BLACK_CACHE_VERSION }}-${{ steps.generate-black-key.outputs.version }}-${{
+            env.HA_SHORT_VERSION }}-
       - name: Run black (fully)
         if: needs.info.outputs.test_full_suite == 'true'
+        env:
+          BLACK_CACHE_DIR: ${{ env.BLACK_CACHE }}
         run: |
           . venv/bin/activate
           pre-commit run --hook-stage manual black --all-files --show-diff-on-failure
       - name: Run black (partially)
         if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
+        env:
+          BLACK_CACHE_DIR: ${{ env.BLACK_CACHE }}
         run: |
           . venv/bin/activate
           shopt -s globstar
@@ -297,7 +335,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.7.0
         id: python
@@ -306,7 +344,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -315,7 +353,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.3.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -346,7 +384,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.7.0
         id: python
@@ -355,7 +393,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -364,7 +402,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.3.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -440,7 +478,7 @@ 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@v4.1.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -454,7 +492,7 @@ 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.3.2
         with:
           path: venv
           lookup-only: true
@@ -463,7 +501,7 @@ jobs:
             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.3.2
         with:
           path: ${{ env.PIP_CACHE }}
           key: >-
@@ -508,7 +546,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -517,7 +555,7 @@ jobs:
           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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -540,7 +578,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -549,7 +587,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v3.3.1
+        uses: actions/cache/restore@v3.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -573,7 +611,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -582,7 +620,7 @@ jobs:
           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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -617,7 +655,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -633,7 +671,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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -641,7 +679,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.3.2
         with:
           path: .mypy_cache
           key: >-
@@ -699,7 +737,7 @@ jobs:
             bluez \
             ffmpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -708,7 +746,7 @@ jobs:
           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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -734,9 +772,19 @@ jobs:
       - name: Run pytest (fully)
         if: needs.info.outputs.test_full_suite == 'true'
         timeout-minutes: 60
+        id: pytest-full
+        env:
+          PYTHONDONTWRITEBYTECODE: 1
         run: |
           . venv/bin/activate
           python --version
+          set -o pipefail
+          cov_params=()
+          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant")
+            cov_params+=(--cov-report=xml)
+          fi
+
           python3 -X dev -m pytest \
             -qq \
             --timeout=9 \
@@ -745,37 +793,54 @@ jobs:
             --dist=loadfile \
             --test-group-count ${{ needs.info.outputs.test_group_count }} \
             --test-group=${{ matrix.group }} \
-            --cov="homeassistant" \
-            --cov-report=xml \
+            ${cov_params[@]} \
             -o console_output_style=count \
             -p no:sugar \
-            tests
+            tests \
+              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Run pytest (partially)
         if: needs.info.outputs.test_full_suite == 'false'
         timeout-minutes: 10
+        id: pytest-partial
         shell: bash
+        env:
+          PYTHONDONTWRITEBYTECODE: 1
         run: |
           . venv/bin/activate
           python --version
+          set -o pipefail
 
           if [[ ! -f "tests/components/${{ matrix.group }}/__init__.py" ]]; then
             echo "::error:: missing file tests/components/${{ matrix.group }}/__init__.py"
             exit 1
           fi
 
+          cov_params=()
+          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant.components.${{ matrix.group }}")
+            cov_params+=(--cov-report=xml)
+            cov_params+=(--cov-report=term-missing)
+          fi
+
           python3 -X dev -m pytest \
             -qq \
             --timeout=9 \
             -n auto \
-            --cov="homeassistant.components.${{ matrix.group }}" \
-            --cov-report=xml \
-            --cov-report=term-missing \
+            ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
             --durations-min=1 \
             -p no:sugar \
-            tests/components/${{ matrix.group }}
+            tests/components/${{ matrix.group }} \
+              2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
+      - name: Upload pytest output
+        if: success() || failure() && (steps.pytest-full.conclusion == 'failure' || steps.pytest-partial.conclusion == 'failure')
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: pytest-${{ github.run_number }}
+          path: pytest-*.txt
       - name: Upload coverage artifact
+        if: needs.info.outputs.skip_coverage != 'true'
         uses: actions/upload-artifact@v3.1.2
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
@@ -824,7 +889,7 @@ jobs:
             ffmpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -833,7 +898,7 @@ jobs:
           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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -862,18 +927,27 @@ jobs:
           python3 -m script.translations develop --all
       - name: Run pytest (partially)
         timeout-minutes: 20
+        id: pytest-partial
         shell: bash
+        env:
+          PYTHONDONTWRITEBYTECODE: 1
         run: |
           . venv/bin/activate
           python --version
+          set -o pipefail
+          mariadb=$(echo "${{ matrix.mariadb-group }}" | sed "s/:/-/g")
+          cov_params=()
+          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant.components.recorder")
+            cov_params+=(--cov-report=xml)
+            cov_params+=(--cov-report=term-missing)
+          fi
 
           python3 -X dev -m pytest \
             -qq \
             --timeout=20 \
             -n 1 \
-            --cov="homeassistant.components.recorder" \
-            --cov-report=xml \
-            --cov-report=term-missing \
+            ${cov_params[@]} \
             -o console_output_style=count \
             --durations=10 \
             -p no:sugar \
@@ -881,8 +955,16 @@ jobs:
             tests/components/history \
             tests/components/logbook \
             tests/components/recorder \
-            tests/components/sensor
+            tests/components/sensor \
+              2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
+      - name: Upload pytest output
+        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: pytest-${{ github.run_number }}
+          path: pytest-*.txt
       - name: Upload coverage artifact
+        if: needs.info.outputs.skip_coverage != 'true'
         uses: actions/upload-artifact@v3.1.2
         with:
           name: coverage-${{ matrix.python-version }}-mariadb
@@ -931,7 +1013,7 @@ jobs:
             ffmpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v4.7.0
@@ -940,7 +1022,7 @@ jobs:
           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.3.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -969,18 +1051,27 @@ jobs:
           python3 -m script.translations develop --all
       - name: Run pytest (partially)
         timeout-minutes: 20
+        id: pytest-partial
         shell: bash
+        env:
+          PYTHONDONTWRITEBYTECODE: 1
         run: |
           . venv/bin/activate
           python --version
+          set -o pipefail
+          postgresql=$(echo "${{ matrix.postgresql-group }}" | sed "s/:/-/g")
+          cov_params=()
+          if [[ "${{ needs.info.outputs.skip_coverage }}" != "true" ]]; then
+            cov_params+=(--cov="homeassistant.components.recorder")
+            cov_params+=(--cov-report=xml)
+            cov_params+=(--cov-report=term-missing)
+          fi
 
           python3 -X dev -m pytest \
             -qq \
             --timeout=9 \
             -n 1 \
-            --cov="homeassistant.components.recorder" \
-            --cov-report=xml \
-            --cov-report=term-missing \
+            ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
             --durations-min=10 \
@@ -989,8 +1080,16 @@ jobs:
             tests/components/history \
             tests/components/logbook \
             tests/components/recorder \
-            tests/components/sensor
+            tests/components/sensor \
+              2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
+      - name: Upload pytest output
+        if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
+        uses: actions/upload-artifact@v3.1.2
+        with:
+          name: pytest-${{ github.run_number }}
+          path: pytest-*.txt
       - name: Upload coverage artifact
+        if: needs.info.outputs.skip_coverage != 'true'
         uses: actions/upload-artifact@v3.1.0
         with:
           name: coverage-${{ matrix.python-version }}-postgresql
@@ -1001,6 +1100,7 @@ jobs:
 
   coverage:
     name: Upload test coverage to Codecov
+    if: needs.info.outputs.skip_coverage != 'true'
     runs-on: ubuntu-22.04
     needs:
       - info
@@ -1008,7 +1108,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v3
       - name: Upload coverage to Codecov (full coverage)

.github/workflows/stale.yml

@@ -42,7 +42,7 @@ jobs:
         id: token
         # Pinned to a specific version of the action for security reasons
         # v1.7.0
-        uses: tibdex/github-app-token@b62528385c34dbc9f38e5f4225ac829252d1ea92
+        uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
         with:
           app_id: ${{ secrets.ISSUE_TRIAGE_APP_ID }}
           private_key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }}

.github/workflows/translations.yml

@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v4.7.0

.github/workflows/wheels.yml

@@ -26,7 +26,7 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Get information
         id: info
@@ -56,7 +56,7 @@ jobs:
             echo "CI_BUILD=1"
             echo "ENABLE_HEADLESS=1"
 
-            # Use C-Extension for sqlalchemy
+            # Use C-Extension for SQLAlchemy
             echo "REQUIRE_SQLALCHEMY_CEXT=1"
           ) > .env_file
 
@@ -84,7 +84,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -97,7 +97,7 @@ jobs:
           name: requirements_diff
 
       - name: Build wheels
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2023.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -122,7 +122,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v3.5.3
+        uses: actions/checkout@v4.1.0
 
       - name: Download env_file
         uses: actions/download-artifact@v3
@@ -178,7 +178,7 @@ jobs:
           sed -i "/numpy/d" homeassistant/package_constraints.txt
 
       - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2023.04.0
+        uses: home-assistant/wheels@2023.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -186,13 +186,13 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           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@2023.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -200,13 +200,13 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           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
+        uses: home-assistant/wheels@2023.09.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -214,7 +214,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;grpcio;sqlalchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtac"

.gitignore

@@ -67,6 +67,7 @@ htmlcov/
 test-reports/
 test-results.xml
 test-output.xml
+pytest-*.txt
 
 # Translations
 *.mo

.pre-commit-config.yaml

@@ -1,12 +1,12 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.0.280
+    rev: v0.0.289
     hooks:
       - id: ruff
         args:
           - --fix
-  - repo: https://github.com/psf/black
-    rev: 23.7.0
+  - repo: https://github.com/psf/black-pre-commit-mirror
+    rev: 23.9.1
     hooks:
       - id: black
         args:
@@ -21,7 +21,7 @@ repos:
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
         exclude_types: [csv, json]
-        exclude: ^tests/fixtures/|homeassistant/generated/
+        exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v4.4.0
     hooks:
@@ -43,7 +43,7 @@ repos:
     hooks:
       - id: prettier
   - repo: https://github.com/cdce8p/python-typing-update
-    rev: v0.5.0
+    rev: v0.6.0
     hooks:
       # Run `python-typing-update` hook manually from time to time
       # to update python typing syntax.
@@ -52,7 +52,7 @@ repos:
       - id: python-typing-update
         stages: [manual]
         args:
-          - --py310-plus
+          - --py311-plus
           - --force
           - --keep-updates
         files: ^(homeassistant|tests|script)/.+\.py$

.strict-typing

@@ -53,6 +53,7 @@ homeassistant.components.airzone_cloud.*
 homeassistant.components.aladdin_connect.*
 homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
+homeassistant.components.alexa.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
@@ -87,6 +88,7 @@ homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
+homeassistant.components.climate.*
 homeassistant.components.cloud.*
 homeassistant.components.configurator.*
 homeassistant.components.cover.*
@@ -103,6 +105,7 @@ homeassistant.components.dhcp.*
 homeassistant.components.diagnostics.*
 homeassistant.components.dlna_dmr.*
 homeassistant.components.dnsip.*
+homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.dsmr.*
 homeassistant.components.dunehd.*
@@ -134,9 +137,11 @@ homeassistant.components.fully_kiosk.*
 homeassistant.components.geo_location.*
 homeassistant.components.geocaching.*
 homeassistant.components.gios.*
+homeassistant.components.glances.*
 homeassistant.components.goalzero.*
 homeassistant.components.google.*
 homeassistant.components.google_sheets.*
+homeassistant.components.gpsd.*
 homeassistant.components.greeneye_monitor.*
 homeassistant.components.group.*
 homeassistant.components.guardian.*
@@ -147,6 +152,7 @@ homeassistant.components.history.*
 homeassistant.components.homeassistant.exposed_entities
 homeassistant.components.homeassistant.triggers.event
 homeassistant.components.homeassistant_alerts.*
+homeassistant.components.homeassistant_green.*
 homeassistant.components.homeassistant_hardware.*
 homeassistant.components.homeassistant_sky_connect.*
 homeassistant.components.homeassistant_yellow.*
@@ -174,6 +180,7 @@ homeassistant.components.huawei_lte.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
+homeassistant.components.idasen_desk.*
 homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
@@ -181,7 +188,9 @@ homeassistant.components.imap.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.integration.*
+homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
+homeassistant.components.islamic_prayer_times.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
 homeassistant.components.jewish_calendar.*
@@ -193,6 +202,7 @@ homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lametric.*
 homeassistant.components.laundrify.*
+homeassistant.components.lawn_mower.*
 homeassistant.components.lcn.*
 homeassistant.components.ld2410_ble.*
 homeassistant.components.lidarr.*
@@ -204,11 +214,14 @@ homeassistant.components.local_ip.*
 homeassistant.components.lock.*
 homeassistant.components.logbook.*
 homeassistant.components.logger.*
+homeassistant.components.london_underground.*
 homeassistant.components.lookin.*
 homeassistant.components.luftdaten.*
 homeassistant.components.mailbox.*
 homeassistant.components.mastodon.*
+homeassistant.components.matrix.*
 homeassistant.components.matter.*
+homeassistant.components.media_extractor.*
 homeassistant.components.media_player.*
 homeassistant.components.media_source.*
 homeassistant.components.metoffice.*
@@ -247,7 +260,10 @@ homeassistant.components.peco.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
+homeassistant.components.plugwise.*
+homeassistant.components.poolsense.*
 homeassistant.components.powerwall.*
+homeassistant.components.private_ble_device.*
 homeassistant.components.proximity.*
 homeassistant.components.prusalink.*
 homeassistant.components.pure_energie.*
@@ -296,6 +312,7 @@ homeassistant.components.sonarr.*
 homeassistant.components.speedtestdotnet.*
 homeassistant.components.sql.*
 homeassistant.components.ssdp.*
+homeassistant.components.starlink.*
 homeassistant.components.statistics.*
 homeassistant.components.steamist.*
 homeassistant.components.stookalert.*
@@ -304,6 +321,7 @@ homeassistant.components.sun.*
 homeassistant.components.surepetcare.*
 homeassistant.components.switch.*
 homeassistant.components.switchbee.*
+homeassistant.components.switchbot_cloud.*
 homeassistant.components.switcher_kis.*
 homeassistant.components.synology_dsm.*
 homeassistant.components.systemmonitor.*
@@ -321,9 +339,11 @@ homeassistant.components.tplink.*
 homeassistant.components.tplink_omada.*
 homeassistant.components.tractive.*
 homeassistant.components.tradfri.*
+homeassistant.components.trafikverket_camera.*
 homeassistant.components.trafikverket_ferry.*
 homeassistant.components.trafikverket_train.*
 homeassistant.components.trafikverket_weatherstation.*
+homeassistant.components.trend.*
 homeassistant.components.tts.*
 homeassistant.components.twentemilieu.*
 homeassistant.components.unifi.*

CODEOWNERS

@@ -19,8 +19,6 @@ build.json @home-assistant/supervisor
 
 # Other code
 /homeassistant/scripts/check_config.py @kellerza
-/homeassistant/const.py @epenet
-/homeassistant/util/ @epenet
 
 # Integrations
 /homeassistant/components/abode/ @shred86
@@ -49,10 +47,10 @@ build.json @home-assistant/supervisor
 /tests/components/airq/ @Sibgatulin @dl2080
 /homeassistant/components/airthings/ @danielhiversen
 /tests/components/airthings/ @danielhiversen
-/homeassistant/components/airthings_ble/ @vincegio
-/tests/components/airthings_ble/ @vincegio
-/homeassistant/components/airtouch4/ @LonePurpleWolf
-/tests/components/airtouch4/ @LonePurpleWolf
+/homeassistant/components/airthings_ble/ @vincegio @LaStrada
+/tests/components/airthings_ble/ @vincegio @LaStrada
+/homeassistant/components/airtouch4/ @samsinnamon
+/tests/components/airtouch4/ @samsinnamon
 /homeassistant/components/airvisual/ @bachya
 /tests/components/airvisual/ @bachya
 /homeassistant/components/airvisual_pro/ @bachya
@@ -207,10 +205,14 @@ build.json @home-assistant/supervisor
 /tests/components/cloud/ @home-assistant/cloud
 /homeassistant/components/cloudflare/ @ludeeus @ctalkington
 /tests/components/cloudflare/ @ludeeus @ctalkington
+/homeassistant/components/co2signal/ @jpbede
+/tests/components/co2signal/ @jpbede
 /homeassistant/components/coinbase/ @tombrien
 /tests/components/coinbase/ @tombrien
 /homeassistant/components/color_extractor/ @GenericStudent
 /tests/components/color_extractor/ @GenericStudent
+/homeassistant/components/comelit/ @chemelli74
+/tests/components/comelit/ @chemelli74
 /homeassistant/components/comfoconnect/ @michaelarnauts
 /tests/components/comfoconnect/ @michaelarnauts
 /homeassistant/components/command_line/ @gjohansson-ST
@@ -295,12 +297,10 @@ build.json @home-assistant/supervisor
 /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/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
-/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 @andarotajo
+/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -309,6 +309,8 @@ build.json @home-assistant/supervisor
 /tests/components/easyenergy/ @klaasnicolaas
 /homeassistant/components/ecobee/ @marthoc @marcolivierarsenault
 /tests/components/ecobee/ @marthoc @marcolivierarsenault
+/homeassistant/components/ecoforest/ @pjanuario
+/tests/components/ecoforest/ @pjanuario
 /homeassistant/components/econet/ @vangorra @w1ll1am23
 /tests/components/econet/ @vangorra @w1ll1am23
 /homeassistant/components/ecovacs/ @OverloadUT @mib1185
@@ -345,8 +347,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/enigma2/ @fbradyirl
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
-/homeassistant/components/enphase_envoy/ @gtdiehl
-/tests/components/enphase_envoy/ @gtdiehl
+/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek
+/tests/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
@@ -358,8 +360,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 @kbx81 @bdraco
+/tests/components/esphome/ @OttoWinter @jesserockz @kbx81 @bdraco
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/event/ @home-assistant/core
@@ -388,6 +390,8 @@ build.json @home-assistant/supervisor
 /tests/components/fireservicerota/ @cyberjunky
 /homeassistant/components/firmata/ @DaAwesomeP
 /tests/components/firmata/ @DaAwesomeP
+/homeassistant/components/fitbit/ @allenporter
+/tests/components/fitbit/ @allenporter
 /homeassistant/components/fivem/ @Sander0542
 /tests/components/fivem/ @Sander0542
 /homeassistant/components/fjaraskupan/ @elupus
@@ -400,8 +404,8 @@ build.json @home-assistant/supervisor
 /tests/components/flo/ @dmulcahey
 /homeassistant/components/flume/ @ChrisMandich @bdraco @jeeftor
 /tests/components/flume/ @ChrisMandich @bdraco @jeeftor
-/homeassistant/components/flux_led/ @icemanch @bdraco
-/tests/components/flux_led/ @icemanch @bdraco
+/homeassistant/components/flux_led/ @icemanch
+/tests/components/flux_led/ @icemanch
 /homeassistant/components/forecast_solar/ @klaasnicolaas @frenck
 /tests/components/forecast_solar/ @klaasnicolaas @frenck
 /homeassistant/components/forked_daapd/ @uvjustin
@@ -525,6 +529,8 @@ build.json @home-assistant/supervisor
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
 /tests/components/homeassistant_alerts/ @home-assistant/core
+/homeassistant/components/homeassistant_green/ @home-assistant/core
+/tests/components/homeassistant_green/ @home-assistant/core
 /homeassistant/components/homeassistant_hardware/ @home-assistant/core
 /tests/components/homeassistant_hardware/ @home-assistant/core
 /homeassistant/components/homeassistant_sky_connect/ @home-assistant/core
@@ -556,6 +562,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
 /homeassistant/components/hydrawise/ @dknowles2 @ptcryan
+/tests/components/hydrawise/ @dknowles2 @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
 /homeassistant/components/ialarm/ @RyuzakiKK
@@ -567,6 +574,8 @@ build.json @home-assistant/supervisor
 /tests/components/ibeacon/ @bdraco
 /homeassistant/components/icloud/ @Quentame @nzapponi
 /tests/components/icloud/ @Quentame @nzapponi
+/homeassistant/components/idasen_desk/ @abmantis
+/tests/components/idasen_desk/ @abmantis
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
 /homeassistant/components/image/ @home-assistant/core
@@ -608,8 +617,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iotawatt/ @gtdiehl @jyavenard
 /tests/components/iotawatt/ @gtdiehl @jyavenard
 /homeassistant/components/iperf3/ @rohankapoorcom
-/homeassistant/components/ipma/ @dgomes @abmantis
-/tests/components/ipma/ @dgomes @abmantis
+/homeassistant/components/ipma/ @dgomes
+/tests/components/ipma/ @dgomes
 /homeassistant/components/ipp/ @ctalkington
 /tests/components/ipp/ @ctalkington
 /homeassistant/components/iqvia/ @bachya
@@ -673,6 +682,8 @@ build.json @home-assistant/supervisor
 /tests/components/launch_library/ @ludeeus @DurgNomis-drol
 /homeassistant/components/laundrify/ @xLarry
 /tests/components/laundrify/ @xLarry
+/homeassistant/components/lawn_mower/ @home-assistant/core
+/tests/components/lawn_mower/ @home-assistant/core
 /homeassistant/components/lcn/ @alengwenus
 /tests/components/lcn/ @alengwenus
 /homeassistant/components/ld2410_ble/ @930913
@@ -684,8 +695,6 @@ 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/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linux_battery/ @fabaff
@@ -707,6 +716,8 @@ build.json @home-assistant/supervisor
 /tests/components/logger/ @home-assistant/core
 /homeassistant/components/logi_circle/ @evanjd
 /tests/components/logi_circle/ @evanjd
+/homeassistant/components/london_underground/ @jpbede
+/tests/components/london_underground/ @jpbede
 /homeassistant/components/lookin/ @ANMalko @bdraco
 /tests/components/lookin/ @ANMalko @bdraco
 /homeassistant/components/loqed/ @mikewoudenberg
@@ -723,12 +734,18 @@ build.json @home-assistant/supervisor
 /homeassistant/components/lyric/ @timmo001
 /tests/components/lyric/ @timmo001
 /homeassistant/components/mastodon/ @fabaff
+/homeassistant/components/matrix/ @PaarthShah
+/tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
 /tests/components/matter/ @home-assistant/matter
 /homeassistant/components/mazda/ @bdr99
 /tests/components/mazda/ @bdr99
 /homeassistant/components/meater/ @Sotolotl @emontnemery
 /tests/components/meater/ @Sotolotl @emontnemery
+/homeassistant/components/medcom_ble/ @elafargue
+/tests/components/medcom_ble/ @elafargue
+/homeassistant/components/media_extractor/ @joostlek
+/tests/components/media_extractor/ @joostlek
 /homeassistant/components/media_player/ @home-assistant/core
 /tests/components/media_player/ @home-assistant/core
 /homeassistant/components/media_source/ @hunterjm
@@ -765,8 +782,8 @@ build.json @home-assistant/supervisor
 /tests/components/moat/ @bdraco
 /homeassistant/components/mobile_app/ @home-assistant/core
 /tests/components/mobile_app/ @home-assistant/core
-/homeassistant/components/modbus/ @adamchengtkc @janiversen @vzahradnik
-/tests/components/modbus/ @adamchengtkc @janiversen @vzahradnik
+/homeassistant/components/modbus/ @janiversen
+/tests/components/modbus/ @janiversen
 /homeassistant/components/modem_callerid/ @tkdrob
 /tests/components/modem_callerid/ @tkdrob
 /homeassistant/components/modern_forms/ @wonderslug
@@ -792,8 +809,8 @@ 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/ @ehendrix23 @Lash-L
+/tests/components/myq/ @ehendrix23 @Lash-L
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
@@ -948,6 +965,8 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
 /tests/components/powerwall/ @bdraco @jrester @daniel-simpson
+/homeassistant/components/private_ble_device/ @Jc2k
+/tests/components/private_ble_device/ @Jc2k
 /homeassistant/components/profiler/ @bdraco
 /tests/components/profiler/ @bdraco
 /homeassistant/components/progettihwsw/ @ardaseremet
@@ -1028,8 +1047,6 @@ build.json @home-assistant/supervisor
 /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
@@ -1058,8 +1075,8 @@ build.json @home-assistant/supervisor
 /tests/components/rss_feed_template/ @home-assistant/core
 /homeassistant/components/rtsp_to_webrtc/ @allenporter
 /tests/components/rtsp_to_webrtc/ @allenporter
-/homeassistant/components/ruckus_unleashed/ @gabe565
-/tests/components/ruckus_unleashed/ @gabe565
+/homeassistant/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
+/tests/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
 /homeassistant/components/ruuvi_gateway/ @akx
 /tests/components/ruuvi_gateway/ @akx
 /homeassistant/components/ruuvitag_ble/ @akx
@@ -1077,9 +1094,11 @@ build.json @home-assistant/supervisor
 /tests/components/scene/ @home-assistant/core
 /homeassistant/components/schedule/ @home-assistant/core
 /tests/components/schedule/ @home-assistant/core
+/homeassistant/components/schlage/ @dknowles2
+/tests/components/schlage/ @dknowles2
 /homeassistant/components/schluter/ @prairieapps
-/homeassistant/components/scrape/ @fabaff @gjohansson-ST @epenet
-/tests/components/scrape/ @fabaff @gjohansson-ST @epenet
+/homeassistant/components/scrape/ @fabaff @gjohansson-ST
+/tests/components/scrape/ @fabaff @gjohansson-ST
 /homeassistant/components/screenlogic/ @dieselrabbit @bdraco
 /tests/components/screenlogic/ @dieselrabbit @bdraco
 /homeassistant/components/script/ @home-assistant/core
@@ -1134,8 +1153,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/ @tkdrob @fletcherau
+/tests/components/slack/ @tkdrob @fletcherau
 /homeassistant/components/sleepiq/ @mfugate1 @kbickar
 /tests/components/sleepiq/ @mfugate1 @kbickar
 /homeassistant/components/slide/ @ualex73
@@ -1183,8 +1202,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/spider/ @peternijssen
 /tests/components/spider/ @peternijssen
 /homeassistant/components/splunk/ @Bre77
-/homeassistant/components/spotify/ @frenck
-/tests/components/spotify/ @frenck
+/homeassistant/components/spotify/ @frenck @joostlek
+/tests/components/spotify/ @frenck @joostlek
 /homeassistant/components/sql/ @gjohansson-ST @dougiteixeira
 /tests/components/sql/ @gjohansson-ST @dougiteixeira
 /homeassistant/components/squeezebox/ @rajlaud
@@ -1226,8 +1245,10 @@ build.json @home-assistant/supervisor
 /tests/components/switch_as_x/ @home-assistant/core
 /homeassistant/components/switchbee/ @jafar-atili
 /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/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
+/tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
+/homeassistant/components/switchbot_cloud/ @SeraphicRav
+/tests/components/switchbot_cloud/ @SeraphicRav
 /homeassistant/components/switcher_kis/ @thecode
 /tests/components/switcher_kis/ @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
@@ -1298,6 +1319,8 @@ build.json @home-assistant/supervisor
 /tests/components/trace/ @home-assistant/core
 /homeassistant/components/tractive/ @Danielhiversen @zhulik @bieniu
 /tests/components/tractive/ @Danielhiversen @zhulik @bieniu
+/homeassistant/components/trafikverket_camera/ @gjohansson-ST
+/tests/components/trafikverket_camera/ @gjohansson-ST
 /homeassistant/components/trafikverket_ferry/ @gjohansson-ST
 /tests/components/trafikverket_ferry/ @gjohansson-ST
 /homeassistant/components/trafikverket_train/ @endor-force @gjohansson-ST
@@ -1306,14 +1329,16 @@ 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/trend/ @jpbede
+/tests/components/trend/ @jpbede
 /homeassistant/components/tts/ @home-assistant/core @pvizeli
 /tests/components/tts/ @home-assistant/core @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/twinkly/ @dr1rrb @Robbie1221 @Olen
+/tests/components/twinkly/ @dr1rrb @Robbie1221 @Olen
 /homeassistant/components/twitch/ @joostlek
 /tests/components/twitch/ @joostlek
 /homeassistant/components/ukraine_alarm/ @PaulAnnekov
@@ -1349,11 +1374,11 @@ build.json @home-assistant/supervisor
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
 /homeassistant/components/velux/ @Julius2342
-/homeassistant/components/venstar/ @garbled1
-/tests/components/venstar/ @garbled1
-/homeassistant/components/verisure/ @frenck @niro1987
-/tests/components/verisure/ @frenck @niro1987
-/homeassistant/components/versasense/ @flamm3blemuff1n
+/homeassistant/components/venstar/ @garbled1 @jhollowe
+/tests/components/venstar/ @garbled1 @jhollowe
+/homeassistant/components/verisure/ @frenck
+/tests/components/verisure/ @frenck
+/homeassistant/components/versasense/ @imstevenxyz
 /homeassistant/components/version/ @ludeeus
 /tests/components/version/ @ludeeus
 /homeassistant/components/vesync/ @markperdue @webdjoe @thegardenmonkey
@@ -1365,6 +1390,8 @@ build.json @home-assistant/supervisor
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
+/homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
+/tests/components/vodafone_station/ @paoloantinori @chemelli74
 /homeassistant/components/voip/ @balloob @synesthesiam
 /tests/components/voip/ @balloob @synesthesiam
 /homeassistant/components/volumio/ @OnFreund
@@ -1375,9 +1402,12 @@ build.json @home-assistant/supervisor
 /tests/components/vulcan/ @Antoni-Czaplicki
 /homeassistant/components/wake_on_lan/ @ntilley905
 /tests/components/wake_on_lan/ @ntilley905
+/homeassistant/components/wake_word/ @home-assistant/core @synesthesiam
+/tests/components/wake_word/ @home-assistant/core @synesthesiam
 /homeassistant/components/wallbox/ @hesselonline
 /tests/components/wallbox/ @hesselonline
-/homeassistant/components/waqi/ @andrey-git
+/homeassistant/components/waqi/ @joostlek
+/tests/components/waqi/ @joostlek
 /homeassistant/components/water_heater/ @home-assistant/core
 /tests/components/water_heater/ @home-assistant/core
 /homeassistant/components/watson_tts/ @rutkai
@@ -1387,6 +1417,10 @@ build.json @home-assistant/supervisor
 /tests/components/waze_travel_time/ @eifinger
 /homeassistant/components/weather/ @home-assistant/core
 /tests/components/weather/ @home-assistant/core
+/homeassistant/components/weatherflow/ @natekspencer @jeeftor
+/tests/components/weatherflow/ @natekspencer @jeeftor
+/homeassistant/components/weatherkit/ @tjhorner
+/tests/components/weatherkit/ @tjhorner
 /homeassistant/components/webhook/ @home-assistant/core
 /tests/components/webhook/ @home-assistant/core
 /homeassistant/components/webostv/ @thecode
@@ -1404,8 +1438,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/wilight/ @leofig-rj
 /tests/components/wilight/ @leofig-rj
 /homeassistant/components/wirelesstag/ @sergeymaysak
-/homeassistant/components/withings/ @vangorra
-/tests/components/withings/ @vangorra
+/homeassistant/components/withings/ @vangorra @joostlek
+/tests/components/withings/ @vangorra @joostlek
 /homeassistant/components/wiz/ @sbidy
 /tests/components/wiz/ @sbidy
 /homeassistant/components/wled/ @frenck
@@ -1438,6 +1472,8 @@ build.json @home-assistant/supervisor
 /tests/components/yamaha_musiccast/ @vigonotion @micha91
 /homeassistant/components/yandex_transport/ @rishatik92 @devbis
 /tests/components/yandex_transport/ @rishatik92 @devbis
+/homeassistant/components/yardian/ @h3l1o5
+/tests/components/yardian/ @h3l1o5
 /homeassistant/components/yeelight/ @zewelor @shenxn @starkillerOG @alexyao2015
 /tests/components/yeelight/ @zewelor @shenxn @starkillerOG @alexyao2015
 /homeassistant/components/yeelightsunflower/ @lindsaymarkward

Dockerfile

@@ -15,9 +15,8 @@ COPY homeassistant/package_constraints.txt homeassistant/homeassistant/
 RUN \
     pip3 install \
         --no-cache-dir \
-        --no-index \
         --only-binary=:all: \
-        --find-links "${WHEELS_LINKS}" \
+        --index-url "https://wheels.home-assistant.io/musllinux-index/" \
         -r homeassistant/requirements.txt
 
 COPY requirements_all.txt home_assistant_frontend-* home_assistant_intents-* homeassistant/
@@ -39,9 +38,8 @@ RUN \
         MALLOC_CONF="background_thread:true,metadata_thp:auto,dirty_decay_ms:20000,muzzy_decay_ms:20000" \
         pip3 install \
             --no-cache-dir \
-            --no-index \
             --only-binary=:all: \
-            --find-links "${WHEELS_LINKS}" \
+            --index-url "https://wheels.home-assistant.io/musllinux-index/" \
             -r homeassistant/requirements_all.txt
 
 ## Setup Home Assistant Core
@@ -49,9 +47,8 @@ COPY . homeassistant/
 RUN \
     pip3 install \
         --no-cache-dir \
-        --no-index \
         --only-binary=:all: \
-        --find-links "${WHEELS_LINKS}" \
+        --index-url "https://wheels.home-assistant.io/musllinux-index/" \
         -e ./homeassistant \
     && python3 -m compileall \
         homeassistant/homeassistant

build.yaml

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

homeassistant/__main__.py

@@ -148,16 +148,6 @@ def get_arguments() -> argparse.Namespace:
     return arguments
 
 
-def cmdline() -> list[str]:
-    """Collect path and arguments to re-execute the current hass instance."""
-    if os.path.basename(sys.argv[0]) == "__main__.py":
-        modulepath = os.path.dirname(sys.argv[0])
-        os.environ["PYTHONPATH"] = os.path.dirname(modulepath)
-        return [sys.executable, "-m", "homeassistant"] + list(sys.argv[1:])
-
-    return sys.argv
-
-
 def check_threads() -> None:
     """Check if there are any lingering threads."""
     try:

homeassistant/backports/functools.py

@@ -8,7 +8,7 @@ from typing import Any, Generic, Self, TypeVar, overload
 _T = TypeVar("_T")
 
 
-class cached_property(Generic[_T]):  # pylint: disable=invalid-name
+class cached_property(Generic[_T]):
     """Backport of Python 3.12's cached_property.
 
     Includes https://github.com/python/cpython/pull/101890/files

homeassistant/bootstrap.py

@@ -110,8 +110,7 @@ async def async_setup_hass(
     runtime_config: RuntimeConfig,
 ) -> core.HomeAssistant | None:
     """Set up Home Assistant."""
-    hass = core.HomeAssistant()
-    hass.config.config_dir = runtime_config.config_dir
+    hass = core.HomeAssistant(runtime_config.config_dir)
 
     async_enable_logging(
         hass,
@@ -134,6 +133,7 @@ async def async_setup_hass(
 
     _LOGGER.info("Config directory: %s", runtime_config.config_dir)
 
+    loader.async_setup(hass)
     config_dict = None
     basic_setup_success = False
 
@@ -177,14 +177,15 @@ async def async_setup_hass(
         old_config = hass.config
         old_logging = hass.data.get(DATA_LOGGING)
 
-        hass = core.HomeAssistant()
+        hass = core.HomeAssistant(old_config.config_dir)
         if old_logging:
             hass.data[DATA_LOGGING] = old_logging
         hass.config.skip_pip = old_config.skip_pip
         hass.config.skip_pip_packages = old_config.skip_pip_packages
         hass.config.internal_url = old_config.internal_url
         hass.config.external_url = old_config.external_url
-        hass.config.config_dir = old_config.config_dir
+        # Setup loader cache after the config dir has been set
+        loader.async_setup(hass)
 
     if safe_mode:
         _LOGGER.info("Starting in safe mode")

homeassistant/brands/apple.json

@@ -7,6 +7,7 @@
     "homekit",
     "ibeacon",
     "icloud",
-    "itunes"
+    "itunes",
+    "weatherkit"
   ]
 }

homeassistant/brands/ikea.json

@@ -1,5 +1,5 @@
 {
   "domain": "ikea",
   "name": "IKEA",
-  "integrations": ["symfonisk", "tradfri"]
+  "integrations": ["symfonisk", "tradfri", "idasen_desk"]
 }

homeassistant/brands/switchbot.json

@@ -0,0 +1,5 @@
+{
+  "domain": "switchbot",
+  "name": "SwitchBot",
+  "integrations": ["switchbot", "switchbot_cloud"]
+}

homeassistant/brands/trafikverket.json

@@ -2,6 +2,7 @@
   "domain": "trafikverket",
   "name": "Trafikverket",
   "integrations": [
+    "trafikverket_camera",
     "trafikverket_ferry",
     "trafikverket_train",
     "trafikverket_weatherstation"

homeassistant/brands/u_tec.json

@@ -1,5 +1,5 @@
 {
   "domain": "u_tec",
   "name": "U-tec",
-  "iot_standards": ["zwave"]
+  "integrations": ["ultraloq"]
 }

homeassistant/components/abode/__init__.py

@@ -28,6 +28,7 @@ from homeassistant.const import (
 from homeassistant.core import Event, HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import config_validation as cv, entity
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import dispatcher_send
 
 from .const import ATTRIBUTION, CONF_POLLING, DOMAIN, LOGGER
@@ -287,14 +288,14 @@ class AbodeDevice(AbodeEntity):
         """Initialize Abode device."""
         super().__init__(data)
         self._device = device
-        self._attr_unique_id = device.device_uuid
+        self._attr_unique_id = device.uuid
 
     async def async_added_to_hass(self) -> None:
         """Subscribe to device events."""
         await super().async_added_to_hass()
         await self.hass.async_add_executor_job(
             self._data.abode.events.add_device_callback,
-            self._device.device_id,
+            self._device.id,
             self._update_callback,
         )
 
@@ -302,7 +303,7 @@ class AbodeDevice(AbodeEntity):
         """Unsubscribe from device events."""
         await super().async_will_remove_from_hass()
         await self.hass.async_add_executor_job(
-            self._data.abode.events.remove_all_device_callbacks, self._device.device_id
+            self._data.abode.events.remove_all_device_callbacks, self._device.id
         )
 
     def update(self) -> None:
@@ -313,17 +314,17 @@ class AbodeDevice(AbodeEntity):
     def extra_state_attributes(self) -> dict[str, str]:
         """Return the state attributes."""
         return {
-            "device_id": self._device.device_id,
+            "device_id": self._device.id,
             "battery_low": self._device.battery_low,
             "no_response": self._device.no_response,
             "device_type": self._device.type,
         }
 
     @property
-    def device_info(self) -> entity.DeviceInfo:
+    def device_info(self) -> DeviceInfo:
         """Return device registry information for this entity."""
-        return entity.DeviceInfo(
-            identifiers={(DOMAIN, self._device.device_id)},
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._device.id)},
             manufacturer="Abode",
             model=self._device.type,
             name=self._device.name,

homeassistant/components/abode/alarm_control_panel.py

@@ -69,7 +69,7 @@ class AbodeAlarm(AbodeDevice, alarm.AlarmControlPanelEntity):
     def extra_state_attributes(self) -> dict[str, str]:
         """Return the state attributes."""
         return {
-            "device_id": self._device.device_id,
+            "device_id": self._device.id,
             "battery_backup": self._device.battery,
             "cellular_backup": self._device.is_cellular,
         }

homeassistant/components/abode/camera.py

@@ -30,7 +30,7 @@ async def async_setup_entry(
     data: AbodeSystem = hass.data[DOMAIN]
 
     async_add_entities(
-        AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE)  # pylint: disable=no-member
+        AbodeCamera(data, device, TIMELINE.CAPTURE_IMAGE)
         for device in data.abode.get_devices(generic_type=CONST.TYPE_CAMERA)
     )
 

homeassistant/components/abode/sensor.py

@@ -1,6 +1,8 @@
 """Support for Abode Security System sensors."""
 from __future__ import annotations
 
+from collections.abc import Callable
+from dataclasses import dataclass
 from typing import cast
 
 from jaraco.abode.devices.sensor import Sensor as AbodeSense
@@ -12,25 +14,52 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
 )
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import LIGHT_LUX
+from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import AbodeDevice, AbodeSystem
 from .const import DOMAIN
 
-SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
-    SensorEntityDescription(
+ABODE_TEMPERATURE_UNIT_HA_UNIT = {
+    CONST.UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
+    CONST.UNIT_CELSIUS: UnitOfTemperature.CELSIUS,
+}
+
+
+@dataclass
+class AbodeSensorDescriptionMixin:
+    """Mixin for Abode sensor."""
+
+    value_fn: Callable[[AbodeSense], float]
+    native_unit_of_measurement_fn: Callable[[AbodeSense], str]
+
+
+@dataclass
+class AbodeSensorDescription(SensorEntityDescription, AbodeSensorDescriptionMixin):
+    """Class describing Abode sensor entities."""
+
+
+SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
+    AbodeSensorDescription(
         key=CONST.TEMP_STATUS_KEY,
         device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
+            device.temp_unit
+        ],
+        value_fn=lambda device: cast(float, device.temp),
     ),
-    SensorEntityDescription(
+    AbodeSensorDescription(
         key=CONST.HUMI_STATUS_KEY,
         device_class=SensorDeviceClass.HUMIDITY,
+        native_unit_of_measurement_fn=lambda _: PERCENTAGE,
+        value_fn=lambda device: cast(float, device.humidity),
     ),
-    SensorEntityDescription(
+    AbodeSensorDescription(
         key=CONST.LUX_STATUS_KEY,
         device_class=SensorDeviceClass.ILLUMINANCE,
+        native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
+        value_fn=lambda device: cast(float, device.lux),
     ),
 )
 
@@ -52,32 +81,26 @@ async def async_setup_entry(
 class AbodeSensor(AbodeDevice, SensorEntity):
     """A sensor implementation for Abode devices."""
 
+    entity_description: AbodeSensorDescription
     _device: AbodeSense
 
     def __init__(
         self,
         data: AbodeSystem,
         device: AbodeSense,
-        description: SensorEntityDescription,
+        description: AbodeSensorDescription,
     ) -> None:
         """Initialize a sensor for an Abode device."""
         super().__init__(data, device)
         self.entity_description = description
-        self._attr_unique_id = f"{device.device_uuid}-{description.key}"
-        if description.key == CONST.TEMP_STATUS_KEY:
-            self._attr_native_unit_of_measurement = device.temp_unit
-        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_unique_id = f"{device.uuid}-{description.key}"
 
     @property
-    def native_value(self) -> float | None:
+    def native_value(self) -> float:
         """Return the state of the sensor."""
-        if self.entity_description.key == CONST.TEMP_STATUS_KEY:
-            return cast(float, self._device.temp)
-        if self.entity_description.key == CONST.HUMI_STATUS_KEY:
-            return cast(float, self._device.humidity)
-        if self.entity_description.key == CONST.LUX_STATUS_KEY:
-            return cast(float, self._device.lux)
-        return None
+        return self.entity_description.value_fn(self._device)
+
+    @property
+    def native_unit_of_measurement(self) -> str:
+        """Return the native unit of measurement."""
+        return self.entity_description.native_unit_of_measurement_fn(self._device)

homeassistant/components/accuweather/__init__.py

@@ -1,6 +1,7 @@
 """The AccuWeather component."""
 from __future__ import annotations
 
+from asyncio import timeout
 from datetime import timedelta
 import logging
 from typing import Any
@@ -8,7 +9,6 @@ from typing import Any
 from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
 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
@@ -16,8 +16,7 @@ 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.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import ATTR_FORECAST, CONF_FORECAST, DOMAIN, MANUFACTURER

homeassistant/components/accuweather/config_flow.py

@@ -2,12 +2,12 @@
 from __future__ import annotations
 
 import asyncio
+from asyncio import timeout
 from typing import Any
 
 from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
 from aiohttp import ClientError
 from aiohttp.client_exceptions import ClientConnectorError
-from async_timeout import timeout
 import voluptuous as vol
 
 from homeassistant import config_entries

homeassistant/components/accuweather/const.py

@@ -50,3 +50,8 @@ CONDITION_CLASSES: Final[dict[str, list[int]]] = {
     ATTR_CONDITION_SUNNY: [1, 2, 5],
     ATTR_CONDITION_WINDY: [32],
 }
+CONDITION_MAP = {
+    cond_code: cond_ha
+    for cond_ha, cond_codes in CONDITION_CLASSES.items()
+    for cond_code in cond_codes
+}

homeassistant/components/accuweather/sensor.py

@@ -59,193 +59,280 @@ class AccuWeatherSensorDescription(
     """Class describing AccuWeather sensor entities."""
 
     attr_fn: Callable[[dict[str, Any]], dict[str, Any]] = lambda _: {}
+    day: int | None = None
 
 
 FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
-    AccuWeatherSensorDescription(
-        key="AirQuality",
-        icon="mdi:air-filter",
-        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="AirQuality",
+            icon="mdi:air-filter",
+            value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+            device_class=SensorDeviceClass.ENUM,
+            options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+            translation_key=f"air_quality_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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),
+    *(
+        AccuWeatherSensorDescription(
+            key="CloudCoverDay",
+            icon="mdi:weather-cloudy",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=PERCENTAGE,
+            value_fn=lambda data: cast(int, data),
+            translation_key=f"cloud_cover_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="CloudCoverNight",
-        icon="mdi:weather-cloudy",
-        name="Cloud cover night",
-        entity_registry_enabled_default=False,
-        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+    *(
+        AccuWeatherSensorDescription(
+            key="CloudCoverNight",
+            icon="mdi:weather-cloudy",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=PERCENTAGE,
+            value_fn=lambda data: cast(int, data),
+            translation_key=f"cloud_cover_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="Grass",
-        icon="mdi:grass",
-        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]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="grass_pollen",
+    *(
+        AccuWeatherSensorDescription(
+            key="Grass",
+            icon="mdi:grass",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+            translation_key=f"grass_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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="HoursOfSun",
+            icon="mdi:weather-partly-cloudy",
+            native_unit_of_measurement=UnitOfTime.HOURS,
+            value_fn=lambda data: cast(float, data),
+            translation_key=f"hours_of_sun_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="LongPhraseDay",
-        name="Condition day",
-        value_fn=lambda data: cast(str, data),
+    *(
+        AccuWeatherSensorDescription(
+            key="LongPhraseDay",
+            value_fn=lambda data: cast(str, data),
+            translation_key=f"condition_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="LongPhraseNight",
-        name="Condition night",
-        value_fn=lambda data: cast(str, data),
+    *(
+        AccuWeatherSensorDescription(
+            key="LongPhraseNight",
+            value_fn=lambda data: cast(str, data),
+            translation_key=f"condition_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="Mold",
-        icon="mdi:blur",
-        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]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="mold_pollen",
+    *(
+        AccuWeatherSensorDescription(
+            key="Mold",
+            icon="mdi:blur",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+            translation_key=f"mold_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="Ragweed",
-        icon="mdi:sprout",
-        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]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="ragweed_pollen",
+    *(
+        AccuWeatherSensorDescription(
+            key="Ragweed",
+            icon="mdi:sprout",
+            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+            entity_registry_enabled_default=False,
+            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+            translation_key=f"ragweed_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureMax",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel temperature max",
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+    *(
+        AccuWeatherSensorDescription(
+            key="RealFeelTemperatureMax",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"realfeel_temperature_max_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="RealFeelTemperatureMin",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        name="RealFeel temperature min",
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+    *(
+        AccuWeatherSensorDescription(
+            key="RealFeelTemperatureMin",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"realfeel_temperature_min_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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]),
+    *(
+        AccuWeatherSensorDescription(
+            key="RealFeelTemperatureShadeMax",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"realfeel_temperature_shade_max_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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="RealFeelTemperatureShadeMin",
+            device_class=SensorDeviceClass.TEMPERATURE,
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"realfeel_temperature_shade_min_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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="SolarIrradianceDay",
+            icon="mdi:weather-sunny",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"solar_irradiance_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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]),
+    *(
+        AccuWeatherSensorDescription(
+            key="SolarIrradianceNight",
+            icon="mdi:weather-sunny",
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+            translation_key=f"solar_irradiance_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="ThunderstormProbabilityDay",
-        icon="mdi:weather-lightning",
-        name="Thunderstorm probability day",
-        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+    *(
+        AccuWeatherSensorDescription(
+            key="ThunderstormProbabilityDay",
+            icon="mdi:weather-lightning",
+            native_unit_of_measurement=PERCENTAGE,
+            value_fn=lambda data: cast(int, data),
+            translation_key=f"thunderstorm_probability_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="ThunderstormProbabilityNight",
-        icon="mdi:weather-lightning",
-        name="Thunderstorm probability night",
-        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
+    *(
+        AccuWeatherSensorDescription(
+            key="ThunderstormProbabilityNight",
+            icon="mdi:weather-lightning",
+            native_unit_of_measurement=PERCENTAGE,
+            value_fn=lambda data: cast(int, data),
+            translation_key=f"thunderstorm_probability_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="Tree",
-        icon="mdi:tree-outline",
-        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]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="tree_pollen",
+    *(
+        AccuWeatherSensorDescription(
+            key="Tree",
+            icon="mdi:tree-outline",
+            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+            entity_registry_enabled_default=False,
+            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+            translation_key=f"tree_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="UVIndex",
-        icon="mdi:weather-sunny",
-        name="UV index",
-        native_unit_of_measurement=UV_INDEX,
-        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-        translation_key="uv_index",
+    *(
+        AccuWeatherSensorDescription(
+            key="UVIndex",
+            icon="mdi:weather-sunny",
+            native_unit_of_measurement=UV_INDEX,
+            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+            translation_key=f"uv_index_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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]),
-        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    *(
+        AccuWeatherSensorDescription(
+            key="WindGustDay",
+            device_class=SensorDeviceClass.WIND_SPEED,
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+            translation_key=f"wind_gust_speed_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="WindGustNight",
-        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]),
-        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    *(
+        AccuWeatherSensorDescription(
+            key="WindGustNight",
+            device_class=SensorDeviceClass.WIND_SPEED,
+            entity_registry_enabled_default=False,
+            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+            translation_key=f"wind_gust_speed_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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]),
-        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    *(
+        AccuWeatherSensorDescription(
+            key="WindDay",
+            device_class=SensorDeviceClass.WIND_SPEED,
+            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+            translation_key=f"wind_speed_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
-        key="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]),
-        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+    *(
+        AccuWeatherSensorDescription(
+            key="WindNight",
+            device_class=SensorDeviceClass.WIND_SPEED,
+            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+            translation_key=f"wind_speed_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
 )
 
@@ -253,118 +340,117 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="ApparentTemperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        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]),
+        translation_key="apparent_temperature",
     ),
     AccuWeatherSensorDescription(
         key="Ceiling",
         device_class=SensorDeviceClass.DISTANCE,
         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]),
         suggested_display_precision=0,
+        translation_key="cloud_ceiling",
     ),
     AccuWeatherSensorDescription(
         key="CloudCover",
         icon="mdi:weather-cloudy",
-        name="Cloud cover",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
         value_fn=lambda data: cast(int, data),
+        translation_key="cloud_cover",
     ),
     AccuWeatherSensorDescription(
         key="DewPoint",
         device_class=SensorDeviceClass.TEMPERATURE,
-        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]),
+        translation_key="dew_point",
     ),
     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]),
+        translation_key="realfeel_temperature",
     ),
     AccuWeatherSensorDescription(
         key="RealFeelTemperatureShade",
         device_class=SensorDeviceClass.TEMPERATURE,
-        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]),
+        translation_key="realfeel_temperature_shade",
     ),
     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]),
         attr_fn=lambda data: {"type": data["PrecipitationType"]},
+        translation_key="precipitation",
     ),
     AccuWeatherSensorDescription(
         key="PressureTendency",
         device_class=SensorDeviceClass.ENUM,
         icon="mdi:gauge",
-        name="Pressure tendency",
         options=["falling", "rising", "steady"],
-        translation_key="pressure_tendency",
         value_fn=lambda data: cast(str, data["LocalizedText"]).lower(),
+        translation_key="pressure_tendency",
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
         icon="mdi:weather-sunny",
-        name="UV index",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UV_INDEX,
         value_fn=lambda data: cast(int, data),
         attr_fn=lambda data: {ATTR_LEVEL: data["UVIndexText"]},
+        translation_key="uv_index",
     ),
     AccuWeatherSensorDescription(
         key="WetBulbTemperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        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]),
+        translation_key="wet_bulb_temperature",
     ),
     AccuWeatherSensorDescription(
         key="WindChillTemperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        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]),
+        translation_key="wind_chill_temperature",
     ),
     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]),
+        translation_key="wind_speed",
     ),
     AccuWeatherSensorDescription(
         key="WindGust",
         device_class=SensorDeviceClass.WIND_SPEED,
-        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]),
+        translation_key="wind_gust_speed",
     ),
 )
 
@@ -381,14 +467,12 @@ async def async_setup_entry(
     ]
 
     if coordinator.forecast:
-        # Some air quality/allergy sensors are only available for certain
-        # locations.
-        sensors.extend(
-            AccuWeatherSensor(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]
-        )
+        for description in FORECAST_SENSOR_TYPES:
+            # Some air quality/allergy sensors are only available for certain
+            # locations.
+            if description.key not in coordinator.data[ATTR_FORECAST][description.day]:
+                continue
+            sensors.append(AccuWeatherSensor(coordinator, description))
 
     async_add_entities(sensors)
 
@@ -406,25 +490,21 @@ class AccuWeatherSensor(
         self,
         coordinator: AccuWeatherDataUpdateCoordinator,
         description: AccuWeatherSensorDescription,
-        forecast_day: int | None = None,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
+        self.forecast_day = description.day
         self.entity_description = description
         self._sensor_data = _get_sensor_data(
-            coordinator.data, description.key, forecast_day
+            coordinator.data, description.key, self.forecast_day
         )
-        if forecast_day is not None:
-            self._attr_name = f"{description.name} {forecast_day}d"
-            self._attr_unique_id = (
-                f"{coordinator.location_key}-{description.key}-{forecast_day}".lower()
-            )
+        if self.forecast_day is not None:
+            self._attr_unique_id = f"{coordinator.location_key}-{description.key}-{self.forecast_day}".lower()
         else:
             self._attr_unique_id = (
                 f"{coordinator.location_key}-{description.key}".lower()
             )
         self._attr_device_info = coordinator.device_info
-        self.forecast_day = forecast_day
 
     @property
     def native_value(self) -> str | int | float | None:

homeassistant/components/accuweather/strings.json

@@ -24,14 +24,8 @@
   },
   "entity": {
     "sensor": {
-      "pressure_tendency": {
-        "state": {
-          "steady": "Steady",
-          "rising": "Rising",
-          "falling": "Falling"
-        }
-      },
-      "air_quality": {
+      "air_quality_0d": {
+        "name": "Air quality today",
         "state": {
           "good": "Good",
           "hazardous": "Hazardous",
@@ -41,80 +35,761 @@
           "unhealthy": "Unhealthy"
         }
       },
-      "grass_pollen": {
+      "air_quality_1d": {
+        "name": "Air quality day 1",
+        "state": {
+          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+        }
+      },
+      "air_quality_2d": {
+        "name": "Air quality day 2",
+        "state": {
+          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+        }
+      },
+      "air_quality_3d": {
+        "name": "Air quality day 3",
+        "state": {
+          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+        }
+      },
+      "air_quality_4d": {
+        "name": "Air quality day 4",
+        "state": {
+          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+        }
+      },
+      "apparent_temperature": {
+        "name": "Apparent temperature"
+      },
+      "cloud_ceiling": {
+        "name": "Cloud ceiling"
+      },
+      "cloud_cover": {
+        "name": "Cloud cover"
+      },
+      "cloud_cover_day_0d": {
+        "name": "Cloud cover today"
+      },
+      "cloud_cover_day_1d": {
+        "name": "Cloud cover day 1"
+      },
+      "cloud_cover_day_2d": {
+        "name": "Cloud cover day 2"
+      },
+      "cloud_cover_day_3d": {
+        "name": "Cloud cover day 3"
+      },
+      "cloud_cover_day_4d": {
+        "name": "Cloud cover day 4"
+      },
+      "cloud_cover_night_0d": {
+        "name": "Cloud cover tonight"
+      },
+      "cloud_cover_night_1d": {
+        "name": "Cloud cover night 1"
+      },
+      "cloud_cover_night_2d": {
+        "name": "Cloud cover night 2"
+      },
+      "cloud_cover_night_3d": {
+        "name": "Cloud cover night 3"
+      },
+      "cloud_cover_night_4d": {
+        "name": "Cloud cover night 4"
+      },
+      "condition_day_0d": {
+        "name": "Condition today"
+      },
+      "condition_day_1d": {
+        "name": "Condition day 1"
+      },
+      "condition_day_2d": {
+        "name": "Condition day 2"
+      },
+      "condition_day_3d": {
+        "name": "Condition day 3"
+      },
+      "condition_day_4d": {
+        "name": "Condition day 4"
+      },
+      "condition_night_0d": {
+        "name": "Condition tonight"
+      },
+      "condition_night_1d": {
+        "name": "Condition night 1"
+      },
+      "condition_night_2d": {
+        "name": "Condition night 2"
+      },
+      "condition_night_3d": {
+        "name": "Condition night 3"
+      },
+      "condition_night_4d": {
+        "name": "Condition night 4"
+      },
+      "dew_point": {
+        "name": "Dew point"
+      },
+      "grass_pollen_0d": {
+        "name": "Grass pollen today",
         "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%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
-      "mold_pollen": {
+      "grass_pollen_1d": {
+        "name": "Grass pollen day 1",
         "state_attributes": {
           "level": {
-            "name": "Level",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "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%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
-      "ragweed_pollen": {
+      "grass_pollen_2d": {
+        "name": "Grass pollen day 2",
         "state_attributes": {
           "level": {
-            "name": "Level",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "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%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
-      "tree_pollen": {
+      "grass_pollen_3d": {
+        "name": "Grass pollen day 3",
         "state_attributes": {
           "level": {
-            "name": "Level",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "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%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "grass_pollen_4d": {
+        "name": "Grass pollen day 4",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "hours_of_sun_0d": {
+        "name": "Hours of sun today"
+      },
+      "hours_of_sun_1d": {
+        "name": "Hours of sun day 1"
+      },
+      "hours_of_sun_2d": {
+        "name": "Hours of sun day 2"
+      },
+      "hours_of_sun_3d": {
+        "name": "Hours of sun day 3"
+      },
+      "hours_of_sun_4d": {
+        "name": "Hours of sun day 4"
+      },
+      "mold_pollen_0d": {
+        "name": "Mold pollen today",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "mold_pollen_1d": {
+        "name": "Mold pollen day 1",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "mold_pollen_2d": {
+        "name": "Mold pollen day 2",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "mold_pollen_3d": {
+        "name": "Mold pollen day 3",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "mold_pollen_4d": {
+        "name": "Mold pollen day 4",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "precipitation": {
+        "name": "[%key:component::sensor::entity_component::precipitation::name%]"
+      },
+      "pressure_tendency": {
+        "name": "Pressure tendency",
+        "state": {
+          "steady": "Steady",
+          "rising": "Rising",
+          "falling": "Falling"
+        }
+      },
+      "ragweed_pollen_0d": {
+        "name": "Ragweed pollen today",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "ragweed_pollen_1d": {
+        "name": "Ragweed pollen day 1",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "ragweed_pollen_2d": {
+        "name": "Ragweed pollen day 2",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "ragweed_pollen_3d": {
+        "name": "Ragweed pollen day 3",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "ragweed_pollen_4d": {
+        "name": "Ragweed pollen day 4",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "realfeel_temperature": {
+        "name": "RealFeel temperature"
+      },
+      "realfeel_temperature_max_0d": {
+        "name": "RealFeel temperature max today"
+      },
+      "realfeel_temperature_max_1d": {
+        "name": "RealFeel temperature max day 1"
+      },
+      "realfeel_temperature_max_2d": {
+        "name": "RealFeel temperature max day 2"
+      },
+      "realfeel_temperature_max_3d": {
+        "name": "RealFeel temperature max day 3"
+      },
+      "realfeel_temperature_max_4d": {
+        "name": "RealFeel temperature max day 4"
+      },
+      "realfeel_temperature_min_0d": {
+        "name": "RealFeel temperature min today"
+      },
+      "realfeel_temperature_min_1d": {
+        "name": "RealFeel temperature min day 1"
+      },
+      "realfeel_temperature_min_2d": {
+        "name": "RealFeel temperature min day 2"
+      },
+      "realfeel_temperature_min_3d": {
+        "name": "RealFeel temperature min day 3"
+      },
+      "realfeel_temperature_min_4d": {
+        "name": "RealFeel temperature min day 4"
+      },
+      "realfeel_temperature_shade": {
+        "name": "RealFeel temperature shade"
+      },
+      "realfeel_temperature_shade_max_0d": {
+        "name": "RealFeel temperature shade max today"
+      },
+      "realfeel_temperature_shade_max_1d": {
+        "name": "RealFeel temperature shade max day 1"
+      },
+      "realfeel_temperature_shade_max_2d": {
+        "name": "RealFeel temperature shade max day 2"
+      },
+      "realfeel_temperature_shade_max_3d": {
+        "name": "RealFeel temperature shade max day 3"
+      },
+      "realfeel_temperature_shade_max_4d": {
+        "name": "RealFeel temperature shade max day 4"
+      },
+      "realfeel_temperature_shade_min_0d": {
+        "name": "RealFeel temperature shade min today"
+      },
+      "realfeel_temperature_shade_min_1d": {
+        "name": "RealFeel temperature shade min day 1"
+      },
+      "realfeel_temperature_shade_min_2d": {
+        "name": "RealFeel temperature shade min day 2"
+      },
+      "realfeel_temperature_shade_min_3d": {
+        "name": "RealFeel temperature shade min day 3"
+      },
+      "realfeel_temperature_shade_min_4d": {
+        "name": "RealFeel temperature shade min day 4"
+      },
+      "solar_irradiance_day_0d": {
+        "name": "Solar irradiance today"
+      },
+      "solar_irradiance_day_1d": {
+        "name": "Solar irradiance day 1"
+      },
+      "solar_irradiance_day_2d": {
+        "name": "Solar irradiance day 2"
+      },
+      "solar_irradiance_day_3d": {
+        "name": "Solar irradiance day 3"
+      },
+      "solar_irradiance_day_4d": {
+        "name": "Solar irradiance day 4"
+      },
+      "solar_irradiance_night_0d": {
+        "name": "Solar irradiance tonight"
+      },
+      "solar_irradiance_night_1d": {
+        "name": "Solar irradiance night 1"
+      },
+      "solar_irradiance_night_2d": {
+        "name": "Solar irradiance night 2"
+      },
+      "solar_irradiance_night_3d": {
+        "name": "Solar irradiance night 3"
+      },
+      "solar_irradiance_night_4d": {
+        "name": "Solar irradiance night 4"
+      },
+      "thunderstorm_probability_day_0d": {
+        "name": "Thunderstorm probability today"
+      },
+      "thunderstorm_probability_day_1d": {
+        "name": "Thunderstorm probability day 1"
+      },
+      "thunderstorm_probability_day_2d": {
+        "name": "Thunderstorm probability day 2"
+      },
+      "thunderstorm_probability_day_3d": {
+        "name": "Thunderstorm probability day 3"
+      },
+      "thunderstorm_probability_day_4d": {
+        "name": "Thunderstorm probability day 4"
+      },
+      "thunderstorm_probability_night_0d": {
+        "name": "Thunderstorm probability tonight"
+      },
+      "thunderstorm_probability_night_1d": {
+        "name": "Thunderstorm probability night 1"
+      },
+      "thunderstorm_probability_night_2d": {
+        "name": "Thunderstorm probability night 2"
+      },
+      "thunderstorm_probability_night_3d": {
+        "name": "Thunderstorm probability night 3"
+      },
+      "thunderstorm_probability_night_4d": {
+        "name": "Thunderstorm probability night 4"
+      },
+      "tree_pollen_0d": {
+        "name": "Tree pollen today",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "tree_pollen_1d": {
+        "name": "Tree pollen day 1",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "tree_pollen_2d": {
+        "name": "Tree pollen day 2",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "tree_pollen_3d": {
+        "name": "Tree pollen day 3",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "tree_pollen_4d": {
+        "name": "Tree pollen day 4",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
       "uv_index": {
+        "name": "UV index",
         "state_attributes": {
           "level": {
-            "name": "Level",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "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%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
+      },
+      "uv_index_0d": {
+        "name": "UV index today",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "uv_index_1d": {
+        "name": "UV index day 1",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "uv_index_2d": {
+        "name": "UV index day 2",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "uv_index_3d": {
+        "name": "UV index day 3",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "uv_index_4d": {
+        "name": "UV index day 4",
+        "state_attributes": {
+          "level": {
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "state": {
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+            }
+          }
+        }
+      },
+      "wet_bulb_temperature": {
+        "name": "Wet bulb temperature"
+      },
+      "wind_speed": {
+        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_speed::name%]"
+      },
+      "wind_chill_temperature": {
+        "name": "Wind chill temperature"
+      },
+      "wind_gust_speed": {
+        "name": "[%key:component::weather::entity_component::_::state_attributes::wind_gust_speed::name%]"
+      },
+      "wind_gust_speed_day_0d": {
+        "name": "Wind gust speed today"
+      },
+      "wind_gust_speed_day_1d": {
+        "name": "Wind gust speed day 1"
+      },
+      "wind_gust_speed_day_2d": {
+        "name": "Wind gust speed day 2"
+      },
+      "wind_gust_speed_day_3d": {
+        "name": "Wind gust speed day 3"
+      },
+      "wind_gust_speed_day_4d": {
+        "name": "Wind gust speed day 4"
+      },
+      "wind_gust_speed_night_0d": {
+        "name": "Wind gust speed tonight"
+      },
+      "wind_gust_speed_night_1d": {
+        "name": "Wind gust speed night 1"
+      },
+      "wind_gust_speed_night_2d": {
+        "name": "Wind gust speed night 2"
+      },
+      "wind_gust_speed_night_3d": {
+        "name": "Wind gust speed night 3"
+      },
+      "wind_gust_speed_night_4d": {
+        "name": "Wind gust speed night 4"
+      },
+      "wind_speed_day_0d": {
+        "name": "Wind speed today"
+      },
+      "wind_speed_day_1d": {
+        "name": "Wind speed day 1"
+      },
+      "wind_speed_day_2d": {
+        "name": "Wind speed day 2"
+      },
+      "wind_speed_day_3d": {
+        "name": "Wind speed day 3"
+      },
+      "wind_speed_day_4d": {
+        "name": "Wind speed day 4"
+      },
+      "wind_speed_night_0d": {
+        "name": "Wind speed tonight"
+      },
+      "wind_speed_night_1d": {
+        "name": "Wind speed night 1"
+      },
+      "wind_speed_night_2d": {
+        "name": "Wind speed night 2"
+      },
+      "wind_speed_night_3d": {
+        "name": "Wind speed night 3"
+      },
+      "wind_speed_night_4d": {
+        "name": "Wind speed night 4"
       }
     }
   },

homeassistant/components/accuweather/weather.py

@@ -17,7 +17,8 @@ from homeassistant.components.weather import (
     ATTR_FORECAST_UV_INDEX,
     ATTR_FORECAST_WIND_BEARING,
     Forecast,
-    WeatherEntity,
+    SingleCoordinatorWeatherEntity,
+    WeatherEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -27,9 +28,8 @@ from homeassistant.const import (
     UnitOfSpeed,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 from homeassistant.util.dt import utc_from_timestamp
 
 from . import AccuWeatherDataUpdateCoordinator
@@ -40,7 +40,7 @@ from .const import (
     ATTR_SPEED,
     ATTR_VALUE,
     ATTRIBUTION,
-    CONDITION_CLASSES,
+    CONDITION_MAP,
     DOMAIN,
 )
 
@@ -58,7 +58,7 @@ async def async_setup_entry(
 
 
 class AccuWeatherEntity(
-    CoordinatorEntity[AccuWeatherDataUpdateCoordinator], WeatherEntity
+    SingleCoordinatorWeatherEntity[AccuWeatherDataUpdateCoordinator]
 ):
     """Define an AccuWeather entity."""
 
@@ -68,9 +68,6 @@ class AccuWeatherEntity(
     def __init__(self, coordinator: AccuWeatherDataUpdateCoordinator) -> None:
         """Initialize."""
         super().__init__(coordinator)
-        # Coordinator data is used also for sensors which don't have units automatically
-        # converted, hence the weather entity's native units follow the configured unit
-        # system
         self._attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
         self._attr_native_pressure_unit = UnitOfPressure.HPA
         self._attr_native_temperature_unit = UnitOfTemperature.CELSIUS
@@ -79,18 +76,13 @@ class AccuWeatherEntity(
         self._attr_unique_id = coordinator.location_key
         self._attr_attribution = ATTRIBUTION
         self._attr_device_info = coordinator.device_info
+        if self.coordinator.forecast:
+            self._attr_supported_features = WeatherEntityFeature.FORECAST_DAILY
 
     @property
     def condition(self) -> str | None:
         """Return the current condition."""
-        try:
-            return [
-                k
-                for k, v in CONDITION_CLASSES.items()
-                if self.coordinator.data["WeatherIcon"] in v
-            ][0]
-        except IndexError:
-            return None
+        return CONDITION_MAP.get(self.coordinator.data["WeatherIcon"])
 
     @property
     def cloud_coverage(self) -> float:
@@ -180,9 +172,12 @@ class AccuWeatherEntity(
                 ],
                 ATTR_FORECAST_UV_INDEX: item["UVIndex"][ATTR_VALUE],
                 ATTR_FORECAST_WIND_BEARING: item["WindDay"][ATTR_DIRECTION]["Degrees"],
-                ATTR_FORECAST_CONDITION: [
-                    k for k, v in CONDITION_CLASSES.items() if item["IconDay"] in v
-                ][0],
+                ATTR_FORECAST_CONDITION: CONDITION_MAP.get(item["IconDay"]),
             }
             for item in self.coordinator.data[ATTR_FORECAST]
         ]
+
+    @callback
+    def _async_forecast_daily(self) -> list[Forecast] | None:
+        """Return the daily forecast in native units."""
+        return self.forecast

homeassistant/components/acmeda/base.py

@@ -74,9 +74,9 @@ class AcmedaBase(entity.Entity):
         return self.roller.id
 
     @property
-    def device_info(self) -> entity.DeviceInfo:
+    def device_info(self) -> dr.DeviceInfo:
         """Return the device info."""
-        return entity.DeviceInfo(
+        return dr.DeviceInfo(
             identifiers={(DOMAIN, self.unique_id)},
             manufacturer="Rollease Acmeda",
             name=self.roller.name,

homeassistant/components/acmeda/config_flow.py

@@ -2,11 +2,11 @@
 from __future__ import annotations
 
 import asyncio
+from asyncio import timeout
 from contextlib import suppress
 from typing import Any
 
 import aiopulse
-import async_timeout
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -43,7 +43,7 @@ class AcmedaFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
 
         hubs: list[aiopulse.Hub] = []
         with suppress(asyncio.TimeoutError):
-            async with async_timeout.timeout(5):
+            async with timeout(5):
                 async for hub in aiopulse.Hub.discover():
                     if hub.id not in already_configured:
                         hubs.append(hub)

homeassistant/components/adax/climate.py

@@ -23,7 +23,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL

homeassistant/components/adguard/entity.py

@@ -4,8 +4,8 @@ from __future__ import annotations
 from adguardhome import AdGuardHome, AdGuardHomeError
 
 from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo, Entity
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
+from homeassistant.helpers.entity import Entity
 
 from .const import DATA_ADGUARD_VERSION, DOMAIN, LOGGER
 

homeassistant/components/ads/__init__.py

@@ -1,12 +1,12 @@
 """Support for Automation Device Specification (ADS)."""
 import asyncio
+from asyncio import timeout
 from collections import namedtuple
 import ctypes
 import logging
 import struct
 import threading
 
-import async_timeout
 import pyads
 import voluptuous as vol
 
@@ -301,7 +301,7 @@ class AdsEntity(Entity):
             self._ads_hub.add_device_notification, ads_var, plctype, update
         )
         try:
-            async with async_timeout.timeout(10):
+            async with timeout(10):
                 await self._event.wait()
         except asyncio.TimeoutError:
             _LOGGER.debug("Variable %s: Timeout during first update", ads_var)

homeassistant/components/advantage_air/climate.py

@@ -125,6 +125,13 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     @property
     def target_temperature(self) -> float | None:
         """Return the current target temperature."""
+        # If the system is in MyZone mode, and a zone is set, return that temperature instead.
+        if (
+            self._ac["myZone"] > 0
+            and not self._ac.get(ADVANTAGE_AIR_MYAUTO_ENABLED)
+            and not self._ac.get(ADVANTAGE_AIR_MYTEMP_ENABLED)
+        ):
+            return self._myzone["setTemp"]
         return self._ac["setTemp"]
 
     @property

homeassistant/components/advantage_air/entity.py

@@ -4,7 +4,7 @@ from typing import Any
 from advantage_air import ApiError
 
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
@@ -62,6 +62,12 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
     def _ac(self) -> dict[str, Any]:
         return self.coordinator.data["aircons"][self.ac_key]["info"]
 
+    @property
+    def _myzone(self) -> dict[str, Any]:
+        return self.coordinator.data["aircons"][self.ac_key]["zones"].get(
+            f"z{self._ac['myZone']:02}"
+        )
+
 
 class AdvantageAirZoneEntity(AdvantageAirAcEntity):
     """Parent class for Advantage Air Zone Entities."""

homeassistant/components/advantage_air/light.py

@@ -4,7 +4,7 @@ from typing import Any
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN

homeassistant/components/advantage_air/update.py

@@ -3,7 +3,7 @@
 from homeassistant.components.update import UpdateEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN

homeassistant/components/aemet/__init__.py

@@ -1,11 +1,14 @@
 """The AEMET OpenData component."""
+
 import logging
 
-from aemet_opendata.interface import AEMET
+from aemet_opendata.exceptions import TownNotFound
+from aemet_opendata.interface import AEMET, ConnectionOptions
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import HomeAssistant
+from homeassistant.helpers import aiohttp_client
 
 from .const import (
     CONF_STATION_UPDATES,
@@ -27,11 +30,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     longitude = entry.data[CONF_LONGITUDE]
     station_updates = entry.options.get(CONF_STATION_UPDATES, True)
 
-    aemet = AEMET(api_key)
-    weather_coordinator = WeatherUpdateCoordinator(
-        hass, aemet, latitude, longitude, station_updates
-    )
+    options = ConnectionOptions(api_key, station_updates, True)
+    aemet = AEMET(aiohttp_client.async_get_clientsession(hass), options)
+    try:
+        await aemet.select_coordinates(latitude, longitude)
+    except TownNotFound as err:
+        _LOGGER.error(err)
+        return False
 
+    weather_coordinator = WeatherUpdateCoordinator(hass, aemet)
     await weather_coordinator.async_config_entry_first_refresh()
 
     hass.data.setdefault(DOMAIN, {})

homeassistant/components/aemet/config_flow.py

@@ -1,13 +1,14 @@
 """Config flow for AEMET OpenData."""
 from __future__ import annotations
 
-from aemet_opendata import AEMET
+from aemet_opendata.exceptions import AuthError
+from aemet_opendata.interface import AEMET, ConnectionOptions
 import voluptuous as vol
 
 from homeassistant import config_entries
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_NAME
 from homeassistant.core import callback
-import homeassistant.helpers.config_validation as cv
+from homeassistant.helpers import aiohttp_client, config_validation as cv
 from homeassistant.helpers.schema_config_entry_flow import (
     SchemaFlowFormStep,
     SchemaOptionsFlowHandler,
@@ -39,8 +40,11 @@ class AemetConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
             await self.async_set_unique_id(f"{latitude}-{longitude}")
             self._abort_if_unique_id_configured()
 
-            api_online = await _is_aemet_api_online(self.hass, user_input[CONF_API_KEY])
-            if not api_online:
+            options = ConnectionOptions(user_input[CONF_API_KEY], False, True)
+            aemet = AEMET(aiohttp_client.async_get_clientsession(self.hass), options)
+            try:
+                await aemet.select_coordinates(latitude, longitude)
+            except AuthError:
                 errors["base"] = "invalid_api_key"
 
             if not errors:
@@ -70,10 +74,3 @@ class AemetConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     ) -> SchemaOptionsFlowHandler:
         """Get the options flow for this handler."""
         return SchemaOptionsFlowHandler(config_entry, OPTIONS_FLOW)
-
-
-async def _is_aemet_api_online(hass, api_key):
-    aemet = AEMET(api_key)
-    return await hass.async_add_executor_job(
-        aemet.get_conventional_observation_stations, False
-    )

homeassistant/components/aemet/const.py

@@ -1,6 +1,19 @@
 """Constant values for the AEMET OpenData component."""
 from __future__ import annotations
 
+from aemet_opendata.const import (
+    AOD_COND_CLEAR_NIGHT,
+    AOD_COND_CLOUDY,
+    AOD_COND_FOG,
+    AOD_COND_LIGHTNING,
+    AOD_COND_LIGHTNING_RAINY,
+    AOD_COND_PARTLY_CLODUY,
+    AOD_COND_POURING,
+    AOD_COND_RAINY,
+    AOD_COND_SNOWY,
+    AOD_COND_SUNNY,
+)
+
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_CLOUDY,
@@ -33,6 +46,7 @@ ATTR_API_FORECAST_TEMP = "temperature"
 ATTR_API_FORECAST_TEMP_LOW = "templow"
 ATTR_API_FORECAST_TIME = "datetime"
 ATTR_API_FORECAST_WIND_BEARING = "wind_bearing"
+ATTR_API_FORECAST_WIND_MAX_SPEED = "wind_max_speed"
 ATTR_API_FORECAST_WIND_SPEED = "wind_speed"
 ATTR_API_HUMIDITY = "humidity"
 ATTR_API_PRESSURE = "pressure"
@@ -54,94 +68,16 @@ ATTR_API_WIND_MAX_SPEED = "wind-max-speed"
 ATTR_API_WIND_SPEED = "wind-speed"
 
 CONDITIONS_MAP = {
-    ATTR_CONDITION_CLEAR_NIGHT: {
-        "11n",  # Despejado (de noche)
-    },
-    ATTR_CONDITION_CLOUDY: {
-        "14",  # Nuboso
-        "14n",  # Nuboso (de noche)
-        "15",  # Muy nuboso
-        "15n",  # Muy nuboso (de noche)
-        "16",  # Cubierto
-        "16n",  # Cubierto (de noche)
-        "17",  # Nubes altas
-        "17n",  # Nubes altas (de noche)
-    },
-    ATTR_CONDITION_FOG: {
-        "81",  # Niebla
-        "81n",  # Niebla (de noche)
-        "82",  # Bruma - Neblina
-        "82n",  # Bruma - Neblina (de noche)
-    },
-    ATTR_CONDITION_LIGHTNING: {
-        "51",  # Intervalos nubosos con tormenta
-        "51n",  # Intervalos nubosos con tormenta (de noche)
-        "52",  # Nuboso con tormenta
-        "52n",  # Nuboso con tormenta (de noche)
-        "53",  # Muy nuboso con tormenta
-        "53n",  # Muy nuboso con tormenta (de noche)
-        "54",  # Cubierto con tormenta
-        "54n",  # Cubierto con tormenta (de noche)
-    },
-    ATTR_CONDITION_LIGHTNING_RAINY: {
-        "61",  # Intervalos nubosos con tormenta y lluvia escasa
-        "61n",  # Intervalos nubosos con tormenta y lluvia escasa (de noche)
-        "62",  # Nuboso con tormenta y lluvia escasa
-        "62n",  # Nuboso con tormenta y lluvia escasa (de noche)
-        "63",  # Muy nuboso con tormenta y lluvia escasa
-        "63n",  # Muy nuboso con tormenta y lluvia escasa (de noche)
-        "64",  # Cubierto con tormenta y lluvia escasa
-        "64n",  # Cubierto con tormenta y lluvia escasa (de noche)
-    },
-    ATTR_CONDITION_PARTLYCLOUDY: {
-        "12",  # Poco nuboso
-        "12n",  # Poco nuboso (de noche)
-        "13",  # Intervalos nubosos
-        "13n",  # Intervalos nubosos (de noche)
-    },
-    ATTR_CONDITION_POURING: {
-        "27",  # Chubascos
-        "27n",  # Chubascos (de noche)
-    },
-    ATTR_CONDITION_RAINY: {
-        "23",  # Intervalos nubosos con lluvia
-        "23n",  # Intervalos nubosos con lluvia (de noche)
-        "24",  # Nuboso con lluvia
-        "24n",  # Nuboso con lluvia (de noche)
-        "25",  # Muy nuboso con lluvia
-        "25n",  # Muy nuboso con lluvia (de noche)
-        "26",  # Cubierto con lluvia
-        "26n",  # Cubierto con lluvia (de noche)
-        "43",  # Intervalos nubosos con lluvia escasa
-        "43n",  # Intervalos nubosos con lluvia escasa (de noche)
-        "44",  # Nuboso con lluvia escasa
-        "44n",  # Nuboso con lluvia escasa (de noche)
-        "45",  # Muy nuboso con lluvia escasa
-        "45n",  # Muy nuboso con lluvia escasa (de noche)
-        "46",  # Cubierto con lluvia escasa
-        "46n",  # Cubierto con lluvia escasa (de noche)
-    },
-    ATTR_CONDITION_SNOWY: {
-        "33",  # Intervalos nubosos con nieve
-        "33n",  # Intervalos nubosos con nieve (de noche)
-        "34",  # Nuboso con nieve
-        "34n",  # Nuboso con nieve (de noche)
-        "35",  # Muy nuboso con nieve
-        "35n",  # Muy nuboso con nieve (de noche)
-        "36",  # Cubierto con nieve
-        "36n",  # Cubierto con nieve (de noche)
-        "71",  # Intervalos nubosos con nieve escasa
-        "71n",  # Intervalos nubosos con nieve escasa (de noche)
-        "72",  # Nuboso con nieve escasa
-        "72n",  # Nuboso con nieve escasa (de noche)
-        "73",  # Muy nuboso con nieve escasa
-        "73n",  # Muy nuboso con nieve escasa (de noche)
-        "74",  # Cubierto con nieve escasa
-        "74n",  # Cubierto con nieve escasa (de noche)
-    },
-    ATTR_CONDITION_SUNNY: {
-        "11",  # Despejado
-    },
+    AOD_COND_CLEAR_NIGHT: ATTR_CONDITION_CLEAR_NIGHT,
+    AOD_COND_CLOUDY: ATTR_CONDITION_CLOUDY,
+    AOD_COND_FOG: ATTR_CONDITION_FOG,
+    AOD_COND_LIGHTNING: ATTR_CONDITION_LIGHTNING,
+    AOD_COND_LIGHTNING_RAINY: ATTR_CONDITION_LIGHTNING_RAINY,
+    AOD_COND_PARTLY_CLODUY: ATTR_CONDITION_PARTLYCLOUDY,
+    AOD_COND_POURING: ATTR_CONDITION_POURING,
+    AOD_COND_RAINY: ATTR_CONDITION_RAINY,
+    AOD_COND_SNOWY: ATTR_CONDITION_SNOWY,
+    AOD_COND_SUNNY: ATTR_CONDITION_SUNNY,
 }
 
 FORECAST_MONITORED_CONDITIONS = [
@@ -186,16 +122,3 @@ FORECAST_MODE_ATTR_API = {
     FORECAST_MODE_DAILY: ATTR_API_FORECAST_DAILY,
     FORECAST_MODE_HOURLY: ATTR_API_FORECAST_HOURLY,
 }
-
-
-WIND_BEARING_MAP = {
-    "C": None,
-    "N": 0.0,
-    "NE": 45.0,
-    "E": 90.0,
-    "SE": 135.0,
-    "S": 180.0,
-    "SO": 225.0,
-    "O": 270.0,
-    "NO": 315.0,
-}

homeassistant/components/aemet/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aemet",
   "iot_class": "cloud_polling",
   "loggers": ["aemet_opendata"],
-  "requirements": ["AEMET-OpenData==0.2.2"]
+  "requirements": ["AEMET-OpenData==0.4.5"]
 }

homeassistant/components/aemet/sensor.py

@@ -30,6 +30,7 @@ from .const import (
     ATTR_API_FORECAST_TEMP_LOW,
     ATTR_API_FORECAST_TIME,
     ATTR_API_FORECAST_WIND_BEARING,
+    ATTR_API_FORECAST_WIND_MAX_SPEED,
     ATTR_API_FORECAST_WIND_SPEED,
     ATTR_API_HUMIDITY,
     ATTR_API_PRESSURE,
@@ -99,6 +100,12 @@ FORECAST_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         name="Wind bearing",
         native_unit_of_measurement=DEGREE,
     ),
+    SensorEntityDescription(
+        key=ATTR_API_FORECAST_WIND_MAX_SPEED,
+        name="Wind max speed",
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        device_class=SensorDeviceClass.WIND_SPEED,
+    ),
     SensorEntityDescription(
         key=ATTR_API_FORECAST_WIND_SPEED,
         name="Wind speed",
@@ -206,13 +213,14 @@ WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
         name="Wind max speed",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         device_class=SensorDeviceClass.WIND_SPEED,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
     SensorEntityDescription(
         key=ATTR_API_WIND_SPEED,
         name="Wind speed",
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-        state_class=SensorStateClass.MEASUREMENT,
         device_class=SensorDeviceClass.WIND_SPEED,
+        state_class=SensorStateClass.MEASUREMENT,
     ),
 )
 

homeassistant/components/aemet/weather.py

@@ -1,14 +1,20 @@
 """Support for the AEMET OpenData service."""
+from typing import cast
+
 from homeassistant.components.weather import (
     ATTR_FORECAST_CONDITION,
     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,
     ATTR_FORECAST_WIND_BEARING,
-    WeatherEntity,
+    DOMAIN as WEATHER_DOMAIN,
+    Forecast,
+    SingleCoordinatorWeatherEntity,
+    WeatherEntityFeature,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -17,9 +23,9 @@ from homeassistant.const import (
     UnitOfSpeed,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import (
     ATTR_API_CONDITION,
@@ -30,11 +36,13 @@ from .const import (
     ATTR_API_FORECAST_TEMP_LOW,
     ATTR_API_FORECAST_TIME,
     ATTR_API_FORECAST_WIND_BEARING,
+    ATTR_API_FORECAST_WIND_MAX_SPEED,
     ATTR_API_FORECAST_WIND_SPEED,
     ATTR_API_HUMIDITY,
     ATTR_API_PRESSURE,
     ATTR_API_TEMPERATURE,
     ATTR_API_WIND_BEARING,
+    ATTR_API_WIND_MAX_SPEED,
     ATTR_API_WIND_SPEED,
     ATTRIBUTION,
     DOMAIN,
@@ -64,6 +72,7 @@ FORECAST_MAP = {
         ATTR_API_FORECAST_TEMP: ATTR_FORECAST_NATIVE_TEMP,
         ATTR_API_FORECAST_TIME: ATTR_FORECAST_TIME,
         ATTR_API_FORECAST_WIND_BEARING: ATTR_FORECAST_WIND_BEARING,
+        ATTR_API_FORECAST_WIND_MAX_SPEED: ATTR_FORECAST_NATIVE_WIND_GUST_SPEED,
         ATTR_API_FORECAST_WIND_SPEED: ATTR_FORECAST_NATIVE_WIND_SPEED,
     },
 }
@@ -79,15 +88,33 @@ async def async_setup_entry(
     weather_coordinator = domain_data[ENTRY_WEATHER_COORDINATOR]
 
     entities = []
-    for mode in FORECAST_MODES:
-        name = f"{domain_data[ENTRY_NAME]} {mode}"
-        unique_id = f"{config_entry.unique_id} {mode}"
-        entities.append(AemetWeather(name, unique_id, weather_coordinator, mode))
+    entity_registry = er.async_get(hass)
+
+    # Add daily + hourly entity for legacy config entries, only add daily for new
+    # config entries. This can be removed in HA Core 2024.3
+    if entity_registry.async_get_entity_id(
+        WEATHER_DOMAIN,
+        DOMAIN,
+        f"{config_entry.unique_id} {FORECAST_MODE_HOURLY}",
+    ):
+        for mode in FORECAST_MODES:
+            name = f"{domain_data[ENTRY_NAME]} {mode}"
+            unique_id = f"{config_entry.unique_id} {mode}"
+            entities.append(AemetWeather(name, unique_id, weather_coordinator, mode))
+    else:
+        entities.append(
+            AemetWeather(
+                domain_data[ENTRY_NAME],
+                config_entry.unique_id,
+                weather_coordinator,
+                FORECAST_MODE_DAILY,
+            )
+        )
 
     async_add_entities(entities, False)
 
 
-class AemetWeather(CoordinatorEntity[WeatherUpdateCoordinator], WeatherEntity):
+class AemetWeather(SingleCoordinatorWeatherEntity[WeatherUpdateCoordinator]):
     """Implementation of an AEMET OpenData sensor."""
 
     _attr_attribution = ATTRIBUTION
@@ -95,6 +122,9 @@ class AemetWeather(CoordinatorEntity[WeatherUpdateCoordinator], WeatherEntity):
     _attr_native_pressure_unit = UnitOfPressure.HPA
     _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
     _attr_native_wind_speed_unit = UnitOfSpeed.KILOMETERS_PER_HOUR
+    _attr_supported_features = (
+        WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
+    )
 
     def __init__(
         self,
@@ -117,15 +147,32 @@ class AemetWeather(CoordinatorEntity[WeatherUpdateCoordinator], WeatherEntity):
         """Return the current condition."""
         return self.coordinator.data[ATTR_API_CONDITION]
 
-    @property
-    def forecast(self):
+    def _forecast(self, forecast_mode: str) -> list[Forecast]:
         """Return the forecast array."""
-        forecasts = self.coordinator.data[FORECAST_MODE_ATTR_API[self._forecast_mode]]
-        forecast_map = FORECAST_MAP[self._forecast_mode]
-        return [
-            {ha_key: forecast[api_key] for api_key, ha_key in forecast_map.items()}
-            for forecast in forecasts
-        ]
+        forecasts = self.coordinator.data[FORECAST_MODE_ATTR_API[forecast_mode]]
+        forecast_map = FORECAST_MAP[forecast_mode]
+        return cast(
+            list[Forecast],
+            [
+                {ha_key: forecast[api_key] for api_key, ha_key in forecast_map.items()}
+                for forecast in forecasts
+            ],
+        )
+
+    @property
+    def forecast(self) -> list[Forecast]:
+        """Return the forecast array."""
+        return self._forecast(self._forecast_mode)
+
+    @callback
+    def _async_forecast_daily(self) -> list[Forecast]:
+        """Return the daily forecast in native units."""
+        return self._forecast(FORECAST_MODE_DAILY)
+
+    @callback
+    def _async_forecast_hourly(self) -> list[Forecast]:
+        """Return the hourly forecast in native units."""
+        return self._forecast(FORECAST_MODE_HOURLY)
 
     @property
     def humidity(self):
@@ -147,6 +194,11 @@ class AemetWeather(CoordinatorEntity[WeatherUpdateCoordinator], WeatherEntity):
         """Return the wind bearing."""
         return self.coordinator.data[ATTR_API_WIND_BEARING]
 
+    @property
+    def native_wind_gust_speed(self):
+        """Return the wind gust speed in native units."""
+        return self.coordinator.data[ATTR_API_WIND_MAX_SPEED]
+
     @property
     def native_wind_speed(self):
         """Return the wind speed."""

homeassistant/components/aemet/weather_update_coordinator.py

@@ -1,22 +1,21 @@
 """Weather data coordinator for the AEMET OpenData service."""
 from __future__ import annotations
 
-from dataclasses import dataclass, field
+from asyncio import timeout
 from datetime import timedelta
 import logging
+from typing import Any, Final
 
 from aemet_opendata.const import (
     AEMET_ATTR_DATE,
     AEMET_ATTR_DAY,
     AEMET_ATTR_DIRECTION,
     AEMET_ATTR_ELABORATED,
+    AEMET_ATTR_FEEL_TEMPERATURE,
     AEMET_ATTR_FORECAST,
     AEMET_ATTR_HUMIDITY,
-    AEMET_ATTR_ID,
-    AEMET_ATTR_IDEMA,
     AEMET_ATTR_MAX,
     AEMET_ATTR_MIN,
-    AEMET_ATTR_NAME,
     AEMET_ATTR_PRECIPITATION,
     AEMET_ATTR_PRECIPITATION_PROBABILITY,
     AEMET_ATTR_SKY_STATE,
@@ -25,24 +24,25 @@ from aemet_opendata.const import (
     AEMET_ATTR_SPEED,
     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,
     AEMET_ATTR_TEMPERATURE,
-    AEMET_ATTR_TEMPERATURE_FEELING,
     AEMET_ATTR_WIND,
     AEMET_ATTR_WIND_GUST,
     ATTR_DATA,
 )
+from aemet_opendata.exceptions import AemetError
+from aemet_opendata.forecast import ForecastValue
 from aemet_opendata.helpers import (
     get_forecast_day_value,
     get_forecast_hour_value,
     get_forecast_interval_value,
 )
-import async_timeout
+from aemet_opendata.interface import AEMET
 
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 from homeassistant.util import dt as dt_util
 
@@ -57,6 +57,7 @@ from .const import (
     ATTR_API_FORECAST_TEMP_LOW,
     ATTR_API_FORECAST_TIME,
     ATTR_API_FORECAST_WIND_BEARING,
+    ATTR_API_FORECAST_WIND_MAX_SPEED,
     ATTR_API_FORECAST_WIND_SPEED,
     ATTR_API_HUMIDITY,
     ATTR_API_PRESSURE,
@@ -78,22 +79,19 @@ from .const import (
     ATTR_API_WIND_SPEED,
     CONDITIONS_MAP,
     DOMAIN,
-    WIND_BEARING_MAP,
 )
 
 _LOGGER = logging.getLogger(__name__)
 
+API_TIMEOUT: Final[int] = 120
 STATION_MAX_DELTA = timedelta(hours=2)
 WEATHER_UPDATE_INTERVAL = timedelta(minutes=10)
 
 
 def format_condition(condition: str) -> str:
     """Return condition from dict CONDITIONS_MAP."""
-    for key, value in CONDITIONS_MAP.items():
-        if condition in value:
-            return key
-    _LOGGER.error('Condition "%s" not found in CONDITIONS_MAP', condition)
-    return condition
+    val = ForecastValue.parse_condition(condition)
+    return CONDITIONS_MAP.get(val, val)
 
 
 def format_float(value) -> float | None:
@@ -112,128 +110,33 @@ def format_int(value) -> int | None:
         return None
 
 
-class TownNotFound(UpdateFailed):
-    """Raised when town is not found."""
-
-
 class WeatherUpdateCoordinator(DataUpdateCoordinator):
     """Weather data update coordinator."""
 
-    def __init__(self, hass, aemet, latitude, longitude, station_updates):
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        aemet: AEMET,
+    ) -> None:
         """Initialize coordinator."""
+        self.aemet = aemet
+
         super().__init__(
-            hass, _LOGGER, name=DOMAIN, update_interval=WEATHER_UPDATE_INTERVAL
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=WEATHER_UPDATE_INTERVAL,
         )
 
-        self._aemet = aemet
-        self._station = None
-        self._town = None
-        self._latitude = latitude
-        self._longitude = longitude
-        self._station_updates = station_updates
-        self._data = {
-            "daily": None,
-            "hourly": None,
-            "station": None,
-        }
-
-    async def _async_update_data(self):
-        data = {}
-        async with async_timeout.timeout(120):
-            weather_response = await self._get_aemet_weather()
-        data = self._convert_weather_response(weather_response)
-        return data
-
-    async def _get_aemet_weather(self):
-        """Poll weather data from AEMET OpenData."""
-        weather = await self.hass.async_add_executor_job(self._get_weather_and_forecast)
-        return weather
-
-    def _get_weather_station(self):
-        if not self._station:
-            self._station = (
-                self._aemet.get_conventional_observation_station_by_coordinates(
-                    self._latitude, self._longitude
-                )
-            )
-            if self._station:
-                _LOGGER.debug(
-                    "station found for coordinates [%s, %s]: %s",
-                    self._latitude,
-                    self._longitude,
-                    self._station,
-                )
-        if not self._station:
-            _LOGGER.debug(
-                "station not found for coordinates [%s, %s]",
-                self._latitude,
-                self._longitude,
-            )
-        return self._station
-
-    def _get_weather_town(self):
-        if not self._town:
-            self._town = self._aemet.get_town_by_coordinates(
-                self._latitude, self._longitude
-            )
-            if self._town:
-                _LOGGER.debug(
-                    "Town found for coordinates [%s, %s]: %s",
-                    self._latitude,
-                    self._longitude,
-                    self._town,
-                )
-        if not self._town:
-            _LOGGER.error(
-                "Town not found for coordinates [%s, %s]",
-                self._latitude,
-                self._longitude,
-            )
-            raise TownNotFound
-        return self._town
-
-    def _get_weather_and_forecast(self):
-        """Get weather and forecast data from AEMET OpenData."""
-
-        self._get_weather_town()
-
-        daily = self._aemet.get_specific_forecast_town_daily(self._town[AEMET_ATTR_ID])
-        if not daily:
-            _LOGGER.error(
-                'Error fetching daily data for town "%s"', self._town[AEMET_ATTR_ID]
-            )
-
-        hourly = self._aemet.get_specific_forecast_town_hourly(
-            self._town[AEMET_ATTR_ID]
-        )
-        if not hourly:
-            _LOGGER.error(
-                'Error fetching hourly data for town "%s"', self._town[AEMET_ATTR_ID]
-            )
-
-        station = None
-        if self._station_updates and self._get_weather_station():
-            station = self._aemet.get_conventional_observation_station_data(
-                self._station[AEMET_ATTR_IDEMA]
-            )
-            if not station:
-                _LOGGER.error(
-                    'Error fetching data for station "%s"',
-                    self._station[AEMET_ATTR_IDEMA],
-                )
-
-        if daily:
-            self._data["daily"] = daily
-        if hourly:
-            self._data["hourly"] = hourly
-        if station:
-            self._data["station"] = station
-
-        return AemetWeather(
-            self._data["daily"],
-            self._data["hourly"],
-            self._data["station"],
-        )
+    async def _async_update_data(self) -> dict[str, Any]:
+        """Update coordinator data."""
+        async with timeout(API_TIMEOUT):
+            try:
+                await self.aemet.update()
+            except AemetError as error:
+                raise UpdateFailed(error) from error
+        weather_response = self.aemet.legacy_weather()
+        return self._convert_weather_response(weather_response)
 
     def _convert_weather_response(self, weather_response):
         """Format the weather response correctly."""
@@ -428,6 +331,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
             ),
             ATTR_API_FORECAST_TEMP: self._get_temperature(day, hour),
             ATTR_API_FORECAST_TIME: dt_util.as_utc(forecast_dt).isoformat(),
+            ATTR_API_FORECAST_WIND_MAX_SPEED: self._get_wind_max_speed(day, hour),
             ATTR_API_FORECAST_WIND_SPEED: self._get_wind_speed(day, hour),
             ATTR_API_FORECAST_WIND_BEARING: self._get_wind_bearing(day, hour),
         }
@@ -518,14 +422,14 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
 
     def _get_station_id(self):
         """Get station ID from weather data."""
-        if self._station:
-            return self._station[AEMET_ATTR_IDEMA]
+        if self.aemet.station:
+            return self.aemet.station.get_id()
         return None
 
     def _get_station_name(self):
         """Get station name from weather data."""
-        if self._station:
-            return self._station[AEMET_ATTR_STATION_LOCATION]
+        if self.aemet.station:
+            return self.aemet.station.get_name()
         return None
 
     @staticmethod
@@ -561,19 +465,19 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
     @staticmethod
     def _get_temperature_feeling(day_data, hour):
         """Get temperature from weather data."""
-        val = get_forecast_hour_value(day_data[AEMET_ATTR_TEMPERATURE_FEELING], hour)
+        val = get_forecast_hour_value(day_data[AEMET_ATTR_FEEL_TEMPERATURE], hour)
         return format_int(val)
 
     def _get_town_id(self):
         """Get town ID from weather data."""
-        if self._town:
-            return self._town[AEMET_ATTR_ID]
+        if self.aemet.town:
+            return self.aemet.town.get_id()
         return None
 
     def _get_town_name(self):
         """Get town name from weather data."""
-        if self._town:
-            return self._town[AEMET_ATTR_NAME]
+        if self.aemet.town:
+            return self.aemet.town.get_name()
         return None
 
     @staticmethod
@@ -582,10 +486,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
         val = get_forecast_hour_value(
             day_data[AEMET_ATTR_WIND_GUST], hour, key=AEMET_ATTR_DIRECTION
         )[0]
-        if val in WIND_BEARING_MAP:
-            return WIND_BEARING_MAP[val]
-        _LOGGER.error("%s not found in Wind Bearing map", val)
-        return None
+        return ForecastValue.parse_wind_direction(val)
 
     @staticmethod
     def _get_wind_bearing_day(day_data):
@@ -593,10 +494,7 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
         val = get_forecast_day_value(
             day_data[AEMET_ATTR_WIND], key=AEMET_ATTR_DIRECTION
         )
-        if val in WIND_BEARING_MAP:
-            return WIND_BEARING_MAP[val]
-        _LOGGER.error("%s not found in Wind Bearing map", val)
-        return None
+        return ForecastValue.parse_wind_direction(val)
 
     @staticmethod
     def _get_wind_max_speed(day_data, hour):
@@ -623,12 +521,3 @@ class WeatherUpdateCoordinator(DataUpdateCoordinator):
         if val:
             return format_int(val)
         return None
-
-
-@dataclass
-class AemetWeather:
-    """Class to harmonize weather data model."""
-
-    daily: dict = field(default_factory=dict)
-    hourly: dict = field(default_factory=dict)
-    station: dict = field(default_factory=dict)

homeassistant/components/aftership/__init__.py

@@ -1 +1,42 @@
-"""The aftership component."""
+"""The AfterShip integration."""
+from __future__ import annotations
+
+from pyaftership import AfterShip, AfterShipException
+
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import CONF_API_KEY, Platform
+from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+
+from .const import DOMAIN
+
+PLATFORMS: list[Platform] = [Platform.SENSOR]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up AfterShip from a config entry."""
+
+    hass.data.setdefault(DOMAIN, {})
+
+    session = async_get_clientsession(hass)
+    aftership = AfterShip(api_key=entry.data[CONF_API_KEY], session=session)
+
+    try:
+        await aftership.trackings.list()
+    except AfterShipException as err:
+        raise ConfigEntryNotReady from err
+
+    hass.data[DOMAIN][entry.entry_id] = aftership
+
+    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

homeassistant/components/aftership/config_flow.py

@@ -0,0 +1,90 @@
+"""Config flow for AfterShip integration."""
+from __future__ import annotations
+
+import logging
+from typing import Any
+
+from pyaftership import AfterShip, AfterShipException
+import voluptuous as vol
+
+from homeassistant.config_entries import ConfigFlow
+from homeassistant.const import CONF_API_KEY, CONF_NAME
+from homeassistant.core import DOMAIN as HOMEASSISTANT_DOMAIN
+from homeassistant.data_entry_flow import AbortFlow, FlowResult
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AfterShipConfigFlow(ConfigFlow, domain=DOMAIN):
+    """Handle a config flow for AfterShip."""
+
+    VERSION = 1
+
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> FlowResult:
+        """Handle the initial step."""
+        errors: dict[str, str] = {}
+        if user_input is not None:
+            self._async_abort_entries_match({CONF_API_KEY: user_input[CONF_API_KEY]})
+            try:
+                aftership = AfterShip(
+                    api_key=user_input[CONF_API_KEY],
+                    session=async_get_clientsession(self.hass),
+                )
+                await aftership.trackings.list()
+            except AfterShipException:
+                _LOGGER.exception("Aftership raised exception")
+                errors["base"] = "cannot_connect"
+            else:
+                return self.async_create_entry(title="AfterShip", data=user_input)
+
+        return self.async_show_form(
+            step_id="user",
+            data_schema=vol.Schema({vol.Required(CONF_API_KEY): str}),
+            errors=errors,
+        )
+
+    async def async_step_import(self, config: dict[str, Any]) -> FlowResult:
+        """Import configuration from yaml."""
+        try:
+            self._async_abort_entries_match({CONF_API_KEY: config[CONF_API_KEY]})
+        except AbortFlow as err:
+            async_create_issue(
+                self.hass,
+                DOMAIN,
+                "deprecated_yaml_import_issue_already_configured",
+                breaks_in_ha_version="2024.4.0",
+                is_fixable=False,
+                issue_domain=DOMAIN,
+                severity=IssueSeverity.WARNING,
+                translation_key="deprecated_yaml_import_issue_already_configured",
+                translation_placeholders={
+                    "domain": DOMAIN,
+                    "integration_title": "AfterShip",
+                },
+            )
+            raise err
+
+        async_create_issue(
+            self.hass,
+            HOMEASSISTANT_DOMAIN,
+            f"deprecated_yaml_{DOMAIN}",
+            breaks_in_ha_version="2024.4.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml",
+            translation_placeholders={
+                "domain": DOMAIN,
+                "integration_title": "AfterShip",
+            },
+        )
+        return self.async_create_entry(
+            title=config.get(CONF_NAME, "AfterShip"),
+            data={CONF_API_KEY: config[CONF_API_KEY]},
+        )

homeassistant/components/aftership/manifest.json

@@ -2,6 +2,7 @@
   "domain": "aftership",
   "name": "AfterShip",
   "codeowners": [],
+  "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aftership",
   "iot_class": "cloud_polling",
   "requirements": ["pyaftership==21.11.0"]

homeassistant/components/aftership/sensor.py

@@ -11,6 +11,7 @@ from homeassistant.components.sensor import (
     PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
     SensorEntity,
 )
+from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_NAME
 from homeassistant.core import HomeAssistant, ServiceCall
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
@@ -20,6 +21,7 @@ from homeassistant.helpers.dispatcher import (
     async_dispatcher_send,
 )
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from homeassistant.util import Throttle
 
@@ -58,19 +60,43 @@ async def async_setup_platform(
     discovery_info: DiscoveryInfoType | None = None,
 ) -> None:
     """Set up the AfterShip sensor platform."""
-    apikey = config[CONF_API_KEY]
-    name = config[CONF_NAME]
-
-    session = async_get_clientsession(hass)
-    aftership = AfterShip(api_key=apikey, session=session)
-
+    aftership = AfterShip(
+        api_key=config[CONF_API_KEY], session=async_get_clientsession(hass)
+    )
     try:
         await aftership.trackings.list()
-    except AfterShipException as err:
-        _LOGGER.error("No tracking data found. Check API key is correct: %s", err)
-        return
+    except AfterShipException:
+        async_create_issue(
+            hass,
+            DOMAIN,
+            "deprecated_yaml_import_issue_cannot_connect",
+            breaks_in_ha_version="2024.4.0",
+            is_fixable=False,
+            issue_domain=DOMAIN,
+            severity=IssueSeverity.WARNING,
+            translation_key="deprecated_yaml_import_issue_cannot_connect",
+            translation_placeholders={
+                "integration_title": "AfterShip",
+                "url": "/config/integrations/dashboard/add?domain=aftership",
+            },
+        )
 
-    async_add_entities([AfterShipSensor(aftership, name)], True)
+    hass.async_create_task(
+        hass.config_entries.flow.async_init(
+            DOMAIN, context={"source": SOURCE_IMPORT}, data=config
+        )
+    )
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up AfterShip sensor entities based on a config entry."""
+    aftership: AfterShip = hass.data[DOMAIN][config_entry.entry_id]
+
+    async_add_entities([AfterShipSensor(aftership, config_entry.title)], True)
 
     async def handle_add_tracking(call: ServiceCall) -> None:
         """Call when a user adds a new Aftership tracking from Home Assistant."""

homeassistant/components/aftership/strings.json

@@ -1,4 +1,19 @@
 {
+  "config": {
+    "step": {
+      "user": {
+        "data": {
+          "api_key": "[%key:common::config_flow::data::api_key%]"
+        }
+      }
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+    },
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    }
+  },
   "services": {
     "add_tracking": {
       "name": "Add tracking",
@@ -32,5 +47,15 @@
         }
       }
     }
+  },
+  "issues": {
+    "deprecated_yaml_import_issue_already_configured": {
+      "title": "The {integration_title} YAML configuration import failed",
+      "description": "Configuring {integration_title} using YAML is being removed but the YAML configuration was already imported.\n\nRemove the YAML configuration and restart Home Assistant."
+    },
+    "deprecated_yaml_import_issue_cannot_connect": {
+      "title": "The {integration_title} YAML configuration import failed",
+      "description": "Configuring {integration_title} using YAML is being removed but there was an connection error importing your YAML configuration.\n\nEnsure connection to {integration_title} works and restart Home Assistant to try again or remove the {integration_title} YAML configuration from your configuration.yaml file and continue to [set up the integration]({url}) manually."
+    }
   }
 }

homeassistant/components/agent_dvr/alarm_control_panel.py

@@ -13,7 +13,7 @@ from homeassistant.const import (
     STATE_ALARM_DISARMED,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import CONNECTION, DOMAIN as AGENT_DOMAIN

homeassistant/components/agent_dvr/camera.py

@@ -8,7 +8,7 @@ from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
     AddEntitiesCallback,
     async_get_current_platform,

homeassistant/components/airly/__init__.py

@@ -3,13 +3,6 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from math import ceil
-
-from aiohttp import ClientSession
-from aiohttp.client_exceptions import ClientConnectorError
-from airly import Airly
-from airly.exceptions import AirlyError
-import async_timeout
 
 from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
 from homeassistant.config_entries import ConfigEntry
@@ -17,53 +10,15 @@ from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, Pla
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt as dt_util
 
-from .const import (
-    ATTR_API_ADVICE,
-    ATTR_API_CAQI,
-    ATTR_API_CAQI_DESCRIPTION,
-    ATTR_API_CAQI_LEVEL,
-    CONF_USE_NEAREST,
-    DOMAIN,
-    MAX_UPDATE_INTERVAL,
-    MIN_UPDATE_INTERVAL,
-    NO_AIRLY_SENSORS,
-)
+from .const import CONF_USE_NEAREST, DOMAIN, MIN_UPDATE_INTERVAL
+from .coordinator import AirlyDataUpdateCoordinator
 
 PLATFORMS = [Platform.SENSOR]
 
 _LOGGER = logging.getLogger(__name__)
 
 
-def set_update_interval(instances_count: int, requests_remaining: int) -> timedelta:
-    """Return data update interval.
-
-    The number of requests is reset at midnight UTC so we calculate the update
-    interval based on number of minutes until midnight, the number of Airly instances
-    and the number of remaining requests.
-    """
-    now = dt_util.utcnow()
-    midnight = dt_util.find_next_time_expression_time(
-        now, seconds=[0], minutes=[0], hours=[0]
-    )
-    minutes_to_midnight = (midnight - now).total_seconds() / 60
-    interval = timedelta(
-        minutes=min(
-            max(
-                ceil(minutes_to_midnight / requests_remaining * instances_count),
-                MIN_UPDATE_INTERVAL,
-            ),
-            MAX_UPDATE_INTERVAL,
-        )
-    )
-
-    _LOGGER.debug("Data will be update every %s", interval)
-
-    return interval
-
-
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Airly as config entry."""
     api_key = entry.data[CONF_API_KEY]
@@ -131,75 +86,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class AirlyDataUpdateCoordinator(DataUpdateCoordinator):
-    """Define an object to hold Airly data."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        session: ClientSession,
-        api_key: str,
-        latitude: float,
-        longitude: float,
-        update_interval: timedelta,
-        use_nearest: bool,
-    ) -> None:
-        """Initialize."""
-        self.latitude = latitude
-        self.longitude = longitude
-        # Currently, Airly only supports Polish and English
-        language = "pl" if hass.config.language == "pl" else "en"
-        self.airly = Airly(api_key, session, language=language)
-        self.use_nearest = use_nearest
-
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def _async_update_data(self) -> dict[str, str | float | int]:
-        """Update data via library."""
-        data: dict[str, str | float | int] = {}
-        if self.use_nearest:
-            measurements = self.airly.create_measurements_session_nearest(
-                self.latitude, self.longitude, max_distance_km=5
-            )
-        else:
-            measurements = self.airly.create_measurements_session_point(
-                self.latitude, self.longitude
-            )
-        async with async_timeout.timeout(20):
-            try:
-                await measurements.update()
-            except (AirlyError, ClientConnectorError) as error:
-                raise UpdateFailed(error) from error
-
-        _LOGGER.debug(
-            "Requests remaining: %s/%s",
-            self.airly.requests_remaining,
-            self.airly.requests_per_day,
-        )
-
-        # Airly API sometimes returns None for requests remaining so we update
-        # update_interval only if we have valid value.
-        if self.airly.requests_remaining:
-            self.update_interval = set_update_interval(
-                len(self.hass.config_entries.async_entries(DOMAIN)),
-                self.airly.requests_remaining,
-            )
-
-        values = measurements.current["values"]
-        index = measurements.current["indexes"][0]
-        standards = measurements.current["standards"]
-
-        if index["description"] == NO_AIRLY_SENSORS:
-            raise UpdateFailed("Can't retrieve data: no Airly sensors in this area")
-        for value in values:
-            data[value["name"]] = value["value"]
-        for standard in standards:
-            data[f"{standard['pollutant']}_LIMIT"] = standard["limit"]
-            data[f"{standard['pollutant']}_PERCENT"] = standard["percent"]
-        data[ATTR_API_CAQI] = index["value"]
-        data[ATTR_API_CAQI_LEVEL] = index["level"].lower().replace("_", " ")
-        data[ATTR_API_CAQI_DESCRIPTION] = index["description"]
-        data[ATTR_API_ADVICE] = index["advice"]
-        return data

homeassistant/components/airly/config_flow.py

@@ -1,13 +1,13 @@
 """Adds config flow for Airly."""
 from __future__ import annotations
 
+from asyncio import timeout
 from http import HTTPStatus
 from typing import Any
 
 from aiohttp import ClientSession
 from airly import Airly
 from airly.exceptions import AirlyError
-import async_timeout
 import voluptuous as vol
 
 from homeassistant import config_entries
@@ -105,7 +105,7 @@ async def test_location(
         measurements = airly.create_measurements_session_point(
             latitude=latitude, longitude=longitude
         )
-    async with async_timeout.timeout(10):
+    async with timeout(10):
         await measurements.update()
 
     current = measurements.current

homeassistant/components/airly/coordinator.py

@@ -0,0 +1,126 @@
+"""DataUpdateCoordinator for the Airly integration."""
+from asyncio import timeout
+from datetime import timedelta
+import logging
+from math import ceil
+
+from aiohttp import ClientSession
+from aiohttp.client_exceptions import ClientConnectorError
+from airly import Airly
+from airly.exceptions import AirlyError
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
+
+from .const import (
+    ATTR_API_ADVICE,
+    ATTR_API_CAQI,
+    ATTR_API_CAQI_DESCRIPTION,
+    ATTR_API_CAQI_LEVEL,
+    DOMAIN,
+    MAX_UPDATE_INTERVAL,
+    MIN_UPDATE_INTERVAL,
+    NO_AIRLY_SENSORS,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def set_update_interval(instances_count: int, requests_remaining: int) -> timedelta:
+    """Return data update interval.
+
+    The number of requests is reset at midnight UTC so we calculate the update
+    interval based on number of minutes until midnight, the number of Airly instances
+    and the number of remaining requests.
+    """
+    now = dt_util.utcnow()
+    midnight = dt_util.find_next_time_expression_time(
+        now, seconds=[0], minutes=[0], hours=[0]
+    )
+    minutes_to_midnight = (midnight - now).total_seconds() / 60
+    interval = timedelta(
+        minutes=min(
+            max(
+                ceil(minutes_to_midnight / requests_remaining * instances_count),
+                MIN_UPDATE_INTERVAL,
+            ),
+            MAX_UPDATE_INTERVAL,
+        )
+    )
+
+    _LOGGER.debug("Data will be update every %s", interval)
+
+    return interval
+
+
+class AirlyDataUpdateCoordinator(DataUpdateCoordinator):
+    """Define an object to hold Airly data."""
+
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        session: ClientSession,
+        api_key: str,
+        latitude: float,
+        longitude: float,
+        update_interval: timedelta,
+        use_nearest: bool,
+    ) -> None:
+        """Initialize."""
+        self.latitude = latitude
+        self.longitude = longitude
+        # Currently, Airly only supports Polish and English
+        language = "pl" if hass.config.language == "pl" else "en"
+        self.airly = Airly(api_key, session, language=language)
+        self.use_nearest = use_nearest
+
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+
+    async def _async_update_data(self) -> dict[str, str | float | int]:
+        """Update data via library."""
+        data: dict[str, str | float | int] = {}
+        if self.use_nearest:
+            measurements = self.airly.create_measurements_session_nearest(
+                self.latitude, self.longitude, max_distance_km=5
+            )
+        else:
+            measurements = self.airly.create_measurements_session_point(
+                self.latitude, self.longitude
+            )
+        async with timeout(20):
+            try:
+                await measurements.update()
+            except (AirlyError, ClientConnectorError) as error:
+                raise UpdateFailed(error) from error
+
+        _LOGGER.debug(
+            "Requests remaining: %s/%s",
+            self.airly.requests_remaining,
+            self.airly.requests_per_day,
+        )
+
+        # Airly API sometimes returns None for requests remaining so we update
+        # update_interval only if we have valid value.
+        if self.airly.requests_remaining:
+            self.update_interval = set_update_interval(
+                len(self.hass.config_entries.async_entries(DOMAIN)),
+                self.airly.requests_remaining,
+            )
+
+        values = measurements.current["values"]
+        index = measurements.current["indexes"][0]
+        standards = measurements.current["standards"]
+
+        if index["description"] == NO_AIRLY_SENSORS:
+            raise UpdateFailed("Can't retrieve data: no Airly sensors in this area")
+        for value in values:
+            data[value["name"]] = value["value"]
+        for standard in standards:
+            data[f"{standard['pollutant']}_LIMIT"] = standard["limit"]
+            data[f"{standard['pollutant']}_PERCENT"] = standard["percent"]
+        data[ATTR_API_CAQI] = index["value"]
+        data[ATTR_API_CAQI_LEVEL] = index["level"].lower().replace("_", " ")
+        data[ATTR_API_CAQI_DESCRIPTION] = index["description"]
+        data[ATTR_API_ADVICE] = index["advice"]
+        return data

homeassistant/components/airly/sensor.py

@@ -20,8 +20,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceEntryType
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 

homeassistant/components/airnow/__init__.py

@@ -2,11 +2,6 @@
 import datetime
 import logging
 
-from aiohttp.client_exceptions import ClientConnectorError
-from pyairnow import WebServiceAPI
-from pyairnow.conv import aqi_to_concentration
-from pyairnow.errors import AirNowError
-
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_API_KEY,
@@ -17,26 +12,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import (
-    ATTR_API_AQI,
-    ATTR_API_AQI_DESCRIPTION,
-    ATTR_API_AQI_LEVEL,
-    ATTR_API_AQI_PARAM,
-    ATTR_API_CAT_DESCRIPTION,
-    ATTR_API_CAT_LEVEL,
-    ATTR_API_CATEGORY,
-    ATTR_API_PM25,
-    ATTR_API_POLLUTANT,
-    ATTR_API_REPORT_DATE,
-    ATTR_API_REPORT_HOUR,
-    ATTR_API_STATE,
-    ATTR_API_STATION,
-    ATTR_API_STATION_LATITUDE,
-    ATTR_API_STATION_LONGITUDE,
-    DOMAIN,
-)
+from .const import DOMAIN
+from .coordinator import AirNowDataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 PLATFORMS = [Platform.SENSOR]
@@ -47,7 +25,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     api_key = entry.data[CONF_API_KEY]
     latitude = entry.data[CONF_LATITUDE]
     longitude = entry.data[CONF_LONGITUDE]
-    distance = entry.data[CONF_RADIUS]
+
+    # Station Radius is a user-configurable option
+    distance = entry.options[CONF_RADIUS]
 
     # Reports are published hourly but update twice per hour
     update_interval = datetime.timedelta(minutes=30)
@@ -65,11 +45,33 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     hass.data.setdefault(DOMAIN, {})
     hass.data[DOMAIN][entry.entry_id] = coordinator
 
+    # Listen for option changes
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
+async def async_migrate_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Migrate old entry."""
+    _LOGGER.debug("Migrating from version %s", entry.version)
+
+    if entry.version == 1:
+        new_options = {CONF_RADIUS: entry.data[CONF_RADIUS]}
+        new_data = entry.data.copy()
+        del new_data[CONF_RADIUS]
+
+        entry.version = 2
+        hass.config_entries.async_update_entry(
+            entry, data=new_data, options=new_options
+        )
+
+    _LOGGER.info("Migration to version %s successful", entry.version)
+
+    return True
+
+
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
@@ -80,70 +82,6 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return unload_ok
 
 
-class AirNowDataUpdateCoordinator(DataUpdateCoordinator):
-    """Define an object to hold Airly data."""
-
-    def __init__(
-        self, hass, session, api_key, latitude, longitude, distance, update_interval
-    ):
-        """Initialize."""
-        self.latitude = latitude
-        self.longitude = longitude
-        self.distance = distance
-
-        self.airnow = WebServiceAPI(api_key, session=session)
-
-        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
-
-    async def _async_update_data(self):
-        """Update data via library."""
-        data = {}
-        try:
-            obs = await self.airnow.observations.latLong(
-                self.latitude,
-                self.longitude,
-                distance=self.distance,
-            )
-
-        except (AirNowError, ClientConnectorError) as error:
-            raise UpdateFailed(error) from error
-
-        if not obs:
-            raise UpdateFailed("No data was returned from AirNow")
-
-        max_aqi = 0
-        max_aqi_level = 0
-        max_aqi_desc = ""
-        max_aqi_poll = ""
-        for obv in obs:
-            # Convert AQIs to Concentration
-            pollutant = obv[ATTR_API_AQI_PARAM]
-            concentration = aqi_to_concentration(obv[ATTR_API_AQI], pollutant)
-            data[obv[ATTR_API_AQI_PARAM]] = concentration
-
-            # Overall AQI is the max of all pollutant AQIs
-            if obv[ATTR_API_AQI] > max_aqi:
-                max_aqi = obv[ATTR_API_AQI]
-                max_aqi_level = obv[ATTR_API_CATEGORY][ATTR_API_CAT_LEVEL]
-                max_aqi_desc = obv[ATTR_API_CATEGORY][ATTR_API_CAT_DESCRIPTION]
-                max_aqi_poll = pollutant
-
-            # Copy other data from PM2.5 Value
-            if obv[ATTR_API_AQI_PARAM] == ATTR_API_PM25:
-                # Copy Report Details
-                data[ATTR_API_REPORT_DATE] = obv[ATTR_API_REPORT_DATE]
-                data[ATTR_API_REPORT_HOUR] = obv[ATTR_API_REPORT_HOUR]
-
-                # Copy Station Details
-                data[ATTR_API_STATE] = obv[ATTR_API_STATE]
-                data[ATTR_API_STATION] = obv[ATTR_API_STATION]
-                data[ATTR_API_STATION_LATITUDE] = obv[ATTR_API_STATION_LATITUDE]
-                data[ATTR_API_STATION_LONGITUDE] = obv[ATTR_API_STATION_LONGITUDE]
-
-        # Store Overall AQI
-        data[ATTR_API_AQI] = max_aqi
-        data[ATTR_API_AQI_LEVEL] = max_aqi_level
-        data[ATTR_API_AQI_DESCRIPTION] = max_aqi_desc
-        data[ATTR_API_POLLUTANT] = max_aqi_poll
-
-        return data
+async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
+    """Handle options update."""
+    await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/airnow/config_flow.py

@@ -1,11 +1,12 @@
 """Config flow for AirNow integration."""
 import logging
+from typing import Any
 
 from pyairnow import WebServiceAPI
 from pyairnow.errors import AirNowError, EmptyResponseError, InvalidKeyError
 import voluptuous as vol
 
-from homeassistant import config_entries, core, exceptions
+from homeassistant import config_entries, core, data_entry_flow, exceptions
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, CONF_RADIUS
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 import homeassistant.helpers.config_validation as cv
@@ -48,7 +49,7 @@ async def validate_input(hass: core.HomeAssistant, data):
 class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
     """Handle a config flow for AirNow."""
 
-    VERSION = 1
+    VERSION = 2
 
     async def async_step_user(self, user_input=None):
         """Handle the initial step."""
@@ -75,12 +76,14 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                 errors["base"] = "unknown"
             else:
                 # Create Entry
+                radius = user_input.pop(CONF_RADIUS)
                 return self.async_create_entry(
                     title=(
                         f"AirNow Sensor at {user_input[CONF_LATITUDE]},"
                         f" {user_input[CONF_LONGITUDE]}"
                     ),
                     data=user_input,
+                    options={CONF_RADIUS: radius},
                 )
 
         return self.async_show_form(
@@ -94,12 +97,49 @@ class ConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
                     vol.Optional(
                         CONF_LONGITUDE, default=self.hass.config.longitude
                     ): cv.longitude,
-                    vol.Optional(CONF_RADIUS, default=150): int,
+                    vol.Optional(CONF_RADIUS, default=150): vol.All(
+                        int, vol.Range(min=5)
+                    ),
                 }
             ),
             errors=errors,
         )
 
+    @staticmethod
+    @core.callback
+    def async_get_options_flow(
+        config_entry: config_entries.ConfigEntry,
+    ) -> config_entries.OptionsFlow:
+        """Return the options flow."""
+        return OptionsFlowHandler(config_entry)
+
+
+class OptionsFlowHandler(config_entries.OptionsFlowWithConfigEntry):
+    """Handle an options flow for AirNow."""
+
+    async def async_step_init(
+        self, user_input: dict[str, Any] | None = None
+    ) -> data_entry_flow.FlowResult:
+        """Manage the options."""
+        if user_input is not None:
+            return self.async_create_entry(data=user_input)
+
+        options_schema = vol.Schema(
+            {
+                vol.Optional(CONF_RADIUS): vol.All(
+                    int,
+                    vol.Range(min=5),
+                ),
+            }
+        )
+
+        return self.async_show_form(
+            step_id="init",
+            data_schema=self.add_suggested_values_to_schema(
+                options_schema, self.config_entry.options
+            ),
+        )
+
 
 class CannotConnect(exceptions.HomeAssistantError):
     """Error to indicate we cannot connect."""

homeassistant/components/airnow/coordinator.py

@@ -0,0 +1,99 @@
+"""DataUpdateCoordinator for the AirNow integration."""
+import logging
+
+from aiohttp.client_exceptions import ClientConnectorError
+from pyairnow import WebServiceAPI
+from pyairnow.conv import aqi_to_concentration
+from pyairnow.errors import AirNowError
+
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import (
+    ATTR_API_AQI,
+    ATTR_API_AQI_DESCRIPTION,
+    ATTR_API_AQI_LEVEL,
+    ATTR_API_AQI_PARAM,
+    ATTR_API_CAT_DESCRIPTION,
+    ATTR_API_CAT_LEVEL,
+    ATTR_API_CATEGORY,
+    ATTR_API_PM25,
+    ATTR_API_POLLUTANT,
+    ATTR_API_REPORT_DATE,
+    ATTR_API_REPORT_HOUR,
+    ATTR_API_STATE,
+    ATTR_API_STATION,
+    ATTR_API_STATION_LATITUDE,
+    ATTR_API_STATION_LONGITUDE,
+    DOMAIN,
+)
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AirNowDataUpdateCoordinator(DataUpdateCoordinator):
+    """The AirNow update coordinator."""
+
+    def __init__(
+        self, hass, session, api_key, latitude, longitude, distance, update_interval
+    ):
+        """Initialize."""
+        self.latitude = latitude
+        self.longitude = longitude
+        self.distance = distance
+
+        self.airnow = WebServiceAPI(api_key, session=session)
+
+        super().__init__(hass, _LOGGER, name=DOMAIN, update_interval=update_interval)
+
+    async def _async_update_data(self):
+        """Update data via library."""
+        data = {}
+        try:
+            obs = await self.airnow.observations.latLong(
+                self.latitude,
+                self.longitude,
+                distance=self.distance,
+            )
+
+        except (AirNowError, ClientConnectorError) as error:
+            raise UpdateFailed(error) from error
+
+        if not obs:
+            raise UpdateFailed("No data was returned from AirNow")
+
+        max_aqi = 0
+        max_aqi_level = 0
+        max_aqi_desc = ""
+        max_aqi_poll = ""
+        for obv in obs:
+            # Convert AQIs to Concentration
+            pollutant = obv[ATTR_API_AQI_PARAM]
+            concentration = aqi_to_concentration(obv[ATTR_API_AQI], pollutant)
+            data[obv[ATTR_API_AQI_PARAM]] = concentration
+
+            # Overall AQI is the max of all pollutant AQIs
+            if obv[ATTR_API_AQI] > max_aqi:
+                max_aqi = obv[ATTR_API_AQI]
+                max_aqi_level = obv[ATTR_API_CATEGORY][ATTR_API_CAT_LEVEL]
+                max_aqi_desc = obv[ATTR_API_CATEGORY][ATTR_API_CAT_DESCRIPTION]
+                max_aqi_poll = pollutant
+
+            # Copy other data from PM2.5 Value
+            if obv[ATTR_API_AQI_PARAM] == ATTR_API_PM25:
+                # Copy Report Details
+                data[ATTR_API_REPORT_DATE] = obv[ATTR_API_REPORT_DATE]
+                data[ATTR_API_REPORT_HOUR] = obv[ATTR_API_REPORT_HOUR]
+
+                # Copy Station Details
+                data[ATTR_API_STATE] = obv[ATTR_API_STATE]
+                data[ATTR_API_STATION] = obv[ATTR_API_STATION]
+                data[ATTR_API_STATION_LATITUDE] = obv[ATTR_API_STATION_LATITUDE]
+                data[ATTR_API_STATION_LONGITUDE] = obv[ATTR_API_STATION_LONGITUDE]
+
+        # Store Overall AQI
+        data[ATTR_API_AQI] = max_aqi
+        data[ATTR_API_AQI_LEVEL] = max_aqi_level
+        data[ATTR_API_AQI_DESCRIPTION] = max_aqi_desc
+        data[ATTR_API_POLLUTANT] = max_aqi_poll
+
+        return data

homeassistant/components/airnow/sensor.py

@@ -17,8 +17,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.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
@@ -30,6 +29,9 @@ from .const import (
     ATTR_API_AQI_LEVEL,
     ATTR_API_O3,
     ATTR_API_PM25,
+    ATTR_API_STATION,
+    ATTR_API_STATION_LATITUDE,
+    ATTR_API_STATION_LONGITUDE,
     DEFAULT_NAME,
     DOMAIN,
 )
@@ -40,6 +42,7 @@ PARALLEL_UPDATES = 1
 
 ATTR_DESCR = "description"
 ATTR_LEVEL = "level"
+ATTR_STATION = "reporting_station"
 
 
 @dataclass
@@ -55,6 +58,16 @@ class AirNowEntityDescription(SensorEntityDescription, AirNowEntityDescriptionMi
     """Describes Airnow sensor entity."""
 
 
+def station_extra_attrs(data: dict[str, Any]) -> dict[str, Any]:
+    """Process extra attributes for station location (if available)."""
+    if ATTR_API_STATION in data:
+        return {
+            "lat": data.get(ATTR_API_STATION_LATITUDE),
+            "long": data.get(ATTR_API_STATION_LONGITUDE),
+        }
+    return {}
+
+
 SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
     AirNowEntityDescription(
         key=ATTR_API_AQI,
@@ -85,6 +98,13 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
         value_fn=lambda data: data.get(ATTR_API_O3),
         extra_state_attributes_fn=None,
     ),
+    AirNowEntityDescription(
+        key=ATTR_API_STATION,
+        translation_key="station",
+        icon="mdi:blur",
+        value_fn=lambda data: data.get(ATTR_API_STATION),
+        extra_state_attributes_fn=station_extra_attrs,
+    ),
 )
 
 

homeassistant/components/airnow/strings.json

@@ -21,10 +21,26 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     }
   },
+  "options": {
+    "step": {
+      "init": {
+        "data": {
+          "radius": "Station Radius (miles)"
+        }
+      }
+    }
+  },
   "entity": {
     "sensor": {
       "o3": {
         "name": "[%key:component::sensor::entity_component::ozone::name%]"
+      },
+      "station": {
+        "name": "PM2.5 reporting station",
+        "state_attributes": {
+          "lat": { "name": "[%key:common::config_flow::data::latitude%]" },
+          "long": { "name": "[%key:common::config_flow::data::longitude%]" }
+        }
       }
     }
   }

homeassistant/components/airq/coordinator.py

@@ -10,7 +10,7 @@ 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.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import DOMAIN, MANUFACTURER, TARGET_ROUTE, UPDATE_INTERVAL

homeassistant/components/airthings/sensor.py

@@ -21,7 +21,7 @@ from homeassistant.const import (
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (

homeassistant/components/airthings_ble/config_flow.py

@@ -34,8 +34,12 @@ class Discovery:
 
 
 def get_name(device: AirthingsDevice) -> str:
-    """Generate name with identifier for device."""
-    return f"{device.name} ({device.identifier})"
+    """Generate name with model and identifier for device."""
+
+    name = device.friendly_name()
+    if identifier := device.identifier:
+        name += f" ({identifier})"
+    return name
 
 
 class AirthingsDeviceUpdateError(Exception):
@@ -156,7 +160,7 @@ class AirthingsConfigFlow(ConfigFlow, domain=DOMAIN):
             return self.async_abort(reason="no_devices_found")
 
         titles = {
-            address: get_name(discovery.device)
+            address: discovery.device.name
             for (address, discovery) in self._discovered_devices.items()
         }
         return self.async_show_form(

homeassistant/components/airthings_ble/manifest.json

@@ -19,10 +19,10 @@
       "service_uuid": "b42e3882-ade7-11e4-89d3-123b93f75cba"
     }
   ],
-  "codeowners": ["@vincegio"],
+  "codeowners": ["@vincegio", "@LaStrada"],
   "config_flow": true,
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
   "iot_class": "local_polling",
-  "requirements": ["airthings-ble==0.5.3"]
+  "requirements": ["airthings-ble==0.5.6-2"]
 }

homeassistant/components/airthings_ble/sensor.py

@@ -5,26 +5,35 @@ import logging
 
 from airthings_ble import AirthingsDevice
 
-from homeassistant import config_entries
 from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
     LIGHT_LUX,
     PERCENTAGE,
     EntityCategory,
+    Platform,
     UnitOfPressure,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import CONNECTION_BLUETOOTH
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.device_registry import (
+    CONNECTION_BLUETOOTH,
+    DeviceInfo,
+    async_get as device_async_get,
+)
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
+from homeassistant.helpers.entity_registry import (
+    RegistryEntry,
+    async_entries_for_device,
+    async_get as entity_async_get,
+)
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
@@ -108,9 +117,44 @@ SENSORS_MAPPING_TEMPLATE: dict[str, SensorEntityDescription] = {
 }
 
 
+@callback
+def async_migrate(hass: HomeAssistant, address: str, sensor_name: str) -> None:
+    """Migrate entities to new unique ids (with BLE Address)."""
+    ent_reg = entity_async_get(hass)
+    unique_id_trailer = f"_{sensor_name}"
+    new_unique_id = f"{address}{unique_id_trailer}"
+    if ent_reg.async_get_entity_id(DOMAIN, Platform.SENSOR, new_unique_id):
+        # New unique id already exists
+        return
+    dev_reg = device_async_get(hass)
+    if not (
+        device := dev_reg.async_get_device(
+            connections={(CONNECTION_BLUETOOTH, address)}
+        )
+    ):
+        return
+    entities = async_entries_for_device(
+        ent_reg,
+        device_id=device.id,
+        include_disabled_entities=True,
+    )
+    matching_reg_entry: RegistryEntry | None = None
+    for entry in entities:
+        if entry.unique_id.endswith(unique_id_trailer) and (
+            not matching_reg_entry or "(" not in entry.unique_id
+        ):
+            matching_reg_entry = entry
+    if not matching_reg_entry or matching_reg_entry.unique_id == new_unique_id:
+        # Already has the newest unique id format
+        return
+    entity_id = matching_reg_entry.entity_id
+    ent_reg.async_update_entity(entity_id=entity_id, new_unique_id=new_unique_id)
+    _LOGGER.debug("Migrated entity '%s' to unique id '%s'", entity_id, new_unique_id)
+
+
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: config_entries.ConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Airthings BLE sensors."""
@@ -138,6 +182,7 @@ async def async_setup_entry(
                 sensor_value,
             )
             continue
+        async_migrate(hass, coordinator.data.address, sensor_type)
         entities.append(
             AirthingsSensor(coordinator, coordinator.data, sensors_mapping[sensor_type])
         )
@@ -162,11 +207,11 @@ class AirthingsSensor(
         super().__init__(coordinator)
         self.entity_description = entity_description
 
-        name = f"{airthings_device.name} {airthings_device.identifier}"
+        name = airthings_device.name
+        if identifier := airthings_device.identifier:
+            name += f" ({identifier})"
 
-        self._attr_unique_id = f"{name}_{entity_description.key}"
-
-        self._id = airthings_device.address
+        self._attr_unique_id = f"{airthings_device.address}_{entity_description.key}"
         self._attr_device_info = DeviceInfo(
             connections={
                 (
@@ -175,9 +220,10 @@ class AirthingsSensor(
                 )
             },
             name=name,
-            manufacturer="Airthings",
+            manufacturer=airthings_device.manufacturer,
             hw_version=airthings_device.hw_version,
             sw_version=airthings_device.sw_version,
+            model=airthings_device.model,
         )
 
     @property

homeassistant/components/airtouch4/__init__.py

@@ -1,19 +1,13 @@
 """The AirTouch4 integration."""
-import logging
-
 from airtouch4pyapi import AirTouch
-from airtouch4pyapi.airtouch import AirTouchStatus
 
-from homeassistant.components.climate import SCAN_INTERVAL
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
+from .coordinator import AirtouchDataUpdateCoordinator
 
 PLATFORMS = [Platform.CLIMATE]
 
@@ -44,38 +38,3 @@ async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         hass.data[DOMAIN].pop(entry.entry_id)
 
     return unload_ok
-
-
-class AirtouchDataUpdateCoordinator(DataUpdateCoordinator):
-    """Class to manage fetching Airtouch data."""
-
-    def __init__(self, hass, airtouch):
-        """Initialize global Airtouch data updater."""
-        self.airtouch = airtouch
-
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-
-    async def _async_update_data(self):
-        """Fetch data from Airtouch."""
-        await self.airtouch.UpdateInfo()
-        if self.airtouch.Status != AirTouchStatus.OK:
-            raise UpdateFailed("Airtouch connection issue")
-        return {
-            "acs": [
-                {"ac_number": ac.AcNumber, "is_on": ac.IsOn}
-                for ac in self.airtouch.GetAcs()
-            ],
-            "groups": [
-                {
-                    "group_number": group.GroupNumber,
-                    "group_name": group.GroupName,
-                    "is_on": group.IsOn,
-                }
-                for group in self.airtouch.GetGroups()
-            ],
-        }

homeassistant/components/airtouch4/climate.py

@@ -18,7 +18,7 @@ from homeassistant.components.climate import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -98,28 +98,20 @@ class AirtouchAC(CoordinatorEntity, ClimateEntity):
         self._ac_number = ac_number
         self._airtouch = coordinator.airtouch
         self._info = info
-        self._unit = self._airtouch.GetAcs()[self._ac_number]
+        self._unit = self._airtouch.GetAcs()[ac_number]
+        self._attr_unique_id = f"ac_{ac_number}"
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"ac_{ac_number}")},
+            name=f"AC {ac_number}",
+            manufacturer="Airtouch",
+            model="Airtouch 4",
+        )
 
     @callback
     def _handle_coordinator_update(self):
         self._unit = self._airtouch.GetAcs()[self._ac_number]
         return super()._handle_coordinator_update()
 
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info for this device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
-            name=f"AC {self._ac_number}",
-            manufacturer="Airtouch",
-            model="Airtouch 4",
-        )
-
-    @property
-    def unique_id(self):
-        """Return unique ID for this device."""
-        return f"ac_{self._ac_number}"
-
     @property
     def current_temperature(self):
         """Return the current temperature."""
@@ -208,29 +200,21 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
         """Initialize the climate device."""
         super().__init__(coordinator)
         self._group_number = group_number
+        self._attr_unique_id = group_number
         self._airtouch = coordinator.airtouch
         self._info = info
-        self._unit = self._airtouch.GetGroupByGroupNumber(self._group_number)
-
-    @callback
-    def _handle_coordinator_update(self):
-        self._unit = self._airtouch.GetGroupByGroupNumber(self._group_number)
-        return super()._handle_coordinator_update()
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device info for this device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
+        self._unit = self._airtouch.GetGroupByGroupNumber(group_number)
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, group_number)},
             manufacturer="Airtouch",
             model="Airtouch 4",
             name=self._unit.GroupName,
         )
 
-    @property
-    def unique_id(self):
-        """Return unique ID for this device."""
-        return self._group_number
+    @callback
+    def _handle_coordinator_update(self):
+        self._unit = self._airtouch.GetGroupByGroupNumber(self._group_number)
+        return super()._handle_coordinator_update()
 
     @property
     def min_temp(self):

homeassistant/components/airtouch4/coordinator.py

@@ -0,0 +1,46 @@
+"""DataUpdateCoordinator for the airtouch integration."""
+import logging
+
+from airtouch4pyapi.airtouch import AirTouchStatus
+
+from homeassistant.components.climate import SCAN_INTERVAL
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AirtouchDataUpdateCoordinator(DataUpdateCoordinator):
+    """Class to manage fetching Airtouch data."""
+
+    def __init__(self, hass, airtouch):
+        """Initialize global Airtouch data updater."""
+        self.airtouch = airtouch
+
+        super().__init__(
+            hass,
+            _LOGGER,
+            name=DOMAIN,
+            update_interval=SCAN_INTERVAL,
+        )
+
+    async def _async_update_data(self):
+        """Fetch data from Airtouch."""
+        await self.airtouch.UpdateInfo()
+        if self.airtouch.Status != AirTouchStatus.OK:
+            raise UpdateFailed("Airtouch connection issue")
+        return {
+            "acs": [
+                {"ac_number": ac.AcNumber, "is_on": ac.IsOn}
+                for ac in self.airtouch.GetAcs()
+            ],
+            "groups": [
+                {
+                    "group_number": group.GroupNumber,
+                    "group_name": group.GroupName,
+                    "is_on": group.IsOn,
+                }
+                for group in self.airtouch.GetGroups()
+            ],
+        }

homeassistant/components/airtouch4/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "airtouch4",
   "name": "AirTouch 4",
-  "codeowners": ["@LonePurpleWolf"],
+  "codeowners": ["@samsinnamon"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airtouch4",
   "iot_class": "local_polling",

homeassistant/components/airvisual/__init__.py

@@ -421,8 +421,10 @@ class AirVisualEntity(CoordinatorEntity):
         self._entry = entry
         self.entity_description = description
 
+    # pylint: disable-next=hass-missing-super-call
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""
+        await super().async_added_to_hass()
 
         @callback
         def update() -> None:

homeassistant/components/airvisual/config_flow.py

@@ -109,19 +109,21 @@ class AirVisualFlowHandler(config_entries.ConfigFlow, domain=DOMAIN):
             "airvisual_checked_api_keys_lock", asyncio.Lock()
         )
 
-        if integration_type == INTEGRATION_TYPE_GEOGRAPHY_COORDS:
-            coro = cloud_api.air_quality.nearest_city()
-            error_schema = self.geography_coords_schema
-            error_step = "geography_by_coords"
-        else:
-            coro = cloud_api.air_quality.city(
-                user_input[CONF_CITY], user_input[CONF_STATE], user_input[CONF_COUNTRY]
-            )
-            error_schema = GEOGRAPHY_NAME_SCHEMA
-            error_step = "geography_by_name"
-
         async with valid_keys_lock:
             if user_input[CONF_API_KEY] not in valid_keys:
+                if integration_type == INTEGRATION_TYPE_GEOGRAPHY_COORDS:
+                    coro = cloud_api.air_quality.nearest_city()
+                    error_schema = self.geography_coords_schema
+                    error_step = "geography_by_coords"
+                else:
+                    coro = cloud_api.air_quality.city(
+                        user_input[CONF_CITY],
+                        user_input[CONF_STATE],
+                        user_input[CONF_COUNTRY],
+                    )
+                    error_schema = GEOGRAPHY_NAME_SCHEMA
+                    error_step = "geography_by_name"
+
                 try:
                     await coro
                 except (InvalidKeyError, KeyExpiredError, UnauthorizedError):

homeassistant/components/airvisual_pro/__init__.py

@@ -23,7 +23,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers.entity import DeviceInfo, EntityDescription
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,

homeassistant/components/airzone/__init__.py

@@ -24,6 +24,7 @@ PLATFORMS: list[Platform] = [
     Platform.CLIMATE,
     Platform.SELECT,
     Platform.SENSOR,
+    Platform.WATER_HEATER,
 ]
 
 _LOGGER = logging.getLogger(__name__)

homeassistant/components/airzone/coordinator.py

@@ -1,13 +1,13 @@
 """The Airzone integration."""
 from __future__ import annotations
 
+from asyncio import timeout
 from datetime import timedelta
 import logging
 from typing import Any
 
 from aioairzone.exceptions import AirzoneError
 from aioairzone.localapi import AirzoneLocalApi
-import async_timeout
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -35,7 +35,7 @@ class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
-        async with async_timeout.timeout(AIOAIRZONE_DEVICE_TIMEOUT_SEC):
+        async with timeout(AIOAIRZONE_DEVICE_TIMEOUT_SEC):
             try:
                 await self.airzone.update()
             except AirzoneError as error:

homeassistant/components/airzone/entity.py

@@ -10,6 +10,7 @@ from aioairzone.const import (
     AZD_AVAILABLE,
     AZD_FIRMWARE,
     AZD_FULL_NAME,
+    AZD_HOT_WATER,
     AZD_ID,
     AZD_MAC,
     AZD_MODEL,
@@ -26,7 +27,7 @@ from aioairzone.exceptions import AirzoneError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
@@ -81,6 +82,47 @@ class AirzoneSystemEntity(AirzoneEntity):
         return value
 
 
+class AirzoneHotWaterEntity(AirzoneEntity):
+    """Define an Airzone Hot Water entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, f"{entry.entry_id}_dhw")},
+            manufacturer=MANUFACTURER,
+            model="DHW",
+            name=self.get_airzone_value(AZD_NAME),
+            via_device=(DOMAIN, f"{entry.entry_id}_ws"),
+        )
+        self._attr_unique_id = entry.unique_id or entry.entry_id
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return DHW value by key."""
+        return self.coordinator.data[AZD_HOT_WATER].get(key)
+
+    async def _async_update_dhw_params(self, params: dict[str, Any]) -> None:
+        """Send DHW parameters to API."""
+        _params = {
+            API_SYSTEM_ID: 0,
+            **params,
+        }
+        _LOGGER.debug("update_dhw_params=%s", _params)
+        try:
+            await self.coordinator.airzone.set_dhw_parameters(_params)
+        except AirzoneError as error:
+            raise HomeAssistantError(
+                f"Failed to set dhw {self.name}: {error}"
+            ) from error
+
+        self.coordinator.async_set_updated_data(self.coordinator.airzone.data())
+
+
 class AirzoneWebServerEntity(AirzoneEntity):
     """Define an Airzone WebServer entity."""
 

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.5"]
+  "requirements": ["aioairzone==0.6.8"]
 }

homeassistant/components/airzone/sensor.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 from typing import Any, Final
 
 from aioairzone.const import (
+    AZD_HOT_WATER,
     AZD_HUMIDITY,
     AZD_NAME,
     AZD_TEMP,
@@ -31,7 +32,21 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN, TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
-from .entity import AirzoneEntity, AirzoneWebServerEntity, AirzoneZoneEntity
+from .entity import (
+    AirzoneEntity,
+    AirzoneHotWaterEntity,
+    AirzoneWebServerEntity,
+    AirzoneZoneEntity,
+)
+
+HOT_WATER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
+    SensorEntityDescription(
+        device_class=SensorDeviceClass.TEMPERATURE,
+        key=AZD_TEMP,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
+)
 
 WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
     SensorEntityDescription(
@@ -71,6 +86,18 @@ async def async_setup_entry(
 
     sensors: list[AirzoneSensor] = []
 
+    if AZD_HOT_WATER in coordinator.data:
+        dhw_data = coordinator.data[AZD_HOT_WATER]
+        for description in HOT_WATER_SENSOR_TYPES:
+            if description.key in dhw_data:
+                sensors.append(
+                    AirzoneHotWaterSensor(
+                        coordinator,
+                        description,
+                        entry,
+                    )
+                )
+
     if AZD_WEBSERVER in coordinator.data:
         ws_data = coordinator.data[AZD_WEBSERVER]
         for description in WEBSERVER_SENSOR_TYPES:
@@ -114,6 +141,30 @@ class AirzoneSensor(AirzoneEntity, SensorEntity):
         self._attr_native_value = self.get_airzone_value(self.entity_description.key)
 
 
+class AirzoneHotWaterSensor(AirzoneHotWaterEntity, AirzoneSensor):
+    """Define an Airzone Hot Water sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: SensorEntityDescription,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, entry)
+
+        self._attr_unique_id = f"{self._attr_unique_id}_dhw_{description.key}"
+        self.entity_description = description
+
+        self._attr_native_unit_of_measurement = TEMP_UNIT_LIB_TO_HASS.get(
+            self.get_airzone_value(AZD_TEMP_UNIT)
+        )
+
+        self._async_update_attrs()
+
+
 class AirzoneWebServerSensor(AirzoneWebServerEntity, AirzoneSensor):
     """Define an Airzone WebServer sensor."""
 

homeassistant/components/airzone/water_heater.py

@@ -0,0 +1,131 @@
+"""Support for the Airzone water heater."""
+from __future__ import annotations
+
+from typing import Any, Final
+
+from aioairzone.common import HotWaterOperation
+from aioairzone.const import (
+    API_ACS_ON,
+    API_ACS_POWER_MODE,
+    API_ACS_SET_POINT,
+    AZD_HOT_WATER,
+    AZD_NAME,
+    AZD_OPERATION,
+    AZD_OPERATIONS,
+    AZD_TEMP,
+    AZD_TEMP_MAX,
+    AZD_TEMP_MIN,
+    AZD_TEMP_SET,
+    AZD_TEMP_UNIT,
+)
+
+from homeassistant.components.water_heater import (
+    STATE_ECO,
+    STATE_PERFORMANCE,
+    WaterHeaterEntity,
+    WaterHeaterEntityFeature,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN, TEMP_UNIT_LIB_TO_HASS
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import AirzoneHotWaterEntity
+
+OPERATION_LIB_TO_HASS: Final[dict[HotWaterOperation, str]] = {
+    HotWaterOperation.Off: STATE_OFF,
+    HotWaterOperation.On: STATE_ECO,
+    HotWaterOperation.Powerful: STATE_PERFORMANCE,
+}
+
+OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
+    STATE_OFF: {
+        API_ACS_ON: 0,
+    },
+    STATE_ECO: {
+        API_ACS_ON: 1,
+        API_ACS_POWER_MODE: 0,
+    },
+    STATE_PERFORMANCE: {
+        API_ACS_ON: 1,
+        API_ACS_POWER_MODE: 1,
+    },
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone sensors from a config_entry."""
+    coordinator = hass.data[DOMAIN][entry.entry_id]
+    if AZD_HOT_WATER in coordinator.data:
+        async_add_entities([AirzoneWaterHeater(coordinator, entry)])
+
+
+class AirzoneWaterHeater(AirzoneHotWaterEntity, WaterHeaterEntity):
+    """Define an Airzone Water Heater."""
+
+    _attr_supported_features = (
+        WaterHeaterEntityFeature.TARGET_TEMPERATURE
+        | WaterHeaterEntityFeature.ON_OFF
+        | WaterHeaterEntityFeature.OPERATION_MODE
+    )
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        entry: ConfigEntry,
+    ) -> None:
+        """Initialize Airzone water heater entity."""
+        super().__init__(coordinator, entry)
+
+        self._attr_name = self.get_airzone_value(AZD_NAME)
+        self._attr_unique_id = f"{self._attr_unique_id}_dhw"
+        self._attr_operation_list = [
+            OPERATION_LIB_TO_HASS[operation]
+            for operation in self.get_airzone_value(AZD_OPERATIONS)
+        ]
+        self._attr_temperature_unit = TEMP_UNIT_LIB_TO_HASS[
+            self.get_airzone_value(AZD_TEMP_UNIT)
+        ]
+
+        self._async_update_attrs()
+
+    async def async_turn_off(self, **kwargs: Any) -> None:
+        """Turn the water heater off."""
+        await self._async_update_dhw_params({API_ACS_ON: 0})
+
+    async def async_turn_on(self, **kwargs: Any) -> None:
+        """Turn the water heater off."""
+        await self._async_update_dhw_params({API_ACS_ON: 1})
+
+    async def async_set_operation_mode(self, operation_mode: str) -> None:
+        """Set new target operation mode."""
+        params = OPERATION_MODE_TO_DHW_PARAMS.get(operation_mode, {})
+        await self._async_update_dhw_params(params)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        params: dict[str, Any] = {}
+        if ATTR_TEMPERATURE in kwargs:
+            params[API_ACS_SET_POINT] = kwargs[ATTR_TEMPERATURE]
+        await self._async_update_dhw_params(params)
+
+    @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 water heater attributes."""
+        self._attr_current_temperature = self.get_airzone_value(AZD_TEMP)
+        self._attr_current_operation = OPERATION_LIB_TO_HASS[
+            self.get_airzone_value(AZD_OPERATION)
+        ]
+        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)

homeassistant/components/airzone_cloud/__init__.py

@@ -14,6 +14,7 @@ from .coordinator import AirzoneUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
+    Platform.CLIMATE,
     Platform.SENSOR,
 ]
 

homeassistant/components/airzone_cloud/binary_sensor.py

@@ -9,6 +9,7 @@ from aioairzone_cloud.const import (
     AZD_AIDOOS,
     AZD_ERRORS,
     AZD_PROBLEMS,
+    AZD_SYSTEMS,
     AZD_WARNINGS,
     AZD_ZONES,
 )
@@ -25,7 +26,12 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN
 from .coordinator import AirzoneUpdateCoordinator
-from .entity import AirzoneAidooEntity, AirzoneEntity, AirzoneZoneEntity
+from .entity import (
+    AirzoneAidooEntity,
+    AirzoneEntity,
+    AirzoneSystemEntity,
+    AirzoneZoneEntity,
+)
 
 
 @dataclass
@@ -51,6 +57,20 @@ AIDOO_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...
     ),
 )
 
+
+SYSTEM_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]] = (
+    AirzoneBinarySensorEntityDescription(
+        attributes={
+            "errors": AZD_ERRORS,
+            "warnings": AZD_WARNINGS,
+        },
+        device_class=BinarySensorDeviceClass.PROBLEM,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        key=AZD_PROBLEMS,
+    ),
+)
+
+
 ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]] = (
     AirzoneBinarySensorEntityDescription(
         device_class=BinarySensorDeviceClass.RUNNING,
@@ -87,6 +107,18 @@ async def async_setup_entry(
                     )
                 )
 
+    for system_id, system_data in coordinator.data.get(AZD_SYSTEMS, {}).items():
+        for description in SYSTEM_BINARY_SENSOR_TYPES:
+            if description.key in system_data:
+                binary_sensors.append(
+                    AirzoneSystemBinarySensor(
+                        coordinator,
+                        description,
+                        system_id,
+                        system_data,
+                    )
+                )
+
     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:
@@ -145,6 +177,27 @@ class AirzoneAidooBinarySensor(AirzoneAidooEntity, AirzoneBinarySensor):
         self._async_update_attrs()
 
 
+class AirzoneSystemBinarySensor(AirzoneSystemEntity, AirzoneBinarySensor):
+    """Define an Airzone Cloud System binary sensor."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        description: AirzoneBinarySensorEntityDescription,
+        system_id: str,
+        system_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator, system_id, system_data)
+
+        self._attr_unique_id = f"{system_id}_{description.key}"
+        self.entity_description = description
+
+        self._async_update_attrs()
+
+
 class AirzoneZoneBinarySensor(AirzoneZoneEntity, AirzoneBinarySensor):
     """Define an Airzone Cloud Zone binary sensor."""
 

homeassistant/components/airzone_cloud/climate.py

@@ -0,0 +1,208 @@
+"""Support for the Airzone Cloud climate."""
+from __future__ import annotations
+
+from typing import Any, Final
+
+from aioairzone_cloud.common import OperationAction, OperationMode, TemperatureUnit
+from aioairzone_cloud.const import (
+    API_MODE,
+    API_OPTS,
+    API_POWER,
+    API_SETPOINT,
+    API_UNITS,
+    API_VALUE,
+    AZD_ACTION,
+    AZD_HUMIDITY,
+    AZD_MASTER,
+    AZD_MODE,
+    AZD_MODES,
+    AZD_POWER,
+    AZD_TEMP,
+    AZD_TEMP_SET,
+    AZD_TEMP_SET_MAX,
+    AZD_TEMP_SET_MIN,
+    AZD_TEMP_STEP,
+    AZD_ZONES,
+)
+
+from homeassistant.components.climate import (
+    ClimateEntity,
+    ClimateEntityFeature,
+    HVACAction,
+    HVACMode,
+)
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from .const import DOMAIN
+from .coordinator import AirzoneUpdateCoordinator
+from .entity import AirzoneEntity, AirzoneZoneEntity
+
+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_MODE_LIB_TO_HASS: Final[dict[OperationMode, HVACMode]] = {
+    OperationMode.STOP: HVACMode.OFF,
+    OperationMode.COOLING: HVACMode.COOL,
+    OperationMode.COOLING_AIR: HVACMode.COOL,
+    OperationMode.COOLING_RADIANT: HVACMode.COOL,
+    OperationMode.COOLING_COMBINED: HVACMode.COOL,
+    OperationMode.HEATING: HVACMode.HEAT,
+    OperationMode.HEAT_AIR: HVACMode.HEAT,
+    OperationMode.HEAT_RADIANT: HVACMode.HEAT,
+    OperationMode.HEAT_COMBINED: HVACMode.HEAT,
+    OperationMode.EMERGENCY_HEAT: HVACMode.HEAT,
+    OperationMode.VENTILATION: HVACMode.FAN_ONLY,
+    OperationMode.DRY: HVACMode.DRY,
+    OperationMode.AUTO: HVACMode.HEAT_COOL,
+}
+HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
+    HVACMode.OFF: OperationMode.STOP,
+    HVACMode.COOL: OperationMode.COOLING,
+    HVACMode.HEAT: OperationMode.HEATING,
+    HVACMode.FAN_ONLY: OperationMode.VENTILATION,
+    HVACMode.DRY: OperationMode.DRY,
+    HVACMode.HEAT_COOL: OperationMode.AUTO,
+}
+
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+) -> None:
+    """Add Airzone climate from a config_entry."""
+    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+
+    entities: list[AirzoneClimate] = []
+
+    # Zones
+    for zone_id, zone_data in coordinator.data.get(AZD_ZONES, {}).items():
+        entities.append(
+            AirzoneZoneClimate(
+                coordinator,
+                zone_id,
+                zone_data,
+            )
+        )
+
+    async_add_entities(entities)
+
+
+class AirzoneClimate(AirzoneEntity, ClimateEntity):
+    """Define an Airzone Cloud climate."""
+
+    _attr_supported_features = ClimateEntityFeature.TARGET_TEMPERATURE
+    _attr_temperature_unit = UnitOfTemperature.CELSIUS
+
+    async def async_turn_on(self) -> None:
+        """Turn the entity on."""
+        params = {
+            API_POWER: {
+                API_VALUE: True,
+            },
+        }
+        await self._async_update_params(params)
+
+    async def async_turn_off(self) -> None:
+        """Turn the entity off."""
+        params = {
+            API_POWER: {
+                API_VALUE: False,
+            },
+        }
+        await self._async_update_params(params)
+
+    async def async_set_temperature(self, **kwargs: Any) -> None:
+        """Set new target temperature."""
+        params: dict[str, Any] = {}
+        if ATTR_TEMPERATURE in kwargs:
+            params[API_SETPOINT] = {
+                API_VALUE: kwargs[ATTR_TEMPERATURE],
+                API_OPTS: {
+                    API_UNITS: TemperatureUnit.CELSIUS.value,
+                },
+            }
+        await self._async_update_params(params)
+
+    @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 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_POWER):
+            self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[
+                self.get_airzone_value(AZD_MODE)
+            ]
+        else:
+            self._attr_hvac_mode = HVACMode.OFF
+        self._attr_max_temp = self.get_airzone_value(AZD_TEMP_SET_MAX)
+        self._attr_min_temp = self.get_airzone_value(AZD_TEMP_SET_MIN)
+        self._attr_target_temperature = self.get_airzone_value(AZD_TEMP_SET)
+
+
+class AirzoneZoneClimate(AirzoneZoneEntity, AirzoneClimate):
+    """Define an Airzone Cloud Zone climate."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        system_zone_id: str,
+        zone_data: dict,
+    ) -> None:
+        """Initialize Airzone Cloud Zone climate."""
+        super().__init__(coordinator, system_zone_id, zone_data)
+
+        self._attr_unique_id = system_zone_id
+        self._attr_target_temperature_step = self.get_airzone_value(AZD_TEMP_STEP)
+        self._attr_hvac_modes = [
+            HVAC_MODE_LIB_TO_HASS[mode] for mode in self.get_airzone_value(AZD_MODES)
+        ]
+        if HVACMode.OFF not in self._attr_hvac_modes:
+            self._attr_hvac_modes += [HVACMode.OFF]
+
+        self._async_update_attrs()
+
+    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
+        """Set hvac mode."""
+        slave_raise = False
+
+        params: dict[str, Any] = {}
+        if hvac_mode == HVACMode.OFF:
+            params[API_POWER] = {
+                API_VALUE: False,
+            }
+        else:
+            mode = HVAC_MODE_HASS_TO_LIB[hvac_mode]
+            if mode != self.get_airzone_value(AZD_MODE):
+                if self.get_airzone_value(AZD_MASTER):
+                    params[API_MODE] = {
+                        API_VALUE: mode.value,
+                    }
+                else:
+                    slave_raise = True
+            params[API_POWER] = {
+                API_VALUE: True,
+            }
+
+        await self._async_update_params(params)
+
+        if slave_raise:
+            raise HomeAssistantError(f"Mode can't be changed on slave zone {self.name}")

homeassistant/components/airzone_cloud/coordinator.py

@@ -1,13 +1,13 @@
 """The Airzone Cloud integration coordinator."""
 from __future__ import annotations
 
+from asyncio import timeout
 from datetime import timedelta
 import logging
 from typing import Any
 
 from aioairzone_cloud.cloudapi import AirzoneCloudApi
 from aioairzone_cloud.exceptions import AirzoneCloudError
-import async_timeout
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
@@ -35,7 +35,7 @@ class AirzoneUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
 
     async def _async_update_data(self) -> dict[str, Any]:
         """Update data via library."""
-        async with async_timeout.timeout(AIOAIRZONE_CLOUD_TIMEOUT_SEC):
+        async with timeout(AIOAIRZONE_CLOUD_TIMEOUT_SEC):
             try:
                 await self.airzone.update()
             except AirzoneCloudError as error:

homeassistant/components/airzone_cloud/entity.py

@@ -2,6 +2,7 @@
 from __future__ import annotations
 
 from abc import ABC, abstractmethod
+import logging
 from typing import Any
 
 from aioairzone_cloud.const import (
@@ -10,18 +11,23 @@ from aioairzone_cloud.const import (
     AZD_FIRMWARE,
     AZD_NAME,
     AZD_SYSTEM_ID,
+    AZD_SYSTEMS,
     AZD_WEBSERVER,
     AZD_WEBSERVERS,
     AZD_ZONES,
 )
+from aioairzone_cloud.exceptions import AirzoneCloudError
 
+from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN, MANUFACTURER
 from .coordinator import AirzoneUpdateCoordinator
 
+_LOGGER = logging.getLogger(__name__)
+
 
 class AirzoneEntity(CoordinatorEntity[AirzoneUpdateCoordinator], ABC):
     """Define an Airzone Cloud entity."""
@@ -35,6 +41,10 @@ class AirzoneEntity(CoordinatorEntity[AirzoneUpdateCoordinator], ABC):
     def get_airzone_value(self, key: str) -> Any:
         """Return Airzone Cloud entity value by key."""
 
+    async def _async_update_params(self, params: dict[str, Any]) -> None:
+        """Send Airzone parameters to Cloud API."""
+        raise NotImplementedError
+
 
 class AirzoneAidooEntity(AirzoneEntity):
     """Define an Airzone Cloud Aidoo entity."""
@@ -65,6 +75,35 @@ class AirzoneAidooEntity(AirzoneEntity):
         return value
 
 
+class AirzoneSystemEntity(AirzoneEntity):
+    """Define an Airzone Cloud System entity."""
+
+    def __init__(
+        self,
+        coordinator: AirzoneUpdateCoordinator,
+        system_id: str,
+        system_data: dict[str, Any],
+    ) -> None:
+        """Initialize."""
+        super().__init__(coordinator)
+
+        self.system_id = system_id
+
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, system_id)},
+            manufacturer=MANUFACTURER,
+            name=system_data[AZD_NAME],
+            via_device=(DOMAIN, system_data[AZD_WEBSERVER]),
+        )
+
+    def get_airzone_value(self, key: str) -> Any:
+        """Return system value by key."""
+        value = None
+        if system := self.coordinator.data[AZD_SYSTEMS].get(self.system_id):
+            value = system.get(key)
+        return value
+
+
 class AirzoneWebServerEntity(AirzoneEntity):
     """Define an Airzone Cloud WebServer entity."""
 
@@ -123,3 +162,15 @@ class AirzoneZoneEntity(AirzoneEntity):
         if zone := self.coordinator.data[AZD_ZONES].get(self.zone_id):
             value = zone.get(key)
         return value
+
+    async def _async_update_params(self, params: dict[str, Any]) -> None:
+        """Send Zone parameters to Cloud API."""
+        _LOGGER.debug("zone=%s: update_params=%s", self.name, params)
+        try:
+            await self.coordinator.airzone.api_set_zone_id_params(self.zone_id, params)
+        except AirzoneCloudError as error:
+            raise HomeAssistantError(
+                f"Failed to set {self.name} params: {error}"
+            ) from error
+
+        self.coordinator.async_set_updated_data(self.coordinator.airzone.data())

homeassistant/components/airzone_cloud/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_polling",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.2.1"]
+  "requirements": ["aioairzone-cloud==0.2.3"]
 }

homeassistant/components/aladdin_connect/cover.py

@@ -10,8 +10,8 @@ from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import STATE_CLOSED, STATE_CLOSING, STATE_OPENING
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.exceptions import HomeAssistantError, PlatformNotReady
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN, STATES_MAP, SUPPORTED_FEATURES
@@ -75,11 +75,13 @@ class AladdinDevice(CoverEntity):
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Issue close command to cover."""
-        await self._acc.close_door(self._device_id, self._number)
+        if not await self._acc.close_door(self._device_id, self._number):
+            raise HomeAssistantError("Aladdin Connect API failed to close the cover")
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Issue open command to cover."""
-        await self._acc.open_door(self._device_id, self._number)
+        if not await self._acc.open_door(self._device_id, self._number):
+            raise HomeAssistantError("Aladdin Connect API failed to open the cover")
 
     async def async_update(self) -> None:
         """Update status of cover."""

homeassistant/components/aladdin_connect/diagnostics.py

@@ -0,0 +1,29 @@
+"""Diagnostics support for Aladdin Connect."""
+from __future__ import annotations
+
+from typing import Any
+
+from AIOAladdinConnect import AladdinConnectClient
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.config_entries import ConfigEntry
+from homeassistant.core import HomeAssistant
+
+from .const import DOMAIN
+
+TO_REDACT = {"serial", "device_id"}
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant,
+    config_entry: ConfigEntry,
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+
+    acc: AladdinConnectClient = hass.data[DOMAIN][config_entry.entry_id]
+
+    diagnostics_data = {
+        "doors": async_redact_data(acc.doors, TO_REDACT),
+    }
+
+    return diagnostics_data

homeassistant/components/aladdin_connect/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aladdin_connect",
   "iot_class": "cloud_polling",
   "loggers": ["aladdin_connect"],
-  "requirements": ["AIOAladdinConnect==0.1.57"]
+  "requirements": ["AIOAladdinConnect==0.1.58"]
 }

homeassistant/components/aladdin_connect/sensor.py

@@ -16,7 +16,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, SIGNAL_STRENGTH_DECIBELS
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity import DeviceInfo
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN

homeassistant/components/alarmdecoder/__init__.py

@@ -16,8 +16,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.event import async_track_point_in_time
-from homeassistant.util import dt as dt_util
+from homeassistant.helpers.event import async_call_later
 
 from .const import (
     CONF_DEVICE_BAUD,
@@ -66,9 +65,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
             await hass.async_add_executor_job(controller.open, baud)
         except NoDeviceError:
             _LOGGER.debug("Failed to connect. Retrying in 5 seconds")
-            async_track_point_in_time(
-                hass, open_connection, dt_util.utcnow() + timedelta(seconds=5)
-            )
+            async_call_later(hass, timedelta(seconds=5), open_connection)
             return
         _LOGGER.debug("Established a connection with the alarmdecoder")
         hass.data[DOMAIN][entry.entry_id][DATA_RESTART] = True

homeassistant/components/alexa/__init__.py

@@ -16,7 +16,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entityfilter
 from homeassistant.helpers.typing import ConfigType
 
-from . import flash_briefings, intent, smart_home_http
+from . import flash_briefings, intent, smart_home
 from .const import (
     CONF_AUDIO,
     CONF_DISPLAY_CATEGORIES,
@@ -100,6 +100,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if CONF_SMART_HOME in config:
         smart_home_config: dict[str, Any] | None = config[CONF_SMART_HOME]
         smart_home_config = smart_home_config or SMART_HOME_SCHEMA({})
-        await smart_home_http.async_setup(hass, smart_home_config)
+        await smart_home.async_setup(hass, smart_home_config)
 
     return True

homeassistant/components/alexa/auth.py

@@ -1,15 +1,16 @@
 """Support for Alexa skill auth."""
 import asyncio
-from datetime import timedelta
+from asyncio import timeout
+from datetime import datetime, timedelta
 from http import HTTPStatus
 import json
 import logging
+from typing import Any
 
 import aiohttp
-import async_timeout
 
 from homeassistant.const import CONF_CLIENT_ID, CONF_CLIENT_SECRET
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import aiohttp_client
 from homeassistant.helpers.storage import Store
 from homeassistant.util import dt as dt_util
@@ -30,24 +31,24 @@ STORAGE_REFRESH_TOKEN = "refresh_token"
 class Auth:
     """Handle authentication to send events to Alexa."""
 
-    def __init__(self, hass, client_id, client_secret):
+    def __init__(self, hass: HomeAssistant, client_id: str, client_secret: str) -> None:
         """Initialize the Auth class."""
         self.hass = hass
 
         self.client_id = client_id
         self.client_secret = client_secret
 
-        self._prefs = None
-        self._store = Store(hass, STORAGE_VERSION, STORAGE_KEY)
+        self._prefs: dict[str, Any] | None = None
+        self._store: Store = Store(hass, STORAGE_VERSION, STORAGE_KEY)
 
         self._get_token_lock = asyncio.Lock()
 
-    async def async_do_auth(self, accept_grant_code):
+    async def async_do_auth(self, accept_grant_code: str) -> str | None:
         """Do authentication with an AcceptGrant code."""
         # access token not retrieved yet for the first time, so this should
         # be an access token request
 
-        lwa_params = {
+        lwa_params: dict[str, str] = {
             "grant_type": "authorization_code",
             "code": accept_grant_code,
             CONF_CLIENT_ID: self.client_id,
@@ -61,25 +62,28 @@ class Auth:
         return await self._async_request_new_token(lwa_params)
 
     @callback
-    def async_invalidate_access_token(self):
+    def async_invalidate_access_token(self) -> None:
         """Invalidate access token."""
+        assert self._prefs is not None
         self._prefs[STORAGE_ACCESS_TOKEN] = None
 
-    async def async_get_access_token(self):
+    async def async_get_access_token(self) -> str | None:
         """Perform access token or token refresh request."""
         async with self._get_token_lock:
             if self._prefs is None:
                 await self.async_load_preferences()
 
+            assert self._prefs is not None
             if self.is_token_valid():
                 _LOGGER.debug("Token still valid, using it")
-                return self._prefs[STORAGE_ACCESS_TOKEN]
+                token: str = self._prefs[STORAGE_ACCESS_TOKEN]
+                return token
 
             if self._prefs[STORAGE_REFRESH_TOKEN] is None:
                 _LOGGER.debug("Token invalid and no refresh token available")
                 return None
 
-            lwa_params = {
+            lwa_params: dict[str, str] = {
                 "grant_type": "refresh_token",
                 "refresh_token": self._prefs[STORAGE_REFRESH_TOKEN],
                 CONF_CLIENT_ID: self.client_id,
@@ -90,22 +94,26 @@ class Auth:
             return await self._async_request_new_token(lwa_params)
 
     @callback
-    def is_token_valid(self):
+    def is_token_valid(self) -> bool:
         """Check if a token is already loaded and if it is still valid."""
+        assert self._prefs is not None
         if not self._prefs[STORAGE_ACCESS_TOKEN]:
             return False
 
-        expire_time = dt_util.parse_datetime(self._prefs[STORAGE_EXPIRE_TIME])
+        expire_time: datetime | None = dt_util.parse_datetime(
+            self._prefs[STORAGE_EXPIRE_TIME]
+        )
+        assert expire_time is not None
         preemptive_expire_time = expire_time - timedelta(
             seconds=PREEMPTIVE_REFRESH_TTL_IN_SECONDS
         )
 
         return dt_util.utcnow() < preemptive_expire_time
 
-    async def _async_request_new_token(self, lwa_params):
+    async def _async_request_new_token(self, lwa_params: dict[str, str]) -> str | None:
         try:
             session = aiohttp_client.async_get_clientsession(self.hass)
-            async with async_timeout.timeout(10):
+            async with timeout(10):
                 response = await session.post(
                     LWA_TOKEN_URI,
                     headers=LWA_HEADERS,
@@ -127,9 +135,9 @@ class Auth:
         response_json = await response.json()
         _LOGGER.debug("LWA response body  : %s", response_json)
 
-        access_token = response_json["access_token"]
-        refresh_token = response_json["refresh_token"]
-        expires_in = response_json["expires_in"]
+        access_token: str = response_json["access_token"]
+        refresh_token: str = response_json["refresh_token"]
+        expires_in: int = response_json["expires_in"]
         expire_time = dt_util.utcnow() + timedelta(seconds=expires_in)
 
         await self._async_update_preferences(
@@ -138,7 +146,7 @@ class Auth:
 
         return access_token
 
-    async def async_load_preferences(self):
+    async def async_load_preferences(self) -> None:
         """Load preferences with stored tokens."""
         self._prefs = await self._store.async_load()
 
@@ -149,10 +157,13 @@ class Auth:
                 STORAGE_EXPIRE_TIME: None,
             }
 
-    async def _async_update_preferences(self, access_token, refresh_token, expire_time):
+    async def _async_update_preferences(
+        self, access_token: str, refresh_token: str, expire_time: str
+    ) -> None:
         """Update user preferences."""
         if self._prefs is None:
             await self.async_load_preferences()
+            assert self._prefs is not None
 
         if access_token is not None:
             self._prefs[STORAGE_ACCESS_TOKEN] = access_token

homeassistant/components/alexa/config.py

@@ -4,6 +4,9 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 import asyncio
 import logging
+from typing import Any
+
+from yarl import URL
 
 from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
 from homeassistant.helpers.storage import Store
@@ -33,38 +36,38 @@ class AbstractConfig(ABC):
         await self._store.async_load()
 
     @property
-    def supports_auth(self):
+    def supports_auth(self) -> bool:
         """Return if config supports auth."""
         return False
 
     @property
-    def should_report_state(self):
+    def should_report_state(self) -> bool:
         """Return if states should be proactively reported."""
         return False
 
     @property
-    def endpoint(self):
+    @abstractmethod
+    def endpoint(self) -> str | URL | None:
         """Endpoint for report state."""
-        return None
 
     @property
     @abstractmethod
-    def locale(self):
+    def locale(self) -> str | None:
         """Return config locale."""
 
     @property
-    def entity_config(self):
+    def entity_config(self) -> dict[str, Any]:
         """Return entity config."""
         return {}
 
     @property
-    def is_reporting_states(self):
+    def is_reporting_states(self) -> bool:
         """Return if proactive mode is enabled."""
         return self._unsub_proactive_report is not None
 
     @callback
     @abstractmethod
-    def user_identifier(self):
+    def user_identifier(self) -> str:
         """Return an identifier for the user that represents this config."""
 
     async def async_enable_proactive_mode(self) -> None:
@@ -85,29 +88,29 @@ class AbstractConfig(ABC):
         self._unsub_proactive_report = None
 
     @callback
-    def should_expose(self, entity_id):
+    def should_expose(self, entity_id: str) -> bool:
         """If an entity should be exposed."""
         return False
 
     @callback
-    def async_invalidate_access_token(self):
+    def async_invalidate_access_token(self) -> None:
         """Invalidate access token."""
         raise NotImplementedError
 
-    async def async_get_access_token(self):
+    async def async_get_access_token(self) -> str | None:
         """Get an access token."""
         raise NotImplementedError
 
-    async def async_accept_grant(self, code):
+    async def async_accept_grant(self, code: str) -> str | None:
         """Accept a grant."""
         raise NotImplementedError
 
     @property
-    def authorized(self):
+    def authorized(self) -> bool:
         """Return authorization status."""
         return self._store.authorized
 
-    async def set_authorized(self, authorized) -> None:
+    async def set_authorized(self, authorized: bool) -> None:
         """Set authorization status.
 
         - Set when an incoming message is received from Alexa.
@@ -132,25 +135,26 @@ class AlexaConfigStore:
     _STORAGE_VERSION = 1
     _STORAGE_KEY = DOMAIN
 
-    def __init__(self, hass):
+    def __init__(self, hass: HomeAssistant) -> None:
         """Initialize a configuration store."""
-        self._data = None
+        self._data: dict[str, Any] | None = None
         self._hass = hass
-        self._store = Store(hass, self._STORAGE_VERSION, self._STORAGE_KEY)
+        self._store: Store = Store(hass, self._STORAGE_VERSION, self._STORAGE_KEY)
 
     @property
-    def authorized(self):
+    def authorized(self) -> bool:
         """Return authorization status."""
-        return self._data[STORE_AUTHORIZED]
+        assert self._data is not None
+        return bool(self._data[STORE_AUTHORIZED])
 
     @callback
-    def set_authorized(self, authorized):
+    def set_authorized(self, authorized: bool) -> None:
         """Set authorization status."""
-        if authorized != self._data[STORE_AUTHORIZED]:
+        if self._data is not None and authorized != self._data[STORE_AUTHORIZED]:
             self._data[STORE_AUTHORIZED] = authorized
             self._store.async_delay_save(lambda: self._data, 1.0)
 
-    async def async_load(self):
+    async def async_load(self) -> None:
         """Load saved configuration from disk."""
         if data := await self._store.async_load():
             self._data = data

homeassistant/components/alexa/const.py

@@ -69,7 +69,7 @@ API_TEMP_UNITS = {
 # Needs to be ordered dict for `async_api_set_thermostat_mode` which does a
 # reverse mapping of this dict and we want to map the first occurrence of OFF
 # back to HA state.
-API_THERMOSTAT_MODES = OrderedDict(
+API_THERMOSTAT_MODES: OrderedDict[str, str] = OrderedDict(
     [
         (climate.HVACMode.HEAT, "HEAT"),
         (climate.HVACMode.COOL, "COOL"),

homeassistant/components/alexa/entities.py

@@ -3,7 +3,7 @@ from __future__ import annotations
 
 from collections.abc import Generator, Iterable
 import logging
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Any
 
 from homeassistant.components import (
     alarm_control_panel,
@@ -274,22 +274,23 @@ class AlexaEntity:
         self.entity_conf = config.entity_config.get(entity.entity_id, {})
 
     @property
-    def entity_id(self):
+    def entity_id(self) -> str:
         """Return the Entity ID."""
         return self.entity.entity_id
 
-    def friendly_name(self):
+    def friendly_name(self) -> str:
         """Return the Alexa API friendly name."""
-        return self.entity_conf.get(CONF_NAME, self.entity.name).translate(
-            TRANSLATION_TABLE
-        )
+        friendly_name: str = self.entity_conf.get(
+            CONF_NAME, self.entity.name
+        ).translate(TRANSLATION_TABLE)
+        return friendly_name
 
-    def description(self):
+    def description(self) -> str:
         """Return the Alexa API description."""
         description = self.entity_conf.get(CONF_DESCRIPTION) or self.entity_id
         return f"{description} via Home Assistant".translate(TRANSLATION_TABLE)
 
-    def alexa_id(self):
+    def alexa_id(self) -> str:
         """Return the Alexa API entity id."""
         return generate_alexa_id(self.entity.entity_id)
 
@@ -317,7 +318,7 @@ class AlexaEntity:
         """
         raise NotImplementedError
 
-    def serialize_properties(self):
+    def serialize_properties(self) -> Generator[dict[str, Any], None, None]:
         """Yield each supported property in API format."""
         for interface in self.interfaces():
             if not interface.properties_proactively_reported():
@@ -325,9 +326,9 @@ class AlexaEntity:
 
             yield from interface.serialize_properties()
 
-    def serialize_discovery(self):
+    def serialize_discovery(self) -> dict[str, Any]:
         """Serialize the entity for discovery."""
-        result = {
+        result: dict[str, Any] = {
             "displayCategories": self.display_categories(),
             "cookie": {},
             "endpointId": self.alexa_id(),
@@ -366,7 +367,7 @@ def async_get_entities(
     hass: HomeAssistant, config: AbstractConfig
 ) -> list[AlexaEntity]:
     """Return all entities that are supported by Alexa."""
-    entities = []
+    entities: list[AlexaEntity] = []
     for state in hass.states.async_all():
         if state.entity_id in CLOUD_NEVER_EXPOSED_ENTITIES:
             continue
@@ -706,7 +707,8 @@ class MediaPlayerCapabilities(AlexaEntity):
 
         # AlexaEqualizerController is disabled for denonavr
         # since it blocks alexa from discovering any devices.
-        domain = entity_sources(self.hass).get(self.entity_id, {}).get("domain")
+        entity_info = entity_sources(self.hass).get(self.entity_id)
+        domain = entity_info["domain"] if entity_info else None
         if (
             supported & media_player.MediaPlayerEntityFeature.SELECT_SOUND_MODE
             and domain != "denonavr"
@@ -725,7 +727,7 @@ class MediaPlayerCapabilities(AlexaEntity):
 class SceneCapabilities(AlexaEntity):
     """Class to represent Scene capabilities."""
 
-    def description(self):
+    def description(self) -> str:
         """Return the Alexa API description."""
         description = AlexaEntity.description(self)
         if "scene" not in description.casefold():

homeassistant/components/alexa/errors.py

@@ -1,8 +1,9 @@
 """Alexa related errors."""
 from __future__ import annotations
 
-from typing import Literal
+from typing import Any, Literal
 
+from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 
 from .const import API_TEMP_UNITS
@@ -29,7 +30,9 @@ class AlexaError(Exception):
     namespace: str | None = None
     error_type: str | None = None
 
-    def __init__(self, error_message, payload=None):
+    def __init__(
+        self, error_message: str, payload: dict[str, Any] | None = None
+    ) -> None:
         """Initialize an alexa error."""
         Exception.__init__(self)
         self.error_message = error_message
@@ -42,7 +45,7 @@ class AlexaInvalidEndpointError(AlexaError):
     namespace = "Alexa"
     error_type = "NO_SUCH_ENDPOINT"
 
-    def __init__(self, endpoint_id):
+    def __init__(self, endpoint_id: str) -> None:
         """Initialize invalid endpoint error."""
         msg = f"The endpoint {endpoint_id} does not exist"
         AlexaError.__init__(self, msg)
@@ -87,13 +90,22 @@ class AlexaUnsupportedThermostatModeError(AlexaError):
     error_type = "UNSUPPORTED_THERMOSTAT_MODE"
 
 
+class AlexaUnsupportedThermostatTargetStateError(AlexaError):
+    """Class to represent unsupported climate target state error."""
+
+    namespace = "Alexa.ThermostatController"
+    error_type = "INVALID_TARGET_STATE"
+
+
 class AlexaTempRangeError(AlexaError):
     """Class to represent TempRange errors."""
 
     namespace = "Alexa"
     error_type = "TEMPERATURE_VALUE_OUT_OF_RANGE"
 
-    def __init__(self, hass, temp, min_temp, max_temp):
+    def __init__(
+        self, hass: HomeAssistant, temp: float, min_temp: float, max_temp: float
+    ) -> None:
         """Initialize TempRange error."""
         unit = hass.config.units.temperature_unit
         temp_range = {

homeassistant/components/alexa/flash_briefings.py

@@ -4,10 +4,13 @@ from http import HTTPStatus
 import logging
 import uuid
 
+from aiohttp.web_response import StreamResponse
+
 from homeassistant.components import http
 from homeassistant.const import CONF_PASSWORD
-from homeassistant.core import callback
+from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import template
+from homeassistant.helpers.typing import ConfigType
 import homeassistant.util.dt as dt_util
 
 from .const import (
@@ -32,7 +35,7 @@ FLASH_BRIEFINGS_API_ENDPOINT = "/api/alexa/flash_briefings/{briefing_id}"
 
 
 @callback
-def async_setup(hass, flash_briefing_config):
+def async_setup(hass: HomeAssistant, flash_briefing_config: ConfigType) -> None:
     """Activate Alexa component."""
     hass.http.register_view(AlexaFlashBriefingView(hass, flash_briefing_config))
 
@@ -44,14 +47,16 @@ class AlexaFlashBriefingView(http.HomeAssistantView):
     requires_auth = False
     name = "api:alexa:flash_briefings"
 
-    def __init__(self, hass, flash_briefings):
+    def __init__(self, hass: HomeAssistant, flash_briefings: ConfigType) -> None:
         """Initialize Alexa view."""
         super().__init__()
         self.flash_briefings = flash_briefings
         template.attach(hass, self.flash_briefings)
 
     @callback
-    def get(self, request, briefing_id):
+    def get(
+        self, request: http.HomeAssistantRequest, briefing_id: str
+    ) -> StreamResponse | tuple[bytes, HTTPStatus]:
         """Handle Alexa Flash Briefing request."""
         _LOGGER.debug("Received Alexa flash briefing request for: %s", briefing_id)