Allow multiple template.select platform entries (#55908)

* Fix upnp add_entities

* Remove nesting level

.coveragerc

@@ -36,6 +36,9 @@ omit =
     homeassistant/components/agent_dvr/helpers.py
     homeassistant/components/airnow/__init__.py
     homeassistant/components/airnow/sensor.py
+    homeassistant/components/airtouch4/__init__.py
+    homeassistant/components/airtouch4/climate.py
+    homeassistant/components/airtouch4/const.py
     homeassistant/components/airvisual/__init__.py
     homeassistant/components/airvisual/sensor.py
     homeassistant/components/aladdin_connect/*
@@ -314,6 +317,12 @@ omit =
     homeassistant/components/firmata/switch.py
     homeassistant/components/fitbit/*
     homeassistant/components/fixer/sensor.py
+    homeassistant/components/fjaraskupan/__init__.py
+    homeassistant/components/fjaraskupan/binary_sensor.py
+    homeassistant/components/fjaraskupan/const.py
+    homeassistant/components/fjaraskupan/fan.py
+    homeassistant/components/fjaraskupan/light.py
+    homeassistant/components/fjaraskupan/sensor.py
     homeassistant/components/fleetgo/device_tracker.py
     homeassistant/components/flexit/climate.py
     homeassistant/components/flic/binary_sensor.py
@@ -375,6 +384,7 @@ omit =
     homeassistant/components/google/*
     homeassistant/components/google_cloud/tts.py
     homeassistant/components/google_maps/device_tracker.py
+    homeassistant/components/google_pubsub/__init__.py
     homeassistant/components/google_travel_time/__init__.py
     homeassistant/components/google_travel_time/helpers.py
     homeassistant/components/google_travel_time/sensor.py
@@ -636,6 +646,7 @@ omit =
     homeassistant/components/modbus/cover.py
     homeassistant/components/modbus/climate.py
     homeassistant/components/modbus/modbus.py
+    homeassistant/components/modbus/sensor.py
     homeassistant/components/modbus/validators.py
     homeassistant/components/modem_callerid/sensor.py
     homeassistant/components/motion_blinds/__init__.py
@@ -666,17 +677,21 @@ omit =
     homeassistant/components/mysensors/helpers.py
     homeassistant/components/mysensors/light.py
     homeassistant/components/mysensors/notify.py
-    homeassistant/components/mysensors/sensor.py
     homeassistant/components/mysensors/switch.py
     homeassistant/components/mystrom/binary_sensor.py
     homeassistant/components/mystrom/light.py
     homeassistant/components/mystrom/switch.py
     homeassistant/components/myq/__init__.py
+    homeassistant/components/myq/cover.py
+    homeassistant/components/myq/light.py
     homeassistant/components/nad/media_player.py
+    homeassistant/components/nanoleaf/__init__.py
     homeassistant/components/nanoleaf/light.py
+    homeassistant/components/nanoleaf/util.py
     homeassistant/components/neato/__init__.py
     homeassistant/components/neato/api.py
     homeassistant/components/neato/camera.py
+    homeassistant/components/neato/hub.py
     homeassistant/components/neato/sensor.py
     homeassistant/components/neato/switch.py
     homeassistant/components/neato/vacuum.py
@@ -695,7 +710,8 @@ omit =
     homeassistant/components/niko_home_control/light.py
     homeassistant/components/nilu/air_quality.py
     homeassistant/components/nissan_leaf/*
-    homeassistant/components/nmap_tracker/*
+    homeassistant/components/nmap_tracker/__init__.py
+    homeassistant/components/nmap_tracker/device_tracker.py
     homeassistant/components/nmbs/sensor.py
     homeassistant/components/notion/__init__.py
     homeassistant/components/notion/binary_sensor.py
@@ -829,9 +845,9 @@ omit =
     homeassistant/components/raincloud/*
     homeassistant/components/rainmachine/__init__.py
     homeassistant/components/rainmachine/binary_sensor.py
+    homeassistant/components/rainmachine/model.py
     homeassistant/components/rainmachine/sensor.py
     homeassistant/components/rainmachine/switch.py
-    homeassistant/components/rainforest_eagle/sensor.py
     homeassistant/components/raspihats/*
     homeassistant/components/raspyrfm/*
     homeassistant/components/recollect_waste/__init__.py
@@ -849,12 +865,8 @@ omit =
     homeassistant/components/ring/camera.py
     homeassistant/components/ripple/sensor.py
     homeassistant/components/rituals_perfume_genie/binary_sensor.py
-    homeassistant/components/rituals_perfume_genie/entity.py
     homeassistant/components/rituals_perfume_genie/number.py
     homeassistant/components/rituals_perfume_genie/select.py
-    homeassistant/components/rituals_perfume_genie/sensor.py
-    homeassistant/components/rituals_perfume_genie/switch.py
-    homeassistant/components/rituals_perfume_genie/__init__.py
     homeassistant/components/rocketchat/notify.py
     homeassistant/components/roomba/__init__.py
     homeassistant/components/roomba/binary_sensor.py
@@ -892,7 +904,9 @@ omit =
     homeassistant/components/screenlogic/switch.py
     homeassistant/components/scsgate/*
     homeassistant/components/sendgrid/notify.py
-    homeassistant/components/sense/*
+    homeassistant/components/sense/__init__.py
+    homeassistant/components/sense/binary_sensor.py
+    homeassistant/components/sense/sensor.py
     homeassistant/components/sensehat/light.py
     homeassistant/components/sensehat/sensor.py
     homeassistant/components/sensibo/climate.py
@@ -987,6 +1001,7 @@ omit =
     homeassistant/components/suez_water/*
     homeassistant/components/supervisord/sensor.py
     homeassistant/components/surepetcare/__init__.py
+    homeassistant/components/surepetcare/binary_sensor.py
     homeassistant/components/surepetcare/sensor.py
     homeassistant/components/swiss_hydrological_data/sensor.py
     homeassistant/components/swiss_public_transport/sensor.py
@@ -1007,8 +1022,9 @@ omit =
     homeassistant/components/synology_srm/device_tracker.py
     homeassistant/components/syslog/notify.py
     homeassistant/components/system_bridge/__init__.py
-    homeassistant/components/system_bridge/const.py
     homeassistant/components/system_bridge/binary_sensor.py
+    homeassistant/components/system_bridge/const.py
+    homeassistant/components/system_bridge/coordinator.py
     homeassistant/components/system_bridge/sensor.py
     homeassistant/components/systemmonitor/sensor.py
     homeassistant/components/tado/*
@@ -1016,6 +1032,8 @@ omit =
     homeassistant/components/tank_utility/sensor.py
     homeassistant/components/tankerkoenig/*
     homeassistant/components/tapsaff/binary_sensor.py
+    homeassistant/components/tautulli/const.py
+    homeassistant/components/tautulli/coordinator.py
     homeassistant/components/tautulli/sensor.py
     homeassistant/components/ted5000/sensor.py
     homeassistant/components/telegram/notify.py
@@ -1078,6 +1096,10 @@ omit =
     homeassistant/components/traccar/device_tracker.py
     homeassistant/components/traccar/const.py
     homeassistant/components/trackr/device_tracker.py
+    homeassistant/components/tractive/__init__.py
+    homeassistant/components/tractive/device_tracker.py
+    homeassistant/components/tractive/entity.py
+    homeassistant/components/tractive/sensor.py
     homeassistant/components/tradfri/*
     homeassistant/components/trafikverket_train/sensor.py
     homeassistant/components/trafikverket_weatherstation/sensor.py
@@ -1111,7 +1133,6 @@ omit =
     homeassistant/components/upcloud/switch.py
     homeassistant/components/upnp/*
     homeassistant/components/upc_connect/*
-    homeassistant/components/uptimerobot/binary_sensor.py
     homeassistant/components/uscis/sensor.py
     homeassistant/components/vallox/*
     homeassistant/components/vasttrafik/sensor.py
@@ -1195,6 +1216,7 @@ omit =
     homeassistant/components/xiaomi_miio/__init__.py
     homeassistant/components/xiaomi_miio/air_quality.py
     homeassistant/components/xiaomi_miio/alarm_control_panel.py
+    homeassistant/components/xiaomi_miio/binary_sensor.py
     homeassistant/components/xiaomi_miio/device.py
     homeassistant/components/xiaomi_miio/device_tracker.py
     homeassistant/components/xiaomi_miio/fan.py

.devcontainer/devcontainer.json

@@ -24,7 +24,12 @@
     "editor.formatOnSave": true,
     "editor.formatOnType": true,
     "files.trimTrailingWhitespace": true,
-    "terminal.integrated.shell.linux": "/usr/bin/zsh",
+    "terminal.integrated.profiles.linux": {
+      "zsh": {
+        "path": "/usr/bin/zsh"
+      }
+    },
+    "terminal.integrated.defaultProfile.linux": "zsh",
     "yaml.customTags": [
       "!input scalar",
       "!secret scalar",

.github/PULL_REQUEST_TEMPLATE.md

@@ -71,6 +71,7 @@ If the code communicates with devices, web services, or third-party tools:
       Updated and included derived files by running: `python3 -m script.hassfest`.
 - [ ] New or updated dependencies have been added to `requirements_all.txt`.  
       Updated by running `python3 -m script.gen_requirements_all`.
+- [ ] For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
 - [ ] Untested files have been added to `.coveragerc`.
 
 The integration reached or maintains the following [Integration Quality Scale][quality-scale]:

.github/workflows/builder.yml

@@ -47,6 +47,19 @@ jobs:
         with:
           ignore-dev: true
 
+      - name: Generate meta info
+        shell: bash
+        run: |
+          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > OFFICIAL_IMAGE
+
+      - name: Signing meta info file
+        uses: home-assistant/actions/helpers/codenotary@master
+        with:
+          source: file://${{ github.workspace }}/OFFICIAL_IMAGE
+          user: ${{ secrets.VCN_USER }}
+          password: ${{ secrets.VCN_PASSWORD }}
+          organisation: home-assistant.io
+
   build_python:
     name: Build PyPi package
     needs: init
@@ -101,6 +114,11 @@ jobs:
           python3 script/version_bump.py nightly
           version="$(python setup.py -V)"
 
+      - name: Write meta info file
+        shell: bash
+        run: |
+          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
+
       - name: Login to DockerHub
         uses: docker/login-action@v1.10.0
         with:
@@ -230,11 +248,12 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Install VCN tools
+        uses: home-assistant/actions/helpers/vcn@master
+
       - name: Build Meta Image
         shell: bash
         run: |
-          bash <(curl https://getvcn.codenotary.com -L)
-
           export DOCKER_CLI_EXPERIMENTAL=enabled
 
           function create_manifest() {

.github/workflows/ci.yaml

@@ -740,4 +740,4 @@ jobs:
           coverage report --fail-under=94
           coverage xml
       - name: Upload coverage to Codecov
-        uses: codecov/codecov-action@v2.0.2
+        uses: codecov/codecov-action@v2.0.3

.github/workflows/lock.yml

@@ -9,7 +9,7 @@ jobs:
   lock:
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@v2.1.1
+      - uses: dessant/lock-threads@v2.1.2
         with:
           github-token: ${{ github.token }}
           issue-lock-inactive-days: "30"

.github/workflows/wheels.yml

@@ -65,7 +65,7 @@ jobs:
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         tag:
-          - "3.9-alpine3.13"
+          - "3.9-alpine3.14"
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2.3.4
@@ -105,7 +105,7 @@ jobs:
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         tag:
-          - "3.9-alpine3.13"
+          - "3.9-alpine3.14"
     steps:
       - name: Checkout the repository
         uses: actions/checkout@v2.3.4

.gitignore

@@ -2,7 +2,7 @@ config/*
 config2/*
 
 tests/testing_config/deps
-tests/testing_config/home-assistant.log
+tests/testing_config/home-assistant.log*
 
 # hass-release
 data/

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/asottile/pyupgrade
-    rev: v2.23.0
+    rev: v2.23.3
     hooks:
       - id: pyupgrade
         args: [--py38-plus]
@@ -45,7 +45,7 @@ repos:
           - --configfile=tests/bandit.yaml
         files: ^(homeassistant|script|tests)/.+\.py$
   - repo: https://github.com/PyCQA/isort
-    rev: 5.8.0
+    rev: 5.9.3
     hooks:
       - id: isort
   - repo: https://github.com/pre-commit/pre-commit-hooks

.strict-typing

@@ -15,6 +15,7 @@ homeassistant.components.alarm_control_panel.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.ambee.*
 homeassistant.components.ambient_station.*
+homeassistant.components.amcrest.*
 homeassistant.components.ampio.*
 homeassistant.components.automation.*
 homeassistant.components.binary_sensor.*
@@ -63,6 +64,7 @@ homeassistant.components.mailbox.*
 homeassistant.components.media_player.*
 homeassistant.components.mysensors.*
 homeassistant.components.nam.*
+homeassistant.components.neato.*
 homeassistant.components.nest.*
 homeassistant.components.netatmo.*
 homeassistant.components.network.*
@@ -103,6 +105,7 @@ homeassistant.components.tile.*
 homeassistant.components.tts.*
 homeassistant.components.upcloud.*
 homeassistant.components.uptime.*
+homeassistant.components.uptimerobot.*
 homeassistant.components.vacuum.*
 homeassistant.components.water_heater.*
 homeassistant.components.weather.*

.vscode/tasks.json

@@ -60,6 +60,21 @@
       },
       "problemMatcher": []
     },
+    {
+      "label": "Code Coverage",
+      "detail": "Generate code coverage report for a given integration.",
+      "type": "shell",
+      "command": "pytest ./tests/components/${input:integrationName}/ --cov=homeassistant.components.${input:integrationName} --cov-report term-missing",
+      "group": {
+        "kind": "test",
+        "isDefault": true
+      },
+      "presentation": {
+        "reveal": "always",
+        "panel": "new"
+      },
+      "problemMatcher": []
+    },
     {
       "label": "Generate Requirements",
       "type": "shell",
@@ -102,5 +117,12 @@
       },
       "problemMatcher": []
     }
+  ],
+  "inputs": [
+    {
+      "id": "integrationName",
+      "type": "promptString",
+      "description": "For which integration should the task run?"
+    }
   ]
 }

CODEOWNERS

@@ -29,6 +29,7 @@ homeassistant/components/aemet/* @noltari
 homeassistant/components/agent_dvr/* @ispysoftware
 homeassistant/components/airly/* @bieniu
 homeassistant/components/airnow/* @asymworks
+homeassistant/components/airtouch4/* @LonePurpleWolf
 homeassistant/components/airvisual/* @bachya
 homeassistant/components/alarmdecoder/* @ajschmidt8
 homeassistant/components/alexa/* @home-assistant/cloud @ochlocracy
@@ -37,6 +38,7 @@ homeassistant/components/alpha_vantage/* @fabaff
 homeassistant/components/ambee/* @frenck
 homeassistant/components/ambiclimate/* @danielhiversen
 homeassistant/components/ambient_station/* @bachya
+homeassistant/components/amcrest/* @flacjacket
 homeassistant/components/analytics/* @home-assistant/core @ludeeus
 homeassistant/components/androidtv/* @JeffLIrion
 homeassistant/components/apache_kafka/* @bachya
@@ -117,7 +119,6 @@ homeassistant/components/dexcom/* @gagebenne
 homeassistant/components/dhcp/* @bdraco
 homeassistant/components/dht/* @thegardenmonkey
 homeassistant/components/digital_ocean/* @fabaff
-homeassistant/components/directv/* @ctalkington
 homeassistant/components/discogs/* @thibmaek
 homeassistant/components/doorbird/* @oblogic7 @bdraco
 homeassistant/components/dsmr/* @Robbie1221 @frenck
@@ -161,6 +162,7 @@ homeassistant/components/filter/* @dgomes
 homeassistant/components/fireservicerota/* @cyberjunky
 homeassistant/components/firmata/* @DaAwesomeP
 homeassistant/components/fixer/* @fabaff
+homeassistant/components/fjaraskupan/* @elupus
 homeassistant/components/flick_electric/* @ZephireNZ
 homeassistant/components/flipr/* @cnico
 homeassistant/components/flo/* @dmulcahey
@@ -186,6 +188,7 @@ homeassistant/components/geo_rss_events/* @exxamalte
 homeassistant/components/geonetnz_quakes/* @exxamalte
 homeassistant/components/geonetnz_volcano/* @exxamalte
 homeassistant/components/gios/* @bieniu
+homeassistant/components/github/* @timmo001 @ludeeus
 homeassistant/components/gitter/* @fabaff
 homeassistant/components/glances/* @fabaff @engrbm87
 homeassistant/components/goalzero/* @tkdrob
@@ -196,10 +199,10 @@ homeassistant/components/gpsd/* @fabaff
 homeassistant/components/gree/* @cmroche
 homeassistant/components/greeneye_monitor/* @jkeljo
 homeassistant/components/group/* @home-assistant/core
-homeassistant/components/growatt_server/* @indykoning @muppet3000
+homeassistant/components/growatt_server/* @indykoning @muppet3000 @JasperPlant
 homeassistant/components/guardian/* @bachya
 homeassistant/components/habitica/* @ASMfreaK @leikoilja
-homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco @mkeesey
+homeassistant/components/harmony/* @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
 homeassistant/components/hassio/* @home-assistant/supervisor
 homeassistant/components/heatmiser/* @andylockran
 homeassistant/components/heos/* @andrewsayre
@@ -245,6 +248,7 @@ homeassistant/components/integration/* @dgomes
 homeassistant/components/intent/* @home-assistant/core
 homeassistant/components/intesishome/* @jnimmo
 homeassistant/components/ios/* @robbiet480
+homeassistant/components/iotawatt/* @gtdiehl
 homeassistant/components/iperf3/* @rohankapoorcom
 homeassistant/components/ipma/* @dgomes @abmantis
 homeassistant/components/ipp/* @ctalkington
@@ -319,10 +323,11 @@ homeassistant/components/msteams/* @peroyvind
 homeassistant/components/mullvad/* @meichthys
 homeassistant/components/mutesync/* @currentoor
 homeassistant/components/my/* @home-assistant/core
-homeassistant/components/myq/* @bdraco
+homeassistant/components/myq/* @bdraco @ehendrix23
 homeassistant/components/mysensors/* @MartinHjelmare @functionpointer
 homeassistant/components/mystrom/* @fabaff
 homeassistant/components/nam/* @bieniu
+homeassistant/components/nanoleaf/* @milanmeu
 homeassistant/components/neato/* @dshokouhi @Santobert
 homeassistant/components/nederlandse_spoorwegen/* @YarmoM
 homeassistant/components/nello/* @pschmitt
@@ -337,6 +342,7 @@ homeassistant/components/nfandroidtv/* @tkdrob
 homeassistant/components/nightscout/* @marciogranzotto
 homeassistant/components/nilu/* @hfurubotten
 homeassistant/components/nissan_leaf/* @filcole
+homeassistant/components/nmap_tracker/* @bdraco
 homeassistant/components/nmbs/* @thibmaek
 homeassistant/components/no_ip/* @fabaff
 homeassistant/components/noaa_tides/* @jdelaney72
@@ -370,6 +376,7 @@ homeassistant/components/orangepi_gpio/* @pascallj
 homeassistant/components/oru/* @bvlaicu
 homeassistant/components/ovo_energy/* @timmo001
 homeassistant/components/ozw/* @cgarwood @marcelveldt @MartinHjelmare
+homeassistant/components/p1_monitor/* @klaasnicolaas
 homeassistant/components/panel_custom/* @home-assistant/frontend
 homeassistant/components/panel_iframe/* @home-assistant/frontend
 homeassistant/components/pcal9535a/* @Shulyaka
@@ -502,7 +509,7 @@ homeassistant/components/synology_dsm/* @hacf-fr @Quentame @mib1185
 homeassistant/components/synology_srm/* @aerialls
 homeassistant/components/syslog/* @fabaff
 homeassistant/components/system_bridge/* @timmo001
-homeassistant/components/tado/* @michaelarnauts @bdraco @noltari
+homeassistant/components/tado/* @michaelarnauts @noltari
 homeassistant/components/tag/* @balloob @dmulcahey
 homeassistant/components/tahoma/* @philklei
 homeassistant/components/tankerkoenig/* @guillempages
@@ -525,6 +532,8 @@ homeassistant/components/totalconnect/* @austinmroczek
 homeassistant/components/tplink/* @rytilahti @thegardenmonkey
 homeassistant/components/traccar/* @ludeeus
 homeassistant/components/trace/* @home-assistant/core
+homeassistant/components/tractive/* @Danielhiversen @zhulik @bieniu
+homeassistant/components/tradfri/* @janiversen
 homeassistant/components/trafikverket_train/* @endor-force
 homeassistant/components/trafikverket_weatherstation/* @endor-force
 homeassistant/components/transmission/* @engrbm87 @JPHutchins
@@ -539,10 +548,12 @@ homeassistant/components/upb/* @gwww
 homeassistant/components/upc_connect/* @pvizeli @fabaff
 homeassistant/components/upcloud/* @scop
 homeassistant/components/updater/* @home-assistant/core
-homeassistant/components/upnp/* @StevenLooman
+homeassistant/components/upnp/* @StevenLooman @ehendrix23
 homeassistant/components/uptimerobot/* @ludeeus
+homeassistant/components/usb/* @bdraco
 homeassistant/components/usgs_earthquakes_feed/* @exxamalte
 homeassistant/components/utility_meter/* @dgomes
+homeassistant/components/vallox/* @andre-richter
 homeassistant/components/velbus/* @Cereal2nd @brefra
 homeassistant/components/velux/* @Julius2342
 homeassistant/components/vera/* @pavoni
@@ -576,13 +587,13 @@ homeassistant/components/worldclock/* @fabaff
 homeassistant/components/xbox/* @hunterjm
 homeassistant/components/xbox_live/* @MartinHjelmare
 homeassistant/components/xiaomi_aqara/* @danielhiversen @syssi
-homeassistant/components/xiaomi_miio/* @rytilahti @syssi @starkillerOG
+homeassistant/components/xiaomi_miio/* @rytilahti @syssi @starkillerOG @bieniu
 homeassistant/components/xiaomi_tv/* @simse
 homeassistant/components/xmpp/* @fabaff @flowolf
 homeassistant/components/yale_smart_alarm/* @gjohansson-ST
 homeassistant/components/yamaha_musiccast/* @vigonotion @micha91
 homeassistant/components/yandex_transport/* @rishatik92 @devbis
-homeassistant/components/yeelight/* @rytilahti @zewelor @shenxn
+homeassistant/components/yeelight/* @rytilahti @zewelor @shenxn @starkillerOG
 homeassistant/components/yeelightsunflower/* @lindsaymarkward
 homeassistant/components/yi/* @bachya
 homeassistant/components/youless/* @gjong

Dockerfile

@@ -16,6 +16,21 @@ RUN \
     -e ./homeassistant \
     && python3 -m compileall homeassistant/homeassistant
 
+# Fix Bug with Alpine 3.14 and sqlite 3.35
+# https://gitlab.alpinelinux.org/alpine/aports/-/issues/12524
+ARG BUILD_ARCH
+RUN \
+    if [ "${BUILD_ARCH}" = "amd64" ]; then \
+        export APK_ARCH=x86_64; \
+    elif [ "${BUILD_ARCH}" = "i386" ]; then \
+        export APK_ARCH=x86; \
+    else \
+        export APK_ARCH=${BUILD_ARCH}; \
+    fi \
+    && curl -O http://dl-cdn.alpinelinux.org/alpine/v3.13/main/${APK_ARCH}/sqlite-libs-3.34.1-r0.apk \
+    && apk add --no-cache sqlite-libs-3.34.1-r0.apk \
+    && rm -f sqlite-libs-3.34.1-r0.apk
+
 # Home Assistant S6-Overlay
 COPY rootfs /
 

Dockerfile.dev

@@ -6,6 +6,8 @@ RUN \
     curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - \
     && apt-get update \
     && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
+        # Additional library needed by some tests and accordingly by VScode Tests Discovery
+        bluez \
         libudev-dev \
         libavformat-dev \
         libavcodec-dev \

build.json

@@ -2,11 +2,11 @@
   "image": "homeassistant/{arch}-homeassistant",
   "shadow_repository": "ghcr.io/home-assistant",
   "build_from": {
-    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.07.0",
-    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.07.0",
-    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.07.0",
-    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.07.0",
-    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.07.0"
+    "aarch64": "ghcr.io/home-assistant/aarch64-homeassistant-base:2021.08.0",
+    "armhf": "ghcr.io/home-assistant/armhf-homeassistant-base:2021.08.0",
+    "armv7": "ghcr.io/home-assistant/armv7-homeassistant-base:2021.08.0",
+    "amd64": "ghcr.io/home-assistant/amd64-homeassistant-base:2021.08.0",
+    "i386": "ghcr.io/home-assistant/i386-homeassistant-base:2021.08.0"
   },
   "labels": {
     "io.hass.type": "core",

docs/source/api/util.rst

@@ -118,14 +118,6 @@ homeassistant.util.pressure
    :undoc-members:
    :show-inheritance:
 
-homeassistant.util.ruamel\_yaml
--------------------------------
-
-.. automodule:: homeassistant.util.ruamel_yaml
-   :members:
-   :undoc-members:
-   :show-inheritance:
-
 homeassistant.util.ssl
 ----------------------
 

homeassistant/auth/auth_store.py

@@ -17,6 +17,8 @@ from .const import GROUP_ID_ADMIN, GROUP_ID_READ_ONLY, GROUP_ID_USER
 from .permissions import PermissionLookup, system_policies
 from .permissions.types import PolicyType
 
+# mypy: disallow-any-generics
+
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth"
 GROUP_NAME_ADMIN = "Administrators"
@@ -491,7 +493,7 @@ class AuthStore:
         self._store.async_delay_save(self._data_to_save, 1)
 
     @callback
-    def _data_to_save(self) -> dict:
+    def _data_to_save(self) -> dict[str, list[dict[str, Any]]]:
         """Return the data to store."""
         assert self._users is not None
         assert self._groups is not None

homeassistant/auth/providers/__init__.py

@@ -22,6 +22,8 @@ from ..auth_store import AuthStore
 from ..const import MFA_SESSION_EXPIRATION
 from ..models import Credentials, RefreshToken, User, UserMeta
 
+# mypy: disallow-any-generics
+
 _LOGGER = logging.getLogger(__name__)
 DATA_REQS = "auth_prov_reqs_processed"
 
@@ -96,7 +98,7 @@ class AuthProvider:
 
     # Implement by extending class
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return the data flow for logging in with auth provider.
 
         Auth provider should extend LoginFlow and return an instance.

homeassistant/auth/providers/command_line.py

@@ -17,6 +17,8 @@ from homeassistant.exceptions import HomeAssistantError
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 CONF_ARGS = "args"
 CONF_META = "meta"
 
@@ -56,7 +58,7 @@ class CommandLineAuthProvider(AuthProvider):
         super().__init__(*args, **kwargs)
         self._user_meta: dict[str, dict[str, Any]] = {}
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return CommandLineLoginFlow(self)
 

homeassistant/auth/providers/homeassistant.py

@@ -19,6 +19,8 @@ from homeassistant.exceptions import HomeAssistantError
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 STORAGE_VERSION = 1
 STORAGE_KEY = "auth_provider.homeassistant"
 
@@ -235,7 +237,7 @@ class HassAuthProvider(AuthProvider):
             await data.async_load()
             self.data = data
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return HassLoginFlow(self)
 

homeassistant/auth/providers/insecure_example.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 from collections import OrderedDict
 from collections.abc import Mapping
 import hmac
-from typing import cast
+from typing import Any, cast
 
 import voluptuous as vol
 
@@ -15,6 +15,8 @@ from homeassistant.exceptions import HomeAssistantError
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 USER_SCHEMA = vol.Schema(
     {
         vol.Required("username"): str,
@@ -37,7 +39,7 @@ class InvalidAuthError(HomeAssistantError):
 class ExampleAuthProvider(AuthProvider):
     """Example auth provider based on hardcoded usernames and passwords."""
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return ExampleLoginFlow(self)
 

homeassistant/auth/providers/legacy_api_password.py

@@ -7,7 +7,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 import hmac
-from typing import cast
+from typing import Any, cast
 
 import voluptuous as vol
 
@@ -19,6 +19,8 @@ import homeassistant.helpers.config_validation as cv
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from ..models import Credentials, UserMeta
 
+# mypy: disallow-any-generics
+
 AUTH_PROVIDER_TYPE = "legacy_api_password"
 CONF_API_PASSWORD = "api_password"
 
@@ -44,7 +46,7 @@ class LegacyApiPasswordAuthProvider(AuthProvider):
         """Return api_password."""
         return str(self.config[CONF_API_PASSWORD])
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return LegacyLoginFlow(self)
 

homeassistant/auth/providers/trusted_networks.py

@@ -27,6 +27,8 @@ from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 from .. import InvalidAuthError
 from ..models import Credentials, RefreshToken, UserMeta
 
+# mypy: disallow-any-generics
+
 IPAddress = Union[IPv4Address, IPv6Address]
 IPNetwork = Union[IPv4Network, IPv6Network]
 
@@ -97,7 +99,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
         """Trusted Networks auth provider does not support MFA."""
         return False
 
-    async def async_login_flow(self, context: dict | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         assert context is not None
         ip_addr = cast(IPAddress, context.get("ip_address"))

homeassistant/bootstrap.py

@@ -332,14 +332,20 @@ def async_enable_logging(
         not err_path_exists and os.access(err_dir, os.W_OK)
     ):
 
+        err_handler: logging.handlers.RotatingFileHandler | logging.handlers.TimedRotatingFileHandler
         if log_rotate_days:
-            err_handler: logging.FileHandler = (
-                logging.handlers.TimedRotatingFileHandler(
-                    err_log_path, when="midnight", backupCount=log_rotate_days
-                )
+            err_handler = logging.handlers.TimedRotatingFileHandler(
+                err_log_path, when="midnight", backupCount=log_rotate_days
             )
         else:
-            err_handler = logging.FileHandler(err_log_path, mode="w", delay=True)
+            err_handler = logging.handlers.RotatingFileHandler(
+                err_log_path, backupCount=1
+            )
+
+        try:
+            err_handler.doRollover()
+        except OSError as err:
+            _LOGGER.error("Error rolling over log file: %s", err)
 
         err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
         err_handler.setFormatter(logging.Formatter(fmt, datefmt=datefmt))

homeassistant/components/abode/camera.py

@@ -1,4 +1,6 @@
 """Support for Abode Security System cameras."""
+from __future__ import annotations
+
 from datetime import timedelta
 
 import abodepy.helpers.constants as CONST
@@ -73,7 +75,9 @@ class AbodeCamera(AbodeDevice, Camera):
         else:
             self._response = None
 
-    def camera_image(self):
+    def camera_image(
+        self, width: int | None = None, height: int | None = None
+    ) -> bytes | None:
         """Get a camera image."""
         self.refresh_image()
 

homeassistant/components/abode/sensor.py

@@ -1,7 +1,9 @@
 """Support for Abode Security System sensors."""
+from __future__ import annotations
+
 import abodepy.helpers.constants as CONST
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import (
     DEVICE_CLASS_HUMIDITY,
     DEVICE_CLASS_ILLUMINANCE,
@@ -11,12 +13,23 @@ from homeassistant.const import (
 from . import AbodeDevice
 from .const import DOMAIN
 
-# Sensor types: Name, icon
-SENSOR_TYPES = {
-    CONST.TEMP_STATUS_KEY: ["Temperature", DEVICE_CLASS_TEMPERATURE],
-    CONST.HUMI_STATUS_KEY: ["Humidity", DEVICE_CLASS_HUMIDITY],
-    CONST.LUX_STATUS_KEY: ["Lux", DEVICE_CLASS_ILLUMINANCE],
-}
+SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key=CONST.TEMP_STATUS_KEY,
+        name="Temperature",
+        device_class=DEVICE_CLASS_TEMPERATURE,
+    ),
+    SensorEntityDescription(
+        key=CONST.HUMI_STATUS_KEY,
+        name="Humidity",
+        device_class=DEVICE_CLASS_HUMIDITY,
+    ),
+    SensorEntityDescription(
+        key=CONST.LUX_STATUS_KEY,
+        name="Lux",
+        device_class=DEVICE_CLASS_ILLUMINANCE,
+    ),
+)
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
@@ -26,10 +39,14 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     entities = []
 
     for device in data.abode.get_devices(generic_type=CONST.TYPE_SENSOR):
-        for sensor_type in SENSOR_TYPES:
-            if sensor_type not in device.get_value(CONST.STATUSES_KEY):
-                continue
-            entities.append(AbodeSensor(data, device, sensor_type))
+        conditions = device.get_value(CONST.STATUSES_KEY)
+        entities.extend(
+            [
+                AbodeSensor(data, device, description)
+                for description in SENSOR_TYPES
+                if description.key in conditions
+            ]
+        )
 
     async_add_entities(entities)
 
@@ -37,26 +54,25 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 class AbodeSensor(AbodeDevice, SensorEntity):
     """A sensor implementation for Abode devices."""
 
-    def __init__(self, data, device, sensor_type):
+    def __init__(self, data, device, description: SensorEntityDescription):
         """Initialize a sensor for an Abode device."""
         super().__init__(data, device)
-        self._sensor_type = sensor_type
-        self._attr_name = f"{device.name} {SENSOR_TYPES[sensor_type][0]}"
-        self._attr_device_class = SENSOR_TYPES[self._sensor_type][1]
-        self._attr_unique_id = f"{device.device_uuid}-{sensor_type}"
-        if self._sensor_type == CONST.TEMP_STATUS_KEY:
-            self._attr_unit_of_measurement = device.temp_unit
-        elif self._sensor_type == CONST.HUMI_STATUS_KEY:
-            self._attr_unit_of_measurement = device.humidity_unit
-        elif self._sensor_type == CONST.LUX_STATUS_KEY:
-            self._attr_unit_of_measurement = device.lux_unit
+        self.entity_description = description
+        self._attr_name = f"{device.name} {description.name}"
+        self._attr_unique_id = f"{device.device_uuid}-{description.key}"
+        if description.key == CONST.TEMP_STATUS_KEY:
+            self._attr_native_unit_of_measurement = device.temp_unit
+        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 = device.lux_unit
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the sensor."""
-        if self._sensor_type == CONST.TEMP_STATUS_KEY:
+        if self.entity_description.key == CONST.TEMP_STATUS_KEY:
             return self._device.temp
-        if self._sensor_type == CONST.HUMI_STATUS_KEY:
+        if self.entity_description.key == CONST.HUMI_STATUS_KEY:
             return self._device.humidity
-        if self._sensor_type == CONST.LUX_STATUS_KEY:
+        if self.entity_description.key == CONST.LUX_STATUS_KEY:
             return self._device.lux

homeassistant/components/abode/translations/fr.json

@@ -2,7 +2,7 @@
     "config": {
         "abort": {
             "reauth_successful": "La r\u00e9-authentification a r\u00e9ussi",
-            "single_instance_allowed": "D\u00e9ja configur\u00e9. Une seule configuration possible."
+            "single_instance_allowed": "D\u00e9j\u00e0 configur\u00e9. Une seule configuration possible."
         },
         "error": {
             "cannot_connect": "\u00c9chec de connexion",

homeassistant/components/accuweather/sensor.py

@@ -88,10 +88,10 @@ class AccuWeatherSensor(CoordinatorEntity, SensorEntity):
             )
         if coordinator.is_metric:
             self._unit_system = API_METRIC
-            self._attr_unit_of_measurement = description.unit_metric
+            self._attr_native_unit_of_measurement = description.unit_metric
         else:
             self._unit_system = API_IMPERIAL
-            self._attr_unit_of_measurement = description.unit_imperial
+            self._attr_native_unit_of_measurement = description.unit_imperial
         self._attr_device_info = {
             "identifiers": {(DOMAIN, coordinator.location_key)},
             "name": NAME,
@@ -101,7 +101,7 @@ class AccuWeatherSensor(CoordinatorEntity, SensorEntity):
         self.forecast_day = forecast_day
 
     @property
-    def state(self) -> StateType:
+    def native_value(self) -> StateType:
         """Return the state."""
         if self.forecast_day is not None:
             if self.entity_description.device_class == DEVICE_CLASS_TEMPERATURE:

homeassistant/components/accuweather/translations/fr.json

@@ -14,7 +14,7 @@
                     "api_key": "Cl\u00e9 d'API",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
-                    "name": "Nom de l'int\u00e9gration"
+                    "name": "Nom"
                 },
                 "description": "Si vous avez besoin d'aide pour la configuration, consultez le site suivant : https://www.home-assistant.io/integrations/accuweather/\n\nCertains capteurs ne sont pas activ\u00e9s par d\u00e9faut. Vous pouvez les activer dans le registre des entit\u00e9s apr\u00e8s la configuration de l'int\u00e9gration.\nLes pr\u00e9visions m\u00e9t\u00e9orologiques ne sont pas activ\u00e9es par d\u00e9faut. Vous pouvez l'activer dans les options d'int\u00e9gration.",
                 "title": "AccuWeather"

homeassistant/components/accuweather/translations/he.json

@@ -5,7 +5,8 @@
         },
         "error": {
             "cannot_connect": "\u05d4\u05d4\u05ea\u05d7\u05d1\u05e8\u05d5\u05ea \u05e0\u05db\u05e9\u05dc\u05d4",
-            "invalid_api_key": "\u05de\u05e4\u05ea\u05d7 API \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9"
+            "invalid_api_key": "\u05de\u05e4\u05ea\u05d7 API \u05dc\u05d0 \u05d7\u05d5\u05e7\u05d9",
+            "requests_exceeded": "\u05d0\u05d9\u05e8\u05e2\u05d4 \u05d7\u05e8\u05d9\u05d2\u05d4 \u05de\u05de\u05e1\u05e4\u05e8 \u05d4\u05d1\u05e7\u05e9\u05d5\u05ea \u05d4\u05de\u05d5\u05ea\u05e8 \u05dc-API \u05e9\u05dc Accuweather. \u05e2\u05dc\u05d9\u05da \u05dc\u05d4\u05de\u05ea\u05d9\u05df \u05d0\u05d5 \u05dc\u05e9\u05e0\u05d5\u05ea \u05d0\u05ea \u05de\u05e4\u05ea\u05d7 \u05d4-API."
         },
         "step": {
             "user": {
@@ -15,6 +16,7 @@
                     "longitude": "\u05e7\u05d5 \u05d0\u05d5\u05e8\u05da",
                     "name": "\u05e9\u05dd"
                 },
+                "description": "\u05d0\u05dd \u05d4\u05d9\u05e0\u05da \u05d6\u05e7\u05d5\u05e7 \u05dc\u05e2\u05d6\u05e8\u05d4 \u05e2\u05dd \u05d4\u05ea\u05e6\u05d5\u05e8\u05d4, \u05d9\u05e9 \u05dc\u05e2\u05d9\u05d9\u05df \u05db\u05d0\u05df: https://www.home-assistant.io/integrations/accuweather/\n\n\u05d7\u05d9\u05d9\u05e9\u05e0\u05d9\u05dd \u05de\u05e1\u05d5\u05d9\u05de\u05d9\u05dd \u05d0\u05d9\u05e0\u05dd \u05d6\u05de\u05d9\u05e0\u05d9\u05dd \u05db\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc. \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05d4\u05e4\u05d5\u05da \u05d0\u05d5\u05ea\u05dd \u05dc\u05d6\u05de\u05d9\u05e0\u05d9\u05dd \u05d1\u05e8\u05d9\u05e9\u05d5\u05dd \u05d4\u05d9\u05e9\u05d5\u05d9\u05d5\u05ea \u05dc\u05d0\u05d7\u05e8 \u05e7\u05d1\u05d9\u05e2\u05ea \u05d4\u05ea\u05e6\u05d5\u05e8\u05d4 \u05e9\u05dc \u05d4\u05e9\u05d9\u05dc\u05d5\u05d1.\n\u05ea\u05d7\u05d6\u05d9\u05ea \u05de\u05d6\u05d2 \u05d4\u05d0\u05d5\u05d5\u05d9\u05e8 \u05d0\u05d9\u05e0\u05d4 \u05d6\u05de\u05d9\u05e0\u05d4 \u05db\u05d1\u05e8\u05d9\u05e8\u05ea \u05de\u05d7\u05d3\u05dc. \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05ea\u05da \u05dc\u05d4\u05e4\u05d5\u05da \u05d0\u05d5\u05ea\u05d5 \u05dc\u05d6\u05de\u05d9\u05df \u05d1\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea \u05d4\u05e9\u05d9\u05dc\u05d5\u05d1.",
                 "title": "AccuWeather"
             }
         }
@@ -22,6 +24,9 @@
     "options": {
         "step": {
             "user": {
+                "data": {
+                    "forecast": "\u05ea\u05d7\u05d6\u05d9\u05ea \u05de\u05d6\u05d2 \u05d4\u05d0\u05d5\u05d5\u05d9\u05e8"
+                },
                 "description": "\u05d1\u05e9\u05dc \u05de\u05d2\u05d1\u05dc\u05d5\u05ea \u05d4\u05d2\u05d9\u05e8\u05e1\u05d4 \u05d4\u05d7\u05d9\u05e0\u05de\u05d9\u05ea \u05e9\u05dc \u05de\u05e4\u05ea\u05d7 \u05d4-API \u05e9\u05dc AccuWeather, \u05db\u05d0\u05e9\u05e8 \u05ea\u05e4\u05e2\u05d9\u05dc \u05ea\u05d7\u05d6\u05d9\u05ea \u05de\u05d6\u05d2 \u05d0\u05d5\u05d5\u05d9\u05e8, \u05e2\u05d3\u05db\u05d5\u05e0\u05d9 \u05e0\u05ea\u05d5\u05e0\u05d9\u05dd \u05d9\u05d1\u05d5\u05e6\u05e2\u05d5 \u05db\u05dc 80 \u05d3\u05e7\u05d5\u05ea \u05d1\u05de\u05e7\u05d5\u05dd \u05db\u05dc 40 \u05d3\u05e7\u05d5\u05ea.",
                 "title": "\u05d0\u05e4\u05e9\u05e8\u05d5\u05d9\u05d5\u05ea AccuWeather"
             }
@@ -29,7 +34,8 @@
     },
     "system_health": {
         "info": {
-            "can_reach_server": "\u05d4\u05e9\u05d2\u05ea \u05e9\u05e8\u05ea AccuWeather"
+            "can_reach_server": "\u05d4\u05e9\u05d2\u05ea \u05e9\u05e8\u05ea AccuWeather",
+            "remaining_requests": "\u05d4\u05d1\u05e7\u05e9\u05d5\u05ea \u05d4\u05e0\u05d5\u05ea\u05e8\u05d5\u05ea \u05de\u05d5\u05ea\u05e8\u05d5\u05ea"
         }
     }
 }

homeassistant/components/accuweather/translations/hu.json

@@ -5,7 +5,8 @@
         },
         "error": {
             "cannot_connect": "Sikertelen csatlakoz\u00e1s",
-            "invalid_api_key": "\u00c9rv\u00e9nytelen API kulcs"
+            "invalid_api_key": "\u00c9rv\u00e9nytelen API kulcs",
+            "requests_exceeded": "T\u00fall\u00e9pt\u00e9k az Accuweather API-hoz beny\u00fajtott k\u00e9relmek megengedett sz\u00e1m\u00e1t. Meg kell v\u00e1rnia vagy m\u00f3dos\u00edtania kell az API-kulcsot."
         },
         "step": {
             "user": {
@@ -15,6 +16,7 @@
                     "longitude": "Hossz\u00fas\u00e1g",
                     "name": "N\u00e9v"
                 },
+                "description": "Ha seg\u00edts\u00e9gre van sz\u00fcks\u00e9ge a konfigur\u00e1l\u00e1shoz, n\u00e9zze meg itt: https://www.home-assistant.io/integrations/accuweather/ \n\nEgyes \u00e9rz\u00e9kel\u0151k alap\u00e9rtelmez\u00e9s szerint nincsenek enged\u00e9lyezve. Az integr\u00e1ci\u00f3s konfigur\u00e1ci\u00f3 ut\u00e1n enged\u00e9lyezheti \u0151ket az entit\u00e1s-nyilv\u00e1ntart\u00e1sban.\nAz id\u0151j\u00e1r\u00e1s-el\u0151rejelz\u00e9s alap\u00e9rtelmez\u00e9s szerint nincs enged\u00e9lyezve. Ezt az integr\u00e1ci\u00f3s be\u00e1ll\u00edt\u00e1sokban enged\u00e9lyezheti.",
                 "title": "AccuWeather"
             }
         }
@@ -22,6 +24,10 @@
     "options": {
         "step": {
             "user": {
+                "data": {
+                    "forecast": "Id\u0151j\u00e1r\u00e1s el\u0151rejelz\u00e9s"
+                },
+                "description": "Az AccuWeather API kulcs ingyenes verzi\u00f3j\u00e1nak korl\u00e1tai miatt, amikor enged\u00e9lyezi az id\u0151j\u00e1r\u00e1s -el\u0151rejelz\u00e9st, az adatfriss\u00edt\u00e9seket 40 percenk\u00e9nt 80 percenk\u00e9nt hajtj\u00e1k v\u00e9gre.",
                 "title": "AccuWeather be\u00e1ll\u00edt\u00e1sok"
             }
         }

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

@@ -0,0 +1,9 @@
+{
+    "state": {
+        "accuweather__pressure_tendency": {
+            "falling": "\u05d9\u05d5\u05e8\u05d3",
+            "rising": "\u05e2\u05d5\u05dc\u05d4",
+            "steady": "\u05d9\u05e6\u05d9\u05d1"
+        }
+    }
+}

homeassistant/components/acmeda/cover.py

@@ -61,7 +61,7 @@ class AcmedaCover(AcmedaBase, CoverEntity):
         None is unknown, 0 is closed, 100 is fully open.
         """
         position = None
-        if self.roller.type in [7, 10]:
+        if self.roller.type in (7, 10):
             position = 100 - self.roller.closed_percent
         return position
 

homeassistant/components/acmeda/sensor.py

@@ -34,7 +34,7 @@ class AcmedaBattery(AcmedaBase, SensorEntity):
     """Representation of a Acmeda cover device."""
 
     device_class = DEVICE_CLASS_BATTERY
-    unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = PERCENTAGE
 
     @property
     def name(self):
@@ -42,6 +42,6 @@ class AcmedaBattery(AcmedaBase, SensorEntity):
         return f"{super().name} Battery"
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the device."""
         return self.roller.battery

homeassistant/components/acmeda/translations/hu.json

@@ -2,6 +2,14 @@
     "config": {
         "abort": {
             "no_devices_found": "Nem tal\u00e1lhat\u00f3 eszk\u00f6z a h\u00e1l\u00f3zaton"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "id": "Gazdag\u00e9p azonos\u00edt\u00f3"
+                },
+                "title": "V\u00e1lassza ki a hozz\u00e1adni k\u00edv\u00e1nt hubot"
+            }
         }
     }
 }

homeassistant/components/actiontec/const.py

@@ -4,7 +4,9 @@ from __future__ import annotations
 import re
 from typing import Final
 
-LEASES_REGEX: Final[re.Pattern] = re.compile(
+# mypy: disallow-any-generics
+
+LEASES_REGEX: Final[re.Pattern[str]] = re.compile(
     r"(?P<ip>([0-9]{1,3}[\.]){3}[0-9]{1,3})"
     + r"\smac:\s(?P<mac>([0-9a-f]{2}[:-]){5}([0-9a-f]{2}))"
     + r"\svalid\sfor:\s(?P<timevalid>(-?\d+))"

homeassistant/components/adax/climate.py

@@ -49,20 +49,19 @@ async def async_setup_entry(
 class AdaxDevice(ClimateEntity):
     """Representation of a heater."""
 
+    _attr_hvac_modes = [HVAC_MODE_HEAT, HVAC_MODE_OFF]
+    _attr_max_temp = 35
+    _attr_min_temp = 5
+    _attr_supported_features = SUPPORT_TARGET_TEMPERATURE
+    _attr_target_temperature_step = PRECISION_WHOLE
+    _attr_temperature_unit = TEMP_CELSIUS
+
     def __init__(self, heater_data: dict[str, Any], adax_data_handler: Adax) -> None:
         """Initialize the heater."""
         self._heater_data = heater_data
         self._adax_data_handler = adax_data_handler
 
-    @property
-    def supported_features(self) -> int:
-        """Return the list of supported features."""
-        return SUPPORT_TARGET_TEMPERATURE
-
-    @property
-    def unique_id(self) -> str:
-        """Return a unique ID."""
-        return f"{self._heater_data['homeId']}_{self._heater_data['id']}"
+        self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
 
     @property
     def name(self) -> str:
@@ -83,11 +82,6 @@ class AdaxDevice(ClimateEntity):
             return "mdi:radiator"
         return "mdi:radiator-off"
 
-    @property
-    def hvac_modes(self) -> list[str]:
-        """Return the list of available hvac operation modes."""
-        return [HVAC_MODE_HEAT, HVAC_MODE_OFF]
-
     async def async_set_hvac_mode(self, hvac_mode: str) -> None:
         """Set hvac mode."""
         if hvac_mode == HVAC_MODE_HEAT:
@@ -105,21 +99,6 @@ class AdaxDevice(ClimateEntity):
             return
         await self._adax_data_handler.update()
 
-    @property
-    def temperature_unit(self) -> str:
-        """Return the unit of measurement which this device uses."""
-        return TEMP_CELSIUS
-
-    @property
-    def min_temp(self) -> int:
-        """Return the minimum temperature."""
-        return 5
-
-    @property
-    def max_temp(self) -> int:
-        """Return the maximum temperature."""
-        return 35
-
     @property
     def current_temperature(self) -> float | None:
         """Return the current temperature."""
@@ -130,11 +109,6 @@ class AdaxDevice(ClimateEntity):
         """Return the temperature we try to reach."""
         return self._heater_data.get("targetTemperature")
 
-    @property
-    def target_temperature_step(self) -> int:
-        """Return the supported step of target temperature."""
-        return PRECISION_WHOLE
-
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         temperature = kwargs.get(ATTR_TEMPERATURE)

homeassistant/components/adax/manifest.json

@@ -4,7 +4,7 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/adax",
   "requirements": [
-    "adax==0.0.1"
+    "adax==0.1.1"
   ],
   "codeowners": [
     "@danielhiversen"

homeassistant/components/adax/translations/cs.json

@@ -10,6 +10,7 @@
         "step": {
             "user": {
                 "data": {
+                    "account_id": "ID \u00fa\u010dtu",
                     "host": "Hostitel",
                     "password": "Heslo"
                 }

homeassistant/components/adax/translations/es.json

@@ -0,0 +1,13 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "data": {
+                    "account_id": "ID de la cuenta",
+                    "host": "Anfitri\u00f3n",
+                    "password": "Contrase\u00f1a"
+                }
+            }
+        }
+    }
+}

homeassistant/components/adax/translations/hu.json

@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Az eszk\u00f6z m\u00e1r konfigur\u00e1lva van"
+        },
+        "error": {
+            "cannot_connect": "Nem siker\u00fclt csatlakozni",
+            "invalid_auth": "\u00c9rv\u00e9nytelen hiteles\u00edt\u00e9s"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "account_id": "Fi\u00f3k ID",
+                    "host": "Gazdag\u00e9p",
+                    "password": "Jelsz\u00f3"
+                }
+            }
+        }
+    }
+}

homeassistant/components/adax/translations/no.json

@@ -0,0 +1,20 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten er allerede konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes",
+            "invalid_auth": "Ugyldig godkjenning"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "account_id": "Konto-ID",
+                    "host": "Vert",
+                    "password": "Passord"
+                }
+            }
+        }
+    }
+}

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

@@ -0,0 +1,14 @@
+{
+    "config": {
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "password": "\u5bc6\u7801"
+                }
+            }
+        }
+    }
+}

homeassistant/components/adguard/__init__.py

@@ -198,7 +198,7 @@ class AdGuardHomeDeviceEntity(AdGuardHomeEntity):
         """Return device information about this AdGuard Home instance."""
         return {
             "identifiers": {
-                (DOMAIN, self.adguard.host, self.adguard.port, self.adguard.base_path)
+                (DOMAIN, self.adguard.host, self.adguard.port, self.adguard.base_path)  # type: ignore
             },
             "name": "AdGuard Home",
             "manufacturer": "AdGuard Team",

homeassistant/components/adguard/config_flow.py

@@ -51,6 +51,7 @@ class AdGuardHomeFlowHandler(ConfigFlow, domain=DOMAIN):
         self, errors: dict[str, str] | None = None
     ) -> FlowResult:
         """Show the Hass.io confirmation form to the user."""
+        assert self._hassio_discovery
         return self.async_show_form(
             step_id="hassio_confirm",
             description_placeholders={"addon": self._hassio_discovery["addon"]},
@@ -73,11 +74,13 @@ class AdGuardHomeFlowHandler(ConfigFlow, domain=DOMAIN):
 
         session = async_get_clientsession(self.hass, user_input[CONF_VERIFY_SSL])
 
+        username: str | None = user_input.get(CONF_USERNAME)
+        password: str | None = user_input.get(CONF_PASSWORD)
         adguard = AdGuardHome(
             user_input[CONF_HOST],
             port=user_input[CONF_PORT],
-            username=user_input.get(CONF_USERNAME),
-            password=user_input.get(CONF_PASSWORD),
+            username=username,  # type:ignore[arg-type]
+            password=password,  # type:ignore[arg-type]
             tls=user_input[CONF_SSL],
             verify_ssl=user_input[CONF_VERIFY_SSL],
             session=session,
@@ -122,6 +125,7 @@ class AdGuardHomeFlowHandler(ConfigFlow, domain=DOMAIN):
 
         session = async_get_clientsession(self.hass, False)
 
+        assert self._hassio_discovery
         adguard = AdGuardHome(
             self._hassio_discovery[CONF_HOST],
             port=self._hassio_discovery[CONF_PORT],

homeassistant/components/adguard/sensor.py

@@ -62,7 +62,7 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
         enabled_default: bool = True,
     ) -> None:
         """Initialize AdGuard Home sensor."""
-        self._state = None
+        self._state: int | str | None = None
         self._unit_of_measurement = unit_of_measurement
         self.measurement = measurement
 
@@ -82,12 +82,12 @@ class AdGuardHomeSensor(AdGuardHomeDeviceEntity, SensorEntity):
         )
 
     @property
-    def state(self) -> str | None:
+    def native_value(self) -> int | str | None:
         """Return the state of the sensor."""
         return self._state
 
     @property
-    def unit_of_measurement(self) -> str | None:
+    def native_unit_of_measurement(self) -> str | None:
         """Return the unit this state is expressed in."""
         return self._unit_of_measurement
 

homeassistant/components/adguard/translations/fr.json

@@ -17,9 +17,9 @@
                     "host": "H\u00f4te",
                     "password": "Mot de passe",
                     "port": "Port",
-                    "ssl": "AdGuard Home utilise un certificat SSL",
+                    "ssl": "Utilise un certificat SSL",
                     "username": "Nom d'utilisateur",
-                    "verify_ssl": "AdGuard Home utilise un certificat appropri\u00e9"
+                    "verify_ssl": "V\u00e9rifier le certificat SSL"
                 },
                 "description": "Configurez votre instance AdGuard Home pour permettre la surveillance et le contr\u00f4le."
             }

homeassistant/components/adguard/translations/hu.json

@@ -1,7 +1,8 @@
 {
     "config": {
         "abort": {
-            "already_configured": "A szolg\u00e1ltat\u00e1s m\u00e1r konfigur\u00e1lva van"
+            "already_configured": "A szolg\u00e1ltat\u00e1s m\u00e1r konfigur\u00e1lva van",
+            "existing_instance_updated": "Friss\u00edtette a megl\u00e9v\u0151 konfigur\u00e1ci\u00f3t."
         },
         "error": {
             "cannot_connect": "Sikertelen csatlakoz\u00e1s"
@@ -19,7 +20,8 @@
                     "ssl": "SSL tan\u00fas\u00edtv\u00e1ny haszn\u00e1lata",
                     "username": "Felhaszn\u00e1l\u00f3n\u00e9v",
                     "verify_ssl": "SSL-tan\u00fas\u00edtv\u00e1ny ellen\u0151rz\u00e9se"
-                }
+                },
+                "description": "\u00c1ll\u00edtsa be az AdGuard Home p\u00e9ld\u00e1nyt, hogy lehet\u0151v\u00e9 tegye a fel\u00fcgyeletet \u00e9s az ir\u00e1ny\u00edt\u00e1st."
             }
         }
     }

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

@@ -1,14 +1,23 @@
 {
     "config": {
         "abort": {
+            "already_configured": "\u670d\u52a1\u5df2\u88ab\u914d\u7f6e",
             "existing_instance_updated": "\u66f4\u65b0\u4e86\u73b0\u6709\u914d\u7f6e\u3002"
         },
+        "error": {
+            "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
         "step": {
             "user": {
                 "data": {
+                    "host": "\u4e3b\u673a\u5730\u5740",
                     "password": "\u5bc6\u7801",
-                    "username": "\u7528\u6237\u540d"
-                }
+                    "port": "\u7aef\u53e3",
+                    "ssl": "\u4f7f\u7528 SSL \u8bc1\u4e66\u51ed\u8bc1",
+                    "username": "\u7528\u6237\u540d",
+                    "verify_ssl": "\u9a8c\u8bc1 SSL \u8bc1\u4e66\u51ed\u8bc1"
+                },
+                "description": "\u8bbe\u7f6e\u60a8\u7684 AdGuard Home \u5b9e\u4f8b\u4ee5\u5141\u8bb8\u76d1\u89c6\u548c\u63a7\u5236"
             }
         }
     }

homeassistant/components/ads/cover.py

@@ -91,13 +91,13 @@ class AdsCover(AdsEntity, CoverEntity):
     ):
         """Initialize AdsCover entity."""
         super().__init__(ads_hub, name, ads_var_is_closed)
-        if self._ads_var is None:
+        if self._attr_unique_id is None:
             if ads_var_position is not None:
-                self._unique_id = ads_var_position
+                self._attr_unique_id = ads_var_position
             elif ads_var_pos_set is not None:
-                self._unique_id = ads_var_pos_set
+                self._attr_unique_id = ads_var_pos_set
             elif ads_var_open is not None:
-                self._unique_id = ads_var_open
+                self._attr_unique_id = ads_var_open
 
         self._state_dict[STATE_KEY_POSITION] = None
         self._ads_var_position = ads_var_position

homeassistant/components/ads/sensor.py

@@ -50,7 +50,7 @@ class AdsSensor(AdsEntity, SensorEntity):
     def __init__(self, ads_hub, ads_var, ads_type, name, unit_of_measurement, factor):
         """Initialize AdsSensor entity."""
         super().__init__(ads_hub, name, ads_var)
-        self._attr_unit_of_measurement = unit_of_measurement
+        self._attr_native_unit_of_measurement = unit_of_measurement
         self._ads_type = ads_type
         self._factor = factor
 
@@ -64,6 +64,6 @@ class AdsSensor(AdsEntity, SensorEntity):
         )
 
     @property
-    def state(self) -> StateType:
+    def native_value(self) -> StateType:
         """Return the state of the device."""
         return self._state_dict[STATE_KEY_STATE]

homeassistant/components/advantage_air/climate.py

@@ -15,7 +15,6 @@ from homeassistant.components.climate.const import (
     SUPPORT_TARGET_TEMPERATURE,
 )
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, TEMP_CELSIUS
-from homeassistant.core import callback
 from homeassistant.helpers import entity_platform
 
 from .const import (
@@ -166,19 +165,22 @@ class AdvantageAirZone(AdvantageAirClimateEntity):
             f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}'
         )
 
-    async def async_added_to_hass(self):
-        """When entity is added to hass."""
-        self.async_on_remove(self.coordinator.async_add_listener(self._update_callback))
-
-    @callback
-    def _update_callback(self) -> None:
-        """Load data from integration."""
-        self._attr_current_temperature = self._zone["measuredTemp"]
-        self._attr_target_temperature = self._zone["setTemp"]
-        self._attr_hvac_mode = HVAC_MODE_OFF
+    @property
+    def hvac_mode(self):
+        """Return the current state as HVAC mode."""
         if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
-            self._attr_hvac_mode = HVAC_MODE_FAN_ONLY
-        self.async_write_ha_state()
+            return HVAC_MODE_FAN_ONLY
+        return HVAC_MODE_OFF
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._zone["measuredTemp"]
+
+    @property
+    def target_temperature(self):
+        """Return the target temperature."""
+        return self._zone["setTemp"]
 
     async def async_set_hvac_mode(self, hvac_mode):
         """Set the HVAC Mode and State."""

homeassistant/components/advantage_air/sensor.py

@@ -1,7 +1,11 @@
 """Sensor platform for Advantage Air integration."""
 import voluptuous as vol
 
-from homeassistant.components.sensor import STATE_CLASS_MEASUREMENT, SensorEntity
+from homeassistant.components.sensor import (
+    DEVICE_CLASS_TEMPERATURE,
+    STATE_CLASS_MEASUREMENT,
+    SensorEntity,
+)
 from homeassistant.const import PERCENTAGE, TEMP_CELSIUS
 from homeassistant.helpers import config_validation as cv, entity_platform
 
@@ -45,7 +49,7 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
 class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air timer control."""
 
-    _attr_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
+    _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
 
     def __init__(self, instance, ac_key, action):
         """Initialize the Advantage Air timer control."""
@@ -58,7 +62,7 @@ class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
         )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current value."""
         return self._ac[self._time_key]
 
@@ -78,7 +82,7 @@ class AdvantageAirTimeTo(AdvantageAirEntity, SensorEntity):
 class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air Zone Vent Sensor."""
 
-    _attr_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = PERCENTAGE
     _attr_state_class = STATE_CLASS_MEASUREMENT
 
     def __init__(self, instance, ac_key, zone_key):
@@ -90,7 +94,7 @@ class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
         )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current value of the air vent."""
         if self._zone["state"] == ADVANTAGE_AIR_STATE_OPEN:
             return self._zone["value"]
@@ -107,19 +111,19 @@ class AdvantageAirZoneVent(AdvantageAirEntity, SensorEntity):
 class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
     """Representation of Advantage Air Zone wireless signal sensor."""
 
-    _attr_unit_of_measurement = PERCENTAGE
+    _attr_native_unit_of_measurement = PERCENTAGE
     _attr_state_class = STATE_CLASS_MEASUREMENT
 
     def __init__(self, instance, ac_key, zone_key):
         """Initialize an Advantage Air Zone wireless signal sensor."""
-        super().__init__(instance, ac_key, zone_key=zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} Signal'
         self._attr_unique_id = (
             f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-signal'
         )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current value of the wireless signal."""
         return self._zone["rssi"]
 
@@ -138,20 +142,22 @@ class AdvantageAirZoneSignal(AdvantageAirEntity, SensorEntity):
 
 
 class AdvantageAirZoneTemp(AdvantageAirEntity, SensorEntity):
-    """Representation of Advantage Air Zone wireless signal sensor."""
+    """Representation of Advantage Air Zone temperature sensor."""
 
-    _attr_unit_of_measurement = TEMP_CELSIUS
+    _attr_native_unit_of_measurement = TEMP_CELSIUS
+    _attr_device_class = DEVICE_CLASS_TEMPERATURE
     _attr_state_class = STATE_CLASS_MEASUREMENT
-    _attr_icon = "mdi:thermometer"
     _attr_entity_registry_enabled_default = False
 
     def __init__(self, instance, ac_key, zone_key):
         """Initialize an Advantage Air Zone Temp Sensor."""
         super().__init__(instance, ac_key, zone_key)
         self._attr_name = f'{self._zone["name"]} Temperature'
-        self._attr_unique_id = f'{self.coordinator.data["system"]["rid"]}-{self.ac_key}-{self.zone_key}-temp'
+        self._attr_unique_id = (
+            f'{self.coordinator.data["system"]["rid"]}-{ac_key}-{zone_key}-temp'
+        )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the current value of the measured temperature."""
         return self._zone["measuredTemp"]

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

@@ -2,6 +2,7 @@
     "config": {
         "step": {
             "user": {
+                "description": "Con\u00e9ctese a la API de su tableta de pared Advantage Air.",
                 "title": "Conectar"
             }
         }

homeassistant/components/aemet/const.py

@@ -1,5 +1,7 @@
 """Constant values for the AEMET OpenData component."""
+from __future__ import annotations
 
+from homeassistant.components.sensor import SensorEntityDescription
 from homeassistant.components.weather import (
     ATTR_CONDITION_CLEAR_NIGHT,
     ATTR_CONDITION_CLOUDY,
@@ -40,9 +42,6 @@ DEFAULT_NAME = "AEMET"
 DOMAIN = "aemet"
 ENTRY_NAME = "name"
 ENTRY_WEATHER_COORDINATOR = "weather_coordinator"
-SENSOR_NAME = "sensor_name"
-SENSOR_UNIT = "sensor_unit"
-SENSOR_DEVICE_CLASS = "sensor_device_class"
 
 ATTR_API_CONDITION = "condition"
 ATTR_API_FORECAST_DAILY = "forecast-daily"
@@ -200,118 +199,145 @@ FORECAST_MODE_ATTR_API = {
     FORECAST_MODE_HOURLY: ATTR_API_FORECAST_HOURLY,
 }
 
-FORECAST_SENSOR_TYPES = {
-    ATTR_FORECAST_CONDITION: {
-        SENSOR_NAME: "Condition",
-    },
-    ATTR_FORECAST_PRECIPITATION: {
-        SENSOR_NAME: "Precipitation",
-        SENSOR_UNIT: PRECIPITATION_MILLIMETERS_PER_HOUR,
-    },
-    ATTR_FORECAST_PRECIPITATION_PROBABILITY: {
-        SENSOR_NAME: "Precipitation probability",
-        SENSOR_UNIT: PERCENTAGE,
-    },
-    ATTR_FORECAST_TEMP: {
-        SENSOR_NAME: "Temperature",
-        SENSOR_UNIT: TEMP_CELSIUS,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE,
-    },
-    ATTR_FORECAST_TEMP_LOW: {
-        SENSOR_NAME: "Temperature Low",
-        SENSOR_UNIT: TEMP_CELSIUS,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE,
-    },
-    ATTR_FORECAST_TIME: {
-        SENSOR_NAME: "Time",
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TIMESTAMP,
-    },
-    ATTR_FORECAST_WIND_BEARING: {
-        SENSOR_NAME: "Wind bearing",
-        SENSOR_UNIT: DEGREE,
-    },
-    ATTR_FORECAST_WIND_SPEED: {
-        SENSOR_NAME: "Wind speed",
-        SENSOR_UNIT: SPEED_KILOMETERS_PER_HOUR,
-    },
-}
-WEATHER_SENSOR_TYPES = {
-    ATTR_API_CONDITION: {
-        SENSOR_NAME: "Condition",
-    },
-    ATTR_API_HUMIDITY: {
-        SENSOR_NAME: "Humidity",
-        SENSOR_UNIT: PERCENTAGE,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_HUMIDITY,
-    },
-    ATTR_API_PRESSURE: {
-        SENSOR_NAME: "Pressure",
-        SENSOR_UNIT: PRESSURE_HPA,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_PRESSURE,
-    },
-    ATTR_API_RAIN: {
-        SENSOR_NAME: "Rain",
-        SENSOR_UNIT: PRECIPITATION_MILLIMETERS_PER_HOUR,
-    },
-    ATTR_API_RAIN_PROB: {
-        SENSOR_NAME: "Rain probability",
-        SENSOR_UNIT: PERCENTAGE,
-    },
-    ATTR_API_SNOW: {
-        SENSOR_NAME: "Snow",
-        SENSOR_UNIT: PRECIPITATION_MILLIMETERS_PER_HOUR,
-    },
-    ATTR_API_SNOW_PROB: {
-        SENSOR_NAME: "Snow probability",
-        SENSOR_UNIT: PERCENTAGE,
-    },
-    ATTR_API_STATION_ID: {
-        SENSOR_NAME: "Station ID",
-    },
-    ATTR_API_STATION_NAME: {
-        SENSOR_NAME: "Station name",
-    },
-    ATTR_API_STATION_TIMESTAMP: {
-        SENSOR_NAME: "Station timestamp",
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TIMESTAMP,
-    },
-    ATTR_API_STORM_PROB: {
-        SENSOR_NAME: "Storm probability",
-        SENSOR_UNIT: PERCENTAGE,
-    },
-    ATTR_API_TEMPERATURE: {
-        SENSOR_NAME: "Temperature",
-        SENSOR_UNIT: TEMP_CELSIUS,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE,
-    },
-    ATTR_API_TEMPERATURE_FEELING: {
-        SENSOR_NAME: "Temperature feeling",
-        SENSOR_UNIT: TEMP_CELSIUS,
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TEMPERATURE,
-    },
-    ATTR_API_TOWN_ID: {
-        SENSOR_NAME: "Town ID",
-    },
-    ATTR_API_TOWN_NAME: {
-        SENSOR_NAME: "Town name",
-    },
-    ATTR_API_TOWN_TIMESTAMP: {
-        SENSOR_NAME: "Town timestamp",
-        SENSOR_DEVICE_CLASS: DEVICE_CLASS_TIMESTAMP,
-    },
-    ATTR_API_WIND_BEARING: {
-        SENSOR_NAME: "Wind bearing",
-        SENSOR_UNIT: DEGREE,
-    },
-    ATTR_API_WIND_MAX_SPEED: {
-        SENSOR_NAME: "Wind max speed",
-        SENSOR_UNIT: SPEED_KILOMETERS_PER_HOUR,
-    },
-    ATTR_API_WIND_SPEED: {
-        SENSOR_NAME: "Wind speed",
-        SENSOR_UNIT: SPEED_KILOMETERS_PER_HOUR,
-    },
-}
+FORECAST_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key=ATTR_FORECAST_CONDITION,
+        name="Condition",
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_PRECIPITATION,
+        name="Precipitation",
+        native_unit_of_measurement=PRECIPITATION_MILLIMETERS_PER_HOUR,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_PRECIPITATION_PROBABILITY,
+        name="Precipitation probability",
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_TEMP,
+        name="Temperature",
+        native_unit_of_measurement=TEMP_CELSIUS,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_TEMP_LOW,
+        name="Temperature Low",
+        native_unit_of_measurement=TEMP_CELSIUS,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_TIME,
+        name="Time",
+        device_class=DEVICE_CLASS_TIMESTAMP,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_WIND_BEARING,
+        name="Wind bearing",
+        native_unit_of_measurement=DEGREE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_FORECAST_WIND_SPEED,
+        name="Wind speed",
+        native_unit_of_measurement=SPEED_KILOMETERS_PER_HOUR,
+    ),
+)
+WEATHER_SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key=ATTR_API_CONDITION,
+        name="Condition",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_HUMIDITY,
+        name="Humidity",
+        native_unit_of_measurement=PERCENTAGE,
+        device_class=DEVICE_CLASS_HUMIDITY,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_PRESSURE,
+        name="Pressure",
+        native_unit_of_measurement=PRESSURE_HPA,
+        device_class=DEVICE_CLASS_PRESSURE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_RAIN,
+        name="Rain",
+        native_unit_of_measurement=PRECIPITATION_MILLIMETERS_PER_HOUR,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_RAIN_PROB,
+        name="Rain probability",
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_SNOW,
+        name="Snow",
+        native_unit_of_measurement=PRECIPITATION_MILLIMETERS_PER_HOUR,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_SNOW_PROB,
+        name="Snow probability",
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_STATION_ID,
+        name="Station ID",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_STATION_NAME,
+        name="Station name",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_STATION_TIMESTAMP,
+        name="Station timestamp",
+        device_class=DEVICE_CLASS_TIMESTAMP,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_STORM_PROB,
+        name="Storm probability",
+        native_unit_of_measurement=PERCENTAGE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_TEMPERATURE,
+        name="Temperature",
+        native_unit_of_measurement=TEMP_CELSIUS,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_TEMPERATURE_FEELING,
+        name="Temperature feeling",
+        native_unit_of_measurement=TEMP_CELSIUS,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_TOWN_ID,
+        name="Town ID",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_TOWN_NAME,
+        name="Town name",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_TOWN_TIMESTAMP,
+        name="Town timestamp",
+        device_class=DEVICE_CLASS_TIMESTAMP,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_WIND_BEARING,
+        name="Wind bearing",
+        native_unit_of_measurement=DEGREE,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_WIND_MAX_SPEED,
+        name="Wind max speed",
+        native_unit_of_measurement=SPEED_KILOMETERS_PER_HOUR,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_WIND_SPEED,
+        name="Wind speed",
+        native_unit_of_measurement=SPEED_KILOMETERS_PER_HOUR,
+    ),
+)
 
 WIND_BEARING_MAP = {
     "C": None,

homeassistant/components/aemet/sensor.py

@@ -1,5 +1,7 @@
 """Support for the AEMET OpenData service."""
-from homeassistant.components.sensor import SensorEntity
+from __future__ import annotations
+
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import ATTR_ATTRIBUTION
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -14,9 +16,6 @@ from .const import (
     FORECAST_MONITORED_CONDITIONS,
     FORECAST_SENSOR_TYPES,
     MONITORED_CONDITIONS,
-    SENSOR_DEVICE_CLASS,
-    SENSOR_NAME,
-    SENSOR_UNIT,
     WEATHER_SENSOR_TYPES,
 )
 from .weather_update_coordinator import WeatherUpdateCoordinator
@@ -28,37 +27,30 @@ async def async_setup_entry(hass, config_entry, async_add_entities):
     name = domain_data[ENTRY_NAME]
     weather_coordinator = domain_data[ENTRY_WEATHER_COORDINATOR]
 
-    weather_sensor_types = WEATHER_SENSOR_TYPES
-    forecast_sensor_types = FORECAST_SENSOR_TYPES
-
-    entities = []
-    for sensor_type in MONITORED_CONDITIONS:
-        unique_id = f"{config_entry.unique_id}-{sensor_type}"
-        entities.append(
-            AemetSensor(
-                name,
-                unique_id,
-                sensor_type,
-                weather_sensor_types[sensor_type],
+    unique_id = config_entry.unique_id
+    entities: list[AbstractAemetSensor] = [
+        AemetSensor(name, unique_id, weather_coordinator, description)
+        for description in WEATHER_SENSOR_TYPES
+        if description.key in MONITORED_CONDITIONS
+    ]
+    entities.extend(
+        [
+            AemetForecastSensor(
+                name_prefix,
+                unique_id_prefix,
                 weather_coordinator,
+                mode,
+                description,
             )
-        )
-
-    for mode in FORECAST_MODES:
-        name = f"{domain_data[ENTRY_NAME]} {mode}"
-
-        for sensor_type in FORECAST_MONITORED_CONDITIONS:
-            unique_id = f"{config_entry.unique_id}-forecast-{mode}-{sensor_type}"
-            entities.append(
-                AemetForecastSensor(
-                    f"{name} Forecast",
-                    unique_id,
-                    sensor_type,
-                    forecast_sensor_types[sensor_type],
-                    weather_coordinator,
-                    mode,
-                )
+            for mode in FORECAST_MODES
+            if (
+                (name_prefix := f"{domain_data[ENTRY_NAME]} {mode} Forecast")
+                and (unique_id_prefix := f"{unique_id}-forecast-{mode}")
             )
+            for description in FORECAST_SENSOR_TYPES
+            if description.key in FORECAST_MONITORED_CONDITIONS
+        ]
+    )
 
     async_add_entities(entities)
 
@@ -72,20 +64,14 @@ class AbstractAemetSensor(CoordinatorEntity, SensorEntity):
         self,
         name,
         unique_id,
-        sensor_type,
-        sensor_configuration,
         coordinator: WeatherUpdateCoordinator,
+        description: SensorEntityDescription,
     ):
         """Initialize the sensor."""
         super().__init__(coordinator)
-        self._name = name
-        self._unique_id = unique_id
-        self._sensor_type = sensor_type
-        self._sensor_name = sensor_configuration[SENSOR_NAME]
-        self._attr_name = f"{self._name} {self._sensor_name}"
-        self._attr_unique_id = self._unique_id
-        self._attr_device_class = sensor_configuration.get(SENSOR_DEVICE_CLASS)
-        self._attr_unit_of_measurement = sensor_configuration.get(SENSOR_UNIT)
+        self.entity_description = description
+        self._attr_name = f"{name} {description.name}"
+        self._attr_unique_id = unique_id
 
 
 class AemetSensor(AbstractAemetSensor):
@@ -95,20 +81,21 @@ class AemetSensor(AbstractAemetSensor):
         self,
         name,
         unique_id,
-        sensor_type,
-        sensor_configuration,
         weather_coordinator: WeatherUpdateCoordinator,
+        description: SensorEntityDescription,
     ):
         """Initialize the sensor."""
         super().__init__(
-            name, unique_id, sensor_type, sensor_configuration, weather_coordinator
+            name=name,
+            unique_id=f"{unique_id}-{description.key}",
+            coordinator=weather_coordinator,
+            description=description,
         )
-        self._weather_coordinator = weather_coordinator
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the device."""
-        return self._weather_coordinator.data.get(self._sensor_type)
+        return self.coordinator.data.get(self.entity_description.key)
 
 
 class AemetForecastSensor(AbstractAemetSensor):
@@ -118,28 +105,29 @@ class AemetForecastSensor(AbstractAemetSensor):
         self,
         name,
         unique_id,
-        sensor_type,
-        sensor_configuration,
         weather_coordinator: WeatherUpdateCoordinator,
         forecast_mode,
+        description: SensorEntityDescription,
     ):
         """Initialize the sensor."""
         super().__init__(
-            name, unique_id, sensor_type, sensor_configuration, weather_coordinator
+            name=name,
+            unique_id=f"{unique_id}-{description.key}",
+            coordinator=weather_coordinator,
+            description=description,
         )
-        self._weather_coordinator = weather_coordinator
         self._forecast_mode = forecast_mode
         self._attr_entity_registry_enabled_default = (
             self._forecast_mode == FORECAST_MODE_DAILY
         )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state of the device."""
         forecast = None
-        forecasts = self._weather_coordinator.data.get(
+        forecasts = self.coordinator.data.get(
             FORECAST_MODE_ATTR_API[self._forecast_mode]
         )
         if forecasts:
-            forecast = forecasts[0].get(self._sensor_type)
+            forecast = forecasts[0].get(self.entity_description.key)
         return forecast

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

@@ -5,8 +5,18 @@
                 "data": {
                     "name": "Nombre de la integraci\u00f3n"
                 },
+                "description": "Configure la integraci\u00f3n de AEMET OpenData. Para generar la clave API vaya a https://opendata.aemet.es/centrodedescargas/altaUsuario",
                 "title": "AEMET OpenData"
             }
         }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "station_updates": "Recopile datos de las estaciones meteorol\u00f3gicas de AEMET"
+                }
+            }
+        }
     }
 }

homeassistant/components/aemet/weather_update_coordinator.py

@@ -1,4 +1,6 @@
 """Weather data coordinator for the AEMET OpenData service."""
+from __future__ import annotations
+
 from dataclasses import dataclass, field
 from datetime import timedelta
 import logging
@@ -95,7 +97,7 @@ def format_condition(condition: str) -> str:
     return condition
 
 
-def format_float(value) -> float:
+def format_float(value) -> float | None:
     """Try converting string to float."""
     try:
         return float(value)
@@ -103,7 +105,7 @@ def format_float(value) -> float:
         return None
 
 
-def format_int(value) -> int:
+def format_int(value) -> int | None:
     """Try converting string to int."""
     try:
         return int(value)

homeassistant/components/aftership/sensor.py

@@ -109,7 +109,7 @@ async def async_setup_platform(
 class AfterShipSensor(SensorEntity):
     """Representation of a AfterShip sensor."""
 
-    _attr_unit_of_measurement: str = "packages"
+    _attr_native_unit_of_measurement: str = "packages"
     _attr_icon: str = ICON
 
     def __init__(self, aftership: Tracking, name: str) -> None:
@@ -120,7 +120,7 @@ class AfterShipSensor(SensorEntity):
         self._attr_name = name
 
     @property
-    def state(self) -> int | None:
+    def native_value(self) -> int | None:
         """Return the state of the sensor."""
         return self._state
 

homeassistant/components/agent_dvr/camera.py

@@ -67,8 +67,6 @@ async def async_setup_entry(
 class AgentCamera(MjpegCamera):
     """Representation of an Agent Device Stream."""
 
-    _attr_supported_features = SUPPORT_ON_OFF
-
     def __init__(self, device):
         """Initialize as a subclass of MjpegCamera."""
         device_info = {
@@ -80,7 +78,6 @@ class AgentCamera(MjpegCamera):
         self._removed = False
         self._attr_name = f"{device.client.name} {device.name}"
         self._attr_unique_id = f"{device._client.unique}_{device.typeID}_{device.id}"
-        self._attr_should_poll = True
         super().__init__(device_info)
         self._attr_device_info = {
             "identifiers": {(AGENT_DOMAIN, self.unique_id)},
@@ -102,10 +99,10 @@ class AgentCamera(MjpegCamera):
             if self.device.client.is_available and not self._removed:
                 _LOGGER.error("%s lost", self.name)
                 self._removed = True
-        self._attr_available = self.device.client.is_available
         self._attr_icon = "mdi:camcorder-off"
         if self.is_on:
             self._attr_icon = "mdi:camcorder"
+        self._attr_available = self.device.client.is_available
         self._attr_extra_state_attributes = {
             ATTR_ATTRIBUTION: ATTRIBUTION,
             "editable": False,
@@ -117,6 +114,11 @@ class AgentCamera(MjpegCamera):
             "alerts_enabled": self.device.alerts_active,
         }
 
+    @property
+    def should_poll(self) -> bool:
+        """Update the state periodically."""
+        return True
+
     @property
     def is_recording(self) -> bool:
         """Return whether the monitor is recording."""
@@ -137,6 +139,11 @@ class AgentCamera(MjpegCamera):
         """Return True if entity is connected."""
         return self.device.connected
 
+    @property
+    def supported_features(self) -> int:
+        """Return supported features."""
+        return SUPPORT_ON_OFF
+
     @property
     def is_on(self) -> bool:
         """Return true if on."""

homeassistant/components/agent_dvr/translations/fr.json

@@ -4,13 +4,13 @@
             "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
-            "already_in_progress": "La configuration de l'appareil est d\u00e9j\u00e0 en cours.",
+            "already_in_progress": "La configuration est d\u00e9j\u00e0 en cours",
             "cannot_connect": "\u00c9chec de connexion"
         },
         "step": {
             "user": {
                 "data": {
-                    "host": "Nom d'h\u00f4te ou adresse IP",
+                    "host": "H\u00f4te",
                     "port": "Port"
                 },
                 "title": "Configurer l'agent DVR"

homeassistant/components/agent_dvr/translations/hu.json

@@ -12,7 +12,8 @@
                 "data": {
                     "host": "Hoszt",
                     "port": "Port"
-                }
+                },
+                "title": "\u00c1ll\u00edtsa be az Agent DVR-t"
             }
         }
     }

homeassistant/components/agent_dvr/translations/zh-Hans.json

@@ -1,7 +1,20 @@
 {
     "config": {
+        "abort": {
+            "already_configured": "\u8bbe\u5907\u5df2\u88ab\u914d\u7f6e"
+        },
         "error": {
+            "already_in_progress": "\u914d\u7f6e\u6d41\u5df2\u8fdb\u884c\u4e2d",
             "cannot_connect": "\u8fde\u63a5\u5931\u8d25"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u673a\u5730\u5740",
+                    "port": "\u7aef\u53e3"
+                },
+                "title": "\u914d\u7f6e Agent DVR"
+            }
         }
     }
 }

homeassistant/components/airly/const.py

@@ -3,19 +3,6 @@ from __future__ import annotations
 
 from typing import Final
 
-from homeassistant.components.sensor import STATE_CLASS_MEASUREMENT
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    DEVICE_CLASS_HUMIDITY,
-    DEVICE_CLASS_PRESSURE,
-    DEVICE_CLASS_TEMPERATURE,
-    PERCENTAGE,
-    PRESSURE_HPA,
-    TEMP_CELSIUS,
-)
-
-from .model import AirlySensorEntityDescription
-
 ATTR_API_ADVICE: Final = "ADVICE"
 ATTR_API_CAQI: Final = "CAQI"
 ATTR_API_CAQI_DESCRIPTION: Final = "DESCRIPTION"
@@ -45,55 +32,3 @@ MANUFACTURER: Final = "Airly sp. z o.o."
 MAX_UPDATE_INTERVAL: Final = 90
 MIN_UPDATE_INTERVAL: Final = 5
 NO_AIRLY_SENSORS: Final = "There are no Airly sensors in this area yet."
-
-SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
-    AirlySensorEntityDescription(
-        key=ATTR_API_CAQI,
-        name=ATTR_API_CAQI,
-        unit_of_measurement="CAQI",
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_PM1,
-        icon="mdi:blur",
-        name=ATTR_API_PM1,
-        unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_PM25,
-        icon="mdi:blur",
-        name="PM2.5",
-        unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_PM10,
-        icon="mdi:blur",
-        name=ATTR_API_PM10,
-        unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_HUMIDITY,
-        device_class=DEVICE_CLASS_HUMIDITY,
-        name=ATTR_API_HUMIDITY.capitalize(),
-        unit_of_measurement=PERCENTAGE,
-        state_class=STATE_CLASS_MEASUREMENT,
-        value=lambda value: round(value, 1),
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_PRESSURE,
-        device_class=DEVICE_CLASS_PRESSURE,
-        name=ATTR_API_PRESSURE.capitalize(),
-        unit_of_measurement=PRESSURE_HPA,
-        state_class=STATE_CLASS_MEASUREMENT,
-    ),
-    AirlySensorEntityDescription(
-        key=ATTR_API_TEMPERATURE,
-        device_class=DEVICE_CLASS_TEMPERATURE,
-        name=ATTR_API_TEMPERATURE.capitalize(),
-        unit_of_measurement=TEMP_CELSIUS,
-        state_class=STATE_CLASS_MEASUREMENT,
-        value=lambda value: round(value, 1),
-    ),
-)

homeassistant/components/airly/model.py

@@ -1,14 +0,0 @@
-"""Type definitions for Airly integration."""
-from __future__ import annotations
-
-from dataclasses import dataclass
-from typing import Callable
-
-from homeassistant.components.sensor import SensorEntityDescription
-
-
-@dataclass
-class AirlySensorEntityDescription(SensorEntityDescription):
-    """Class describing Airly sensor entities."""
-
-    value: Callable = round

homeassistant/components/airly/sensor.py

@@ -1,11 +1,30 @@
 """Support for the Airly sensor service."""
 from __future__ import annotations
 
-from typing import Any, cast
+from dataclasses import dataclass
+from typing import Any, Callable, cast
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import (
+    STATE_CLASS_MEASUREMENT,
+    SensorEntity,
+    SensorEntityDescription,
+)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import ATTR_ATTRIBUTION, CONF_NAME
+from homeassistant.const import (
+    ATTR_ATTRIBUTION,
+    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    CONF_NAME,
+    DEVICE_CLASS_AQI,
+    DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_PM1,
+    DEVICE_CLASS_PM10,
+    DEVICE_CLASS_PM25,
+    DEVICE_CLASS_PRESSURE,
+    DEVICE_CLASS_TEMPERATURE,
+    PERCENTAGE,
+    PRESSURE_HPA,
+    TEMP_CELSIUS,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
@@ -18,8 +37,12 @@ from .const import (
     ATTR_API_CAQI,
     ATTR_API_CAQI_DESCRIPTION,
     ATTR_API_CAQI_LEVEL,
+    ATTR_API_HUMIDITY,
+    ATTR_API_PM1,
     ATTR_API_PM10,
     ATTR_API_PM25,
+    ATTR_API_PRESSURE,
+    ATTR_API_TEMPERATURE,
     ATTR_DESCRIPTION,
     ATTR_LEVEL,
     ATTR_LIMIT,
@@ -28,15 +51,74 @@ from .const import (
     DEFAULT_NAME,
     DOMAIN,
     MANUFACTURER,
-    SENSOR_TYPES,
     SUFFIX_LIMIT,
     SUFFIX_PERCENT,
 )
-from .model import AirlySensorEntityDescription
 
 PARALLEL_UPDATES = 1
 
 
+@dataclass
+class AirlySensorEntityDescription(SensorEntityDescription):
+    """Class describing Airly sensor entities."""
+
+    value: Callable = round
+
+
+SENSOR_TYPES: tuple[AirlySensorEntityDescription, ...] = (
+    AirlySensorEntityDescription(
+        key=ATTR_API_CAQI,
+        device_class=DEVICE_CLASS_AQI,
+        name=ATTR_API_CAQI,
+        native_unit_of_measurement="CAQI",
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_PM1,
+        device_class=DEVICE_CLASS_PM1,
+        name=ATTR_API_PM1,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        state_class=STATE_CLASS_MEASUREMENT,
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_PM25,
+        device_class=DEVICE_CLASS_PM25,
+        name="PM2.5",
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        state_class=STATE_CLASS_MEASUREMENT,
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_PM10,
+        device_class=DEVICE_CLASS_PM10,
+        name=ATTR_API_PM10,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+        state_class=STATE_CLASS_MEASUREMENT,
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_HUMIDITY,
+        device_class=DEVICE_CLASS_HUMIDITY,
+        name=ATTR_API_HUMIDITY.capitalize(),
+        native_unit_of_measurement=PERCENTAGE,
+        state_class=STATE_CLASS_MEASUREMENT,
+        value=lambda value: round(value, 1),
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_PRESSURE,
+        device_class=DEVICE_CLASS_PRESSURE,
+        name=ATTR_API_PRESSURE.capitalize(),
+        native_unit_of_measurement=PRESSURE_HPA,
+        state_class=STATE_CLASS_MEASUREMENT,
+    ),
+    AirlySensorEntityDescription(
+        key=ATTR_API_TEMPERATURE,
+        device_class=DEVICE_CLASS_TEMPERATURE,
+        name=ATTR_API_TEMPERATURE.capitalize(),
+        native_unit_of_measurement=TEMP_CELSIUS,
+        state_class=STATE_CLASS_MEASUREMENT,
+        value=lambda value: round(value, 1),
+    ),
+)
+
+
 async def async_setup_entry(
     hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
 ) -> None:
@@ -84,7 +166,7 @@ class AirlySensor(CoordinatorEntity, SensorEntity):
         self.entity_description = description
 
     @property
-    def state(self) -> StateType:
+    def native_value(self) -> StateType:
         """Return the state."""
         state = self.coordinator.data[self.entity_description.key]
         return cast(StateType, self.entity_description.value(state))

homeassistant/components/airly/translations/fr.json

@@ -1,7 +1,7 @@
 {
     "config": {
         "abort": {
-            "already_configured": "L'int\u00e9gration des coordonn\u00e9es d'Airly est d\u00e9j\u00e0 configur\u00e9."
+            "already_configured": "L'emplacement est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
             "invalid_api_key": "Cl\u00e9 API invalide",
@@ -13,7 +13,7 @@
                     "api_key": "Cl\u00e9 d'API",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
-                    "name": "Nom de l'int\u00e9gration"
+                    "name": "Nom"
                 },
                 "description": "Configurez l'int\u00e9gration de la qualit\u00e9 de l'air Airly. Pour g\u00e9n\u00e9rer une cl\u00e9 API, rendez-vous sur https://developer.airly.eu/register.",
                 "title": "Airly"

homeassistant/components/airnow/sensor.py

@@ -1,14 +1,15 @@
 """Support for the AirNow sensor service."""
-from homeassistant.components.sensor import SensorEntity
+from __future__ import annotations
+
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.const import (
     ATTR_ATTRIBUTION,
-    ATTR_DEVICE_CLASS,
-    ATTR_ICON,
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
 )
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from . import AirNowDataUpdateCoordinator
 from .const import (
     ATTR_API_AQI,
     ATTR_API_AQI_DESCRIPTION,
@@ -22,69 +23,69 @@ from .const import (
 
 ATTRIBUTION = "Data provided by AirNow"
 
-ATTR_LABEL = "label"
-ATTR_UNIT = "unit"
-
 PARALLEL_UPDATES = 1
 
-SENSOR_TYPES = {
-    ATTR_API_AQI: {
-        ATTR_DEVICE_CLASS: None,
-        ATTR_ICON: "mdi:blur",
-        ATTR_LABEL: ATTR_API_AQI,
-        ATTR_UNIT: "aqi",
-    },
-    ATTR_API_PM25: {
-        ATTR_DEVICE_CLASS: None,
-        ATTR_ICON: "mdi:blur",
-        ATTR_LABEL: ATTR_API_PM25,
-        ATTR_UNIT: CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    },
-    ATTR_API_O3: {
-        ATTR_DEVICE_CLASS: None,
-        ATTR_ICON: "mdi:blur",
-        ATTR_LABEL: ATTR_API_O3,
-        ATTR_UNIT: CONCENTRATION_PARTS_PER_MILLION,
-    },
-}
+SENSOR_TYPES: tuple[SensorEntityDescription, ...] = (
+    SensorEntityDescription(
+        key=ATTR_API_AQI,
+        icon="mdi:blur",
+        name=ATTR_API_AQI,
+        native_unit_of_measurement="aqi",
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_PM25,
+        icon="mdi:blur",
+        name=ATTR_API_PM25,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    SensorEntityDescription(
+        key=ATTR_API_O3,
+        icon="mdi:blur",
+        name=ATTR_API_O3,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+)
 
 
 async def async_setup_entry(hass, config_entry, async_add_entities):
     """Set up AirNow sensor entities based on a config entry."""
     coordinator = hass.data[DOMAIN][config_entry.entry_id]
 
-    sensors = []
-    for sensor in SENSOR_TYPES:
-        sensors.append(AirNowSensor(coordinator, sensor))
+    entities = [AirNowSensor(coordinator, description) for description in SENSOR_TYPES]
 
-    async_add_entities(sensors, False)
+    async_add_entities(entities, False)
 
 
 class AirNowSensor(CoordinatorEntity, SensorEntity):
     """Define an AirNow sensor."""
 
-    def __init__(self, coordinator, kind):
+    coordinator: AirNowDataUpdateCoordinator
+
+    def __init__(
+        self,
+        coordinator: AirNowDataUpdateCoordinator,
+        description: SensorEntityDescription,
+    ) -> None:
         """Initialize."""
         super().__init__(coordinator)
-        self.kind = kind
+        self.entity_description = description
         self._state = None
         self._attrs = {ATTR_ATTRIBUTION: ATTRIBUTION}
-        self._attr_name = f"AirNow {SENSOR_TYPES[self.kind][ATTR_LABEL]}"
-        self._attr_icon = SENSOR_TYPES[self.kind][ATTR_ICON]
-        self._attr_device_class = SENSOR_TYPES[self.kind][ATTR_DEVICE_CLASS]
-        self._attr_unit_of_measurement = SENSOR_TYPES[self.kind][ATTR_UNIT]
-        self._attr_unique_id = f"{self.coordinator.latitude}-{self.coordinator.longitude}-{self.kind.lower()}"
+        self._attr_name = f"AirNow {description.name}"
+        self._attr_unique_id = (
+            f"{coordinator.latitude}-{coordinator.longitude}-{description.key.lower()}"
+        )
 
     @property
-    def state(self):
+    def native_value(self):
         """Return the state."""
-        self._state = self.coordinator.data[self.kind]
+        self._state = self.coordinator.data[self.entity_description.key]
         return self._state
 
     @property
     def extra_state_attributes(self):
         """Return the state attributes."""
-        if self.kind == ATTR_API_AQI:
+        if self.entity_description.key == ATTR_API_AQI:
             self._attrs[SENSOR_AQI_ATTR_DESCR] = self.coordinator.data[
                 ATTR_API_AQI_DESCRIPTION
             ]

homeassistant/components/airnow/translations/fr.json

@@ -4,7 +4,7 @@
             "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
         },
         "error": {
-            "cannot_connect": "\u00c9chec \u00e0 la connexion",
+            "cannot_connect": "\u00c9chec de connexion",
             "invalid_auth": "Authentification invalide",
             "invalid_location": "Aucun r\u00e9sultat trouv\u00e9 pour cet emplacement",
             "unknown": "Erreur inattendue"
@@ -12,7 +12,7 @@
         "step": {
             "user": {
                 "data": {
-                    "api_key": "Cl\u00e9 API",
+                    "api_key": "Cl\u00e9 d'API",
                     "latitude": "Latitude",
                     "longitude": "Longitude",
                     "radius": "Rayon d'action de la station (en miles, facultatif)"

homeassistant/components/airtouch4/__init__.py

@@ -0,0 +1,81 @@
+"""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
+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__)
+
+PLATFORMS = ["climate"]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+    """Set up AirTouch4 from a config entry."""
+    hass.data.setdefault(DOMAIN, {})
+    host = entry.data[CONF_HOST]
+    airtouch = AirTouch(host)
+    await airtouch.UpdateInfo()
+    info = airtouch.GetAcs()
+    if not info:
+        raise ConfigEntryNotReady
+    coordinator = AirtouchDataUpdateCoordinator(hass, airtouch)
+    await coordinator.async_config_entry_first_refresh()
+    hass.data[DOMAIN][entry.entry_id] = coordinator
+
+    hass.config_entries.async_setup_platforms(entry, PLATFORMS)
+
+    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)
+
+    if unload_ok:
+        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

@@ -0,0 +1,335 @@
+"""AirTouch 4 component to control of AirTouch 4 Climate Devices."""
+
+import logging
+
+from homeassistant.components.climate import ClimateEntity
+from homeassistant.components.climate.const import (
+    FAN_AUTO,
+    FAN_DIFFUSE,
+    FAN_FOCUS,
+    FAN_HIGH,
+    FAN_LOW,
+    FAN_MEDIUM,
+    HVAC_MODE_AUTO,
+    HVAC_MODE_COOL,
+    HVAC_MODE_DRY,
+    HVAC_MODE_FAN_ONLY,
+    HVAC_MODE_HEAT,
+    HVAC_MODE_OFF,
+    SUPPORT_FAN_MODE,
+    SUPPORT_TARGET_TEMPERATURE,
+)
+from homeassistant.const import ATTR_TEMPERATURE, TEMP_CELSIUS
+from homeassistant.core import callback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+
+SUPPORT_FLAGS = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
+AT_TO_HA_STATE = {
+    "Heat": HVAC_MODE_HEAT,
+    "Cool": HVAC_MODE_COOL,
+    "AutoHeat": HVAC_MODE_AUTO,  # airtouch reports either autoheat or autocool
+    "AutoCool": HVAC_MODE_AUTO,
+    "Auto": HVAC_MODE_AUTO,
+    "Dry": HVAC_MODE_DRY,
+    "Fan": HVAC_MODE_FAN_ONLY,
+}
+
+HA_STATE_TO_AT = {
+    HVAC_MODE_HEAT: "Heat",
+    HVAC_MODE_COOL: "Cool",
+    HVAC_MODE_AUTO: "Auto",
+    HVAC_MODE_DRY: "Dry",
+    HVAC_MODE_FAN_ONLY: "Fan",
+    HVAC_MODE_OFF: "Off",
+}
+
+AT_TO_HA_FAN_SPEED = {
+    "Quiet": FAN_DIFFUSE,
+    "Low": FAN_LOW,
+    "Medium": FAN_MEDIUM,
+    "High": FAN_HIGH,
+    "Powerful": FAN_FOCUS,
+    "Auto": FAN_AUTO,
+    "Turbo": "turbo",
+}
+
+AT_GROUP_MODES = [HVAC_MODE_OFF, HVAC_MODE_FAN_ONLY]
+
+HA_FAN_SPEED_TO_AT = {value: key for key, value in AT_TO_HA_FAN_SPEED.items()}
+
+_LOGGER = logging.getLogger(__name__)
+
+
+async def async_setup_entry(hass, config_entry, async_add_entities):
+    """Set up the Airtouch 4."""
+    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    info = coordinator.data
+    entities = [
+        AirtouchGroup(coordinator, group["group_number"], info)
+        for group in info["groups"]
+    ] + [AirtouchAC(coordinator, ac["ac_number"], info) for ac in info["acs"]]
+
+    _LOGGER.debug(" Found entities %s", entities)
+
+    async_add_entities(entities)
+
+
+class AirtouchAC(CoordinatorEntity, ClimateEntity):
+    """Representation of an AirTouch 4 ac."""
+
+    _attr_supported_features = SUPPORT_TARGET_TEMPERATURE | SUPPORT_FAN_MODE
+    _attr_temperature_unit = TEMP_CELSIUS
+
+    def __init__(self, coordinator, ac_number, info):
+        """Initialize the climate device."""
+        super().__init__(coordinator)
+        self._ac_number = ac_number
+        self._airtouch = coordinator.airtouch
+        self._info = info
+        self._unit = self._airtouch.GetAcs()[self._ac_number]
+
+    @callback
+    def _handle_coordinator_update(self):
+        self._unit = self._airtouch.GetAcs()[self._ac_number]
+        return super()._handle_coordinator_update()
+
+    @property
+    def device_info(self):
+        """Return device info for this device."""
+        return {
+            "identifiers": {(DOMAIN, self.unique_id)},
+            "name": self.name,
+            "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."""
+        return self._unit.Temperature
+
+    @property
+    def name(self):
+        """Return the name of the climate device."""
+        return f"AC {self._ac_number}"
+
+    @property
+    def fan_mode(self):
+        """Return fan mode of the AC this group belongs to."""
+        return AT_TO_HA_FAN_SPEED[self._airtouch.acs[self._ac_number].AcFanSpeed]
+
+    @property
+    def fan_modes(self):
+        """Return the list of available fan modes."""
+        airtouch_fan_speeds = self._airtouch.GetSupportedFanSpeedsForAc(self._ac_number)
+        return [AT_TO_HA_FAN_SPEED[speed] for speed in airtouch_fan_speeds]
+
+    @property
+    def hvac_mode(self):
+        """Return hvac target hvac state."""
+        is_off = self._unit.PowerState == "Off"
+        if is_off:
+            return HVAC_MODE_OFF
+
+        return AT_TO_HA_STATE[self._airtouch.acs[self._ac_number].AcMode]
+
+    @property
+    def hvac_modes(self):
+        """Return the list of available operation modes."""
+        airtouch_modes = self._airtouch.GetSupportedCoolingModesForAc(self._ac_number)
+        modes = [AT_TO_HA_STATE[mode] for mode in airtouch_modes]
+        modes.append(HVAC_MODE_OFF)
+        return modes
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """Set new operation mode."""
+        if hvac_mode not in HA_STATE_TO_AT:
+            raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
+
+        if hvac_mode == HVAC_MODE_OFF:
+            return await self.async_turn_off()
+        await self._airtouch.SetCoolingModeForAc(
+            self._ac_number, HA_STATE_TO_AT[hvac_mode]
+        )
+        # in case it isn't already, unless the HVAC mode was off, then the ac should be on
+        await self.async_turn_on()
+        self._unit = self._airtouch.GetAcs()[self._ac_number]
+        _LOGGER.debug("Setting operation mode of %s to %s", self._ac_number, hvac_mode)
+        self.async_write_ha_state()
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set new fan mode."""
+        if fan_mode not in self.fan_modes:
+            raise ValueError(f"Unsupported fan mode: {fan_mode}")
+
+        _LOGGER.debug("Setting fan mode of %s to %s", self._ac_number, fan_mode)
+        await self._airtouch.SetFanSpeedForAc(
+            self._ac_number, HA_FAN_SPEED_TO_AT[fan_mode]
+        )
+        self._unit = self._airtouch.GetAcs()[self._ac_number]
+        self.async_write_ha_state()
+
+    async def async_turn_on(self):
+        """Turn on."""
+        _LOGGER.debug("Turning %s on", self.unique_id)
+        # in case ac is not on. Airtouch turns itself off if no groups are turned on
+        # (even if groups turned back on)
+        await self._airtouch.TurnAcOn(self._ac_number)
+
+    async def async_turn_off(self):
+        """Turn off."""
+        _LOGGER.debug("Turning %s off", self.unique_id)
+        await self._airtouch.TurnAcOff(self._ac_number)
+        self.async_write_ha_state()
+
+
+class AirtouchGroup(CoordinatorEntity, ClimateEntity):
+    """Representation of an AirTouch 4 group."""
+
+    _attr_supported_features = SUPPORT_TARGET_TEMPERATURE
+    _attr_temperature_unit = TEMP_CELSIUS
+    _attr_hvac_modes = AT_GROUP_MODES
+
+    def __init__(self, coordinator, group_number, info):
+        """Initialize the climate device."""
+        super().__init__(coordinator)
+        self._group_number = 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):
+        """Return device info for this device."""
+        return {
+            "identifiers": {(DOMAIN, self.unique_id)},
+            "name": self.name,
+            "manufacturer": "Airtouch",
+            "model": "Airtouch 4",
+        }
+
+    @property
+    def unique_id(self):
+        """Return unique ID for this device."""
+        return self._group_number
+
+    @property
+    def min_temp(self):
+        """Return Minimum Temperature for AC of this group."""
+        return self._airtouch.acs[self._unit.BelongsToAc].MinSetpoint
+
+    @property
+    def max_temp(self):
+        """Return Max Temperature for AC of this group."""
+        return self._airtouch.acs[self._unit.BelongsToAc].MaxSetpoint
+
+    @property
+    def name(self):
+        """Return the name of the climate device."""
+        return self._unit.GroupName
+
+    @property
+    def current_temperature(self):
+        """Return the current temperature."""
+        return self._unit.Temperature
+
+    @property
+    def target_temperature(self):
+        """Return the temperature we are trying to reach."""
+        return self._unit.TargetSetpoint
+
+    @property
+    def hvac_mode(self):
+        """Return hvac target hvac state."""
+        # there are other power states that aren't 'on' but still count as on (eg. 'Turbo')
+        is_off = self._unit.PowerState == "Off"
+        if is_off:
+            return HVAC_MODE_OFF
+
+        return HVAC_MODE_FAN_ONLY
+
+    async def async_set_hvac_mode(self, hvac_mode):
+        """Set new operation mode."""
+        if hvac_mode not in HA_STATE_TO_AT:
+            raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
+
+        if hvac_mode == HVAC_MODE_OFF:
+            return await self.async_turn_off()
+        if self.hvac_mode == HVAC_MODE_OFF:
+            await self.async_turn_on()
+        self._unit = self._airtouch.GetGroups()[self._group_number]
+        _LOGGER.debug(
+            "Setting operation mode of %s to %s", self._group_number, hvac_mode
+        )
+        self.async_write_ha_state()
+
+    @property
+    def fan_mode(self):
+        """Return fan mode of the AC this group belongs to."""
+        return AT_TO_HA_FAN_SPEED[self._airtouch.acs[self._unit.BelongsToAc].AcFanSpeed]
+
+    @property
+    def fan_modes(self):
+        """Return the list of available fan modes."""
+        airtouch_fan_speeds = self._airtouch.GetSupportedFanSpeedsByGroup(
+            self._group_number
+        )
+        return [AT_TO_HA_FAN_SPEED[speed] for speed in airtouch_fan_speeds]
+
+    async def async_set_temperature(self, **kwargs):
+        """Set new target temperatures."""
+        temp = kwargs.get(ATTR_TEMPERATURE)
+
+        _LOGGER.debug("Setting temp of %s to %s", self._group_number, str(temp))
+        self._unit = await self._airtouch.SetGroupToTemperature(
+            self._group_number, int(temp)
+        )
+        self.async_write_ha_state()
+
+    async def async_set_fan_mode(self, fan_mode):
+        """Set new fan mode."""
+        if fan_mode not in self.fan_modes:
+            raise ValueError(f"Unsupported fan mode: {fan_mode}")
+
+        _LOGGER.debug("Setting fan mode of %s to %s", self._group_number, fan_mode)
+        self._unit = await self._airtouch.SetFanSpeedByGroup(
+            self._group_number, HA_FAN_SPEED_TO_AT[fan_mode]
+        )
+        self.async_write_ha_state()
+
+    async def async_turn_on(self):
+        """Turn on."""
+        _LOGGER.debug("Turning %s on", self.unique_id)
+        await self._airtouch.TurnGroupOn(self._group_number)
+
+        # in case ac is not on. Airtouch turns itself off if no groups are turned on
+        # (even if groups turned back on)
+        await self._airtouch.TurnAcOn(
+            self._airtouch.GetGroupByGroupNumber(self._group_number).BelongsToAc
+        )
+        # this might cause the ac object to be wrong, so force the shared data
+        # store to update
+        await self.coordinator.async_request_refresh()
+        self.async_write_ha_state()
+
+    async def async_turn_off(self):
+        """Turn off."""
+        _LOGGER.debug("Turning %s off", self.unique_id)
+        await self._airtouch.TurnGroupOff(self._group_number)
+        # this will cause the ac object to be wrong
+        # (ac turns off automatically if no groups are running)
+        # so force the shared data store to update
+        await self.coordinator.async_request_refresh()
+        self.async_write_ha_state()

homeassistant/components/airtouch4/config_flow.py

@@ -0,0 +1,50 @@
+"""Config flow for AirTouch4."""
+from airtouch4pyapi import AirTouch, AirTouchStatus
+import voluptuous as vol
+
+from homeassistant import config_entries
+from homeassistant.const import CONF_HOST
+
+from .const import DOMAIN
+
+DATA_SCHEMA = vol.Schema({vol.Required(CONF_HOST): str})
+
+
+class AirtouchConfigFlow(config_entries.ConfigFlow, domain=DOMAIN):
+    """Handle an Airtouch config flow."""
+
+    VERSION = 1
+
+    async def async_step_user(self, user_input=None):
+        """Handle a flow initialized by the user."""
+        if user_input is None:
+            return self.async_show_form(step_id="user", data_schema=DATA_SCHEMA)
+
+        errors = {}
+
+        host = user_input[CONF_HOST]
+        self._async_abort_entries_match({CONF_HOST: host})
+
+        airtouch = AirTouch(host)
+        await airtouch.UpdateInfo()
+        airtouch_status = airtouch.Status
+        airtouch_has_groups = bool(
+            airtouch.Status == AirTouchStatus.OK and airtouch.GetGroups()
+        )
+
+        if airtouch_status != AirTouchStatus.OK:
+            errors["base"] = "cannot_connect"
+        elif not airtouch_has_groups:
+            errors["base"] = "no_units"
+
+        if errors:
+            return self.async_show_form(
+                step_id="user", data_schema=DATA_SCHEMA, errors=errors
+            )
+
+        return self.async_create_entry(
+            title=user_input[CONF_HOST],
+            data={
+                CONF_HOST: user_input[CONF_HOST],
+            },
+        )

homeassistant/components/airtouch4/const.py

@@ -0,0 +1,3 @@
+"""Constants for the AirTouch4 integration."""
+
+DOMAIN = "airtouch4"

homeassistant/components/airtouch4/manifest.json

@@ -0,0 +1,13 @@
+{
+  "domain": "airtouch4",
+  "name": "AirTouch 4",
+  "config_flow": true,
+  "documentation": "https://www.home-assistant.io/integrations/airtouch4",
+  "requirements": [
+    "airtouch4pyapi==1.0.5"
+  ],
+  "codeowners": [
+    "@LonePurpleWolf"
+  ],
+  "iot_class": "local_polling"
+}

homeassistant/components/airtouch4/strings.json

@@ -0,0 +1,19 @@
+{
+  "config": {
+    "abort": {
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+    },
+    "error": {
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "no_units": "Could not find any AirTouch 4 Groups."
+    },
+    "step": {
+      "user": {
+        "title": "Setup your AirTouch 4 connection details.",
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]"
+        }
+      }
+    }
+  }
+}

homeassistant/components/airtouch4/translations/ca.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "El dispositiu ja est\u00e0 configurat"
+        },
+        "error": {
+            "cannot_connect": "Ha fallat la connexi\u00f3",
+            "no_units": "No s'han trobat grups AirTouch 4."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Amfitri\u00f3"
+                },
+                "title": "Configura els detalls de connexi\u00f3 d'AirTouch 4."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/cs.json

@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Za\u0159\u00edzen\u00ed je ji\u017e nastaveno"
+        },
+        "error": {
+            "cannot_connect": "Nepoda\u0159ilo se p\u0159ipojit"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Hostitel"
+                }
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/de.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Ger\u00e4t ist bereits konfiguriert"
+        },
+        "error": {
+            "cannot_connect": "Verbindung fehlgeschlagen",
+            "no_units": "Es konnten keine AirTouch 4-Gruppen gefunden werden."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Richte deine AirTouch 4-Verbindungsdetails ein."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/el.json

@@ -0,0 +1,9 @@
+{
+    "config": {
+        "step": {
+            "user": {
+                "title": "\u03a1\u03c5\u03b8\u03bc\u03af\u03c3\u03c4\u03b5 \u03c4\u03b1 \u03c3\u03c4\u03bf\u03b9\u03c7\u03b5\u03af\u03b1 \u03c3\u03cd\u03bd\u03b4\u03b5\u03c3\u03b7\u03c2 \u03c4\u03bf\u03c5 {intergration}."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/en.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Device is already configured"
+        },
+        "error": {
+            "cannot_connect": "Failed to connect",
+            "no_units": "Could not find any AirTouch 4 Groups."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Setup your AirTouch 4 connection details."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/es.json

@@ -0,0 +1,15 @@
+{
+    "config": {
+        "error": {
+            "no_units": "No se pudo encontrar ning\u00fan grupo AirTouch 4."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Anfitri\u00f3n"
+                },
+                "title": "Configura los detalles de conexi\u00f3n de tu AirTouch 4."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/et.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Seade on juba h\u00e4\u00e4lestatud"
+        },
+        "error": {
+            "cannot_connect": "\u00dchendamine nurjus",
+            "no_units": "Ei leidnud \u00fchtegi AirTouch 4 gruppi."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "AirTouch 4 \u00fchenduse \u00fcksikasjade seadistamine."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/fr.json

@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "L'appareil est d\u00e9j\u00e0 configur\u00e9"
+        },
+        "error": {
+            "cannot_connect": "\u00c9chec de connexion"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "H\u00f4te"
+                }
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/he.json

@@ -0,0 +1,17 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u05ea\u05e6\u05d5\u05e8\u05ea \u05d4\u05d4\u05ea\u05e7\u05df \u05db\u05d1\u05e8 \u05e0\u05e7\u05d1\u05e2\u05d4"
+        },
+        "error": {
+            "cannot_connect": "\u05d4\u05d4\u05ea\u05d7\u05d1\u05e8\u05d5\u05ea \u05e0\u05db\u05e9\u05dc\u05d4"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u05de\u05d0\u05e8\u05d7"
+                }
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/hu.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Az eszk\u00f6z m\u00e1r konfigur\u00e1lva van"
+        },
+        "error": {
+            "cannot_connect": "Sikertelen kapcsol\u00f3d\u00e1s",
+            "no_units": "Nem tal\u00e1lhat\u00f3 AirTouch 4 csoport."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Gazdag\u00e9p"
+                },
+                "title": "\u00c1ll\u00edtsa be az AirTouch 4 csatlakoz\u00e1si adatait."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/it.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Il dispositivo \u00e8 gi\u00e0 configurato"
+        },
+        "error": {
+            "cannot_connect": "Impossibile connettersi",
+            "no_units": "Impossibile trovare alcun gruppo AirTouch 4."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Imposta i dettagli della connessione AirTouch 4."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/nl.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Apparaat is al geconfigureerd"
+        },
+        "error": {
+            "cannot_connect": "Kan geen verbinding maken",
+            "no_units": "Kan geen AirTouch 4-groepen vinden."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Host"
+                },
+                "title": "Stel uw AirTouch 4 verbindingsgegevens in."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/no.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Enheten er allerede konfigurert"
+        },
+        "error": {
+            "cannot_connect": "Tilkobling mislyktes",
+            "no_units": "Kan ikke finne noen AirTouch 4 -grupper."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Vert"
+                },
+                "title": "Konfigurer AirTouch 4 -tilkoblingsdetaljer."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/pl.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "Urz\u0105dzenie jest ju\u017c skonfigurowane"
+        },
+        "error": {
+            "cannot_connect": "Nie mo\u017cna nawi\u0105za\u0107 po\u0142\u0105czenia",
+            "no_units": "Nie mo\u017cna znale\u017a\u0107 \u017cadnych grup AirTouch 4."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "Nazwa hosta lub adres IP"
+                },
+                "title": "Konfiguracja po\u0142\u0105czenia AirTouch 4."
+            }
+        }
+    }
+}

homeassistant/components/airtouch4/translations/ru.json

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u042d\u0442\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e \u0443\u0436\u0435 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u043e \u0432 Home Assistant."
+        },
+        "error": {
+            "cannot_connect": "\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f.",
+            "no_units": "\u0413\u0440\u0443\u043f\u043f\u044b AirTouch 4 \u043d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u044b."
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u0425\u043e\u0441\u0442"
+                },
+                "title": "AirTouch 4"
+            }
+        }
+    }
+}

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

@@ -0,0 +1,19 @@
+{
+    "config": {
+        "abort": {
+            "already_configured": "\u88dd\u7f6e\u5df2\u7d93\u8a2d\u5b9a\u5b8c\u6210"
+        },
+        "error": {
+            "cannot_connect": "\u9023\u7dda\u5931\u6557",
+            "no_units": "\u627e\u4e0d\u5230\u4efb\u4f55 AirTouch 4 \u7fa4\u7d44\u3002"
+        },
+        "step": {
+            "user": {
+                "data": {
+                    "host": "\u4e3b\u6a5f\u7aef"
+                },
+                "title": "\u8a2d\u5b9a AirTouch 4  \u9023\u7dda\u8cc7\u8a0a\u3002"
+            }
+        }
+    }
+}

homeassistant/components/airvisual/__init__.py

@@ -32,6 +32,7 @@ from homeassistant.helpers import (
     config_validation as cv,
     entity_registry,
 )
+from homeassistant.helpers.entity import EntityDescription
 from homeassistant.helpers.update_coordinator import (
     CoordinatorEntity,
     DataUpdateCoordinator,
@@ -358,11 +359,14 @@ async def async_reload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
 class AirVisualEntity(CoordinatorEntity):
     """Define a generic AirVisual entity."""
 
-    def __init__(self, coordinator: DataUpdateCoordinator) -> None:
+    def __init__(
+        self, coordinator: DataUpdateCoordinator, description: EntityDescription
+    ) -> None:
         """Initialize."""
         super().__init__(coordinator)
 
         self._attr_extra_state_attributes = {ATTR_ATTRIBUTION: DEFAULT_ATTRIBUTION}
+        self.entity_description = description
 
     async def async_added_to_hass(self) -> None:
         """Register callbacks."""

homeassistant/components/airvisual/sensor.py

@@ -1,7 +1,7 @@
 """Support for AirVisual air quality sensors."""
 from __future__ import annotations
 
-from homeassistant.components.sensor import SensorEntity
+from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_LATITUDE,
@@ -14,10 +14,15 @@ from homeassistant.const import (
     CONF_LONGITUDE,
     CONF_SHOW_ON_MAP,
     CONF_STATE,
+    DEVICE_CLASS_AQI,
     DEVICE_CLASS_BATTERY,
     DEVICE_CLASS_CO2,
     DEVICE_CLASS_HUMIDITY,
+    DEVICE_CLASS_PM1,
+    DEVICE_CLASS_PM10,
+    DEVICE_CLASS_PM25,
     DEVICE_CLASS_TEMPERATURE,
+    DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
     PERCENTAGE,
     TEMP_CELSIUS,
 )
@@ -59,60 +64,84 @@ SENSOR_KIND_SENSOR_LIFE = "sensor_life"
 SENSOR_KIND_TEMPERATURE = "temperature"
 SENSOR_KIND_VOC = "voc"
 
-GEOGRAPHY_SENSORS = [
-    (SENSOR_KIND_LEVEL, "Air Pollution Level", "mdi:gauge", None),
-    (SENSOR_KIND_AQI, "Air Quality Index", "mdi:chart-line", "AQI"),
-    (SENSOR_KIND_POLLUTANT, "Main Pollutant", "mdi:chemical-weapon", None),
-]
+GEOGRAPHY_SENSOR_DESCRIPTIONS = (
+    SensorEntityDescription(
+        key=SENSOR_KIND_LEVEL,
+        name="Air Pollution Level",
+        device_class=DEVICE_CLASS_POLLUTANT_LEVEL,
+        icon="mdi:gauge",
+    ),
+    SensorEntityDescription(
+        key=SENSOR_KIND_AQI,
+        name="Air Quality Index",
+        device_class=DEVICE_CLASS_AQI,
+        native_unit_of_measurement="AQI",
+    ),
+    SensorEntityDescription(
+        key=SENSOR_KIND_POLLUTANT,
+        name="Main Pollutant",
+        device_class=DEVICE_CLASS_POLLUTANT_LABEL,
+        icon="mdi:chemical-weapon",
+    ),
+)
 GEOGRAPHY_SENSOR_LOCALES = {"cn": "Chinese", "us": "U.S."}
 
-NODE_PRO_SENSORS = [
-    (SENSOR_KIND_AQI, "Air Quality Index", None, "mdi:chart-line", "AQI"),
-    (SENSOR_KIND_BATTERY_LEVEL, "Battery", DEVICE_CLASS_BATTERY, None, PERCENTAGE),
-    (
-        SENSOR_KIND_CO2,
-        "C02",
-        DEVICE_CLASS_CO2,
-        None,
-        CONCENTRATION_PARTS_PER_MILLION,
+NODE_PRO_SENSOR_DESCRIPTIONS = (
+    SensorEntityDescription(
+        key=SENSOR_KIND_AQI,
+        name="Air Quality Index",
+        device_class=DEVICE_CLASS_AQI,
+        native_unit_of_measurement="AQI",
     ),
-    (SENSOR_KIND_HUMIDITY, "Humidity", DEVICE_CLASS_HUMIDITY, None, PERCENTAGE),
-    (
-        SENSOR_KIND_PM_0_1,
-        "PM 0.1",
-        None,
-        "mdi:sprinkler",
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    SensorEntityDescription(
+        key=SENSOR_KIND_BATTERY_LEVEL,
+        name="Battery",
+        device_class=DEVICE_CLASS_BATTERY,
+        native_unit_of_measurement=PERCENTAGE,
     ),
-    (
-        SENSOR_KIND_PM_1_0,
-        "PM 1.0",
-        None,
-        "mdi:sprinkler",
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    SensorEntityDescription(
+        key=SENSOR_KIND_CO2,
+        name="C02",
+        device_class=DEVICE_CLASS_CO2,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
     ),
-    (
-        SENSOR_KIND_PM_2_5,
-        "PM 2.5",
-        None,
-        "mdi:sprinkler",
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    SensorEntityDescription(
+        key=SENSOR_KIND_HUMIDITY,
+        name="Humidity",
+        device_class=DEVICE_CLASS_HUMIDITY,
+        native_unit_of_measurement=PERCENTAGE,
     ),
-    (
-        SENSOR_KIND_TEMPERATURE,
-        "Temperature",
-        DEVICE_CLASS_TEMPERATURE,
-        None,
-        TEMP_CELSIUS,
+    SensorEntityDescription(
+        key=SENSOR_KIND_PM_0_1,
+        name="PM 0.1",
+        device_class=DEVICE_CLASS_PM1,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
-    (
-        SENSOR_KIND_VOC,
-        "VOC",
-        None,
-        "mdi:sprinkler",
-        CONCENTRATION_PARTS_PER_MILLION,
+    SensorEntityDescription(
+        key=SENSOR_KIND_PM_1_0,
+        name="PM 1.0",
+        device_class=DEVICE_CLASS_PM10,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     ),
-]
+    SensorEntityDescription(
+        key=SENSOR_KIND_PM_2_5,
+        name="PM 2.5",
+        device_class=DEVICE_CLASS_PM25,
+        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
+    ),
+    SensorEntityDescription(
+        key=SENSOR_KIND_TEMPERATURE,
+        name="Temperature",
+        device_class=DEVICE_CLASS_TEMPERATURE,
+        native_unit_of_measurement=TEMP_CELSIUS,
+    ),
+    SensorEntityDescription(
+        key=SENSOR_KIND_VOC,
+        name="VOC",
+        device_class=DEVICE_CLASS_VOLATILE_ORGANIC_COMPOUNDS,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
+    ),
+)
 
 STATE_POLLUTANT_LABEL_CO = "co"
 STATE_POLLUTANT_LABEL_N2 = "n2"
@@ -156,27 +185,19 @@ async def async_setup_entry(
     coordinator = hass.data[DOMAIN][DATA_COORDINATOR][config_entry.entry_id]
 
     sensors: list[AirVisualGeographySensor | AirVisualNodeProSensor]
-    if config_entry.data[CONF_INTEGRATION_TYPE] in [
+    if config_entry.data[CONF_INTEGRATION_TYPE] in (
         INTEGRATION_TYPE_GEOGRAPHY_COORDS,
         INTEGRATION_TYPE_GEOGRAPHY_NAME,
-    ]:
+    ):
         sensors = [
-            AirVisualGeographySensor(
-                coordinator,
-                config_entry,
-                kind,
-                name,
-                icon,
-                unit,
-                locale,
-            )
+            AirVisualGeographySensor(coordinator, config_entry, description, locale)
             for locale in GEOGRAPHY_SENSOR_LOCALES
-            for kind, name, icon, unit in GEOGRAPHY_SENSORS
+            for description in GEOGRAPHY_SENSOR_DESCRIPTIONS
         ]
     else:
         sensors = [
-            AirVisualNodeProSensor(coordinator, kind, name, device_class, icon, unit)
-            for kind, name, device_class, icon, unit in NODE_PRO_SENSORS
+            AirVisualNodeProSensor(coordinator, description)
+            for description in NODE_PRO_SENSOR_DESCRIPTIONS
         ]
 
     async_add_entities(sensors, True)
@@ -189,19 +210,12 @@ class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
         self,
         coordinator: DataUpdateCoordinator,
         config_entry: ConfigEntry,
-        kind: str,
-        name: str,
-        icon: str,
-        unit: str | None,
+        description: SensorEntityDescription,
         locale: str,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator)
+        super().__init__(coordinator, description)
 
-        if kind == SENSOR_KIND_LEVEL:
-            self._attr_device_class = DEVICE_CLASS_POLLUTANT_LEVEL
-        elif kind == SENSOR_KIND_POLLUTANT:
-            self._attr_device_class = DEVICE_CLASS_POLLUTANT_LABEL
         self._attr_extra_state_attributes.update(
             {
                 ATTR_CITY: config_entry.data.get(CONF_CITY),
@@ -209,12 +223,9 @@ class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
                 ATTR_COUNTRY: config_entry.data.get(CONF_COUNTRY),
             }
         )
-        self._attr_icon = icon
-        self._attr_name = f"{GEOGRAPHY_SENSOR_LOCALES[locale]} {name}"
-        self._attr_unique_id = f"{config_entry.unique_id}_{locale}_{kind}"
-        self._attr_unit_of_measurement = unit
+        self._attr_name = f"{GEOGRAPHY_SENSOR_LOCALES[locale]} {description.name}"
+        self._attr_unique_id = f"{config_entry.unique_id}_{locale}_{description.key}"
         self._config_entry = config_entry
-        self._kind = kind
         self._locale = locale
 
     @property
@@ -230,18 +241,18 @@ class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
         except KeyError:
             return
 
-        if self._kind == SENSOR_KIND_LEVEL:
+        if self.entity_description.key == SENSOR_KIND_LEVEL:
             aqi = data[f"aqi{self._locale}"]
-            [(self._attr_state, self._attr_icon)] = [
+            [(self._attr_native_value, self._attr_icon)] = [
                 (name, icon)
                 for (floor, ceiling), (name, icon) in POLLUTANT_LEVELS.items()
                 if floor <= aqi <= ceiling
             ]
-        elif self._kind == SENSOR_KIND_AQI:
-            self._attr_state = data[f"aqi{self._locale}"]
-        elif self._kind == SENSOR_KIND_POLLUTANT:
+        elif self.entity_description.key == SENSOR_KIND_AQI:
+            self._attr_native_value = data[f"aqi{self._locale}"]
+        elif self.entity_description.key == SENSOR_KIND_POLLUTANT:
             symbol = data[f"main{self._locale}"]
-            self._attr_state = symbol
+            self._attr_native_value = symbol
             self._attr_extra_state_attributes.update(
                 {
                     ATTR_POLLUTANT_SYMBOL: symbol,
@@ -281,25 +292,15 @@ class AirVisualNodeProSensor(AirVisualEntity, SensorEntity):
     """Define an AirVisual sensor related to a Node/Pro unit."""
 
     def __init__(
-        self,
-        coordinator: DataUpdateCoordinator,
-        kind: str,
-        name: str,
-        device_class: str | None,
-        icon: str | None,
-        unit: str,
+        self, coordinator: DataUpdateCoordinator, description: SensorEntityDescription
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator)
+        super().__init__(coordinator, description)
 
-        self._attr_device_class = device_class
-        self._attr_icon = icon
         self._attr_name = (
-            f"{coordinator.data['settings']['node_name']} Node/Pro: {name}"
+            f"{coordinator.data['settings']['node_name']} Node/Pro: {description.name}"
         )
-        self._attr_unique_id = f"{coordinator.data['serial_number']}_{kind}"
-        self._attr_unit_of_measurement = unit
-        self._kind = kind
+        self._attr_unique_id = f"{coordinator.data['serial_number']}_{description.key}"
 
     @property
     def device_info(self) -> DeviceInfo:
@@ -318,26 +319,32 @@ class AirVisualNodeProSensor(AirVisualEntity, SensorEntity):
     @callback
     def update_from_latest_data(self) -> None:
         """Update the entity from the latest data."""
-        if self._kind == SENSOR_KIND_AQI:
+        if self.entity_description.key == SENSOR_KIND_AQI:
             if self.coordinator.data["settings"]["is_aqi_usa"]:
-                self._attr_state = self.coordinator.data["measurements"]["aqi_us"]
+                self._attr_native_value = self.coordinator.data["measurements"][
+                    "aqi_us"
+                ]
             else:
-                self._attr_state = self.coordinator.data["measurements"]["aqi_cn"]
-        elif self._kind == SENSOR_KIND_BATTERY_LEVEL:
-            self._attr_state = self.coordinator.data["status"]["battery"]
-        elif self._kind == SENSOR_KIND_CO2:
-            self._attr_state = self.coordinator.data["measurements"].get("co2")
-        elif self._kind == SENSOR_KIND_HUMIDITY:
-            self._attr_state = self.coordinator.data["measurements"].get("humidity")
-        elif self._kind == SENSOR_KIND_PM_0_1:
-            self._attr_state = self.coordinator.data["measurements"].get("pm0_1")
-        elif self._kind == SENSOR_KIND_PM_1_0:
-            self._attr_state = self.coordinator.data["measurements"].get("pm1_0")
-        elif self._kind == SENSOR_KIND_PM_2_5:
-            self._attr_state = self.coordinator.data["measurements"].get("pm2_5")
-        elif self._kind == SENSOR_KIND_TEMPERATURE:
-            self._attr_state = self.coordinator.data["measurements"].get(
+                self._attr_native_value = self.coordinator.data["measurements"][
+                    "aqi_cn"
+                ]
+        elif self.entity_description.key == SENSOR_KIND_BATTERY_LEVEL:
+            self._attr_native_value = self.coordinator.data["status"]["battery"]
+        elif self.entity_description.key == SENSOR_KIND_CO2:
+            self._attr_native_value = self.coordinator.data["measurements"].get("co2")
+        elif self.entity_description.key == SENSOR_KIND_HUMIDITY:
+            self._attr_native_value = self.coordinator.data["measurements"].get(
+                "humidity"
+            )
+        elif self.entity_description.key == SENSOR_KIND_PM_0_1:
+            self._attr_native_value = self.coordinator.data["measurements"].get("pm0_1")
+        elif self.entity_description.key == SENSOR_KIND_PM_1_0:
+            self._attr_native_value = self.coordinator.data["measurements"].get("pm1_0")
+        elif self.entity_description.key == SENSOR_KIND_PM_2_5:
+            self._attr_native_value = self.coordinator.data["measurements"].get("pm2_5")
+        elif self.entity_description.key == SENSOR_KIND_TEMPERATURE:
+            self._attr_native_value = self.coordinator.data["measurements"].get(
                 "temperature_C"
             )
-        elif self._kind == SENSOR_KIND_VOC:
-            self._attr_state = self.coordinator.data["measurements"].get("voc")
+        elif self.entity_description.key == SENSOR_KIND_VOC:
+            self._attr_native_value = self.coordinator.data["measurements"].get("voc")

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

@@ -13,6 +13,15 @@
                 "description": "Utilice la API en la nube de AirVisual para monitorear una latitud / longitud.",
                 "title": "Configurar una geograf\u00eda"
             },
+            "geography_by_name": {
+                "data": {
+                    "city": "Ciudad",
+                    "country": "Pa\u00eds",
+                    "state": "estado"
+                },
+                "description": "Utilice la API en la nube de AirVisual para monitorear una ciudad/estado/pa\u00eds.",
+                "title": "Configurar una geograf\u00eda"
+            },
             "node_pro": {
                 "data": {
                     "ip_address": "Direcci\u00f3n IP/nombre de host de la unidad",
@@ -21,6 +30,9 @@
                 "description": "Monitoree una unidad AirVisual personal. La contrase\u00f1a se puede recuperar de la interfaz de usuario de la unidad.",
                 "title": "Configurar un AirVisual Node/Pro"
             },
+            "reauth_confirm": {
+                "title": "Vuelva a autenticar AirVisual"
+            },
             "user": {
                 "description": "Monitoree la calidad del aire en una ubicaci\u00f3n geogr\u00e1fica.",
                 "title": "Configurar AirVisual"

homeassistant/components/airvisual/translations/fr.json

@@ -13,7 +13,7 @@
         "step": {
             "geography_by_coords": {
                 "data": {
-                    "api_key": "Clef d'API",
+                    "api_key": "Cl\u00e9 d'API",
                     "latitude": "Latitude",
                     "longitude": "Longitude"
                 },
@@ -22,7 +22,7 @@
             },
             "geography_by_name": {
                 "data": {
-                    "api_key": "Clef d'API",
+                    "api_key": "Cl\u00e9 d'API",
                     "city": "Ville",
                     "country": "Pays",
                     "state": "Etat"

homeassistant/components/airvisual/translations/hu.json

@@ -34,13 +34,29 @@
                 "data": {
                     "ip_address": "Hoszt",
                     "password": "Jelsz\u00f3"
-                }
+                },
+                "description": "Szem\u00e9lyes AirVisual egys\u00e9g figyel\u00e9se. A jelsz\u00f3 lek\u00e9rhet\u0151 a k\u00e9sz\u00fcl\u00e9k felhaszn\u00e1l\u00f3i fel\u00fclet\u00e9r\u0151l.",
+                "title": "AirVisual Node/Pro konfigur\u00e1l\u00e1sa"
             },
             "reauth_confirm": {
                 "data": {
                     "api_key": "API kulcs"
                 },
                 "title": "Az AirVisual \u00fajb\u00f3li hiteles\u00edt\u00e9se"
+            },
+            "user": {
+                "description": "V\u00e1lassza ki, hogy milyen t\u00edpus\u00fa AirVisual adatokat szeretne figyelni.",
+                "title": "Az AirVisual konfigur\u00e1l\u00e1sa"
+            }
+        }
+    },
+    "options": {
+        "step": {
+            "init": {
+                "data": {
+                    "show_on_map": "A megfigyelt f\u00f6ldrajz megjelen\u00edt\u00e9se a t\u00e9rk\u00e9pen"
+                },
+                "title": "Az AirVisual konfigur\u00e1l\u00e1sa"
             }
         }
     }

homeassistant/components/airvisual/translations/sensor.cs.json

@@ -0,0 +1,20 @@
+{
+    "state": {
+        "airvisual__pollutant_label": {
+            "co": "Oxid uhelnat\u00fd",
+            "n2": "Oxid dusi\u010dit\u00fd",
+            "o3": "Oz\u00f3n",
+            "p1": "PM10",
+            "p2": "PM2,5",
+            "s2": "Oxid si\u0159i\u010dit\u00fd"
+        },
+        "airvisual__pollutant_level": {
+            "good": "Dobr\u00e9",
+            "hazardous": "Riskantn\u00ed",
+            "moderate": "M\u00edrn\u00e9",
+            "unhealthy": "Nezdrav\u00e9",
+            "unhealthy_sensitive": "Nezdrav\u00e9 pro citliv\u00e9 skupiny",
+            "very_unhealthy": "Velmi nezdrav\u00e9"
+        }
+    }
+}

homeassistant/components/airvisual/translations/sensor.es-419.json

@@ -0,0 +1,20 @@
+{
+    "state": {
+        "airvisual__pollutant_label": {
+            "co": "Mon\u00f3xido de carbono",
+            "n2": "Dioxido de nitrogeno",
+            "o3": "Ozono",
+            "p1": "PM10",
+            "p2": "PM2.5",
+            "s2": "Di\u00f3xido de azufre"
+        },
+        "airvisual__pollutant_level": {
+            "good": "Bueno",
+            "hazardous": "Peligroso",
+            "moderate": "Moderado",
+            "unhealthy": "Insalubre",
+            "unhealthy_sensitive": "Insalubre para grupos sensibles",
+            "very_unhealthy": "Muy insalubre"
+        }
+    }
+}

homeassistant/components/airvisual/translations/sensor.es.json

@@ -0,0 +1,20 @@
+{
+    "state": {
+        "airvisual__pollutant_label": {
+            "co": "Mon\u00f3xido de carbono",
+            "n2": "Di\u00f3xido de nitr\u00f3geno",
+            "o3": "Ozono",
+            "p1": "PM10",
+            "p2": "PM2.5",
+            "s2": "Di\u00f3xido de azufre"
+        },
+        "airvisual__pollutant_level": {
+            "good": "Bueno",
+            "hazardous": "Da\u00f1ino",
+            "moderate": "Moderado",
+            "unhealthy": "Insalubre",
+            "unhealthy_sensitive": "Insalubre para grupos sensibles",
+            "very_unhealthy": "Muy poco saludable"
+        }
+    }
+}

homeassistant/components/airvisual/translations/sensor.hu.json

@@ -0,0 +1,20 @@
+{
+    "state": {
+        "airvisual__pollutant_label": {
+            "co": "Sz\u00e9n-monoxid",
+            "n2": "Nitrog\u00e9n-dioxid",
+            "o3": "\u00d3zon",
+            "p1": "PM10",
+            "p2": "PM2.5",
+            "s2": "K\u00e9n-dioxid"
+        },
+        "airvisual__pollutant_level": {
+            "good": "J\u00f3",
+            "hazardous": "Vesz\u00e9lyes",
+            "moderate": "M\u00e9rs\u00e9kelt",
+            "unhealthy": "Eg\u00e9szs\u00e9gtelen",
+            "unhealthy_sensitive": "Eg\u00e9szs\u00e9gtelen az \u00e9rz\u00e9keny csoportok sz\u00e1m\u00e1ra",
+            "very_unhealthy": "Nagyon eg\u00e9szs\u00e9gtelen"
+        }
+    }
+}