Merge colliding devices when loading the device registry

Remove unnecessary icon states

.core_files.yaml

@@ -120,24 +120,20 @@ tests: &tests
   - pylint/**
   - requirements_test_pre_commit.txt
   - requirements_test.txt
+  - tests/*.py
   - tests/auth/**
   - tests/backports/**
-  - tests/common.py
   - tests/components/history/**
   - tests/components/logbook/**
   - tests/components/recorder/**
   - tests/components/sensor/**
-  - tests/conftest.py
   - tests/hassfest/**
   - tests/helpers/**
-  - tests/ignore_uncaught_exceptions.py
   - tests/mock/**
   - tests/pylint/**
   - tests/scripts/**
-  - tests/syrupy.py
   - tests/test_util/**
   - tests/testing_config/**
-  - tests/typing.py
   - tests/util/**
 
 other: &other

.coveragerc

@@ -62,7 +62,6 @@ omit =
     homeassistant/components/aladdin_connect/api.py
     homeassistant/components/aladdin_connect/application_credentials.py
     homeassistant/components/aladdin_connect/cover.py
-    homeassistant/components/aladdin_connect/model.py
     homeassistant/components/aladdin_connect/sensor.py
     homeassistant/components/alarmdecoder/__init__.py
     homeassistant/components/alarmdecoder/alarm_control_panel.py
@@ -88,8 +87,12 @@ omit =
     homeassistant/components/aprilaire/climate.py
     homeassistant/components/aprilaire/coordinator.py
     homeassistant/components/aprilaire/entity.py
+    homeassistant/components/aprilaire/select.py
+    homeassistant/components/aprilaire/sensor.py
     homeassistant/components/apsystems/__init__.py
     homeassistant/components/apsystems/coordinator.py
+    homeassistant/components/apsystems/entity.py
+    homeassistant/components/apsystems/number.py
     homeassistant/components/apsystems/sensor.py
     homeassistant/components/aqualogic/*
     homeassistant/components/aquostv/media_player.py
@@ -120,6 +123,7 @@ omit =
     homeassistant/components/awair/coordinator.py
     homeassistant/components/azure_service_bus/*
     homeassistant/components/baf/__init__.py
+    homeassistant/components/baf/binary_sensor.py
     homeassistant/components/baf/climate.py
     homeassistant/components/baf/entity.py
     homeassistant/components/baf/fan.py
@@ -128,7 +132,6 @@ omit =
     homeassistant/components/baf/sensor.py
     homeassistant/components/baf/switch.py
     homeassistant/components/baidu/tts.py
-    homeassistant/components/bang_olufsen/__init__.py
     homeassistant/components/bang_olufsen/entity.py
     homeassistant/components/bang_olufsen/media_player.py
     homeassistant/components/bang_olufsen/util.py
@@ -149,12 +152,7 @@ omit =
     homeassistant/components/bloomsky/*
     homeassistant/components/bluesound/*
     homeassistant/components/bluetooth_tracker/*
-    homeassistant/components/bmw_connected_drive/__init__.py
-    homeassistant/components/bmw_connected_drive/binary_sensor.py
-    homeassistant/components/bmw_connected_drive/coordinator.py
-    homeassistant/components/bmw_connected_drive/lock.py
     homeassistant/components/bmw_connected_drive/notify.py
-    homeassistant/components/bmw_connected_drive/sensor.py
     homeassistant/components/bosch_shc/__init__.py
     homeassistant/components/bosch_shc/binary_sensor.py
     homeassistant/components/bosch_shc/cover.py
@@ -185,7 +183,6 @@ omit =
     homeassistant/components/canary/camera.py
     homeassistant/components/cert_expiry/helper.py
     homeassistant/components/channels/*
-    homeassistant/components/circuit/*
     homeassistant/components/cisco_ios/device_tracker.py
     homeassistant/components/cisco_mobility_express/device_tracker.py
     homeassistant/components/cisco_webex_teams/notify.py
@@ -541,7 +538,6 @@ omit =
     homeassistant/components/hko/weather.py
     homeassistant/components/hlk_sw16/__init__.py
     homeassistant/components/hlk_sw16/switch.py
-    homeassistant/components/home_connect/binary_sensor.py
     homeassistant/components/home_connect/entity.py
     homeassistant/components/home_connect/light.py
     homeassistant/components/home_connect/switch.py
@@ -595,7 +591,9 @@ omit =
     homeassistant/components/ifttt/alarm_control_panel.py
     homeassistant/components/iglo/light.py
     homeassistant/components/ihc/*
-    homeassistant/components/incomfort/*
+    homeassistant/components/incomfort/__init__.py
+    homeassistant/components/incomfort/climate.py
+    homeassistant/components/incomfort/water_heater.py
     homeassistant/components/insteon/binary_sensor.py
     homeassistant/components/insteon/climate.py
     homeassistant/components/insteon/cover.py
@@ -625,6 +623,7 @@ omit =
     homeassistant/components/irish_rail_transport/sensor.py
     homeassistant/components/iss/__init__.py
     homeassistant/components/iss/sensor.py
+    homeassistant/components/ista_ecotrend/coordinator.py
     homeassistant/components/isy994/__init__.py
     homeassistant/components/isy994/binary_sensor.py
     homeassistant/components/isy994/button.py
@@ -818,6 +817,7 @@ omit =
     homeassistant/components/motionblinds_ble/cover.py
     homeassistant/components/motionblinds_ble/entity.py
     homeassistant/components/motionblinds_ble/select.py
+    homeassistant/components/motionblinds_ble/sensor.py
     homeassistant/components/motionmount/__init__.py
     homeassistant/components/motionmount/binary_sensor.py
     homeassistant/components/motionmount/entity.py
@@ -855,7 +855,9 @@ omit =
     homeassistant/components/nad/media_player.py
     homeassistant/components/nanoleaf/__init__.py
     homeassistant/components/nanoleaf/button.py
+    homeassistant/components/nanoleaf/coordinator.py
     homeassistant/components/nanoleaf/entity.py
+    homeassistant/components/nanoleaf/event.py
     homeassistant/components/nanoleaf/light.py
     homeassistant/components/neato/__init__.py
     homeassistant/components/neato/api.py
@@ -984,6 +986,7 @@ omit =
     homeassistant/components/orvibo/switch.py
     homeassistant/components/osoenergy/__init__.py
     homeassistant/components/osoenergy/binary_sensor.py
+    homeassistant/components/osoenergy/entity.py
     homeassistant/components/osoenergy/sensor.py
     homeassistant/components/osoenergy/water_heater.py
     homeassistant/components/osramlightify/light.py
@@ -1062,7 +1065,6 @@ omit =
     homeassistant/components/pushbullet/sensor.py
     homeassistant/components/pushover/notify.py
     homeassistant/components/pushsafer/notify.py
-    homeassistant/components/pyload/sensor.py
     homeassistant/components/qbittorrent/__init__.py
     homeassistant/components/qbittorrent/coordinator.py
     homeassistant/components/qbittorrent/sensor.py
@@ -1110,6 +1112,7 @@ omit =
     homeassistant/components/refoss/bridge.py
     homeassistant/components/refoss/coordinator.py
     homeassistant/components/refoss/entity.py
+    homeassistant/components/refoss/sensor.py
     homeassistant/components/refoss/switch.py
     homeassistant/components/refoss/util.py
     homeassistant/components/rejseplanen/sensor.py
@@ -1258,9 +1261,6 @@ omit =
     homeassistant/components/solaredge/__init__.py
     homeassistant/components/solaredge/coordinator.py
     homeassistant/components/solaredge_local/sensor.py
-    homeassistant/components/solarlog/__init__.py
-    homeassistant/components/solarlog/coordinator.py
-    homeassistant/components/solarlog/sensor.py
     homeassistant/components/solax/__init__.py
     homeassistant/components/solax/sensor.py
     homeassistant/components/soma/__init__.py
@@ -1470,12 +1470,6 @@ omit =
     homeassistant/components/traccar_server/entity.py
     homeassistant/components/traccar_server/helpers.py
     homeassistant/components/traccar_server/sensor.py
-    homeassistant/components/tractive/__init__.py
-    homeassistant/components/tractive/binary_sensor.py
-    homeassistant/components/tractive/device_tracker.py
-    homeassistant/components/tractive/entity.py
-    homeassistant/components/tractive/sensor.py
-    homeassistant/components/tractive/switch.py
     homeassistant/components/tradfri/__init__.py
     homeassistant/components/tradfri/base_class.py
     homeassistant/components/tradfri/coordinator.py
@@ -1563,6 +1557,7 @@ omit =
     homeassistant/components/verisure/sensor.py
     homeassistant/components/verisure/switch.py
     homeassistant/components/versasense/*
+    homeassistant/components/vesync/__init__.py
     homeassistant/components/vesync/fan.py
     homeassistant/components/vesync/light.py
     homeassistant/components/vesync/sensor.py
@@ -1656,6 +1651,7 @@ omit =
     homeassistant/components/xiaomi_miio/remote.py
     homeassistant/components/xiaomi_miio/sensor.py
     homeassistant/components/xiaomi_miio/switch.py
+    homeassistant/components/xiaomi_miio/typing.py
     homeassistant/components/xiaomi_tv/media_player.py
     homeassistant/components/xmpp/notify.py
     homeassistant/components/xs1/*

.devcontainer/devcontainer.json

@@ -32,6 +32,7 @@
         "python.pythonPath": "/home/vscode/.local/ha-venv/bin/python",
         "python.terminal.activateEnvInCurrentTerminal": true,
         "python.testing.pytestArgs": ["--no-cov"],
+        "pylint.importStrategy": "fromEnvironment",
         "editor.formatOnPaste": false,
         "editor.formatOnSave": true,
         "editor.formatOnType": true,

.github/workflows/builder.yml

@@ -27,7 +27,7 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
 
@@ -90,11 +90,11 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v3.1.4
+        uses: dawidd6/action-download-artifact@v6
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -105,7 +105,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v3.1.4
+        uses: dawidd6/action-download-artifact@v6
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/intents-package
@@ -242,7 +242,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Set build additional args
         run: |
@@ -279,7 +279,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -320,7 +320,7 @@ jobs:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Install Cosign
         uses: sigstore/cosign-installer@v3.5.0
@@ -450,7 +450,7 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v5.1.0

.github/workflows/ci.yaml

@@ -33,10 +33,10 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 8
+  CACHE_VERSION: 9
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 8
-  HA_SHORT_VERSION: "2024.6"
+  HA_SHORT_VERSION: "2024.7"
   DEFAULT_PYTHON: "3.12"
   ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
@@ -89,7 +89,7 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: |
@@ -226,7 +226,7 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -272,7 +272,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v5.1.0
         id: python
@@ -312,7 +312,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v5.1.0
         id: python
@@ -351,7 +351,7 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v5.1.0
         id: python
@@ -445,7 +445,7 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -488,6 +488,7 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libavcodec-dev \
             libavdevice-dev \
             libavfilter-dev \
@@ -522,7 +523,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -554,7 +555,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -587,7 +588,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -620,6 +621,51 @@ jobs:
           python --version
           pylint --ignore-missing-annotations=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
+  pylint-tests:
+    name: Check pylint on tests
+    runs-on: ubuntu-22.04
+    timeout-minutes: 20
+    if: |
+      (github.event.inputs.mypy-only != 'true' || github.event.inputs.pylint-only == 'true')
+      && (needs.info.outputs.tests_glob || needs.info.outputs.test_full_suite == 'true')
+    needs:
+      - info
+      - base
+    steps:
+      - name: Check out code from GitHub
+        uses: actions/checkout@v4.1.7
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
+        id: python
+        uses: actions/setup-python@v5.1.0
+        with:
+          python-version: ${{ env.DEFAULT_PYTHON }}
+          check-latest: true
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
+        id: cache-venv
+        uses: actions/cache/restore@v4.0.2
+        with:
+          path: venv
+          fail-on-cache-miss: true
+          key: >-
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
+            needs.info.outputs.python_cache_key }}
+      - name: Register pylint problem matcher
+        run: |
+          echo "::add-matcher::.github/workflows/matchers/pylint.json"
+      - name: Run pylint (fully)
+        if: needs.info.outputs.test_full_suite == 'true'
+        run: |
+          . venv/bin/activate
+          python --version
+          pylint --ignore-missing-annotations=y tests
+      - name: Run pylint (partially)
+        if: needs.info.outputs.test_full_suite == 'false'
+        shell: bash
+        run: |
+          . venv/bin/activate
+          python --version
+          pylint --ignore-missing-annotations=y tests/components/${{ needs.info.outputs.tests_glob }}
+
   mypy:
     name: Check mypy
     runs-on: ubuntu-22.04
@@ -631,7 +677,7 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -702,9 +748,10 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -746,6 +793,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
       - prepare-pytest-full
     strategy:
@@ -763,9 +811,10 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -863,6 +912,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -879,9 +929,10 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -986,6 +1037,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1002,9 +1054,10 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -1099,18 +1152,19 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v4.1.7
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v4.4.1
+        uses: codecov/codecov-action@v4.5.0
         with:
           fail_ci_if_error: true
           flags: full-suite
           token: ${{ secrets.CODECOV_TOKEN }}
+          version: v0.6.0
 
   pytest-partial:
     runs-on: ubuntu-22.04
@@ -1128,6 +1182,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1144,9 +1199,10 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
         uses: actions/setup-python@v5.1.0
@@ -1233,14 +1289,15 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
       - name: Download all coverage artifacts
         uses: actions/download-artifact@v4.1.7
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v4.4.1
+        uses: codecov/codecov-action@v4.5.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
+          version: v0.6.0

.github/workflows/codeql.yml

@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.6
+        uses: github/codeql-action/init@v3.25.10
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.6
+        uses: github/codeql-action/analyze@v3.25.10
         with:
           category: "/language:python"

.github/workflows/translations.yml

@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.11"
+  DEFAULT_PYTHON: "3.12"
 
 jobs:
   upload:
@@ -19,7 +19,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@v5.1.0

.github/workflows/wheels.yml

@@ -32,7 +32,7 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
@@ -118,7 +118,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Download env_file
         uses: actions/download-artifact@v4.1.7
@@ -156,7 +156,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.6
+        uses: actions/checkout@v4.1.7
 
       - name: Download env_file
         uses: actions/download-artifact@v4.1.7

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.6
+    rev: v0.4.9
     hooks:
       - id: ruff
         args:
@@ -69,7 +69,7 @@ repos:
         entry: script/run-in-env.sh pylint -j 0 --ignore-missing-annotations=y
         language: script
         types_or: [python, pyi]
-        files: ^homeassistant/.+\.(py|pyi)$
+        files: ^(homeassistant|tests)/.+\.(py|pyi)$
       - id: gen_requirements_all
         name: gen_requirements_all
         entry: script/run-in-env.sh python3 -m script.gen_requirements_all

.strict-typing

@@ -261,6 +261,7 @@ homeassistant.components.jellyfin.*
 homeassistant.components.jewish_calendar.*
 homeassistant.components.jvc_projector.*
 homeassistant.components.kaleidescape.*
+homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
 homeassistant.components.lacrosse.*

.vscode/settings.default.json

@@ -4,5 +4,7 @@
   // https://github.com/microsoft/vscode-python/issues/14067
   "python.testing.pytestArgs": ["--no-cov"],
   // https://code.visualstudio.com/docs/python/testing#_pytest-configuration-settings
-  "python.testing.pytestEnabled": false
+  "python.testing.pytestEnabled": false,
+  // https://code.visualstudio.com/docs/python/linting#_general-settings
+  "pylint.importStrategy": "fromEnvironment"
 }

CODEOWNERS

@@ -88,6 +88,7 @@ build.json @home-assistant/supervisor
 /tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
+/homeassistant/components/amazon_polly/ @jschlyter
 /homeassistant/components/amberelectric/ @madpilot
 /tests/components/amberelectric/ @madpilot
 /homeassistant/components/ambient_network/ @thomaskistler
@@ -129,6 +130,8 @@ build.json @home-assistant/supervisor
 /tests/components/aprs/ @PhilRW
 /homeassistant/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
 /tests/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
+/homeassistant/components/aquacell/ @Jordi1990
+/tests/components/aquacell/ @Jordi1990
 /homeassistant/components/aranet/ @aschmitz @thecode @anrijs
 /tests/components/aranet/ @aschmitz @thecode @anrijs
 /homeassistant/components/arcam_fmj/ @elupus
@@ -184,8 +187,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/binary_sensor/ @home-assistant/core
 /tests/components/binary_sensor/ @home-assistant/core
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
-/homeassistant/components/blebox/ @bbx-a @riokuu @swistakm
-/tests/components/blebox/ @bbx-a @riokuu @swistakm
+/homeassistant/components/blebox/ @bbx-a @swistakm
+/tests/components/blebox/ @bbx-a @swistakm
 /homeassistant/components/blink/ @fronzbot @mkmer
 /tests/components/blink/ @fronzbot @mkmer
 /homeassistant/components/blue_current/ @Floris272 @gleeuwen
@@ -236,7 +239,6 @@ build.json @home-assistant/supervisor
 /tests/components/ccm15/ @ocalvo
 /homeassistant/components/cert_expiry/ @jjlawren
 /tests/components/cert_expiry/ @jjlawren
-/homeassistant/components/circuit/ @braam
 /homeassistant/components/cisco_ios/ @fbradyirl
 /homeassistant/components/cisco_mobility_express/ @fbradyirl
 /homeassistant/components/cisco_webex_teams/ @fbradyirl
@@ -379,7 +381,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/elvia/ @ludeeus
 /tests/components/elvia/ @ludeeus
 /homeassistant/components/emby/ @mezz64
-/homeassistant/components/emoncms/ @borpin
+/homeassistant/components/emoncms/ @borpin @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -629,8 +631,8 @@ build.json @home-assistant/supervisor
 /tests/components/huum/ @frwickst
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
-/homeassistant/components/hydrawise/ @dknowles2 @ptcryan
-/tests/components/hydrawise/ @dknowles2 @ptcryan
+/homeassistant/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
+/tests/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
 /homeassistant/components/ialarm/ @RyuzakiKK
@@ -658,7 +660,8 @@ build.json @home-assistant/supervisor
 /tests/components/imgw_pib/ @bieniu
 /homeassistant/components/improv_ble/ @emontnemery
 /tests/components/improv_ble/ @emontnemery
-/homeassistant/components/incomfort/ @zxdavb
+/homeassistant/components/incomfort/ @jbouwh
+/tests/components/incomfort/ @jbouwh
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
@@ -702,6 +705,8 @@ build.json @home-assistant/supervisor
 /tests/components/islamic_prayer_times/ @engrbm87 @cpfair
 /homeassistant/components/iss/ @DurgNomis-drol
 /tests/components/iss/ @DurgNomis-drol
+/homeassistant/components/ista_ecotrend/ @tr4nt0r
+/tests/components/ista_ecotrend/ @tr4nt0r
 /homeassistant/components/isy994/ @bdraco @shbatm
 /tests/components/isy994/ @bdraco @shbatm
 /homeassistant/components/izone/ @Swamp-Ig
@@ -732,6 +737,8 @@ build.json @home-assistant/supervisor
 /tests/components/kitchen_sink/ @home-assistant/core
 /homeassistant/components/kmtronic/ @dgomes
 /tests/components/kmtronic/ @dgomes
+/homeassistant/components/knocki/ @joostlek @jgatto1
+/tests/components/knocki/ @joostlek @jgatto1
 /homeassistant/components/knx/ @Julius2342 @farmio @marvin-w
 /tests/components/knx/ @Julius2342 @farmio @marvin-w
 /homeassistant/components/kodi/ @OnFreund
@@ -821,6 +828,8 @@ build.json @home-assistant/supervisor
 /tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
 /tests/components/matter/ @home-assistant/matter
+/homeassistant/components/mealie/ @joostlek
+/tests/components/mealie/ @joostlek
 /homeassistant/components/meater/ @Sotolotl @emontnemery
 /tests/components/meater/ @Sotolotl @emontnemery
 /homeassistant/components/medcom_ble/ @elafargue
@@ -832,6 +841,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/media_source/ @hunterjm
 /tests/components/media_source/ @hunterjm
 /homeassistant/components/mediaroom/ @dgomes
+/homeassistant/components/melcloud/ @erwindouna
+/tests/components/melcloud/ @erwindouna
 /homeassistant/components/melissa/ @kennedyshead
 /tests/components/melissa/ @kennedyshead
 /homeassistant/components/melnor/ @vanstinator
@@ -904,8 +915,8 @@ build.json @home-assistant/supervisor
 /tests/components/myuplink/ @pajzo @astrandb
 /homeassistant/components/nam/ @bieniu
 /tests/components/nam/ @bieniu
-/homeassistant/components/nanoleaf/ @milanmeu
-/tests/components/nanoleaf/ @milanmeu
+/homeassistant/components/nanoleaf/ @milanmeu @joostlek
+/tests/components/nanoleaf/ @milanmeu @joostlek
 /homeassistant/components/neato/ @Santobert
 /tests/components/neato/ @Santobert
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM
@@ -986,6 +997,7 @@ build.json @home-assistant/supervisor
 /tests/components/ondilo_ico/ @JeromeHXP
 /homeassistant/components/onewire/ @garbled1 @epenet
 /tests/components/onewire/ @garbled1 @epenet
+/homeassistant/components/onkyo/ @arturpragacz
 /homeassistant/components/onvif/ @hunterjm
 /tests/components/onvif/ @hunterjm
 /homeassistant/components/open_meteo/ @frenck
@@ -1094,6 +1106,8 @@ build.json @home-assistant/supervisor
 /tests/components/pvoutput/ @frenck
 /homeassistant/components/pvpc_hourly_pricing/ @azogue
 /tests/components/pvpc_hourly_pricing/ @azogue
+/homeassistant/components/pyload/ @tr4nt0r
+/tests/components/pyload/ @tr4nt0r
 /homeassistant/components/qbittorrent/ @geoffreylagaisse @finder39
 /tests/components/qbittorrent/ @geoffreylagaisse @finder39
 /homeassistant/components/qingping/ @bdraco
@@ -1172,8 +1186,8 @@ build.json @home-assistant/supervisor
 /tests/components/rituals_perfume_genie/ @milanmeu @frenck
 /homeassistant/components/rmvtransport/ @cgtobi
 /tests/components/rmvtransport/ @cgtobi
-/homeassistant/components/roborock/ @humbertogontijo @Lash-L
-/tests/components/roborock/ @humbertogontijo @Lash-L
+/homeassistant/components/roborock/ @Lash-L
+/tests/components/roborock/ @Lash-L
 /homeassistant/components/roku/ @ctalkington
 /tests/components/roku/ @ctalkington
 /homeassistant/components/romy/ @xeniter
@@ -1297,8 +1311,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge/ @frenck @bdraco
 /tests/components/solaredge/ @frenck @bdraco
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
-/homeassistant/components/solarlog/ @Ernst79
-/tests/components/solarlog/ @Ernst79
+/homeassistant/components/solarlog/ @Ernst79 @dontinelli
+/tests/components/solarlog/ @Ernst79 @dontinelli
 /homeassistant/components/solax/ @squishykid
 /tests/components/solax/ @squishykid
 /homeassistant/components/soma/ @ratsept @sebfortier2288
@@ -1486,8 +1500,6 @@ build.json @home-assistant/supervisor
 /tests/components/unifi/ @Kane610
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
 /homeassistant/components/unifiled/ @florisvdk
-/homeassistant/components/unifiprotect/ @bdraco
-/tests/components/unifiprotect/ @bdraco
 /homeassistant/components/upb/ @gwww
 /tests/components/upb/ @gwww
 /homeassistant/components/upc_connect/ @pvizeli @fabaff

Dockerfile

@@ -12,7 +12,7 @@ ENV \
 ARG QEMU_CPU
 
 # Install uv
-RUN pip3 install uv==0.1.43
+RUN pip3 install uv==0.2.13
 
 WORKDIR /usr/src
 

build.yaml

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

homeassistant/auth/__init__.py

@@ -28,6 +28,7 @@ from .const import ACCESS_TOKEN_EXPIRATION, GROUP_ID_ADMIN, REFRESH_TOKEN_EXPIRA
 from .mfa_modules import MultiFactorAuthModule, auth_mfa_module_from_config
 from .models import AuthFlowResult
 from .providers import AuthProvider, LoginFlow, auth_provider_from_config
+from .providers.homeassistant import HassAuthProvider
 
 EVENT_USER_ADDED = "user_added"
 EVENT_USER_UPDATED = "user_updated"
@@ -53,7 +54,7 @@ async def auth_manager_from_config(
 ) -> AuthManager:
     """Initialize an auth manager from config.
 
-    CORE_CONFIG_SCHEMA will make sure do duplicated auth providers or
+    CORE_CONFIG_SCHEMA will make sure no duplicated auth providers or
     mfa modules exist in configs.
     """
     store = auth_store.AuthStore(hass)
@@ -73,6 +74,13 @@ async def auth_manager_from_config(
         key = (provider.type, provider.id)
         provider_hash[key] = provider
 
+        if isinstance(provider, HassAuthProvider):
+            # Can be removed in 2026.7 with the legacy mode of homeassistant auth provider
+            # We need to initialize the provider to create the repair if needed as otherwise
+            # the provider will be initialized on first use, which could be rare as users
+            # don't frequently change auth settings
+            await provider.async_initialize()
+
     if module_configs:
         modules = await asyncio.gather(
             *(auth_mfa_module_from_config(hass, config) for config in module_configs)
@@ -374,6 +382,13 @@ class AuthManager:
 
         self.hass.bus.async_fire(EVENT_USER_UPDATED, {"user_id": user.id})
 
+    @callback
+    def async_update_user_credentials_data(
+        self, credentials: models.Credentials, data: dict[str, Any]
+    ) -> None:
+        """Update credentials data."""
+        self._store.async_update_user_credentials_data(credentials, data=data)
+
     async def async_activate_user(self, user: models.User) -> None:
         """Activate a user."""
         await self._store.async_activate_user(user)

homeassistant/auth/auth_store.py

@@ -296,6 +296,14 @@ class AuthStore:
             refresh_token.expire_at = None
             self._async_schedule_save()
 
+    @callback
+    def async_update_user_credentials_data(
+        self, credentials: models.Credentials, data: dict[str, Any]
+    ) -> None:
+        """Update credentials data."""
+        credentials.data = data
+        self._async_schedule_save()
+
     async def async_load(self) -> None:  # noqa: C901
         """Load the users."""
         if self._loaded:

homeassistant/auth/providers/homeassistant.py

@@ -14,6 +14,7 @@ import voluptuous as vol
 from homeassistant.const import CONF_ID
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
+from homeassistant.helpers import issue_registry as ir
 from homeassistant.helpers.storage import Store
 
 from ..models import AuthFlowResult, Credentials, UserMeta
@@ -55,6 +56,27 @@ class InvalidUser(HomeAssistantError):
     """
 
 
+class InvalidUsername(InvalidUser):
+    """Raised when invalid username is specified.
+
+    Will not be raised when validating authentication.
+    """
+
+    def __init__(
+        self,
+        *args: object,
+        translation_key: str | None = None,
+        translation_placeholders: dict[str, str] | None = None,
+    ) -> None:
+        """Initialize exception."""
+        super().__init__(
+            *args,
+            translation_domain="auth",
+            translation_key=translation_key,
+            translation_placeholders=translation_placeholders,
+        )
+
+
 class Data:
     """Hold the user data."""
 
@@ -67,13 +89,15 @@ class Data:
         self._data: dict[str, list[dict[str, str]]] | None = None
         # Legacy mode will allow usernames to start/end with whitespace
         # and will compare usernames case-insensitive.
-        # Remove in 2020 or when we launch 1.0.
+        # Deprecated in June 2019 and will be removed in 2026.7
         self.is_legacy = False
 
     @callback
-    def normalize_username(self, username: str) -> str:
+    def normalize_username(
+        self, username: str, *, force_normalize: bool = False
+    ) -> str:
         """Normalize a username based on the mode."""
-        if self.is_legacy:
+        if self.is_legacy and not force_normalize:
             return username
 
         return username.strip().casefold()
@@ -83,44 +107,49 @@ class Data:
         if (data := await self._store.async_load()) is None:
             data = cast(dict[str, list[dict[str, str]]], {"users": []})
 
-        seen: set[str] = set()
+        self._async_check_for_not_normalized_usernames(data)
+        self._data = data
+
+    @callback
+    def _async_check_for_not_normalized_usernames(
+        self, data: dict[str, list[dict[str, str]]]
+    ) -> None:
+        not_normalized_usernames: set[str] = set()
 
         for user in data["users"]:
             username = user["username"]
 
-            # check if we have duplicates
-            if (folded := username.casefold()) in seen:
-                self.is_legacy = True
-
+            if self.normalize_username(username, force_normalize=True) != username:
                 logging.getLogger(__name__).warning(
                     (
                         "Home Assistant auth provider is running in legacy mode "
-                        "because we detected usernames that are case-insensitive"
-                        "equivalent. Please change the username: '%s'."
+                        "because we detected usernames that are normalized (lowercase and without spaces)."
+                        " Please change the username: '%s'."
                     ),
                     username,
                 )
+                not_normalized_usernames.add(username)
 
-                break
-
-            seen.add(folded)
-
-            # check if we have unstripped usernames
-            if username != username.strip():
-                self.is_legacy = True
-
-                logging.getLogger(__name__).warning(
-                    (
-                        "Home Assistant auth provider is running in legacy mode "
-                        "because we detected usernames that start or end in a "
-                        "space. Please change the username: '%s'."
-                    ),
-                    username,
-                )
-
-                break
-
-        self._data = data
+        if not_normalized_usernames:
+            self.is_legacy = True
+            ir.async_create_issue(
+                self.hass,
+                "auth",
+                "homeassistant_provider_not_normalized_usernames",
+                breaks_in_ha_version="2026.7.0",
+                is_fixable=False,
+                severity=ir.IssueSeverity.WARNING,
+                translation_key="homeassistant_provider_not_normalized_usernames",
+                translation_placeholders={
+                    "usernames": f'- "{'"\n- "'.join(sorted(not_normalized_usernames))}"'
+                },
+                learn_more_url="homeassistant://config/users",
+            )
+        else:
+            self.is_legacy = False
+            ir.async_delete_issue(
+                self.hass, "auth", "homeassistant_provider_not_normalized_usernames"
+            )
 
     @property
     def users(self) -> list[dict[str, str]]:
@@ -162,13 +191,11 @@ class Data:
         return hashed
 
     def add_auth(self, username: str, password: str) -> None:
-        """Add a new authenticated user/pass."""
-        username = self.normalize_username(username)
+        """Add a new authenticated user/pass.
 
-        if any(
-            self.normalize_username(user["username"]) == username for user in self.users
-        ):
-            raise InvalidUser
+        Raises InvalidUsername if the new username is invalid.
+        """
+        self._validate_new_username(username)
 
         self.users.append(
             {
@@ -207,6 +234,49 @@ class Data:
         else:
             raise InvalidUser
 
+    @callback
+    def _validate_new_username(self, new_username: str) -> None:
+        """Validate that username is normalized and unique.
+
+        Raises InvalidUsername if the new username is invalid.
+        """
+        normalized_username = self.normalize_username(
+            new_username, force_normalize=True
+        )
+        if normalized_username != new_username:
+            raise InvalidUsername(
+                translation_key="username_not_normalized",
+                translation_placeholders={"new_username": new_username},
+            )
+
+        if any(
+            self.normalize_username(user["username"]) == normalized_username
+            for user in self.users
+        ):
+            raise InvalidUsername(
+                translation_key="username_already_exists",
+                translation_placeholders={"username": new_username},
+            )
+
+    @callback
+    def change_username(self, username: str, new_username: str) -> None:
+        """Update the username.
+
+        Raises InvalidUser if user cannot be found.
+        Raises InvalidUsername if the new username is invalid.
+        """
+        username = self.normalize_username(username)
+        self._validate_new_username(new_username)
+
+        for user in self.users:
+            if self.normalize_username(user["username"]) == username:
+                user["username"] = new_username
+                assert self._data is not None
+                self._async_check_for_not_normalized_usernames(self._data)
+                break
+        else:
+            raise InvalidUser
+
     async def async_save(self) -> None:
         """Save data."""
         if self._data is not None:
@@ -278,6 +348,20 @@ class HassAuthProvider(AuthProvider):
         )
         await self.data.async_save()
 
+    async def async_change_username(
+        self, credential: Credentials, new_username: str
+    ) -> None:
+        """Validate new username and change it including updating credentials object."""
+        if self.data is None:
+            await self.async_initialize()
+            assert self.data is not None
+
+        self.data.change_username(credential.data["username"], new_username)
+        self.hass.auth.async_update_user_credentials_data(
+            credential, {**credential.data, "username": new_username}
+        )
+        await self.data.async_save()
+
     async def async_get_or_create_credentials(
         self, flow_result: Mapping[str, str]
     ) -> Credentials:

homeassistant/auth/providers/legacy_api_password.py

@@ -1,123 +0,0 @@
-"""Support Legacy API password auth provider.
-
-It will be removed when auth system production ready
-"""
-
-from __future__ import annotations
-
-from collections.abc import Mapping
-import hmac
-from typing import Any, cast
-
-import voluptuous as vol
-
-from homeassistant.core import async_get_hass, callback
-from homeassistant.exceptions import HomeAssistantError
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
-
-from ..models import AuthFlowResult, Credentials, UserMeta
-from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
-
-AUTH_PROVIDER_TYPE = "legacy_api_password"
-CONF_API_PASSWORD = "api_password"
-
-_CONFIG_SCHEMA = AUTH_PROVIDER_SCHEMA.extend(
-    {vol.Required(CONF_API_PASSWORD): cv.string}, extra=vol.PREVENT_EXTRA
-)
-
-
-def _create_repair_and_validate(config: dict[str, Any]) -> dict[str, Any]:
-    async_create_issue(
-        async_get_hass(),
-        "auth",
-        "deprecated_legacy_api_password",
-        breaks_in_ha_version="2024.6.0",
-        is_fixable=False,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_legacy_api_password",
-    )
-
-    return _CONFIG_SCHEMA(config)  # type: ignore[no-any-return]
-
-
-CONFIG_SCHEMA = _create_repair_and_validate
-
-
-LEGACY_USER_NAME = "Legacy API password user"
-
-
-class InvalidAuthError(HomeAssistantError):
-    """Raised when submitting invalid authentication."""
-
-
-@AUTH_PROVIDERS.register(AUTH_PROVIDER_TYPE)
-class LegacyApiPasswordAuthProvider(AuthProvider):
-    """An auth provider support legacy api_password."""
-
-    DEFAULT_TITLE = "Legacy API Password"
-
-    @property
-    def api_password(self) -> str:
-        """Return api_password."""
-        return str(self.config[CONF_API_PASSWORD])
-
-    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
-        """Return a flow to login."""
-        return LegacyLoginFlow(self)
-
-    @callback
-    def async_validate_login(self, password: str) -> None:
-        """Validate password."""
-        api_password = str(self.config[CONF_API_PASSWORD])
-
-        if not hmac.compare_digest(
-            api_password.encode("utf-8"), password.encode("utf-8")
-        ):
-            raise InvalidAuthError
-
-    async def async_get_or_create_credentials(
-        self, flow_result: Mapping[str, str]
-    ) -> Credentials:
-        """Return credentials for this login."""
-        credentials = await self.async_credentials()
-        if credentials:
-            return credentials[0]
-
-        return self.async_create_credentials({})
-
-    async def async_user_meta_for_credentials(
-        self, credentials: Credentials
-    ) -> UserMeta:
-        """Return info for the user.
-
-        Will be used to populate info when creating a new user.
-        """
-        return UserMeta(name=LEGACY_USER_NAME, is_active=True)
-
-
-class LegacyLoginFlow(LoginFlow):
-    """Handler for the login flow."""
-
-    async def async_step_init(
-        self, user_input: dict[str, str] | None = None
-    ) -> AuthFlowResult:
-        """Handle the step of the form."""
-        errors = {}
-
-        if user_input is not None:
-            try:
-                cast(
-                    LegacyApiPasswordAuthProvider, self._auth_provider
-                ).async_validate_login(user_input["password"])
-            except InvalidAuthError:
-                errors["base"] = "invalid_auth"
-
-            if not errors:
-                return await self.async_finish({})
-
-        return self.async_show_form(
-            step_id="init",
-            data_schema=vol.Schema({vol.Required("password"): str}),
-            errors=errors,
-        )

homeassistant/block_async_io.py

@@ -1,9 +1,13 @@
 """Block blocking calls being done in asyncio."""
 
 import builtins
+from collections.abc import Callable
 from contextlib import suppress
+from dataclasses import dataclass
+import glob
 from http.client import HTTPConnection
 import importlib
+import os
 import sys
 import threading
 import time
@@ -44,37 +48,131 @@ def _check_sleep_call_allowed(mapped_args: dict[str, Any]) -> bool:
     return False
 
 
+@dataclass(slots=True, frozen=True)
+class BlockingCall:
+    """Class to hold information about a blocking call."""
+
+    original_func: Callable
+    object: object
+    function: str
+    check_allowed: Callable[[dict[str, Any]], bool] | None
+    strict: bool
+    strict_core: bool
+    skip_for_tests: bool
+
+
+_BLOCKING_CALLS: tuple[BlockingCall, ...] = (
+    BlockingCall(
+        original_func=HTTPConnection.putrequest,
+        object=HTTPConnection,
+        function="putrequest",
+        check_allowed=None,
+        strict=True,
+        strict_core=True,
+        skip_for_tests=False,
+    ),
+    BlockingCall(
+        original_func=time.sleep,
+        object=time,
+        function="sleep",
+        check_allowed=_check_sleep_call_allowed,
+        strict=True,
+        strict_core=True,
+        skip_for_tests=False,
+    ),
+    BlockingCall(
+        original_func=glob.glob,
+        object=glob,
+        function="glob",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=False,
+    ),
+    BlockingCall(
+        original_func=glob.iglob,
+        object=glob,
+        function="iglob",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=False,
+    ),
+    BlockingCall(
+        original_func=os.walk,
+        object=os,
+        function="walk",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=False,
+    ),
+    BlockingCall(
+        original_func=os.listdir,
+        object=os,
+        function="listdir",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=True,
+    ),
+    BlockingCall(
+        original_func=os.scandir,
+        object=os,
+        function="scandir",
+        check_allowed=None,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=True,
+    ),
+    BlockingCall(
+        original_func=builtins.open,
+        object=builtins,
+        function="open",
+        check_allowed=_check_file_allowed,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=True,
+    ),
+    BlockingCall(
+        original_func=importlib.import_module,
+        object=importlib,
+        function="import_module",
+        check_allowed=_check_import_call_allowed,
+        strict=False,
+        strict_core=False,
+        skip_for_tests=True,
+    ),
+)
+
+
+@dataclass(slots=True)
+class BlockedCalls:
+    """Class to track which calls are blocked."""
+
+    calls: set[BlockingCall]
+
+
+_BLOCKED_CALLS = BlockedCalls(set())
+
+
 def enable() -> None:
     """Enable the detection of blocking calls in the event loop."""
+    calls = _BLOCKED_CALLS.calls
+    if calls:
+        raise RuntimeError("Blocking call detection is already enabled")
+
     loop_thread_id = threading.get_ident()
-    # Prevent urllib3 and requests doing I/O in event loop
-    HTTPConnection.putrequest = protect_loop(  # type: ignore[method-assign]
-        HTTPConnection.putrequest, loop_thread_id=loop_thread_id
-    )
+    for blocking_call in _BLOCKING_CALLS:
+        if _IN_TESTS and blocking_call.skip_for_tests:
+            continue
 
-    # Prevent sleeping in event loop. Non-strict since 2022.02
-    time.sleep = protect_loop(
-        time.sleep,
-        strict=False,
-        check_allowed=_check_sleep_call_allowed,
-        loop_thread_id=loop_thread_id,
-    )
-
-    if not _IN_TESTS:
-        # Prevent files being opened inside the event loop
-        builtins.open = protect_loop(  # type: ignore[assignment]
-            builtins.open,
-            strict_core=False,
-            strict=False,
-            check_allowed=_check_file_allowed,
-            loop_thread_id=loop_thread_id,
-        )
-        # unittest uses `importlib.import_module` to do mocking
-        # so we cannot protect it if we are running tests
-        importlib.import_module = protect_loop(
-            importlib.import_module,
-            strict_core=False,
-            strict=False,
-            check_allowed=_check_import_call_allowed,
+        protected_function = protect_loop(
+            blocking_call.original_func,
+            strict=blocking_call.strict,
+            strict_core=blocking_call.strict_core,
+            check_allowed=blocking_call.check_allowed,
             loop_thread_id=loop_thread_id,
         )
+        setattr(blocking_call.object, blocking_call.function, protected_function)
+        calls.add(blocking_call)

homeassistant/bootstrap.py

@@ -134,8 +134,15 @@ COOLDOWN_TIME = 60
 
 
 DEBUGGER_INTEGRATIONS = {"debugpy"}
+
+# Core integrations are unconditionally loaded
 CORE_INTEGRATIONS = {"homeassistant", "persistent_notification"}
-LOGGING_INTEGRATIONS = {
+
+# Integrations that are loaded right after the core is set up
+LOGGING_AND_HTTP_DEPS_INTEGRATIONS = {
+    # isal is loaded right away before `http` to ensure if its
+    # enabled, that `isal` is up to date.
+    "isal",
     # Set log levels
     "logger",
     # Error logging
@@ -214,8 +221,8 @@ CRITICAL_INTEGRATIONS = {
 }
 
 SETUP_ORDER = (
-    # Load logging as soon as possible
-    ("logging", LOGGING_INTEGRATIONS),
+    # Load logging and http deps as soon as possible
+    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
     # Setup frontend and recorder
     ("frontend, recorder", {*FRONTEND_INTEGRATIONS, *RECORDER_INTEGRATIONS}),
     # Start up debuggers. Start these first in case they want to wait.
@@ -249,22 +256,39 @@ async def async_setup_hass(
     runtime_config: RuntimeConfig,
 ) -> core.HomeAssistant | None:
     """Set up Home Assistant."""
-    hass = core.HomeAssistant(runtime_config.config_dir)
 
-    async_enable_logging(
-        hass,
-        runtime_config.verbose,
-        runtime_config.log_rotate_days,
-        runtime_config.log_file,
-        runtime_config.log_no_color,
-    )
+    def create_hass() -> core.HomeAssistant:
+        """Create the hass object and do basic setup."""
+        hass = core.HomeAssistant(runtime_config.config_dir)
+        loader.async_setup(hass)
 
-    if runtime_config.debug or hass.loop.get_debug():
-        hass.config.debug = True
+        async_enable_logging(
+            hass,
+            runtime_config.verbose,
+            runtime_config.log_rotate_days,
+            runtime_config.log_file,
+            runtime_config.log_no_color,
+        )
+
+        if runtime_config.debug or hass.loop.get_debug():
+            hass.config.debug = True
+
+        hass.config.safe_mode = runtime_config.safe_mode
+        hass.config.skip_pip = runtime_config.skip_pip
+        hass.config.skip_pip_packages = runtime_config.skip_pip_packages
+
+        return hass
+
+    async def stop_hass(hass: core.HomeAssistant) -> None:
+        """Stop hass."""
+        # Ask integrations to shut down. It's messy but we can't
+        # do a clean stop without knowing what is broken
+        with contextlib.suppress(TimeoutError):
+            async with hass.timeout.async_timeout(10):
+                await hass.async_stop()
+
+    hass = create_hass()
 
-    hass.config.safe_mode = runtime_config.safe_mode
-    hass.config.skip_pip = runtime_config.skip_pip
-    hass.config.skip_pip_packages = runtime_config.skip_pip_packages
     if runtime_config.skip_pip or runtime_config.skip_pip_packages:
         _LOGGER.warning(
             "Skipping pip installation of required modules. This may cause issues"
@@ -276,7 +300,6 @@ async def async_setup_hass(
 
     _LOGGER.info("Config directory: %s", runtime_config.config_dir)
 
-    loader.async_setup(hass)
     block_async_io.enable()
 
     config_dict = None
@@ -302,27 +325,28 @@ async def async_setup_hass(
 
     if config_dict is None:
         recovery_mode = True
+        await stop_hass(hass)
+        hass = create_hass()
 
     elif not basic_setup_success:
         _LOGGER.warning("Unable to set up core integrations. Activating recovery mode")
         recovery_mode = True
+        await stop_hass(hass)
+        hass = create_hass()
 
     elif any(domain not in hass.config.components for domain in CRITICAL_INTEGRATIONS):
         _LOGGER.warning(
             "Detected that %s did not load. Activating recovery mode",
             ",".join(CRITICAL_INTEGRATIONS),
         )
-        # Ask integrations to shut down. It's messy but we can't
-        # do a clean stop without knowing what is broken
-        with contextlib.suppress(TimeoutError):
-            async with hass.timeout.async_timeout(10):
-                await hass.async_stop()
 
-        recovery_mode = True
         old_config = hass.config
         old_logging = hass.data.get(DATA_LOGGING)
 
-        hass = core.HomeAssistant(old_config.config_dir)
+        recovery_mode = True
+        await stop_hass(hass)
+        hass = create_hass()
+
         if old_logging:
             hass.data[DATA_LOGGING] = old_logging
         hass.config.debug = old_config.debug

homeassistant/brands/ambient_weather.json

@@ -0,0 +1,5 @@
+{
+  "domain": "ambient_weather",
+  "name": "Ambient Weather",
+  "integrations": ["ambient_network", "ambient_station"]
+}

homeassistant/brands/ruuvi.json

@@ -0,0 +1,5 @@
+{
+  "domain": "ruuvi",
+  "name": "Ruuvi",
+  "integrations": ["ruuvi_gateway", "ruuvitag_ble"]
+}

homeassistant/brands/weatherflow.json

@@ -0,0 +1,5 @@
+{
+  "domain": "weatherflow",
+  "name": "WeatherFlow",
+  "integrations": ["weatherflow", "weatherflow_cloud"]
+}

homeassistant/components/abode/binary_sensor.py

@@ -5,13 +5,6 @@ from __future__ import annotations
 from typing import cast
 
 from jaraco.abode.devices.sensor import BinarySensor
-from jaraco.abode.helpers.constants import (
-    TYPE_CONNECTIVITY,
-    TYPE_MOISTURE,
-    TYPE_MOTION,
-    TYPE_OCCUPANCY,
-    TYPE_OPENING,
-)
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -34,11 +27,11 @@ async def async_setup_entry(
     data: AbodeSystem = hass.data[DOMAIN]
 
     device_types = [
-        TYPE_CONNECTIVITY,
-        TYPE_MOISTURE,
-        TYPE_MOTION,
-        TYPE_OCCUPANCY,
-        TYPE_OPENING,
+        "connectivity",
+        "moisture",
+        "motion",
+        "occupancy",
+        "door",
     ]
 
     async_add_entities(

homeassistant/components/abode/camera.py

@@ -8,7 +8,6 @@ from typing import Any, cast
 from jaraco.abode.devices.base import Device
 from jaraco.abode.devices.camera import Camera as AbodeCam
 from jaraco.abode.helpers import timeline
-from jaraco.abode.helpers.constants import TYPE_CAMERA
 import requests
 from requests.models import Response
 
@@ -34,7 +33,7 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeCamera(data, device, timeline.CAPTURE_IMAGE)
-        for device in data.abode.get_devices(generic_type=TYPE_CAMERA)
+        for device in data.abode.get_devices(generic_type="camera")
     )
 
 

homeassistant/components/abode/cover.py

@@ -3,7 +3,6 @@
 from typing import Any
 
 from jaraco.abode.devices.cover import Cover
-from jaraco.abode.helpers.constants import TYPE_COVER
 
 from homeassistant.components.cover import CoverEntity
 from homeassistant.config_entries import ConfigEntry
@@ -23,7 +22,7 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeCover(data, device)
-        for device in data.abode.get_devices(generic_type=TYPE_COVER)
+        for device in data.abode.get_devices(generic_type="cover")
     )
 
 

homeassistant/components/abode/entity.py

@@ -105,7 +105,7 @@ class AbodeAutomation(AbodeEntity):
         super().__init__(data)
         self._automation = automation
         self._attr_name = automation.name
-        self._attr_unique_id = automation.automation_id
+        self._attr_unique_id = automation.id
         self._attr_extra_state_attributes = {
             "type": "CUE automation",
         }

homeassistant/components/abode/light.py

@@ -6,7 +6,6 @@ from math import ceil
 from typing import Any
 
 from jaraco.abode.devices.light import Light
-from jaraco.abode.helpers.constants import TYPE_LIGHT
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
@@ -36,7 +35,7 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeLight(data, device)
-        for device in data.abode.get_devices(generic_type=TYPE_LIGHT)
+        for device in data.abode.get_devices(generic_type="light")
     )
 
 

homeassistant/components/abode/lock.py

@@ -3,7 +3,6 @@
 from typing import Any
 
 from jaraco.abode.devices.lock import Lock
-from jaraco.abode.helpers.constants import TYPE_LOCK
 
 from homeassistant.components.lock import LockEntity
 from homeassistant.config_entries import ConfigEntry
@@ -23,7 +22,7 @@ async def async_setup_entry(
 
     async_add_entities(
         AbodeLock(data, device)
-        for device in data.abode.get_devices(generic_type=TYPE_LOCK)
+        for device in data.abode.get_devices(generic_type="lock")
     )
 
 

homeassistant/components/abode/manifest.json

@@ -9,5 +9,5 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["jaraco.abode", "lomond"],
-  "requirements": ["jaraco.abode==3.3.0", "jaraco.functools==3.9.0"]
+  "requirements": ["jaraco.abode==5.1.2"]
 }

homeassistant/components/abode/sensor.py

@@ -7,15 +7,6 @@ from dataclasses import dataclass
 from typing import cast
 
 from jaraco.abode.devices.sensor import Sensor
-from jaraco.abode.helpers.constants import (
-    HUMI_STATUS_KEY,
-    LUX_STATUS_KEY,
-    STATUSES_KEY,
-    TEMP_STATUS_KEY,
-    TYPE_SENSOR,
-    UNIT_CELSIUS,
-    UNIT_FAHRENHEIT,
-)
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -32,8 +23,8 @@ from .const import DOMAIN
 from .entity import AbodeDevice
 
 ABODE_TEMPERATURE_UNIT_HA_UNIT = {
-    UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
-    UNIT_CELSIUS: UnitOfTemperature.CELSIUS,
+    "°F": UnitOfTemperature.FAHRENHEIT,
+    "°C": UnitOfTemperature.CELSIUS,
 }
 
 
@@ -47,7 +38,7 @@ class AbodeSensorDescription(SensorEntityDescription):
 
 SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
-        key=TEMP_STATUS_KEY,
+        key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
@@ -55,13 +46,13 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
         value_fn=lambda device: cast(float, device.temp),
     ),
     AbodeSensorDescription(
-        key=HUMI_STATUS_KEY,
+        key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
-        key=LUX_STATUS_KEY,
+        key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
@@ -78,8 +69,8 @@ async def async_setup_entry(
     async_add_entities(
         AbodeSensor(data, device, description)
         for description in SENSOR_TYPES
-        for device in data.abode.get_devices(generic_type=TYPE_SENSOR)
-        if description.key in device.get_value(STATUSES_KEY)
+        for device in data.abode.get_devices(generic_type="sensor")
+        if description.key in device.get_value("statuses")
     )
 
 

homeassistant/components/abode/switch.py

@@ -5,7 +5,6 @@ from __future__ import annotations
 from typing import Any, cast
 
 from jaraco.abode.devices.switch import Switch
-from jaraco.abode.helpers.constants import TYPE_SWITCH, TYPE_VALVE
 
 from homeassistant.components.switch import SwitchEntity
 from homeassistant.config_entries import ConfigEntry
@@ -17,7 +16,7 @@ from . import AbodeSystem
 from .const import DOMAIN
 from .entity import AbodeAutomation, AbodeDevice
 
-DEVICE_TYPES = [TYPE_SWITCH, TYPE_VALVE]
+DEVICE_TYPES = ["switch", "valve"]
 
 
 async def async_setup_entry(
@@ -89,4 +88,4 @@ class AbodeAutomationSwitch(AbodeAutomation, SwitchEntity):
     @property
     def is_on(self) -> bool:
         """Return True if the automation is enabled."""
-        return bool(self._automation.is_enabled)
+        return bool(self._automation.enabled)

homeassistant/components/accuweather/icons.json

@@ -0,0 +1,51 @@
+{
+  "entity": {
+    "sensor": {
+      "cloud_ceiling": {
+        "default": "mdi:weather-fog"
+      },
+      "cloud_cover": {
+        "default": "mdi:weather-cloudy"
+      },
+      "cloud_cover_day": {
+        "default": "mdi:weather-cloudy"
+      },
+      "cloud_cover_night": {
+        "default": "mdi:weather-cloudy"
+      },
+      "grass_pollen": {
+        "default": "mdi:grass"
+      },
+      "hours_of_sun": {
+        "default": "mdi:weather-partly-cloudy"
+      },
+      "mold_pollen": {
+        "default": "mdi:blur"
+      },
+      "pressure_tendency": {
+        "default": "mdi:gauge"
+      },
+      "ragweed_pollen": {
+        "default": "mdi:sprout"
+      },
+      "thunderstorm_probability_day": {
+        "default": "mdi:weather-lightning"
+      },
+      "thunderstorm_probability_night": {
+        "default": "mdi:weather-lightning"
+      },
+      "translation_key": {
+        "default": "mdi:air-filter"
+      },
+      "tree_pollen": {
+        "default": "mdi:tree-outline"
+      },
+      "uv_index": {
+        "default": "mdi:weather-sunny"
+      },
+      "uv_index_forecast": {
+        "default": "mdi:weather-sunny"
+      }
+    }
+  }
+}

homeassistant/components/accuweather/sensor.py

@@ -55,284 +55,174 @@ class AccuWeatherSensorDescription(SensorEntityDescription):
     attr_fn: Callable[[dict[str, Any]], dict[str, Any]] = lambda _: {}
 
 
-@dataclass(frozen=True, kw_only=True)
-class AccuWeatherForecastSensorDescription(AccuWeatherSensorDescription):
-    """Class describing AccuWeather sensor entities."""
-
-    day: int
-
-
-FORECAST_SENSOR_TYPES: tuple[AccuWeatherForecastSensorDescription, ...] = (
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="AirQuality",
-            icon="mdi:air-filter",
-            value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
-            device_class=SensorDeviceClass.ENUM,
-            options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
-            translation_key=f"air_quality_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
+    AccuWeatherSensorDescription(
+        key="AirQuality",
+        value_fn=lambda data: cast(str, data[ATTR_CATEGORY]),
+        device_class=SensorDeviceClass.ENUM,
+        options=["good", "hazardous", "high", "low", "moderate", "unhealthy"],
+        translation_key="air_quality",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="CloudCoverDay",
-            icon="mdi:weather-cloudy",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"cloud_cover_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="CloudCoverDay",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="cloud_cover_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="CloudCoverNight",
-            icon="mdi:weather-cloudy",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"cloud_cover_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="CloudCoverNight",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="cloud_cover_night",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="Grass",
-            icon="mdi:grass",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"grass_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Grass",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="grass_pollen",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="HoursOfSun",
-            icon="mdi:weather-partly-cloudy",
-            native_unit_of_measurement=UnitOfTime.HOURS,
-            value_fn=lambda data: cast(float, data),
-            translation_key=f"hours_of_sun_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="HoursOfSun",
+        native_unit_of_measurement=UnitOfTime.HOURS,
+        value_fn=lambda data: cast(float, data),
+        translation_key="hours_of_sun",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="LongPhraseDay",
-            value_fn=lambda data: cast(str, data),
-            translation_key=f"condition_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="LongPhraseDay",
+        value_fn=lambda data: cast(str, data),
+        translation_key="condition_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="LongPhraseNight",
-            value_fn=lambda data: cast(str, data),
-            translation_key=f"condition_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="LongPhraseNight",
+        value_fn=lambda data: cast(str, data),
+        translation_key="condition_night",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="Mold",
-            icon="mdi:blur",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"mold_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Mold",
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="mold_pollen",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="Ragweed",
-            icon="mdi:sprout",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            entity_registry_enabled_default=False,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"ragweed_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Ragweed",
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="ragweed_pollen",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="RealFeelTemperatureMax",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_max_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_max",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="RealFeelTemperatureMin",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_min_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_min",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="RealFeelTemperatureShadeMax",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_shade_max_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMax",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_shade_max",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="RealFeelTemperatureShadeMin",
-            device_class=SensorDeviceClass.TEMPERATURE,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"realfeel_temperature_shade_min_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="RealFeelTemperatureShadeMin",
+        device_class=SensorDeviceClass.TEMPERATURE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="realfeel_temperature_shade_min",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="SolarIrradianceDay",
-            icon="mdi:weather-sunny",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"solar_irradiance_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceDay",
+        device_class=SensorDeviceClass.IRRADIANCE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="solar_irradiance_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="SolarIrradianceNight",
-            icon="mdi:weather-sunny",
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
-            value_fn=lambda data: cast(float, data[ATTR_VALUE]),
-            translation_key=f"solar_irradiance_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="SolarIrradianceNight",
+        device_class=SensorDeviceClass.IRRADIANCE,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfIrradiance.WATTS_PER_SQUARE_METER,
+        value_fn=lambda data: cast(float, data[ATTR_VALUE]),
+        translation_key="solar_irradiance_night",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="ThunderstormProbabilityDay",
-            icon="mdi:weather-lightning",
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"thunderstorm_probability_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityDay",
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="thunderstorm_probability_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="ThunderstormProbabilityNight",
-            icon="mdi:weather-lightning",
-            native_unit_of_measurement=PERCENTAGE,
-            value_fn=lambda data: cast(int, data),
-            translation_key=f"thunderstorm_probability_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="ThunderstormProbabilityNight",
+        native_unit_of_measurement=PERCENTAGE,
+        value_fn=lambda data: cast(int, data),
+        translation_key="thunderstorm_probability_night",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="Tree",
-            icon="mdi:tree-outline",
-            native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
-            entity_registry_enabled_default=False,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"tree_pollen_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="Tree",
+        native_unit_of_measurement=CONCENTRATION_PARTS_PER_CUBIC_METER,
+        entity_registry_enabled_default=False,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="tree_pollen",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="UVIndex",
-            icon="mdi:weather-sunny",
-            native_unit_of_measurement=UV_INDEX,
-            value_fn=lambda data: cast(int, data[ATTR_VALUE]),
-            attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
-            translation_key=f"uv_index_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="UVIndex",
+        native_unit_of_measurement=UV_INDEX,
+        value_fn=lambda data: cast(int, data[ATTR_VALUE]),
+        attr_fn=lambda data: {ATTR_LEVEL: data[ATTR_CATEGORY]},
+        translation_key="uv_index_forecast",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="WindGustDay",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_gust_speed_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindGustDay",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_gust_speed_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="WindGustNight",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            entity_registry_enabled_default=False,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_gust_speed_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindGustNight",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        entity_registry_enabled_default=False,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_gust_speed_night",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="WindDay",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_speed_day_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindDay",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_speed_day",
     ),
-    *(
-        AccuWeatherForecastSensorDescription(
-            key="WindNight",
-            device_class=SensorDeviceClass.WIND_SPEED,
-            native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
-            value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
-            attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
-            translation_key=f"wind_speed_night_{day}d",
-            day=day,
-        )
-        for day in range(MAX_FORECAST_DAYS + 1)
+    AccuWeatherSensorDescription(
+        key="WindNight",
+        device_class=SensorDeviceClass.WIND_SPEED,
+        native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
+        value_fn=lambda data: cast(float, data[ATTR_SPEED][ATTR_VALUE]),
+        attr_fn=lambda data: {"direction": data[ATTR_DIRECTION][ATTR_ENGLISH]},
+        translation_key="wind_speed_night",
     ),
 )
 
@@ -349,7 +239,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="Ceiling",
         device_class=SensorDeviceClass.DISTANCE,
-        icon="mdi:weather-fog",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfLength.METERS,
         value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
@@ -358,7 +247,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     ),
     AccuWeatherSensorDescription(
         key="CloudCover",
-        icon="mdi:weather-cloudy",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=PERCENTAGE,
@@ -403,14 +291,12 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="PressureTendency",
         device_class=SensorDeviceClass.ENUM,
-        icon="mdi:gauge",
         options=["falling", "rising", "steady"],
         value_fn=lambda data: cast(str, data["LocalizedText"]).lower(),
         translation_key="pressure_tendency",
     ),
     AccuWeatherSensorDescription(
         key="UVIndex",
-        icon="mdi:weather-sunny",
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UV_INDEX,
         value_fn=lambda data: cast(int, data),
@@ -475,9 +361,10 @@ async def async_setup_entry(
 
     sensors.extend(
         [
-            AccuWeatherForecastSensor(forecast_daily_coordinator, description)
+            AccuWeatherForecastSensor(forecast_daily_coordinator, description, day)
+            for day in range(MAX_FORECAST_DAYS + 1)
             for description in FORECAST_SENSOR_TYPES
-            if description.key in forecast_daily_coordinator.data[description.day]
+            if description.key in forecast_daily_coordinator.data[day]
         ]
     )
 
@@ -543,25 +430,27 @@ class AccuWeatherForecastSensor(
 
     _attr_attribution = ATTRIBUTION
     _attr_has_entity_name = True
-    entity_description: AccuWeatherForecastSensorDescription
+    entity_description: AccuWeatherSensorDescription
 
     def __init__(
         self,
         coordinator: AccuWeatherDailyForecastDataUpdateCoordinator,
-        description: AccuWeatherForecastSensorDescription,
+        description: AccuWeatherSensorDescription,
+        forecast_day: int,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
 
-        self.forecast_day = description.day
         self.entity_description = description
         self._sensor_data = self._get_sensor_data(
-            coordinator.data, description.key, self.forecast_day
+            coordinator.data, description.key, forecast_day
         )
         self._attr_unique_id = (
-            f"{coordinator.location_key}-{description.key}-{self.forecast_day}".lower()
+            f"{coordinator.location_key}-{description.key}-{forecast_day}".lower()
         )
         self._attr_device_info = coordinator.device_info
+        self._attr_translation_placeholders = {"forecast_day": str(forecast_day)}
+        self.forecast_day = forecast_day
 
     @property
     def native_value(self) -> str | int | float | None:

homeassistant/components/accuweather/strings.json

@@ -21,8 +21,8 @@
   },
   "entity": {
     "sensor": {
-      "air_quality_0d": {
-        "name": "Air quality today",
+      "air_quality": {
+        "name": "Air quality day {forecast_day}",
         "state": {
           "good": "Good",
           "hazardous": "Hazardous",
@@ -32,50 +32,6 @@
           "unhealthy": "Unhealthy"
         }
       },
-      "air_quality_1d": {
-        "name": "Air quality day 1",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_2d": {
-        "name": "Air quality day 2",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_3d": {
-        "name": "Air quality day 3",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
-      "air_quality_4d": {
-        "name": "Air quality day 4",
-        "state": {
-          "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-          "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-          "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-          "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-          "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-          "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-        }
-      },
       "apparent_temperature": {
         "name": "Apparent temperature"
       },
@@ -85,240 +41,52 @@
       "cloud_cover": {
         "name": "Cloud cover"
       },
-      "cloud_cover_day_0d": {
-        "name": "Cloud cover today"
+      "cloud_cover_day": {
+        "name": "Cloud cover day {forecast_day}"
       },
-      "cloud_cover_day_1d": {
-        "name": "Cloud cover day 1"
+      "cloud_cover_night": {
+        "name": "Cloud cover night {forecast_day}"
       },
-      "cloud_cover_day_2d": {
-        "name": "Cloud cover day 2"
+      "condition_day": {
+        "name": "Condition day {forecast_day}"
       },
-      "cloud_cover_day_3d": {
-        "name": "Cloud cover day 3"
-      },
-      "cloud_cover_day_4d": {
-        "name": "Cloud cover day 4"
-      },
-      "cloud_cover_night_0d": {
-        "name": "Cloud cover tonight"
-      },
-      "cloud_cover_night_1d": {
-        "name": "Cloud cover night 1"
-      },
-      "cloud_cover_night_2d": {
-        "name": "Cloud cover night 2"
-      },
-      "cloud_cover_night_3d": {
-        "name": "Cloud cover night 3"
-      },
-      "cloud_cover_night_4d": {
-        "name": "Cloud cover night 4"
-      },
-      "condition_day_0d": {
-        "name": "Condition today"
-      },
-      "condition_day_1d": {
-        "name": "Condition day 1"
-      },
-      "condition_day_2d": {
-        "name": "Condition day 2"
-      },
-      "condition_day_3d": {
-        "name": "Condition day 3"
-      },
-      "condition_day_4d": {
-        "name": "Condition day 4"
-      },
-      "condition_night_0d": {
-        "name": "Condition tonight"
-      },
-      "condition_night_1d": {
-        "name": "Condition night 1"
-      },
-      "condition_night_2d": {
-        "name": "Condition night 2"
-      },
-      "condition_night_3d": {
-        "name": "Condition night 3"
-      },
-      "condition_night_4d": {
-        "name": "Condition night 4"
+      "condition_night": {
+        "name": "Condition night {forecast_day}"
       },
       "dew_point": {
         "name": "Dew point"
       },
-      "grass_pollen_0d": {
-        "name": "Grass pollen today",
+      "grass_pollen": {
+        "name": "Grass pollen day {forecast_day}",
         "state_attributes": {
           "level": {
             "name": "Level",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
       },
-      "grass_pollen_1d": {
-        "name": "Grass pollen day 1",
+      "hours_of_sun": {
+        "name": "Hours of sun day {forecast_day}"
+      },
+      "mold_pollen": {
+        "name": "Mold pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_2d": {
-        "name": "Grass pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_3d": {
-        "name": "Grass pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "grass_pollen_4d": {
-        "name": "Grass pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "hours_of_sun_0d": {
-        "name": "Hours of sun today"
-      },
-      "hours_of_sun_1d": {
-        "name": "Hours of sun day 1"
-      },
-      "hours_of_sun_2d": {
-        "name": "Hours of sun day 2"
-      },
-      "hours_of_sun_3d": {
-        "name": "Hours of sun day 3"
-      },
-      "hours_of_sun_4d": {
-        "name": "Hours of sun day 4"
-      },
-      "mold_pollen_0d": {
-        "name": "Mold pollen today",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_1d": {
-        "name": "Mold pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_2d": {
-        "name": "Mold pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_3d": {
-        "name": "Mold pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "mold_pollen_4d": {
-        "name": "Mold pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -334,82 +102,18 @@
           "falling": "Falling"
         }
       },
-      "ragweed_pollen_0d": {
-        "name": "Ragweed pollen today",
+      "ragweed_pollen": {
+        "name": "Ragweed pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_1d": {
-        "name": "Ragweed pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_2d": {
-        "name": "Ragweed pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_3d": {
-        "name": "Ragweed pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "ragweed_pollen_4d": {
-        "name": "Ragweed pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -417,205 +121,45 @@
       "realfeel_temperature": {
         "name": "RealFeel temperature"
       },
-      "realfeel_temperature_max_0d": {
-        "name": "RealFeel temperature max today"
+      "realfeel_temperature_max": {
+        "name": "RealFeel temperature max day {forecast_day}"
       },
-      "realfeel_temperature_max_1d": {
-        "name": "RealFeel temperature max day 1"
-      },
-      "realfeel_temperature_max_2d": {
-        "name": "RealFeel temperature max day 2"
-      },
-      "realfeel_temperature_max_3d": {
-        "name": "RealFeel temperature max day 3"
-      },
-      "realfeel_temperature_max_4d": {
-        "name": "RealFeel temperature max day 4"
-      },
-      "realfeel_temperature_min_0d": {
-        "name": "RealFeel temperature min today"
-      },
-      "realfeel_temperature_min_1d": {
-        "name": "RealFeel temperature min day 1"
-      },
-      "realfeel_temperature_min_2d": {
-        "name": "RealFeel temperature min day 2"
-      },
-      "realfeel_temperature_min_3d": {
-        "name": "RealFeel temperature min day 3"
-      },
-      "realfeel_temperature_min_4d": {
-        "name": "RealFeel temperature min day 4"
+      "realfeel_temperature_min": {
+        "name": "RealFeel temperature min day {forecast_day}"
       },
       "realfeel_temperature_shade": {
         "name": "RealFeel temperature shade"
       },
-      "realfeel_temperature_shade_max_0d": {
-        "name": "RealFeel temperature shade max today"
+      "realfeel_temperature_shade_max": {
+        "name": "RealFeel temperature shade max day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_1d": {
-        "name": "RealFeel temperature shade max day 1"
+      "realfeel_temperature_shade_min": {
+        "name": "RealFeel temperature shade min day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_2d": {
-        "name": "RealFeel temperature shade max day 2"
+      "solar_irradiance_day": {
+        "name": "Solar irradiance day {forecast_day}"
       },
-      "realfeel_temperature_shade_max_3d": {
-        "name": "RealFeel temperature shade max day 3"
+      "solar_irradiance_night": {
+        "name": "Solar irradiance night {forecast_day}"
       },
-      "realfeel_temperature_shade_max_4d": {
-        "name": "RealFeel temperature shade max day 4"
+      "thunderstorm_probability_day": {
+        "name": "Thunderstorm probability day {forecast_day}"
       },
-      "realfeel_temperature_shade_min_0d": {
-        "name": "RealFeel temperature shade min today"
+      "thunderstorm_probability_night": {
+        "name": "Thunderstorm probability night {forecast_day}"
       },
-      "realfeel_temperature_shade_min_1d": {
-        "name": "RealFeel temperature shade min day 1"
-      },
-      "realfeel_temperature_shade_min_2d": {
-        "name": "RealFeel temperature shade min day 2"
-      },
-      "realfeel_temperature_shade_min_3d": {
-        "name": "RealFeel temperature shade min day 3"
-      },
-      "realfeel_temperature_shade_min_4d": {
-        "name": "RealFeel temperature shade min day 4"
-      },
-      "solar_irradiance_day_0d": {
-        "name": "Solar irradiance today"
-      },
-      "solar_irradiance_day_1d": {
-        "name": "Solar irradiance day 1"
-      },
-      "solar_irradiance_day_2d": {
-        "name": "Solar irradiance day 2"
-      },
-      "solar_irradiance_day_3d": {
-        "name": "Solar irradiance day 3"
-      },
-      "solar_irradiance_day_4d": {
-        "name": "Solar irradiance day 4"
-      },
-      "solar_irradiance_night_0d": {
-        "name": "Solar irradiance tonight"
-      },
-      "solar_irradiance_night_1d": {
-        "name": "Solar irradiance night 1"
-      },
-      "solar_irradiance_night_2d": {
-        "name": "Solar irradiance night 2"
-      },
-      "solar_irradiance_night_3d": {
-        "name": "Solar irradiance night 3"
-      },
-      "solar_irradiance_night_4d": {
-        "name": "Solar irradiance night 4"
-      },
-      "thunderstorm_probability_day_0d": {
-        "name": "Thunderstorm probability today"
-      },
-      "thunderstorm_probability_day_1d": {
-        "name": "Thunderstorm probability day 1"
-      },
-      "thunderstorm_probability_day_2d": {
-        "name": "Thunderstorm probability day 2"
-      },
-      "thunderstorm_probability_day_3d": {
-        "name": "Thunderstorm probability day 3"
-      },
-      "thunderstorm_probability_day_4d": {
-        "name": "Thunderstorm probability day 4"
-      },
-      "thunderstorm_probability_night_0d": {
-        "name": "Thunderstorm probability tonight"
-      },
-      "thunderstorm_probability_night_1d": {
-        "name": "Thunderstorm probability night 1"
-      },
-      "thunderstorm_probability_night_2d": {
-        "name": "Thunderstorm probability night 2"
-      },
-      "thunderstorm_probability_night_3d": {
-        "name": "Thunderstorm probability night 3"
-      },
-      "thunderstorm_probability_night_4d": {
-        "name": "Thunderstorm probability night 4"
-      },
-      "tree_pollen_0d": {
-        "name": "Tree pollen today",
+      "tree_pollen": {
+        "name": "Tree pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_1d": {
-        "name": "Tree pollen day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_2d": {
-        "name": "Tree pollen day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_3d": {
-        "name": "Tree pollen day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "tree_pollen_4d": {
-        "name": "Tree pollen day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -624,94 +168,30 @@
         "name": "UV index",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
       },
-      "uv_index_0d": {
-        "name": "UV index today",
+      "uv_index_forecast": {
+        "name": "UV index day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_1d": {
-        "name": "UV index day 1",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_2d": {
-        "name": "UV index day 2",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_3d": {
-        "name": "UV index day 3",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
-            }
-          }
-        }
-      },
-      "uv_index_4d": {
-        "name": "UV index day 4",
-        "state_attributes": {
-          "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
-            "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
+              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
             }
           }
         }
@@ -728,65 +208,17 @@
       "wind_gust_speed": {
         "name": "[%key:component::weather::entity_component::_::state_attributes::wind_gust_speed::name%]"
       },
-      "wind_gust_speed_day_0d": {
-        "name": "Wind gust speed today"
+      "wind_gust_speed_day": {
+        "name": "Wind gust speed day {forecast_day}"
       },
-      "wind_gust_speed_day_1d": {
-        "name": "Wind gust speed day 1"
+      "wind_gust_speed_night": {
+        "name": "Wind gust speed night {forecast_day}"
       },
-      "wind_gust_speed_day_2d": {
-        "name": "Wind gust speed day 2"
+      "wind_speed_day": {
+        "name": "Wind speed day {forecast_day}"
       },
-      "wind_gust_speed_day_3d": {
-        "name": "Wind gust speed day 3"
-      },
-      "wind_gust_speed_day_4d": {
-        "name": "Wind gust speed day 4"
-      },
-      "wind_gust_speed_night_0d": {
-        "name": "Wind gust speed tonight"
-      },
-      "wind_gust_speed_night_1d": {
-        "name": "Wind gust speed night 1"
-      },
-      "wind_gust_speed_night_2d": {
-        "name": "Wind gust speed night 2"
-      },
-      "wind_gust_speed_night_3d": {
-        "name": "Wind gust speed night 3"
-      },
-      "wind_gust_speed_night_4d": {
-        "name": "Wind gust speed night 4"
-      },
-      "wind_speed_day_0d": {
-        "name": "Wind speed today"
-      },
-      "wind_speed_day_1d": {
-        "name": "Wind speed day 1"
-      },
-      "wind_speed_day_2d": {
-        "name": "Wind speed day 2"
-      },
-      "wind_speed_day_3d": {
-        "name": "Wind speed day 3"
-      },
-      "wind_speed_day_4d": {
-        "name": "Wind speed day 4"
-      },
-      "wind_speed_night_0d": {
-        "name": "Wind speed tonight"
-      },
-      "wind_speed_night_1d": {
-        "name": "Wind speed night 1"
-      },
-      "wind_speed_night_2d": {
-        "name": "Wind speed night 2"
-      },
-      "wind_speed_night_3d": {
-        "name": "Wind speed night 3"
-      },
-      "wind_speed_night_4d": {
-        "name": "Wind speed night 4"
+      "wind_speed_night": {
+        "name": "Wind speed night {forecast_day}"
       }
     }
   },

homeassistant/components/accuweather/weather.py

@@ -7,6 +7,7 @@ from typing import cast
 from homeassistant.components.weather import (
     ATTR_FORECAST_CLOUD_COVERAGE,
     ATTR_FORECAST_CONDITION,
+    ATTR_FORECAST_HUMIDITY,
     ATTR_FORECAST_NATIVE_APPARENT_TEMP,
     ATTR_FORECAST_NATIVE_PRECIPITATION,
     ATTR_FORECAST_NATIVE_TEMP,
@@ -183,6 +184,7 @@ class AccuWeatherEntity(
             {
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
                 ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
+                ATTR_FORECAST_HUMIDITY: item["RelativeHumidityDay"]["Average"],
                 ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][

homeassistant/components/acer_projector/switch.py

@@ -9,7 +9,10 @@ from typing import Any
 import serial
 import voluptuous as vol
 
-from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
+from homeassistant.components.switch import (
+    PLATFORM_SCHEMA as SWITCH_PLATFORM_SCHEMA,
+    SwitchEntity,
+)
 from homeassistant.const import (
     CONF_FILENAME,
     CONF_NAME,
@@ -38,7 +41,7 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_FILENAME): cv.isdevice,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,

homeassistant/components/actiontec/device_tracker.py

@@ -10,7 +10,7 @@ import voluptuous as vol
 
 from homeassistant.components.device_tracker import (
     DOMAIN,
-    PLATFORM_SCHEMA as BASE_PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
     DeviceScanner,
 )
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
@@ -23,7 +23,7 @@ from .model import Device
 
 _LOGGER: Final = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA: Final = BASE_PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA: Final = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
         vol.Required(CONF_PASSWORD): cv.string,

homeassistant/components/ads/binary_sensor.py

@@ -7,7 +7,7 @@ import voluptuous as vol
 
 from homeassistant.components.binary_sensor import (
     DEVICE_CLASSES_SCHEMA,
-    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as BINARY_SENSOR_PLATFORM_SCHEMA,
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
@@ -20,7 +20,7 @@ from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 from . import CONF_ADS_VAR, DATA_ADS, STATE_KEY_STATE, AdsEntity
 
 DEFAULT_NAME = "ADS binary sensor"
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = BINARY_SENSOR_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,

homeassistant/components/ads/cover.py

@@ -10,7 +10,7 @@ import voluptuous as vol
 from homeassistant.components.cover import (
     ATTR_POSITION,
     DEVICE_CLASSES_SCHEMA,
-    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as COVER_PLATFORM_SCHEMA,
     CoverEntity,
     CoverEntityFeature,
 )
@@ -36,7 +36,7 @@ CONF_ADS_VAR_OPEN = "adsvar_open"
 CONF_ADS_VAR_CLOSE = "adsvar_close"
 CONF_ADS_VAR_STOP = "adsvar_stop"
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = COVER_PLATFORM_SCHEMA.extend(
     {
         vol.Optional(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_ADS_VAR_POSITION): cv.string,

homeassistant/components/ads/light.py

@@ -9,7 +9,7 @@ import voluptuous as vol
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
-    PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
     ColorMode,
     LightEntity,
 )
@@ -29,7 +29,7 @@ from . import (
 )
 
 DEFAULT_NAME = "ADS Light"
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_ADS_VAR_BRIGHTNESS): cv.string,

homeassistant/components/ads/sensor.py

@@ -4,7 +4,10 @@ from __future__ import annotations
 
 import voluptuous as vol
 
-from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
+from homeassistant.components.sensor import (
+    PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
+    SensorEntity,
+)
 from homeassistant.const import CONF_NAME, CONF_UNIT_OF_MEASUREMENT
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
@@ -22,7 +25,7 @@ from . import (
 )
 
 DEFAULT_NAME = "ADS sensor"
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_ADS_FACTOR): cv.positive_int,

homeassistant/components/ads/switch.py

@@ -7,7 +7,10 @@ from typing import Any
 import pyads
 import voluptuous as vol
 
-from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
+from homeassistant.components.switch import (
+    PLATFORM_SCHEMA as SWITCH_PLATFORM_SCHEMA,
+    SwitchEntity,
+)
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
@@ -18,7 +21,7 @@ from . import CONF_ADS_VAR, DATA_ADS, STATE_KEY_STATE, AdsEntity
 
 DEFAULT_NAME = "ADS Switch"
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,

homeassistant/components/aemet/entity.py

@@ -7,14 +7,35 @@ from typing import Any
 from aemet_opendata.helpers import dict_nested_value
 
 from homeassistant.components.weather import Forecast
+from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from .const import ATTRIBUTION, DOMAIN
 from .coordinator import WeatherUpdateCoordinator
 
 
 class AemetEntity(CoordinatorEntity[WeatherUpdateCoordinator]):
     """Define an AEMET entity."""
 
+    _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: WeatherUpdateCoordinator,
+        name: str,
+        unique_id: str,
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._attr_device_info = DeviceInfo(
+            name=name,
+            entry_type=DeviceEntryType.SERVICE,
+            identifiers={(DOMAIN, unique_id)},
+            manufacturer="AEMET",
+            model="Forecast",
+        )
+
     def get_aemet_forecast(self, forecast_mode: str) -> list[Forecast]:
         """Return AEMET entity forecast by mode."""
         return self.coordinator.data["forecast"][forecast_mode]

homeassistant/components/aemet/manifest.json

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

homeassistant/components/aemet/sensor.py

@@ -43,7 +43,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     DEGREE,
     PERCENTAGE,
@@ -86,7 +85,6 @@ from .const import (
     ATTR_API_WIND_BEARING,
     ATTR_API_WIND_MAX_SPEED,
     ATTR_API_WIND_SPEED,
-    ATTRIBUTION,
     CONDITIONS_MAP,
 )
 from .coordinator import WeatherUpdateCoordinator
@@ -366,12 +364,15 @@ async def async_setup_entry(
     name = domain_data.name
     coordinator = domain_data.coordinator
 
+    unique_id = config_entry.unique_id
+    assert unique_id is not None
+
     async_add_entities(
         AemetSensor(
             name,
             coordinator,
             description,
-            config_entry,
+            unique_id,
         )
         for description in FORECAST_SENSORS + WEATHER_SENSORS
         if dict_nested_value(coordinator.data["lib"], description.keys) is not None
@@ -381,7 +382,6 @@ async def async_setup_entry(
 class AemetSensor(AemetEntity, SensorEntity):
     """Implementation of an AEMET OpenData sensor."""
 
-    _attr_attribution = ATTRIBUTION
     entity_description: AemetSensorEntityDescription
 
     def __init__(
@@ -389,13 +389,12 @@ class AemetSensor(AemetEntity, SensorEntity):
         name: str,
         coordinator: WeatherUpdateCoordinator,
         description: AemetSensorEntityDescription,
-        config_entry: ConfigEntry,
+        unique_id: str,
     ) -> None:
         """Initialize the sensor."""
-        super().__init__(coordinator)
+        super().__init__(coordinator, name, unique_id)
         self.entity_description = description
-        self._attr_name = f"{name} {description.name}"
-        self._attr_unique_id = f"{config_entry.unique_id}-{description.key}"
+        self._attr_unique_id = f"{unique_id}-{description.key}"
 
     @property
     def native_value(self):

homeassistant/components/aemet/weather.py

@@ -28,7 +28,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from . import AemetConfigEntry
-from .const import ATTRIBUTION, CONDITIONS_MAP
+from .const import CONDITIONS_MAP
 from .coordinator import WeatherUpdateCoordinator
 from .entity import AemetEntity
 
@@ -43,10 +43,10 @@ async def async_setup_entry(
     name = domain_data.name
     weather_coordinator = domain_data.coordinator
 
-    async_add_entities(
-        [AemetWeather(name, config_entry.unique_id, weather_coordinator)],
-        False,
-    )
+    unique_id = config_entry.unique_id
+    assert unique_id is not None
+
+    async_add_entities([AemetWeather(name, unique_id, weather_coordinator)])
 
 
 class AemetWeather(
@@ -55,7 +55,6 @@ class AemetWeather(
 ):
     """Implementation of an AEMET OpenData weather."""
 
-    _attr_attribution = ATTRIBUTION
     _attr_native_precipitation_unit = UnitOfPrecipitationDepth.MILLIMETERS
     _attr_native_pressure_unit = UnitOfPressure.HPA
     _attr_native_temperature_unit = UnitOfTemperature.CELSIUS
@@ -63,16 +62,16 @@ class AemetWeather(
     _attr_supported_features = (
         WeatherEntityFeature.FORECAST_DAILY | WeatherEntityFeature.FORECAST_HOURLY
     )
+    _attr_name = None
 
     def __init__(
         self,
-        name,
-        unique_id,
+        name: str,
+        unique_id: str,
         coordinator: WeatherUpdateCoordinator,
     ) -> None:
         """Initialize the sensor."""
-        super().__init__(coordinator)
-        self._attr_name = name
+        super().__init__(coordinator, name, unique_id)
         self._attr_unique_id = unique_id
 
     @property

homeassistant/components/agent_dvr/alarm_control_panel.py

@@ -43,6 +43,7 @@ class AgentBaseStation(AlarmControlPanelEntity):
         | AlarmControlPanelEntityFeature.ARM_AWAY
         | AlarmControlPanelEntityFeature.ARM_NIGHT
     )
+    _attr_code_arm_required = False
     _attr_has_entity_name = True
     _attr_name = None
 

homeassistant/components/air_quality/__init__.py

@@ -17,7 +17,6 @@ from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType, StateType
 
-from . import group as group_pre_import  # noqa: F401
 from .const import DOMAIN
 
 _LOGGER: Final = logging.getLogger(__name__)

homeassistant/components/air_quality/group.py

@@ -1,20 +0,0 @@
-"""Describe group states."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from homeassistant.core import HomeAssistant, callback
-
-if TYPE_CHECKING:
-    from homeassistant.components.group import GroupIntegrationRegistry
-
-from .const import DOMAIN
-
-
-@callback
-def async_describe_on_off_states(
-    hass: HomeAssistant, registry: GroupIntegrationRegistry
-) -> None:
-    """Describe group on off states."""
-    registry.exclude_domain(DOMAIN)

homeassistant/components/airgradient/__init__.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
+
 from airgradient import AirGradientClient
 
 from homeassistant.config_entries import ConfigEntry
@@ -13,7 +15,23 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from .const import DOMAIN
 from .coordinator import AirGradientConfigCoordinator, AirGradientMeasurementCoordinator
 
-PLATFORMS: list[Platform] = [Platform.SELECT, Platform.SENSOR]
+PLATFORMS: list[Platform] = [
+    Platform.BUTTON,
+    Platform.NUMBER,
+    Platform.SELECT,
+    Platform.SENSOR,
+]
+
+
+@dataclass
+class AirGradientData:
+    """AirGradient data class."""
+
+    measurement: AirGradientMeasurementCoordinator
+    config: AirGradientConfigCoordinator
+
+
+type AirGradientConfigEntry = ConfigEntry[AirGradientData]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
@@ -39,10 +57,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         sw_version=measurement_coordinator.data.firmware_version,
     )
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = {
-        "measurement": measurement_coordinator,
-        "config": config_coordinator,
-    }
+    entry.runtime_data = AirGradientData(
+        measurement=measurement_coordinator,
+        config=config_coordinator,
+    )
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -51,7 +69,4 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/airgradient/button.py

@@ -0,0 +1,104 @@
+"""Support for AirGradient buttons."""
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+
+from airgradient import AirGradientClient, ConfigurationControl
+
+from homeassistant.components.button import (
+    DOMAIN as BUTTON_DOMAIN,
+    ButtonEntity,
+    ButtonEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import DOMAIN, AirGradientConfigEntry
+from .coordinator import AirGradientConfigCoordinator
+from .entity import AirGradientEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class AirGradientButtonEntityDescription(ButtonEntityDescription):
+    """Describes AirGradient button entity."""
+
+    press_fn: Callable[[AirGradientClient], Awaitable[None]]
+
+
+CO2_CALIBRATION = AirGradientButtonEntityDescription(
+    key="co2_calibration",
+    translation_key="co2_calibration",
+    entity_category=EntityCategory.CONFIG,
+    press_fn=lambda client: client.request_co2_calibration(),
+)
+LED_BAR_TEST = AirGradientButtonEntityDescription(
+    key="led_bar_test",
+    translation_key="led_bar_test",
+    entity_category=EntityCategory.CONFIG,
+    press_fn=lambda client: client.request_led_bar_test(),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: AirGradientConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up AirGradient button entities based on a config entry."""
+    model = entry.runtime_data.measurement.data.model
+    coordinator = entry.runtime_data.config
+
+    added_entities = False
+
+    @callback
+    def _check_entities() -> None:
+        nonlocal added_entities
+
+        if (
+            coordinator.data.configuration_control is ConfigurationControl.LOCAL
+            and not added_entities
+        ):
+            entities = [AirGradientButton(coordinator, CO2_CALIBRATION)]
+            if "L" in model:
+                entities.append(AirGradientButton(coordinator, LED_BAR_TEST))
+
+            async_add_entities(entities)
+            added_entities = True
+        elif (
+            coordinator.data.configuration_control is not ConfigurationControl.LOCAL
+            and added_entities
+        ):
+            entity_registry = er.async_get(hass)
+            for entity_description in (CO2_CALIBRATION, LED_BAR_TEST):
+                unique_id = f"{coordinator.serial_number}-{entity_description.key}"
+                if entity_id := entity_registry.async_get_entity_id(
+                    BUTTON_DOMAIN, DOMAIN, unique_id
+                ):
+                    entity_registry.async_remove(entity_id)
+            added_entities = False
+
+    coordinator.async_add_listener(_check_entities)
+    _check_entities()
+
+
+class AirGradientButton(AirGradientEntity, ButtonEntity):
+    """Defines an AirGradient button."""
+
+    entity_description: AirGradientButtonEntityDescription
+    coordinator: AirGradientConfigCoordinator
+
+    def __init__(
+        self,
+        coordinator: AirGradientConfigCoordinator,
+        description: AirGradientButtonEntityDescription,
+    ) -> None:
+        """Initialize airgradient button."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.serial_number}-{description.key}"
+
+    async def async_press(self) -> None:
+        """Press the button."""
+        await self.entity_description.press_fn(self.coordinator.client)

homeassistant/components/airgradient/config_flow.py

@@ -2,7 +2,9 @@
 
 from typing import Any
 
-from airgradient import AirGradientClient, AirGradientError
+from airgradient import AirGradientClient, AirGradientError, ConfigurationControl
+from awesomeversion import AwesomeVersion
+from mashumaro import MissingField
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
@@ -12,6 +14,8 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN
 
+MIN_VERSION = AwesomeVersion("3.1.1")
+
 
 class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
     """AirGradient config flow."""
@@ -19,6 +23,14 @@ class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
     def __init__(self) -> None:
         """Initialize the config flow."""
         self.data: dict[str, Any] = {}
+        self.client: AirGradientClient | None = None
+
+    async def set_configuration_source(self) -> None:
+        """Set configuration source to local if it hasn't been set yet."""
+        assert self.client
+        config = await self.client.get_config()
+        if config.configuration_control is ConfigurationControl.NOT_INITIALIZED:
+            await self.client.set_configuration_control(ConfigurationControl.LOCAL)
 
     async def async_step_zeroconf(
         self, discovery_info: zeroconf.ZeroconfServiceInfo
@@ -30,9 +42,12 @@ class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
         await self.async_set_unique_id(discovery_info.properties["serialno"])
         self._abort_if_unique_id_configured(updates={CONF_HOST: host})
 
+        if AwesomeVersion(discovery_info.properties["fw_ver"]) < MIN_VERSION:
+            return self.async_abort(reason="invalid_version")
+
         session = async_get_clientsession(self.hass)
-        air_gradient = AirGradientClient(host, session=session)
-        await air_gradient.get_current_measures()
+        self.client = AirGradientClient(host, session=session)
+        await self.client.get_current_measures()
 
         self.context["title_placeholders"] = {
             "model": self.data[CONF_MODEL],
@@ -44,6 +59,7 @@ class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
     ) -> ConfigFlowResult:
         """Confirm discovery."""
         if user_input is not None:
+            await self.set_configuration_source()
             return self.async_create_entry(
                 title=self.data[CONF_MODEL],
                 data={CONF_HOST: self.data[CONF_HOST]},
@@ -64,14 +80,17 @@ class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
         errors: dict[str, str] = {}
         if user_input:
             session = async_get_clientsession(self.hass)
-            air_gradient = AirGradientClient(user_input[CONF_HOST], session=session)
+            self.client = AirGradientClient(user_input[CONF_HOST], session=session)
             try:
-                current_measures = await air_gradient.get_current_measures()
+                current_measures = await self.client.get_current_measures()
             except AirGradientError:
                 errors["base"] = "cannot_connect"
+            except MissingField:
+                return self.async_abort(reason="invalid_version")
             else:
                 await self.async_set_unique_id(current_measures.serial_number)
                 self._abort_if_unique_id_configured()
+                await self.set_configuration_source()
                 return self.async_create_entry(
                     title=current_measures.model,
                     data={CONF_HOST: user_input[CONF_HOST]},

homeassistant/components/airgradient/const.py

@@ -2,6 +2,14 @@
 
 import logging
 
+from airgradient import PmStandard
+
 DOMAIN = "airgradient"
 
 LOGGER = logging.getLogger(__package__)
+
+PM_STANDARD = {
+    PmStandard.UGM3: "ugm3",
+    PmStandard.USAQI: "us_aqi",
+}
+PM_STANDARD_REVERSE = {v: k for k, v in PM_STANDARD.items()}

homeassistant/components/airgradient/coordinator.py

@@ -1,21 +1,26 @@
 """Define an object to manage fetching AirGradient data."""
 
+from __future__ import annotations
+
 from datetime import timedelta
+from typing import TYPE_CHECKING
 
 from airgradient import AirGradientClient, AirGradientError, Config, Measures
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import LOGGER
 
+if TYPE_CHECKING:
+    from . import AirGradientConfigEntry
+
 
 class AirGradientCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Class to manage fetching AirGradient data."""
 
     _update_interval: timedelta
-    config_entry: ConfigEntry
+    config_entry: AirGradientConfigEntry
 
     def __init__(self, hass: HomeAssistant, client: AirGradientClient) -> None:
         """Initialize coordinator."""

homeassistant/components/airgradient/icons.json

@@ -1,5 +1,13 @@
 {
   "entity": {
+    "button": {
+      "co2_calibration": {
+        "default": "mdi:molecule-co2"
+      },
+      "led_bar_test": {
+        "default": "mdi:lightbulb-on-outline"
+      }
+    },
     "sensor": {
       "total_volatile_organic_component_index": {
         "default": "mdi:molecule"

homeassistant/components/airgradient/manifest.json

@@ -1,11 +1,11 @@
 {
   "domain": "airgradient",
-  "name": "Airgradient",
+  "name": "AirGradient",
   "codeowners": ["@airgradienthq", "@joostlek"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airgradient",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["airgradient==0.4.2"],
+  "requirements": ["airgradient==0.6.0"],
   "zeroconf": ["_airgradient._tcp.local."]
 }

homeassistant/components/airgradient/number.py

@@ -0,0 +1,127 @@
+"""Support for AirGradient number entities."""
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+
+from airgradient import AirGradientClient, Config
+from airgradient.models import ConfigurationControl
+
+from homeassistant.components.number import (
+    DOMAIN as NUMBER_DOMAIN,
+    NumberEntity,
+    NumberEntityDescription,
+)
+from homeassistant.const import PERCENTAGE, EntityCategory
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
+from homeassistant.helpers.entity_platform import AddEntitiesCallback
+
+from . import AirGradientConfigEntry
+from .const import DOMAIN
+from .coordinator import AirGradientConfigCoordinator
+from .entity import AirGradientEntity
+
+
+@dataclass(frozen=True, kw_only=True)
+class AirGradientNumberEntityDescription(NumberEntityDescription):
+    """Describes AirGradient number entity."""
+
+    value_fn: Callable[[Config], int]
+    set_value_fn: Callable[[AirGradientClient, int], Awaitable[None]]
+
+
+DISPLAY_BRIGHTNESS = AirGradientNumberEntityDescription(
+    key="display_brightness",
+    translation_key="display_brightness",
+    entity_category=EntityCategory.CONFIG,
+    native_min_value=0,
+    native_max_value=100,
+    native_step=1,
+    native_unit_of_measurement=PERCENTAGE,
+    value_fn=lambda config: config.display_brightness,
+    set_value_fn=lambda client, value: client.set_display_brightness(value),
+)
+
+LED_BAR_BRIGHTNESS = AirGradientNumberEntityDescription(
+    key="led_bar_brightness",
+    translation_key="led_bar_brightness",
+    entity_category=EntityCategory.CONFIG,
+    native_min_value=0,
+    native_max_value=100,
+    native_step=1,
+    native_unit_of_measurement=PERCENTAGE,
+    value_fn=lambda config: config.led_bar_brightness,
+    set_value_fn=lambda client, value: client.set_led_bar_brightness(value),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: AirGradientConfigEntry,
+    async_add_entities: AddEntitiesCallback,
+) -> None:
+    """Set up AirGradient number entities based on a config entry."""
+
+    model = entry.runtime_data.measurement.data.model
+    coordinator = entry.runtime_data.config
+
+    added_entities = False
+
+    @callback
+    def _async_check_entities() -> None:
+        nonlocal added_entities
+
+        if (
+            coordinator.data.configuration_control is ConfigurationControl.LOCAL
+            and not added_entities
+        ):
+            entities = []
+            if "I" in model:
+                entities.append(AirGradientNumber(coordinator, DISPLAY_BRIGHTNESS))
+            if "L" in model:
+                entities.append(AirGradientNumber(coordinator, LED_BAR_BRIGHTNESS))
+
+            async_add_entities(entities)
+            added_entities = True
+        elif (
+            coordinator.data.configuration_control is not ConfigurationControl.LOCAL
+            and added_entities
+        ):
+            entity_registry = er.async_get(hass)
+            for entity_description in (DISPLAY_BRIGHTNESS, LED_BAR_BRIGHTNESS):
+                unique_id = f"{coordinator.serial_number}-{entity_description.key}"
+                if entity_id := entity_registry.async_get_entity_id(
+                    NUMBER_DOMAIN, DOMAIN, unique_id
+                ):
+                    entity_registry.async_remove(entity_id)
+            added_entities = False
+
+    coordinator.async_add_listener(_async_check_entities)
+    _async_check_entities()
+
+
+class AirGradientNumber(AirGradientEntity, NumberEntity):
+    """Defines an AirGradient number entity."""
+
+    entity_description: AirGradientNumberEntityDescription
+    coordinator: AirGradientConfigCoordinator
+
+    def __init__(
+        self,
+        coordinator: AirGradientConfigCoordinator,
+        description: AirGradientNumberEntityDescription,
+    ) -> None:
+        """Initialize AirGradient number."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.serial_number}-{description.key}"
+
+    @property
+    def native_value(self) -> int | None:
+        """Return the state of the number."""
+        return self.entity_description.value_fn(self.coordinator.data)
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set the selected value."""
+        await self.entity_description.set_value_fn(self.coordinator.client, int(value))
+        await self.coordinator.async_request_refresh()

homeassistant/components/airgradient/select.py

@@ -4,17 +4,21 @@ from collections.abc import Awaitable, Callable
 from dataclasses import dataclass
 
 from airgradient import AirGradientClient, Config
-from airgradient.models import ConfigurationControl, TemperatureUnit
+from airgradient.models import ConfigurationControl, LedBarMode, TemperatureUnit
 
-from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.components.select import (
+    DOMAIN as SELECT_DOMAIN,
+    SelectEntity,
+    SelectEntityDescription,
+)
 from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ServiceValidationError
+from homeassistant.core import HomeAssistant, callback
+from homeassistant.helpers import entity_registry as er
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
-from .coordinator import AirGradientConfigCoordinator, AirGradientMeasurementCoordinator
+from . import AirGradientConfigEntry
+from .const import DOMAIN, PM_STANDARD, PM_STANDARD_REVERSE
+from .coordinator import AirGradientConfigCoordinator
 from .entity import AirGradientEntity
 
 
@@ -22,23 +26,26 @@ from .entity import AirGradientEntity
 class AirGradientSelectEntityDescription(SelectEntityDescription):
     """Describes AirGradient select entity."""
 
-    value_fn: Callable[[Config], str]
+    value_fn: Callable[[Config], str | None]
     set_value_fn: Callable[[AirGradientClient, str], Awaitable[None]]
-    requires_display: bool = False
 
 
 CONFIG_CONTROL_ENTITY = AirGradientSelectEntityDescription(
     key="configuration_control",
     translation_key="configuration_control",
-    options=[x.value for x in ConfigurationControl],
+    options=[ConfigurationControl.CLOUD.value, ConfigurationControl.LOCAL.value],
     entity_category=EntityCategory.CONFIG,
-    value_fn=lambda config: config.configuration_control,
+    value_fn=lambda config: (
+        config.configuration_control
+        if config.configuration_control is not ConfigurationControl.NOT_INITIALIZED
+        else None
+    ),
     set_value_fn=lambda client, value: client.set_configuration_control(
         ConfigurationControl(value)
     ),
 )
 
-PROTECTED_SELECT_TYPES: tuple[AirGradientSelectEntityDescription, ...] = (
+DISPLAY_SELECT_TYPES: tuple[AirGradientSelectEntityDescription, ...] = (
     AirGradientSelectEntityDescription(
         key="display_temperature_unit",
         translation_key="display_temperature_unit",
@@ -48,35 +55,145 @@ PROTECTED_SELECT_TYPES: tuple[AirGradientSelectEntityDescription, ...] = (
         set_value_fn=lambda client, value: client.set_temperature_unit(
             TemperatureUnit(value)
         ),
-        requires_display=True,
+    ),
+    AirGradientSelectEntityDescription(
+        key="display_pm_standard",
+        translation_key="display_pm_standard",
+        options=list(PM_STANDARD_REVERSE),
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda config: PM_STANDARD.get(config.pm_standard),
+        set_value_fn=lambda client, value: client.set_pm_standard(
+            PM_STANDARD_REVERSE[value]
+        ),
+    ),
+)
+
+LED_BAR_ENTITIES: tuple[AirGradientSelectEntityDescription, ...] = (
+    AirGradientSelectEntityDescription(
+        key="led_bar_mode",
+        translation_key="led_bar_mode",
+        options=[x.value for x in LedBarMode],
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda config: config.led_bar_mode,
+        set_value_fn=lambda client, value: client.set_led_bar_mode(LedBarMode(value)),
+    ),
+)
+
+LEARNING_TIME_OFFSET_OPTIONS = [
+    "12",
+    "60",
+    "120",
+    "360",
+    "720",
+]
+
+ABC_DAYS = [
+    "8",
+    "30",
+    "90",
+    "180",
+    "0",
+]
+
+
+def _get_value(value: int, values: list[str]) -> str | None:
+    str_value = str(value)
+    return str_value if str_value in values else None
+
+
+CONTROL_ENTITIES: tuple[AirGradientSelectEntityDescription, ...] = (
+    AirGradientSelectEntityDescription(
+        key="nox_index_learning_time_offset",
+        translation_key="nox_index_learning_time_offset",
+        options=LEARNING_TIME_OFFSET_OPTIONS,
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda config: _get_value(
+            config.nox_learning_offset, LEARNING_TIME_OFFSET_OPTIONS
+        ),
+        set_value_fn=lambda client, value: client.set_nox_learning_offset(int(value)),
+    ),
+    AirGradientSelectEntityDescription(
+        key="voc_index_learning_time_offset",
+        translation_key="voc_index_learning_time_offset",
+        options=LEARNING_TIME_OFFSET_OPTIONS,
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda config: _get_value(
+            config.tvoc_learning_offset, LEARNING_TIME_OFFSET_OPTIONS
+        ),
+        set_value_fn=lambda client, value: client.set_tvoc_learning_offset(int(value)),
+    ),
+    AirGradientSelectEntityDescription(
+        key="co2_automatic_baseline_calibration",
+        translation_key="co2_automatic_baseline_calibration",
+        options=ABC_DAYS,
+        entity_category=EntityCategory.CONFIG,
+        value_fn=lambda config: _get_value(
+            config.co2_automatic_baseline_calibration_days, ABC_DAYS
+        ),
+        set_value_fn=lambda client,
+        value: client.set_co2_automatic_baseline_calibration(int(value)),
     ),
 )
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirGradientConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AirGradient select entities based on a config entry."""
 
-    config_coordinator: AirGradientConfigCoordinator = hass.data[DOMAIN][
-        entry.entry_id
-    ]["config"]
-    measurement_coordinator: AirGradientMeasurementCoordinator = hass.data[DOMAIN][
-        entry.entry_id
-    ]["measurement"]
+    coordinator = entry.runtime_data.config
+    measurement_coordinator = entry.runtime_data.measurement
 
-    entities = [AirGradientSelect(config_coordinator, CONFIG_CONTROL_ENTITY)]
+    async_add_entities([AirGradientSelect(coordinator, CONFIG_CONTROL_ENTITY)])
+
+    model = measurement_coordinator.data.model
+
+    added_entities = False
+
+    @callback
+    def _async_check_entities() -> None:
+        nonlocal added_entities
 
-    entities.extend(
-        AirGradientProtectedSelect(config_coordinator, description)
-        for description in PROTECTED_SELECT_TYPES
         if (
-            description.requires_display
-            and measurement_coordinator.data.model.startswith("I")
-        )
-    )
+            coordinator.data.configuration_control is ConfigurationControl.LOCAL
+            and not added_entities
+        ):
+            entities: list[AirGradientSelect] = [
+                AirGradientSelect(coordinator, description)
+                for description in CONTROL_ENTITIES
+            ]
+            if "I" in model:
+                entities.extend(
+                    AirGradientSelect(coordinator, description)
+                    for description in DISPLAY_SELECT_TYPES
+                )
+            if "L" in model:
+                entities.extend(
+                    AirGradientSelect(coordinator, description)
+                    for description in LED_BAR_ENTITIES
+                )
 
-    async_add_entities(entities)
+            async_add_entities(entities)
+            added_entities = True
+        elif (
+            coordinator.data.configuration_control is not ConfigurationControl.LOCAL
+            and added_entities
+        ):
+            entity_registry = er.async_get(hass)
+            for entity_description in (
+                DISPLAY_SELECT_TYPES + LED_BAR_ENTITIES + CONTROL_ENTITIES
+            ):
+                unique_id = f"{coordinator.serial_number}-{entity_description.key}"
+                if entity_id := entity_registry.async_get_entity_id(
+                    SELECT_DOMAIN, DOMAIN, unique_id
+                ):
+                    entity_registry.async_remove(entity_id)
+            added_entities = False
+
+    coordinator.async_add_listener(_async_check_entities)
+    _async_check_entities()
 
 
 class AirGradientSelect(AirGradientEntity, SelectEntity):
@@ -96,7 +213,7 @@ class AirGradientSelect(AirGradientEntity, SelectEntity):
         self._attr_unique_id = f"{coordinator.serial_number}-{description.key}"
 
     @property
-    def current_option(self) -> str:
+    def current_option(self) -> str | None:
         """Return the state of the select."""
         return self.entity_description.value_fn(self.coordinator.data)
 
@@ -104,19 +221,3 @@ class AirGradientSelect(AirGradientEntity, SelectEntity):
         """Change the selected option."""
         await self.entity_description.set_value_fn(self.coordinator.client, option)
         await self.coordinator.async_request_refresh()
-
-
-class AirGradientProtectedSelect(AirGradientSelect):
-    """Defines a protected AirGradient select entity."""
-
-    async def async_select_option(self, option: str) -> None:
-        """Change the selected option."""
-        if (
-            self.coordinator.data.configuration_control
-            is not ConfigurationControl.LOCAL
-        ):
-            raise ServiceValidationError(
-                translation_domain=DOMAIN,
-                translation_key="no_local_configuration",
-            )
-        await super().async_select_option(option)

homeassistant/components/airgradient/sensor.py

@@ -3,7 +3,13 @@
 from collections.abc import Callable
 from dataclasses import dataclass
 
-from airgradient.models import Measures
+from airgradient import Config
+from airgradient.models import (
+    ConfigurationControl,
+    LedBarMode,
+    Measures,
+    TemperatureUnit,
+)
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -11,7 +17,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_MILLION,
@@ -19,60 +24,69 @@ from homeassistant.const import (
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
     UnitOfTemperature,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 
-from .const import DOMAIN
-from .coordinator import AirGradientMeasurementCoordinator
+from . import AirGradientConfigEntry
+from .const import PM_STANDARD, PM_STANDARD_REVERSE
+from .coordinator import AirGradientConfigCoordinator, AirGradientMeasurementCoordinator
 from .entity import AirGradientEntity
 
 
 @dataclass(frozen=True, kw_only=True)
-class AirGradientSensorEntityDescription(SensorEntityDescription):
-    """Describes AirGradient sensor entity."""
+class AirGradientMeasurementSensorEntityDescription(SensorEntityDescription):
+    """Describes AirGradient measurement sensor entity."""
 
     value_fn: Callable[[Measures], StateType]
 
 
-SENSOR_TYPES: tuple[AirGradientSensorEntityDescription, ...] = (
-    AirGradientSensorEntityDescription(
+@dataclass(frozen=True, kw_only=True)
+class AirGradientConfigSensorEntityDescription(SensorEntityDescription):
+    """Describes AirGradient config sensor entity."""
+
+    value_fn: Callable[[Config], StateType]
+
+
+MEASUREMENT_SENSOR_TYPES: tuple[AirGradientMeasurementSensorEntityDescription, ...] = (
+    AirGradientMeasurementSensorEntityDescription(
         key="pm01",
         device_class=SensorDeviceClass.PM1,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm01,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="pm02",
         device_class=SensorDeviceClass.PM25,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm02,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="pm10",
         device_class=SensorDeviceClass.PM10,
         native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm10,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement=UnitOfTemperature.CELSIUS,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.ambient_temperature,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.relative_humidity,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="signal_strength",
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
@@ -81,32 +95,33 @@ SENSOR_TYPES: tuple[AirGradientSensorEntityDescription, ...] = (
         entity_registry_enabled_default=False,
         value_fn=lambda status: status.signal_strength,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="tvoc",
         translation_key="total_volatile_organic_component_index",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.total_volatile_organic_component_index,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="nitrogen_index",
         translation_key="nitrogen_index",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.nitrogen_index,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="co2",
         device_class=SensorDeviceClass.CO2,
         native_unit_of_measurement=CONCENTRATION_PARTS_PER_MILLION,
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.rco2,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="pm003",
         translation_key="pm003_count",
+        native_unit_of_measurement="particles/dL",
         state_class=SensorStateClass.MEASUREMENT,
         value_fn=lambda status: status.pm003_count,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="nox_raw",
         translation_key="raw_nitrogen",
         native_unit_of_measurement="ticks",
@@ -114,7 +129,7 @@ SENSOR_TYPES: tuple[AirGradientSensorEntityDescription, ...] = (
         entity_registry_enabled_default=False,
         value_fn=lambda status: status.raw_nitrogen,
     ),
-    AirGradientSensorEntityDescription(
+    AirGradientMeasurementSensorEntityDescription(
         key="tvoc_raw",
         translation_key="raw_total_volatile_organic_component",
         native_unit_of_measurement="ticks",
@@ -124,17 +139,90 @@ SENSOR_TYPES: tuple[AirGradientSensorEntityDescription, ...] = (
     ),
 )
 
+CONFIG_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...] = (
+    AirGradientConfigSensorEntityDescription(
+        key="co2_automatic_baseline_calibration_days",
+        translation_key="co2_automatic_baseline_calibration_days",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.DAYS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.co2_automatic_baseline_calibration_days,
+    ),
+    AirGradientConfigSensorEntityDescription(
+        key="nox_learning_offset",
+        translation_key="nox_learning_offset",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.DAYS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.nox_learning_offset,
+    ),
+    AirGradientConfigSensorEntityDescription(
+        key="tvoc_learning_offset",
+        translation_key="tvoc_learning_offset",
+        device_class=SensorDeviceClass.DURATION,
+        native_unit_of_measurement=UnitOfTime.DAYS,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.tvoc_learning_offset,
+    ),
+)
+
+CONFIG_LED_BAR_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...] = (
+    AirGradientConfigSensorEntityDescription(
+        key="led_bar_mode",
+        translation_key="led_bar_mode",
+        device_class=SensorDeviceClass.ENUM,
+        options=[x.value for x in LedBarMode],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.led_bar_mode,
+    ),
+    AirGradientConfigSensorEntityDescription(
+        key="led_bar_brightness",
+        translation_key="led_bar_brightness",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.led_bar_brightness,
+    ),
+)
+
+CONFIG_DISPLAY_SENSOR_TYPES: tuple[AirGradientConfigSensorEntityDescription, ...] = (
+    AirGradientConfigSensorEntityDescription(
+        key="display_temperature_unit",
+        translation_key="display_temperature_unit",
+        device_class=SensorDeviceClass.ENUM,
+        options=[x.value for x in TemperatureUnit],
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.temperature_unit,
+    ),
+    AirGradientConfigSensorEntityDescription(
+        key="display_pm_standard",
+        translation_key="display_pm_standard",
+        device_class=SensorDeviceClass.ENUM,
+        options=list(PM_STANDARD_REVERSE),
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: PM_STANDARD.get(config.pm_standard),
+    ),
+    AirGradientConfigSensorEntityDescription(
+        key="display_brightness",
+        translation_key="display_brightness",
+        native_unit_of_measurement=PERCENTAGE,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda config: config.display_brightness,
+    ),
+)
+
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirGradientConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AirGradient sensor entities based on a config entry."""
 
-    coordinator: AirGradientMeasurementCoordinator = hass.data[DOMAIN][entry.entry_id][
-        "measurement"
-    ]
+    coordinator = entry.runtime_data.measurement
     listener: Callable[[], None] | None = None
-    not_setup: set[AirGradientSensorEntityDescription] = set(SENSOR_TYPES)
+    not_setup: set[AirGradientMeasurementSensorEntityDescription] = set(
+        MEASUREMENT_SENSOR_TYPES
+    )
 
     @callback
     def add_entities() -> None:
@@ -147,7 +235,7 @@ async def async_setup_entry(
             if description.value_fn(coordinator.data) is None:
                 not_setup.add(description)
             else:
-                sensors.append(AirGradientSensor(coordinator, description))
+                sensors.append(AirGradientMeasurementSensor(coordinator, description))
 
         if sensors:
             async_add_entities(sensors)
@@ -159,17 +247,33 @@ async def async_setup_entry(
 
     add_entities()
 
+    entities = [
+        AirGradientConfigSensor(entry.runtime_data.config, description)
+        for description in CONFIG_SENSOR_TYPES
+    ]
+    if "L" in coordinator.data.model:
+        entities.extend(
+            AirGradientConfigSensor(entry.runtime_data.config, description)
+            for description in CONFIG_LED_BAR_SENSOR_TYPES
+        )
+    if "I" in coordinator.data.model:
+        entities.extend(
+            AirGradientConfigSensor(entry.runtime_data.config, description)
+            for description in CONFIG_DISPLAY_SENSOR_TYPES
+        )
+    async_add_entities(entities)
 
-class AirGradientSensor(AirGradientEntity, SensorEntity):
+
+class AirGradientMeasurementSensor(AirGradientEntity, SensorEntity):
     """Defines an AirGradient sensor."""
 
-    entity_description: AirGradientSensorEntityDescription
+    entity_description: AirGradientMeasurementSensorEntityDescription
     coordinator: AirGradientMeasurementCoordinator
 
     def __init__(
         self,
         coordinator: AirGradientMeasurementCoordinator,
-        description: AirGradientSensorEntityDescription,
+        description: AirGradientMeasurementSensorEntityDescription,
     ) -> None:
         """Initialize airgradient sensor."""
         super().__init__(coordinator)
@@ -180,3 +284,28 @@ class AirGradientSensor(AirGradientEntity, SensorEntity):
     def native_value(self) -> StateType:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.coordinator.data)
+
+
+class AirGradientConfigSensor(AirGradientEntity, SensorEntity):
+    """Defines an AirGradient sensor."""
+
+    entity_description: AirGradientConfigSensorEntityDescription
+    coordinator: AirGradientConfigCoordinator
+
+    def __init__(
+        self,
+        coordinator: AirGradientConfigCoordinator,
+        description: AirGradientConfigSensorEntityDescription,
+    ) -> None:
+        """Initialize airgradient sensor."""
+        super().__init__(coordinator)
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.serial_number}-{description.key}"
+        self._attr_entity_registry_enabled_default = (
+            coordinator.data.configuration_control is not ConfigurationControl.LOCAL
+        )
+
+    @property
+    def native_value(self) -> StateType:
+        """Return the state of the sensor."""
+        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/airgradient/strings.json

@@ -15,7 +15,8 @@
       }
     },
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
+      "invalid_version": "This firmware version is unsupported. Please upgrade the firmware of the device to at least version 3.1.1."
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -23,13 +24,28 @@
     }
   },
   "entity": {
+    "button": {
+      "co2_calibration": {
+        "name": "Calibrate CO2 sensor"
+      },
+      "led_bar_test": {
+        "name": "Test LED bar"
+      }
+    },
+    "number": {
+      "led_bar_brightness": {
+        "name": "LED bar brightness"
+      },
+      "display_brightness": {
+        "name": "Display brightness"
+      }
+    },
     "select": {
       "configuration_control": {
         "name": "Configuration source",
         "state": {
           "cloud": "Cloud",
-          "local": "Local",
-          "both": "Both"
+          "local": "Local"
         }
       },
       "display_temperature_unit": {
@@ -38,29 +54,106 @@
           "c": "Celsius",
           "f": "Fahrenheit"
         }
+      },
+      "display_pm_standard": {
+        "name": "Display PM standard",
+        "state": {
+          "ugm3": "µg/m³",
+          "us_aqi": "US AQI"
+        }
+      },
+      "led_bar_mode": {
+        "name": "LED bar mode",
+        "state": {
+          "off": "Off",
+          "co2": "Carbon dioxide",
+          "pm": "Particulate matter"
+        }
+      },
+      "nox_index_learning_time_offset": {
+        "name": "NOx index learning offset",
+        "state": {
+          "12": "12 hours",
+          "60": "60 hours",
+          "120": "120 hours",
+          "360": "360 hours",
+          "720": "720 hours"
+        }
+      },
+      "voc_index_learning_time_offset": {
+        "name": "VOC index learning offset",
+        "state": {
+          "12": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::12%]",
+          "60": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::60%]",
+          "120": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::120%]",
+          "360": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::360%]",
+          "720": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::state::720%]"
+        }
+      },
+      "co2_automatic_baseline_calibration": {
+        "name": "CO2 automatic baseline calibration",
+        "state": {
+          "8": "8 days",
+          "30": "30 days",
+          "90": "90 days",
+          "180": "180 days",
+          "0": "[%key:common::state::off%]"
+        }
       }
     },
     "sensor": {
       "total_volatile_organic_component_index": {
-        "name": "Total VOC index"
+        "name": "VOC index"
       },
       "nitrogen_index": {
-        "name": "Nitrogen index"
+        "name": "NOx index"
       },
       "pm003_count": {
-        "name": "PM0.3 count"
+        "name": "PM0.3"
       },
       "raw_total_volatile_organic_component": {
-        "name": "Raw total VOC"
+        "name": "Raw VOC"
       },
       "raw_nitrogen": {
-        "name": "Raw nitrogen"
+        "name": "Raw NOx"
+      },
+      "display_pm_standard": {
+        "name": "[%key:component::airgradient::entity::select::display_pm_standard::name%]",
+        "state": {
+          "ugm3": "[%key:component::airgradient::entity::select::display_pm_standard::state::ugm3%]",
+          "us_aqi": "[%key:component::airgradient::entity::select::display_pm_standard::state::us_aqi%]"
+        }
+      },
+      "co2_automatic_baseline_calibration_days": {
+        "name": "Carbon dioxide automatic baseline calibration"
+      },
+      "nox_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::nox_index_learning_time_offset::name%]"
+      },
+      "tvoc_learning_offset": {
+        "name": "[%key:component::airgradient::entity::select::voc_index_learning_time_offset::name%]"
+      },
+      "led_bar_mode": {
+        "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
+        "state": {
+          "off": "[%key:component::airgradient::entity::select::led_bar_mode::state::off%]",
+          "co2": "[%key:component::airgradient::entity::select::led_bar_mode::state::co2%]",
+          "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
+        }
+      },
+      "led_bar_brightness": {
+        "name": "[%key:component::airgradient::entity::number::led_bar_brightness::name%]"
+      },
+      "display_temperature_unit": {
+        "name": "[%key:component::airgradient::entity::select::display_temperature_unit::name%]",
+        "state": {
+          "c": "[%key:component::airgradient::entity::select::display_temperature_unit::state::c%]",
+          "f": "[%key:component::airgradient::entity::select::display_temperature_unit::state::f%]"
+        }
+      },
+      "display_brightness": {
+        "name": "[%key:component::airgradient::entity::number::display_brightness::name%]"
       }
     }
-  },
-  "exceptions": {
-    "no_local_configuration": {
-      "message": "Device should be configured with local configuration to be able to change settings."
-    }
   }
 }

homeassistant/components/airnow/const.py

@@ -14,6 +14,7 @@ ATTR_API_POLLUTANT = "Pollutant"
 ATTR_API_REPORT_DATE = "DateObserved"
 ATTR_API_REPORT_HOUR = "HourObserved"
 ATTR_API_REPORT_TZ = "LocalTimeZone"
+ATTR_API_REPORT_TZINFO = "LocalTimeZoneInfo"
 ATTR_API_STATE = "StateCode"
 ATTR_API_STATION = "ReportingArea"
 ATTR_API_STATION_LATITUDE = "Latitude"

homeassistant/components/airnow/coordinator.py

@@ -12,6 +12,7 @@ from pyairnow.errors import AirNowError
 
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.util import dt as dt_util
 
 from .const import (
     ATTR_API_AQI,
@@ -26,6 +27,7 @@ from .const import (
     ATTR_API_REPORT_DATE,
     ATTR_API_REPORT_HOUR,
     ATTR_API_REPORT_TZ,
+    ATTR_API_REPORT_TZINFO,
     ATTR_API_STATE,
     ATTR_API_STATION,
     ATTR_API_STATION_LATITUDE,
@@ -96,7 +98,9 @@ class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                 # Copy Report Details
                 data[ATTR_API_REPORT_DATE] = obv[ATTR_API_REPORT_DATE]
                 data[ATTR_API_REPORT_HOUR] = obv[ATTR_API_REPORT_HOUR]
-                data[ATTR_API_REPORT_TZ] = obv[ATTR_API_REPORT_TZ]
+                data[ATTR_API_REPORT_TZINFO] = await dt_util.async_get_time_zone(
+                    obv[ATTR_API_REPORT_TZ]
+                )
 
                 # Copy Station Details
                 data[ATTR_API_STATE] = obv[ATTR_API_STATE]

homeassistant/components/airnow/sensor.py

@@ -23,7 +23,6 @@ from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
-from homeassistant.util.dt import get_time_zone
 
 from . import AirNowConfigEntry, AirNowDataUpdateCoordinator
 from .const import (
@@ -35,7 +34,7 @@ from .const import (
     ATTR_API_PM25,
     ATTR_API_REPORT_DATE,
     ATTR_API_REPORT_HOUR,
-    ATTR_API_REPORT_TZ,
+    ATTR_API_REPORT_TZINFO,
     ATTR_API_STATION,
     ATTR_API_STATION_LATITUDE,
     ATTR_API_STATION_LONGITUDE,
@@ -84,7 +83,7 @@ SENSOR_TYPES: tuple[AirNowEntityDescription, ...] = (
                 f"{data[ATTR_API_REPORT_DATE]} {data[ATTR_API_REPORT_HOUR]}",
                 "%Y-%m-%d %H",
             )
-            .replace(tzinfo=get_time_zone(data[ATTR_API_REPORT_TZ]))
+            .replace(tzinfo=data[ATTR_API_REPORT_TZINFO])
             .isoformat(),
         },
     ),

homeassistant/components/airtouch4/__init__.py

@@ -7,15 +7,15 @@ from homeassistant.const import CONF_HOST, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 
-from .const import DOMAIN
 from .coordinator import AirtouchDataUpdateCoordinator
 
 PLATFORMS = [Platform.CLIMATE]
 
+type AirTouch4ConfigEntry = ConfigEntry[AirtouchDataUpdateCoordinator]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(hass: HomeAssistant, entry: AirTouch4ConfigEntry) -> bool:
     """Set up AirTouch4 from a config entry."""
-    hass.data.setdefault(DOMAIN, {})
     host = entry.data[CONF_HOST]
     airtouch = AirTouch(host)
     await airtouch.UpdateInfo()
@@ -24,18 +24,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
         raise ConfigEntryNotReady
     coordinator = AirtouchDataUpdateCoordinator(hass, airtouch)
     await coordinator.async_config_entry_first_refresh()
-    hass.data[DOMAIN][entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AirTouch4ConfigEntry) -> 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
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/airtouch4/climate.py

@@ -16,13 +16,13 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from . import AirTouch4ConfigEntry
 from .const import DOMAIN
 
 AT_TO_HA_STATE = {
@@ -63,11 +63,11 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AirTouch4ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Airtouch 4."""
-    coordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     info = coordinator.data
     entities: list[ClimateEntity] = [
         AirtouchGroup(coordinator, group["group_number"], info)

homeassistant/components/airzone/__init__.py

@@ -17,7 +17,6 @@ from homeassistant.helpers import (
     entity_registry as er,
 )
 
-from .const import DOMAIN
 from .coordinator import AirzoneUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
@@ -30,10 +29,12 @@ PLATFORMS: list[Platform] = [
 
 _LOGGER = logging.getLogger(__name__)
 
+type AirzoneConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
+
 
 async def _async_migrate_unique_ids(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: AirzoneConfigEntry,
     coordinator: AirzoneUpdateCoordinator,
 ) -> None:
     """Migrate entities when the mac address gets discovered."""
@@ -71,7 +72,7 @@ async def _async_migrate_unique_ids(
         await er.async_migrate_entries(hass, entry.entry_id, _async_migrator)
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: AirzoneConfigEntry) -> bool:
     """Set up Airzone from a config entry."""
     options = ConnectionOptions(
         entry.data[CONF_HOST],
@@ -84,16 +85,13 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await coordinator.async_config_entry_first_refresh()
     await _async_migrate_unique_ids(hass, entry, coordinator)
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AirzoneConfigEntry) -> bool:
     """Unload a config entry."""
-    if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/airzone/binary_sensor.py

@@ -25,7 +25,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneSystemEntity, AirzoneZoneEntity
 
@@ -75,10 +75,12 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone binary sensors from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     binary_sensors: list[AirzoneBinarySensor] = [
         AirzoneSystemBinarySensor(

homeassistant/components/airzone/climate.py

@@ -50,7 +50,8 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import API_TEMPERATURE_STEP, DOMAIN, TEMP_UNIT_LIB_TO_HASS
+from . import AirzoneConfigEntry
+from .const import API_TEMPERATURE_STEP, TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneZoneEntity
 
@@ -97,10 +98,12 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone sensors from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     async_add_entities(
         AirzoneClimate(
             coordinator,

homeassistant/components/airzone/diagnostics.py

@@ -7,12 +7,10 @@ from typing import Any
 from aioairzone.const import API_MAC, AZD_MAC
 
 from homeassistant.components.diagnostics.util import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_UNIQUE_ID
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import AirzoneUpdateCoordinator
+from . import AirzoneConfigEntry
 
 TO_REDACT_API = [
     API_MAC,
@@ -28,10 +26,10 @@ TO_REDACT_COORD = [
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AirzoneConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
 
     return {
         "api_data": async_redact_data(coordinator.airzone.raw_data(), TO_REDACT_API),

homeassistant/components/airzone/entity.py

@@ -31,6 +31,7 @@ from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
+from . import AirzoneConfigEntry
 from .const import DOMAIN, MANUFACTURER
 from .coordinator import AirzoneUpdateCoordinator
 
@@ -53,7 +54,7 @@ class AirzoneSystemEntity(AirzoneEntity):
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
-        entry: ConfigEntry,
+        entry: AirzoneConfigEntry,
         system_data: dict[str, Any],
     ) -> None:
         """Initialize."""

homeassistant/components/airzone/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==0.7.6"]
+  "requirements": ["aioairzone==0.7.7"]
 }

homeassistant/components/airzone/select.py

@@ -22,7 +22,7 @@ from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
@@ -79,10 +79,12 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone sensors from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         AirzoneZoneSelect(

homeassistant/components/airzone/sensor.py

@@ -30,7 +30,8 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN, TEMP_UNIT_LIB_TO_HASS
+from . import AirzoneConfigEntry
+from .const import TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import (
     AirzoneEntity,
@@ -77,10 +78,12 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone sensors from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     sensors: list[AirzoneSensor] = [
         AirzoneZoneSensor(

homeassistant/components/airzone/water_heater.py

@@ -30,7 +30,8 @@ from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN, TEMP_UNIT_LIB_TO_HASS
+from . import AirzoneConfigEntry
+from .const import TEMP_UNIT_LIB_TO_HASS
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneHotWaterEntity
 
@@ -56,10 +57,12 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone sensors from a config_entry."""
-    coordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
     if AZD_HOT_WATER in coordinator.data:
         async_add_entities([AirzoneWaterHeater(coordinator, entry)])
 

homeassistant/components/airzone_cloud/__init__.py

@@ -10,7 +10,6 @@ from homeassistant.const import CONF_ID, CONF_PASSWORD, CONF_USERNAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import aiohttp_client
 
-from .const import DOMAIN
 from .coordinator import AirzoneUpdateCoordinator
 
 PLATFORMS: list[Platform] = [
@@ -21,8 +20,12 @@ PLATFORMS: list[Platform] = [
     Platform.WATER_HEATER,
 ]
 
+type AirzoneCloudConfigEntry = ConfigEntry[AirzoneUpdateCoordinator]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, entry: AirzoneCloudConfigEntry
+) -> bool:
     """Set up Airzone Cloud from a config entry."""
     options = ConnectionOptions(
         entry.data[CONF_USERNAME],
@@ -41,18 +44,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     coordinator = AirzoneUpdateCoordinator(hass, airzone)
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = coordinator
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AirzoneCloudConfigEntry
+) -> bool:
     """Unload a config entry."""
 
     if unload_ok := await hass.config_entries.async_unload_platforms(entry, PLATFORMS):
-        coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN].pop(entry.entry_id)
+        coordinator = entry.runtime_data
         await coordinator.airzone.logout()
 
     return unload_ok

homeassistant/components/airzone_cloud/binary_sensor.py

@@ -8,8 +8,10 @@ from typing import Any, Final
 from aioairzone_cloud.const import (
     AZD_ACTIVE,
     AZD_AIDOOS,
+    AZD_AIR_DEMAND,
     AZD_AQ_ACTIVE,
     AZD_ERRORS,
+    AZD_FLOOR_DEMAND,
     AZD_PROBLEMS,
     AZD_SYSTEMS,
     AZD_WARNINGS,
@@ -21,12 +23,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorEntity,
     BinarySensorEntityDescription,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneCloudConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
@@ -78,10 +79,20 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
         device_class=BinarySensorDeviceClass.RUNNING,
         key=AZD_ACTIVE,
     ),
+    AirzoneBinarySensorEntityDescription(
+        device_class=BinarySensorDeviceClass.RUNNING,
+        key=AZD_AIR_DEMAND,
+        translation_key="air_demand",
+    ),
     AirzoneBinarySensorEntityDescription(
         key=AZD_AQ_ACTIVE,
         translation_key="air_quality_active",
     ),
+    AirzoneBinarySensorEntityDescription(
+        device_class=BinarySensorDeviceClass.RUNNING,
+        key=AZD_FLOOR_DEMAND,
+        translation_key="floor_demand",
+    ),
     AirzoneBinarySensorEntityDescription(
         attributes={
             "warnings": AZD_WARNINGS,
@@ -94,10 +105,12 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneCloudConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud binary sensors from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     binary_sensors: list[AirzoneBinarySensor] = [
         AirzoneAidooBinarySensor(

homeassistant/components/airzone_cloud/climate.py

@@ -53,13 +53,12 @@ from homeassistant.components.climate import (
     HVACAction,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneCloudConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
@@ -119,10 +118,12 @@ HVAC_MODE_HASS_TO_LIB: Final[dict[HVACMode, OperationMode]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneCloudConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone climate from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     entities: list[AirzoneClimate] = []
 
@@ -193,6 +194,12 @@ class AirzoneClimate(AirzoneEntity, ClimateEntity):
                 ClimateEntityFeature.TARGET_TEMPERATURE_RANGE
             )
 
+        if (
+            self.get_airzone_value(AZD_SPEED) is not None
+            and self.get_airzone_value(AZD_SPEEDS) is not None
+        ):
+            self._initialize_fan_speeds()
+
     @callback
     def _handle_coordinator_update(self) -> None:
         """Update attributes when the coordinator updates."""
@@ -207,6 +214,8 @@ class AirzoneClimate(AirzoneEntity, ClimateEntity):
         self._attr_hvac_action = HVAC_ACTION_LIB_TO_HASS[
             self.get_airzone_value(AZD_ACTION)
         ]
+        if self.supported_features & ClimateEntityFeature.FAN_MODE:
+            self._attr_fan_mode = self._speeds.get(self.get_airzone_value(AZD_SPEED))
         if self.get_airzone_value(AZD_POWER):
             self._attr_hvac_mode = HVAC_MODE_LIB_TO_HASS[
                 self.get_airzone_value(AZD_MODE)
@@ -234,6 +243,37 @@ class AirzoneDeviceClimate(AirzoneClimate):
         | ClimateEntityFeature.TURN_OFF
         | ClimateEntityFeature.TURN_ON
     )
+    _speeds: dict[int, str]
+    _speeds_reverse: dict[str, int]
+
+    def _initialize_fan_speeds(self) -> None:
+        """Initialize fan speeds."""
+        azd_speeds: dict[int, int] = self.get_airzone_value(AZD_SPEEDS)
+        max_speed = max(azd_speeds)
+
+        fan_speeds: dict[int, str]
+        if speeds_map := FAN_SPEED_MAPS.get(max_speed):
+            fan_speeds = speeds_map
+        else:
+            fan_speeds = {}
+
+            for speed in azd_speeds:
+                if speed != 0:
+                    fan_speeds[speed] = f"{int(round((speed * 100) / max_speed, 0))}%"
+
+        if 0 in azd_speeds:
+            fan_speeds = FAN_SPEED_AUTO | fan_speeds
+
+        self._speeds = {}
+        for key, value in fan_speeds.items():
+            _key = azd_speeds.get(key)
+            if _key is not None:
+                self._speeds[_key] = value
+
+        self._speeds_reverse = {v: k for k, v in self._speeds.items()}
+        self._attr_fan_modes = list(self._speeds_reverse)
+
+        self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
 
     async def async_turn_on(self) -> None:
         """Turn the entity on."""
@@ -253,6 +293,15 @@ class AirzoneDeviceClimate(AirzoneClimate):
         }
         await self._async_update_params(params)
 
+    async def async_set_fan_mode(self, fan_mode: str) -> None:
+        """Set new fan mode."""
+        params: dict[str, Any] = {
+            API_SPEED_CONF: {
+                API_VALUE: self._speeds_reverse.get(fan_mode),
+            }
+        }
+        await self._async_update_params(params)
+
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         params: dict[str, Any] = {}
@@ -341,9 +390,6 @@ class AirzoneDeviceGroupClimate(AirzoneClimate):
 class AirzoneAidooClimate(AirzoneAidooEntity, AirzoneDeviceClimate):
     """Define an Airzone Cloud Aidoo climate."""
 
-    _speeds: dict[int, str]
-    _speeds_reverse: dict[str, int]
-
     def __init__(
         self,
         coordinator: AirzoneUpdateCoordinator,
@@ -355,52 +401,9 @@ class AirzoneAidooClimate(AirzoneAidooEntity, AirzoneDeviceClimate):
 
         self._attr_unique_id = aidoo_id
         self._init_attributes()
-        if (
-            self.get_airzone_value(AZD_SPEED) is not None
-            and self.get_airzone_value(AZD_SPEEDS) is not None
-        ):
-            self._initialize_fan_speeds()
 
         self._async_update_attrs()
 
-    def _initialize_fan_speeds(self) -> None:
-        """Initialize Aidoo fan speeds."""
-        azd_speeds: dict[int, int] = self.get_airzone_value(AZD_SPEEDS)
-        max_speed = max(azd_speeds)
-
-        fan_speeds: dict[int, str]
-        if speeds_map := FAN_SPEED_MAPS.get(max_speed):
-            fan_speeds = speeds_map
-        else:
-            fan_speeds = {}
-
-            for speed in azd_speeds:
-                if speed != 0:
-                    fan_speeds[speed] = f"{int(round((speed * 100) / max_speed, 0))}%"
-
-        if 0 in azd_speeds:
-            fan_speeds = FAN_SPEED_AUTO | fan_speeds
-
-        self._speeds = {}
-        for key, value in fan_speeds.items():
-            _key = azd_speeds.get(key)
-            if _key is not None:
-                self._speeds[_key] = value
-
-        self._speeds_reverse = {v: k for k, v in self._speeds.items()}
-        self._attr_fan_modes = list(self._speeds_reverse)
-
-        self._attr_supported_features |= ClimateEntityFeature.FAN_MODE
-
-    async def async_set_fan_mode(self, fan_mode: str) -> None:
-        """Set Aidoo fan mode."""
-        params: dict[str, Any] = {
-            API_SPEED_CONF: {
-                API_VALUE: self._speeds_reverse.get(fan_mode),
-            }
-        }
-        await self._async_update_params(params)
-
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
         params: dict[str, Any] = {}
@@ -418,14 +421,6 @@ class AirzoneAidooClimate(AirzoneAidooEntity, AirzoneDeviceClimate):
             }
         await self._async_update_params(params)
 
-    @callback
-    def _async_update_attrs(self) -> None:
-        """Update Aidoo climate attributes."""
-        super()._async_update_attrs()
-
-        if self.supported_features & ClimateEntityFeature.FAN_MODE:
-            self._attr_fan_mode = self._speeds.get(self.get_airzone_value(AZD_SPEED))
-
 
 class AirzoneGroupClimate(AirzoneGroupEntity, AirzoneDeviceGroupClimate):
     """Define an Airzone Cloud Group climate."""

homeassistant/components/airzone_cloud/diagnostics.py

@@ -22,12 +22,10 @@ from aioairzone_cloud.const import (
 )
 
 from homeassistant.components.diagnostics.util import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
-from .coordinator import AirzoneUpdateCoordinator
+from . import AirzoneCloudConfigEntry
 
 TO_REDACT_API = [
     API_CITY,
@@ -137,10 +135,10 @@ def redact_all(
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AirzoneCloudConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][config_entry.entry_id]
+    coordinator = config_entry.runtime_data
     raw_data = coordinator.airzone.raw_data()
     ids = gather_ids(raw_data)
 

homeassistant/components/airzone_cloud/manifest.json

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

homeassistant/components/airzone_cloud/select.py

@@ -14,12 +14,11 @@ from aioairzone_cloud.const import (
 )
 
 from homeassistant.components.select import SelectEntity, SelectEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneCloudConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneEntity, AirzoneZoneEntity
 
@@ -52,10 +51,12 @@ ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneCloudConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud select from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     # Zones
     async_add_entities(

homeassistant/components/airzone_cloud/sensor.py

@@ -23,7 +23,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     PERCENTAGE,
@@ -34,7 +33,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneCloudConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import (
     AirzoneAidooEntity,
@@ -103,10 +102,12 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneCloudConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud sensors from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     # Aidoos
     sensors: list[AirzoneSensor] = [

homeassistant/components/airzone_cloud/strings.json

@@ -18,8 +18,14 @@
   },
   "entity": {
     "binary_sensor": {
+      "air_demand": {
+        "name": "Air demand"
+      },
       "air_quality_active": {
         "name": "Air Quality active"
+      },
+      "floor_demand": {
+        "name": "Floor demand"
       }
     },
     "select": {

homeassistant/components/airzone_cloud/water_heater.py

@@ -27,12 +27,11 @@ from homeassistant.components.water_heater import (
     WaterHeaterEntity,
     WaterHeaterEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, STATE_OFF, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN
+from . import AirzoneCloudConfigEntry
 from .coordinator import AirzoneUpdateCoordinator
 from .entity import AirzoneHotWaterEntity
 
@@ -68,10 +67,12 @@ OPERATION_MODE_TO_DHW_PARAMS: Final[dict[str, dict[str, Any]]] = {
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AirzoneCloudConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add Airzone Cloud Water Heater from a config_entry."""
-    coordinator: AirzoneUpdateCoordinator = hass.data[DOMAIN][entry.entry_id]
+    coordinator = entry.runtime_data
 
     async_add_entities(
         AirzoneWaterHeater(

homeassistant/components/aladdin_connect/__init__.py

@@ -2,52 +2,93 @@
 
 from __future__ import annotations
 
+from genie_partner_sdk.client import AladdinConnectClient
+
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
+from homeassistant.helpers import device_registry as dr
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.config_entry_oauth2_flow import (
+    OAuth2Session,
+    async_get_config_entry_implementation,
+)
 
-from . import api
-from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION
+from .api import AsyncConfigEntryAuth
+from .const import DOMAIN
+from .coordinator import AladdinConnectCoordinator
 
-PLATFORMS: list[Platform] = [Platform.COVER]
+PLATFORMS: list[Platform] = [Platform.COVER, Platform.SENSOR]
+
+type AladdinConnectConfigEntry = ConfigEntry[AladdinConnectCoordinator]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: AladdinConnectConfigEntry
+) -> bool:
     """Set up Aladdin Connect Genie from a config entry."""
-    implementation = (
-        await config_entry_oauth2_flow.async_get_config_entry_implementation(
-            hass, entry
-        )
-    )
+    implementation = await async_get_config_entry_implementation(hass, entry)
 
-    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
+    session = OAuth2Session(hass, entry, implementation)
+    auth = AsyncConfigEntryAuth(async_get_clientsession(hass), session)
+    coordinator = AladdinConnectCoordinator(hass, AladdinConnectClient(auth))
 
-    # If using an aiohttp-based API lib
-    entry.runtime_data = api.AsyncConfigEntryAuth(
-        aiohttp_client.async_get_clientsession(hass), session
-    )
+    await coordinator.async_setup()
+    await coordinator.async_config_entry_first_refresh()
+
+    entry.runtime_data = coordinator
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
+    async_remove_stale_devices(hass, entry)
+
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AladdinConnectConfigEntry
+) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_migrate_entry(
+    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
+) -> bool:
     """Migrate old config."""
-    if config_entry.version < CONFIG_FLOW_VERSION:
+    if config_entry.version < 2:
         config_entry.async_start_reauth(hass)
-        new_data = {**config_entry.data}
         hass.config_entries.async_update_entry(
             config_entry,
-            data=new_data,
-            version=CONFIG_FLOW_VERSION,
-            minor_version=CONFIG_FLOW_MINOR_VERSION,
+            version=2,
+            minor_version=1,
         )
 
     return True
+
+
+def async_remove_stale_devices(
+    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
+) -> None:
+    """Remove stale devices from device registry."""
+    device_registry = dr.async_get(hass)
+    device_entries = dr.async_entries_for_config_entry(
+        device_registry, config_entry.entry_id
+    )
+    all_device_ids = {door.unique_id for door in config_entry.runtime_data.doors}
+
+    for device_entry in device_entries:
+        device_id: str | None = None
+
+        for identifier in device_entry.identifiers:
+            if identifier[0] == DOMAIN:
+                device_id = identifier[1]
+                break
+
+        if device_id is None or device_id not in all_device_ids:
+            # If device_id is None an invalid device entry was found for this config entry.
+            # If the device_id is not in existing device ids it's a stale device entry.
+            # Remove config entry from this device entry in either case.
+            device_registry.async_update_device(
+                device_entry.id, remove_config_entry_id=config_entry.entry_id
+            )

homeassistant/components/aladdin_connect/api.py

@@ -1,9 +1,11 @@
 """API for Aladdin Connect Genie bound to Home Assistant OAuth."""
 
+from typing import cast
+
 from aiohttp import ClientSession
 from genie_partner_sdk.auth import Auth
 
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.helpers.config_entry_oauth2_flow import OAuth2Session
 
 API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
 API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"
@@ -15,7 +17,7 @@ class AsyncConfigEntryAuth(Auth):  # type: ignore[misc]
     def __init__(
         self,
         websession: ClientSession,
-        oauth_session: config_entry_oauth2_flow.OAuth2Session,
+        oauth_session: OAuth2Session,
     ) -> None:
         """Initialize Aladdin Connect Genie auth."""
         super().__init__(
@@ -25,7 +27,6 @@ class AsyncConfigEntryAuth(Auth):  # type: ignore[misc]
 
     async def async_get_access_token(self) -> str:
         """Return a valid access token."""
-        if not self._oauth_session.valid_token:
-            await self._oauth_session.async_ensure_token_valid()
+        await self._oauth_session.async_ensure_token_valid()
 
-        return str(self._oauth_session.token["access_token"])
+        return cast(str, self._oauth_session.token["access_token"])

homeassistant/components/aladdin_connect/config_flow.py

@@ -4,22 +4,21 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
-import voluptuous as vol
+import jwt
 
 from homeassistant.config_entries import ConfigEntry, ConfigFlowResult
-from homeassistant.helpers import config_entry_oauth2_flow
+from homeassistant.const import CONF_ACCESS_TOKEN, CONF_TOKEN
+from homeassistant.helpers.config_entry_oauth2_flow import AbstractOAuth2FlowHandler
 
-from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
+from .const import DOMAIN
 
 
-class OAuth2FlowHandler(
-    config_entry_oauth2_flow.AbstractOAuth2FlowHandler, domain=DOMAIN
-):
+class AladdinConnectOAuth2FlowHandler(AbstractOAuth2FlowHandler, domain=DOMAIN):
     """Config flow to handle Aladdin Connect Genie OAuth2 authentication."""
 
     DOMAIN = DOMAIN
-    VERSION = CONFIG_FLOW_VERSION
-    MINOR_VERSION = CONFIG_FLOW_MINOR_VERSION
+    VERSION = 2
+    MINOR_VERSION = 1
 
     reauth_entry: ConfigEntry | None = None
 
@@ -37,20 +36,33 @@ class OAuth2FlowHandler(
     ) -> ConfigFlowResult:
         """Dialog that informs the user that reauth is required."""
         if user_input is None:
-            return self.async_show_form(
-                step_id="reauth_confirm",
-                data_schema=vol.Schema({}),
-            )
+            return self.async_show_form(step_id="reauth_confirm")
         return await self.async_step_user()
 
-    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
+    async def async_oauth_create_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
         """Create an oauth config entry or update existing entry for reauth."""
-        if self.reauth_entry:
+        token_payload = jwt.decode(
+            data[CONF_TOKEN][CONF_ACCESS_TOKEN], options={"verify_signature": False}
+        )
+        if not self.reauth_entry:
+            await self.async_set_unique_id(token_payload["sub"])
+            self._abort_if_unique_id_configured()
+
+            return self.async_create_entry(
+                title=token_payload["username"],
+                data=data,
+            )
+
+        if self.reauth_entry.unique_id == token_payload["username"]:
             return self.async_update_reload_and_abort(
                 self.reauth_entry,
                 data=data,
+                unique_id=token_payload["sub"],
             )
-        return await super().async_oauth_create_entry(data)
+        if self.reauth_entry.unique_id == token_payload["sub"]:
+            return self.async_update_reload_and_abort(self.reauth_entry, data=data)
+
+        return self.async_abort(reason="wrong_account")
 
     @property
     def logger(self) -> logging.Logger:

homeassistant/components/aladdin_connect/const.py

@@ -1,14 +1,6 @@
 """Constants for the Aladdin Connect Genie integration."""
 
-from typing import Final
-
-from homeassistant.components.cover import CoverEntityFeature
-
 DOMAIN = "aladdin_connect"
-CONFIG_FLOW_VERSION = 2
-CONFIG_FLOW_MINOR_VERSION = 1
 
-OAUTH2_AUTHORIZE = "https://app.aladdinconnect.com/login.html"
+OAUTH2_AUTHORIZE = "https://app.aladdinconnect.net/login.html"
 OAUTH2_TOKEN = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1/oauth2/token"
-
-SUPPORTED_FEATURES: Final = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE

homeassistant/components/aladdin_connect/coordinator.py

@@ -0,0 +1,38 @@
+"""Define an object to coordinate fetching Aladdin Connect data."""
+
+from datetime import timedelta
+import logging
+
+from genie_partner_sdk.client import AladdinConnectClient
+from genie_partner_sdk.model import GarageDoor
+
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+from .const import DOMAIN
+
+_LOGGER = logging.getLogger(__name__)
+
+
+class AladdinConnectCoordinator(DataUpdateCoordinator[None]):
+    """Aladdin Connect Data Update Coordinator."""
+
+    def __init__(self, hass: HomeAssistant, acc: AladdinConnectClient) -> None:
+        """Initialize."""
+        super().__init__(
+            hass,
+            logger=_LOGGER,
+            name=DOMAIN,
+            update_interval=timedelta(seconds=15),
+        )
+        self.acc = acc
+        self.doors: list[GarageDoor] = []
+
+    async def async_setup(self) -> None:
+        """Fetch initial data."""
+        self.doors = await self.acc.get_doors()
+
+    async def _async_update_data(self) -> None:
+        """Fetch data from API endpoint."""
+        for door in self.doors:
+            await self.acc.update_door(door.device_id, door.door_number)

homeassistant/components/aladdin_connect/cover.py

@@ -1,115 +1,64 @@
 """Cover Entity for Genie Garage Door."""
 
-from datetime import timedelta
 from typing import Any
 
-from genie_partner_sdk.client import AladdinConnectClient
+from genie_partner_sdk.model import GarageDoor
 
-from homeassistant.components.cover import CoverDeviceClass, CoverEntity
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.components.cover import (
+    CoverDeviceClass,
+    CoverEntity,
+    CoverEntityFeature,
+)
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import PlatformNotReady
-import homeassistant.helpers.device_registry as dr
-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import api
-from .const import DOMAIN, SUPPORTED_FEATURES
-from .model import GarageDoor
-
-SCAN_INTERVAL = timedelta(seconds=15)
+from . import AladdinConnectConfigEntry, AladdinConnectCoordinator
+from .entity import AladdinConnectEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AladdinConnectConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Aladdin Connect platform."""
-    session: api.AsyncConfigEntryAuth = config_entry.runtime_data
-    acc = AladdinConnectClient(session)
-    doors = await acc.get_doors()
-    if doors is None:
-        raise PlatformNotReady("Error from Aladdin Connect getting doors")
-    device_registry = dr.async_get(hass)
-    doors_to_add = []
-    for door in doors:
-        existing = device_registry.async_get(door.unique_id)
-        if existing is None:
-            doors_to_add.append(door)
+    coordinator = config_entry.runtime_data
 
-    async_add_entities(
-        (AladdinDevice(acc, door, config_entry) for door in doors_to_add),
-    )
-    remove_stale_devices(hass, config_entry, doors)
+    async_add_entities(AladdinDevice(coordinator, door) for door in coordinator.doors)
 
 
-def remove_stale_devices(
-    hass: HomeAssistant, config_entry: ConfigEntry, devices: list[GarageDoor]
-) -> None:
-    """Remove stale devices from device registry."""
-    device_registry = dr.async_get(hass)
-    device_entries = dr.async_entries_for_config_entry(
-        device_registry, config_entry.entry_id
-    )
-    all_device_ids = {door.unique_id for door in devices}
-
-    for device_entry in device_entries:
-        device_id: str | None = None
-
-        for identifier in device_entry.identifiers:
-            if identifier[0] == DOMAIN:
-                device_id = identifier[1]
-                break
-
-        if device_id is None or device_id not in all_device_ids:
-            # If device_id is None an invalid device entry was found for this config entry.
-            # If the device_id is not in existing device ids it's a stale device entry.
-            # Remove config entry from this device entry in either case.
-            device_registry.async_update_device(
-                device_entry.id, remove_config_entry_id=config_entry.entry_id
-            )
-
-
-class AladdinDevice(CoverEntity):
+class AladdinDevice(AladdinConnectEntity, CoverEntity):
     """Representation of Aladdin Connect cover."""
 
     _attr_device_class = CoverDeviceClass.GARAGE
-    _attr_supported_features = SUPPORTED_FEATURES
-    _attr_has_entity_name = True
+    _attr_supported_features = CoverEntityFeature.OPEN | CoverEntityFeature.CLOSE
     _attr_name = None
 
     def __init__(
-        self, acc: AladdinConnectClient, device: GarageDoor, entry: ConfigEntry
+        self, coordinator: AladdinConnectCoordinator, device: GarageDoor
     ) -> None:
         """Initialize the Aladdin Connect cover."""
-        self._acc = acc
-        self._device_id = device.device_id
-        self._number = device.door_number
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device.unique_id)},
-            name=device.name,
-            manufacturer="Overhead Door",
-        )
+        super().__init__(coordinator, device)
         self._attr_unique_id = device.unique_id
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Issue open command to cover."""
-        await self._acc.open_door(self._device_id, self._number)
+        await self.coordinator.acc.open_door(
+            self._device.device_id, self._device.door_number
+        )
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Issue close command to cover."""
-        await self._acc.close_door(self._device_id, self._number)
-
-    async def async_update(self) -> None:
-        """Update status of cover."""
-        await self._acc.update_door(self._device_id, self._number)
+        await self.coordinator.acc.close_door(
+            self._device.device_id, self._device.door_number
+        )
 
     @property
     def is_closed(self) -> bool | None:
         """Update is closed attribute."""
-        value = self._acc.get_door_status(self._device_id, self._number)
+        value = self.coordinator.acc.get_door_status(
+            self._device.device_id, self._device.door_number
+        )
         if value is None:
             return None
         return bool(value == "closed")
@@ -117,7 +66,9 @@ class AladdinDevice(CoverEntity):
     @property
     def is_closing(self) -> bool | None:
         """Update is closing attribute."""
-        value = self._acc.get_door_status(self._device_id, self._number)
+        value = self.coordinator.acc.get_door_status(
+            self._device.device_id, self._device.door_number
+        )
         if value is None:
             return None
         return bool(value == "closing")
@@ -125,7 +76,9 @@ class AladdinDevice(CoverEntity):
     @property
     def is_opening(self) -> bool | None:
         """Update is opening attribute."""
-        value = self._acc.get_door_status(self._device_id, self._number)
+        value = self.coordinator.acc.get_door_status(
+            self._device.device_id, self._device.door_number
+        )
         if value is None:
             return None
         return bool(value == "opening")

homeassistant/components/aladdin_connect/entity.py

@@ -0,0 +1,27 @@
+"""Defines a base Aladdin Connect entity."""
+
+from genie_partner_sdk.model import GarageDoor
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .const import DOMAIN
+from .coordinator import AladdinConnectCoordinator
+
+
+class AladdinConnectEntity(CoordinatorEntity[AladdinConnectCoordinator]):
+    """Defines a base Aladdin Connect entity."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self, coordinator: AladdinConnectCoordinator, device: GarageDoor
+    ) -> None:
+        """Initialize the entity."""
+        super().__init__(coordinator)
+        self._device = device
+        self._attr_device_info = DeviceInfo(
+            identifiers={(DOMAIN, device.unique_id)},
+            name=device.name,
+            manufacturer="Overhead Door",
+        )

homeassistant/components/aladdin_connect/model.py

@@ -1,30 +0,0 @@
-"""Models for Aladdin connect cover platform."""
-
-from __future__ import annotations
-
-from typing import TypedDict
-
-
-class GarageDoorData(TypedDict):
-    """Aladdin door data."""
-
-    device_id: str
-    door_number: int
-    name: str
-    status: str
-    link_status: str
-    battery_level: int
-
-
-class GarageDoor:
-    """Aladdin Garage Door Entity."""
-
-    def __init__(self, data: GarageDoorData) -> None:
-        """Create `GarageDoor` from dictionary of data."""
-        self.device_id = data["device_id"]
-        self.door_number = data["door_number"]
-        self.unique_id = f"{self.device_id}-{self.door_number}"
-        self.name = data["name"]
-        self.status = data["status"]
-        self.link_status = data["link_status"]
-        self.battery_level = data["battery_level"]

homeassistant/components/aladdin_connect/sensor.py

@@ -4,9 +4,9 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import cast
 
 from genie_partner_sdk.client import AladdinConnectClient
+from genie_partner_sdk.model import GarageDoor
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -14,22 +14,19 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import api
-from .const import DOMAIN
-from .model import GarageDoor
+from . import AladdinConnectConfigEntry, AladdinConnectCoordinator
+from .entity import AladdinConnectEntity
 
 
 @dataclass(frozen=True, kw_only=True)
 class AccSensorEntityDescription(SensorEntityDescription):
     """Describes AladdinConnect sensor entity."""
 
-    value_fn: Callable
+    value_fn: Callable[[AladdinConnectClient, str, int], float | None]
 
 
 SENSORS: tuple[AccSensorEntityDescription, ...] = (
@@ -45,52 +42,39 @@ SENSORS: tuple[AccSensorEntityDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AladdinConnectConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up Aladdin Connect sensor devices."""
+    coordinator = entry.runtime_data
 
-    session: api.AsyncConfigEntryAuth = hass.data[DOMAIN][entry.entry_id]
-    acc = AladdinConnectClient(session)
-
-    entities = []
-    doors = await acc.get_doors()
-
-    for door in doors:
-        entities.extend(
-            [AladdinConnectSensor(acc, door, description) for description in SENSORS]
-        )
-
-    async_add_entities(entities)
+    async_add_entities(
+        AladdinConnectSensor(coordinator, door, description)
+        for description in SENSORS
+        for door in coordinator.doors
+    )
 
 
-class AladdinConnectSensor(SensorEntity):
+class AladdinConnectSensor(AladdinConnectEntity, SensorEntity):
     """A sensor implementation for Aladdin Connect devices."""
 
     entity_description: AccSensorEntityDescription
-    _attr_has_entity_name = True
 
     def __init__(
         self,
-        acc: AladdinConnectClient,
+        coordinator: AladdinConnectCoordinator,
         device: GarageDoor,
         description: AccSensorEntityDescription,
     ) -> None:
         """Initialize a sensor for an Aladdin Connect device."""
-        self._device_id = device.device_id
-        self._number = device.door_number
-        self._acc = acc
+        super().__init__(coordinator, device)
         self.entity_description = description
         self._attr_unique_id = f"{device.unique_id}-{description.key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device.unique_id)},
-            name=device.name,
-            manufacturer="Overhead Door",
-        )
 
     @property
     def native_value(self) -> float | None:
         """Return the state of the sensor."""
-        return cast(
-            float,
-            self.entity_description.value_fn(self._acc, self._device_id, self._number),
+        return self.entity_description.value_fn(
+            self.coordinator.acc, self._device.device_id, self._device.door_number
         )

homeassistant/components/alarm_control_panel/__init__.py

@@ -34,7 +34,6 @@ from homeassistant.helpers.entity import Entity, EntityDescription
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.typing import ConfigType
 
-from . import group as group_pre_import  # noqa: F401
 from .const import (  # noqa: F401
     _DEPRECATED_FORMAT_NUMBER,
     _DEPRECATED_FORMAT_TEXT,

homeassistant/components/alarm_control_panel/group.py

@@ -1,43 +0,0 @@
-"""Describe group states."""
-
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
-from homeassistant.const import (
-    STATE_ALARM_ARMED_AWAY,
-    STATE_ALARM_ARMED_CUSTOM_BYPASS,
-    STATE_ALARM_ARMED_HOME,
-    STATE_ALARM_ARMED_NIGHT,
-    STATE_ALARM_ARMED_VACATION,
-    STATE_ALARM_TRIGGERED,
-    STATE_OFF,
-    STATE_ON,
-)
-from homeassistant.core import HomeAssistant, callback
-
-from .const import DOMAIN
-
-if TYPE_CHECKING:
-    from homeassistant.components.group import GroupIntegrationRegistry
-
-
-@callback
-def async_describe_on_off_states(
-    hass: HomeAssistant, registry: GroupIntegrationRegistry
-) -> None:
-    """Describe group on off states."""
-    registry.on_off_states(
-        DOMAIN,
-        {
-            STATE_ON,
-            STATE_ALARM_ARMED_AWAY,
-            STATE_ALARM_ARMED_CUSTOM_BYPASS,
-            STATE_ALARM_ARMED_HOME,
-            STATE_ALARM_ARMED_NIGHT,
-            STATE_ALARM_ARMED_VACATION,
-            STATE_ALARM_TRIGGERED,
-        },
-        STATE_ON,
-        STATE_OFF,
-    )

homeassistant/components/alarm_control_panel/services.yaml

@@ -1,14 +1,15 @@
 # Describes the format for available alarm control panel services
+.common_service_fields: &common_service_fields
+  code:
+    example: "1234"
+    selector:
+      text:
 
 alarm_disarm:
   target:
     entity:
       domain: alarm_control_panel
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields
 
 alarm_arm_custom_bypass:
   target:
@@ -16,11 +17,7 @@ alarm_arm_custom_bypass:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_CUSTOM_BYPASS
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields
 
 alarm_arm_home:
   target:
@@ -28,11 +25,7 @@ alarm_arm_home:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_HOME
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields
 
 alarm_arm_away:
   target:
@@ -40,23 +33,14 @@ alarm_arm_away:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_AWAY
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
-
+  fields: *common_service_fields
 alarm_arm_night:
   target:
     entity:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_NIGHT
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields
 
 alarm_arm_vacation:
   target:
@@ -64,11 +48,7 @@ alarm_arm_vacation:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_VACATION
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields
 
 alarm_trigger:
   target:
@@ -76,8 +56,4 @@ alarm_trigger:
       domain: alarm_control_panel
       supported_features:
         - alarm_control_panel.AlarmControlPanelEntityFeature.TRIGGER
-  fields:
-    code:
-      example: "1234"
-      selector:
-        text:
+  fields: *common_service_fields

homeassistant/components/alarm_control_panel/strings.json

@@ -17,6 +17,10 @@
       "is_armed_night": "{entity_name} is armed night",
       "is_armed_vacation": "{entity_name} is armed vacation"
     },
+    "extra_fields": {
+      "code": "Code",
+      "for": "[%key:common::device_automation::extra_fields::for%]"
+    },
     "trigger_type": {
       "triggered": "{entity_name} triggered",
       "disarmed": "{entity_name} disarmed",

homeassistant/components/alexa/capabilities.py

@@ -2,10 +2,11 @@
 
 from __future__ import annotations
 
-from collections.abc import Generator
 import logging
 from typing import Any
 
+from typing_extensions import Generator
+
 from homeassistant.components import (
     button,
     climate,
@@ -260,7 +261,7 @@ class AlexaCapability:
 
         return result
 
-    def serialize_properties(self) -> Generator[dict[str, Any], None, None]:
+    def serialize_properties(self) -> Generator[dict[str, Any]]:
         """Return properties serialized for an API response."""
         for prop in self.properties_supported():
             prop_name = prop["name"]

homeassistant/components/alexa/entities.py

@@ -2,10 +2,12 @@
 
 from __future__ import annotations
 
-from collections.abc import Generator, Iterable
+from collections.abc import Iterable
 import logging
 from typing import TYPE_CHECKING, Any
 
+from typing_extensions import Generator
+
 from homeassistant.components import (
     alarm_control_panel,
     alert,
@@ -319,7 +321,7 @@ class AlexaEntity:
         """
         raise NotImplementedError
 
-    def serialize_properties(self) -> Generator[dict[str, Any], None, None]:
+    def serialize_properties(self) -> Generator[dict[str, Any]]:
         """Yield each supported property in API format."""
         for interface in self.interfaces():
             if not interface.properties_proactively_reported():
@@ -405,7 +407,7 @@ class GenericCapabilities(AlexaEntity):
 
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
         yield AlexaEndpointHealth(self.hass, self.entity)
@@ -428,7 +430,7 @@ class SwitchCapabilities(AlexaEntity):
 
         return [DisplayCategory.SWITCH]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
         yield AlexaContactSensor(self.hass, self.entity)
@@ -445,7 +447,7 @@ class ButtonCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.ACTIVITY_TRIGGER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaSceneController(self.entity, supports_deactivation=False)
         yield AlexaEventDetectionSensor(self.hass, self.entity)
@@ -464,7 +466,7 @@ class ClimateCapabilities(AlexaEntity):
             return [DisplayCategory.WATER_HEATER]
         return [DisplayCategory.THERMOSTAT]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         # If we support two modes, one being off, we allow turning on too.
         supported_features = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
@@ -532,7 +534,7 @@ class CoverCapabilities(AlexaEntity):
 
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         device_class = self.entity.attributes.get(ATTR_DEVICE_CLASS)
         if device_class not in (
@@ -570,7 +572,7 @@ class EventCapabilities(AlexaEntity):
             return [DisplayCategory.DOORBELL]
         return None
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         if self.default_display_categories() is not None:
             yield AlexaDoorbellEventSource(self.entity)
@@ -586,7 +588,7 @@ class LightCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.LIGHT]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
 
@@ -610,7 +612,7 @@ class FanCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.FAN]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
         force_range_controller = True
@@ -653,7 +655,7 @@ class HumidifierCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
@@ -677,7 +679,7 @@ class LockCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.SMARTLOCK]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaLockController(self.entity)
         yield AlexaEndpointHealth(self.hass, self.entity)
@@ -696,7 +698,7 @@ class MediaPlayerCapabilities(AlexaEntity):
 
         return [DisplayCategory.TV]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
 
@@ -766,7 +768,7 @@ class SceneCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.SCENE_TRIGGER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaSceneController(self.entity, supports_deactivation=False)
         yield Alexa(self.entity)
@@ -780,7 +782,7 @@ class ScriptCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.ACTIVITY_TRIGGER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaSceneController(self.entity, supports_deactivation=True)
         yield Alexa(self.entity)
@@ -796,7 +798,7 @@ class SensorCapabilities(AlexaEntity):
         # sensors are currently ignored.
         return [DisplayCategory.TEMPERATURE_SENSOR]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         attrs = self.entity.attributes
         if attrs.get(ATTR_UNIT_OF_MEASUREMENT) in {
@@ -827,7 +829,7 @@ class BinarySensorCapabilities(AlexaEntity):
             return [DisplayCategory.CAMERA]
         return None
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         sensor_type = self.get_type()
         if sensor_type is self.TYPE_CONTACT:
@@ -883,7 +885,7 @@ class AlarmControlPanelCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.SECURITY_PANEL]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         if not self.entity.attributes.get("code_arm_required"):
             yield AlexaSecurityPanelController(self.hass, self.entity)
@@ -899,7 +901,7 @@ class ImageProcessingCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.CAMERA]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaEventDetectionSensor(self.hass, self.entity)
         yield AlexaEndpointHealth(self.hass, self.entity)
@@ -915,7 +917,7 @@ class InputNumberCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         domain = self.entity.domain
         yield AlexaRangeController(self.entity, instance=f"{domain}.value")
@@ -931,7 +933,7 @@ class TimerCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaTimeHoldController(self.entity, allow_remote_resume=True)
         yield AlexaPowerController(self.entity)
@@ -946,7 +948,7 @@ class VacuumCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.VACUUM_CLEANER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
         if (
@@ -981,7 +983,7 @@ class ValveCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.OTHER]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
         if supported & valve.ValveEntityFeature.SET_POSITION:
@@ -1006,7 +1008,7 @@ class CameraCapabilities(AlexaEntity):
         """Return the display categories for this entity."""
         return [DisplayCategory.CAMERA]
 
-    def interfaces(self) -> Generator[AlexaCapability, None, None]:
+    def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         if self._check_requirements():
             supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)

homeassistant/components/alpha_vantage/sensor.py

@@ -10,7 +10,10 @@ from alpha_vantage.timeseries import TimeSeries
 import voluptuous as vol
 
 from homeassistant.components import persistent_notification
-from homeassistant.components.sensor import PLATFORM_SCHEMA, SensorEntity
+from homeassistant.components.sensor import (
+    PLATFORM_SCHEMA as SENSOR_PLATFORM_SCHEMA,
+    SensorEntity,
+)
 from homeassistant.const import CONF_API_KEY, CONF_CURRENCY, CONF_NAME
 from homeassistant.core import HomeAssistant
 import homeassistant.helpers.config_validation as cv
@@ -59,7 +62,7 @@ CURRENCY_SCHEMA = vol.Schema(
     }
 )
 
-PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = SENSOR_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_API_KEY): cv.string,
         vol.Optional(CONF_FOREIGN_EXCHANGE): vol.All(cv.ensure_list, [CURRENCY_SCHEMA]),