Raise in EntityComponent.async_prepare_reload on configuration error

* Add switch platform test to enphase_envoy

* review feedback Use HA SWITCH_DOMAIN

* Only use SWITCH_DOMAIN for service call

.core_files.yaml

@@ -49,6 +49,7 @@ base_platforms: &base_platforms
   - homeassistant/components/tts/**
   - homeassistant/components/update/**
   - homeassistant/components/vacuum/**
+  - homeassistant/components/valve/**
   - homeassistant/components/water_heater/**
   - homeassistant/components/weather/**
 
@@ -120,21 +121,18 @@ 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/util/**

.devcontainer/devcontainer.json

@@ -5,9 +5,11 @@
   "postCreateCommand": "script/setup",
   "postStartCommand": "script/bootstrap",
   "containerEnv": {
-    "DEVCONTAINER": "1",
     "PYTHONASYNCIODEBUG": "1"
   },
+  "features": {
+    "ghcr.io/devcontainers/features/github-cli:1": {}
+  },
   // Port 5683 udp is used by Shelly integration
   "appPort": ["8123:8123", "5683:5683/udp"],
   "runArgs": ["-e", "GIT_EDITOR=code --wait"],
@@ -20,13 +22,17 @@
         "visualstudioexptteam.vscodeintellicode",
         "redhat.vscode-yaml",
         "esbenp.prettier-vscode",
-        "GitHub.vscode-pull-request-github"
+        "GitHub.vscode-pull-request-github",
+        "GitHub.copilot"
       ],
       // Please keep this file in sync with settings in home-assistant/.vscode/settings.default.json
       "settings": {
         "python.experiments.optOutFrom": ["pythonTestAdapter"],
-        "python.pythonPath": "/usr/local/bin/python",
+        "python.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
+        "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/PULL_REQUEST_TEMPLATE.md

@@ -74,7 +74,6 @@ If the code communicates with devices, web services, or third-party tools:
 - [ ] New or updated dependencies have been added to `requirements_all.txt`.  
       Updated by running `python3 -m script.gen_requirements_all`.
 - [ ] For the updated dependencies - a link to the changelog, or at minimum a diff between library versions is added to the PR description.
-- [ ] Untested files have been added to `.coveragerc`.
 
 <!--
   This project is very active and we have a high turnover of pull requests.

.github/workflows/builder.yml

@@ -27,12 +27,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -69,7 +69,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: translations
           path: translations.tar.gz
@@ -90,11 +90,11 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        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
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: translations
 
@@ -190,7 +190,7 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -242,7 +242,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Set build additional args
         run: |
@@ -256,7 +256,7 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -279,7 +279,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -320,23 +320,23 @@ jobs:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.4.0
+        uses: sigstore/cosign-installer@v3.5.0
         with:
           cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@v3.1.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -450,15 +450,15 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: translations
 

.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.5"
+  HA_SHORT_VERSION: "2024.8"
   DEFAULT_PYTHON: "3.12"
   ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
@@ -89,11 +89,13 @@ jobs:
     runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
-        run: >-
-          echo "key=venv-${{ env.CACHE_VERSION }}-${{
+        run: |
+          # Include HA_SHORT_VERSION to force the immediate creation
+          # of a new uv cache entry after a version bump.
+          echo "key=venv-${{ env.CACHE_VERSION }}-${{ env.HA_SHORT_VERSION }}-${{
             hashFiles('requirements_test.txt', 'requirements_test_pre_commit.txt') }}-${{
             hashFiles('requirements.txt') }}-${{
             hashFiles('requirements_all.txt') }}-${{
@@ -224,10 +226,10 @@ jobs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -270,9 +272,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -310,9 +312,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -349,9 +351,9 @@ jobs:
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -443,10 +445,10 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -486,6 +488,7 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libavcodec-dev \
             libavdevice-dev \
             libavfilter-dev \
@@ -519,11 +522,17 @@ jobs:
       - info
       - base
     steps:
+      - name: Install additional OS dependencies
+        run: |
+          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
+          sudo apt-get update
+          sudo apt-get -y install \
+            libturbojpeg
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -552,10 +561,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -573,6 +582,46 @@ jobs:
           . venv/bin/activate
           python -m script.gen_requirements_all validate
 
+  audit-licenses:
+    name: Audit licenses
+    runs-on: ubuntu-22.04
+    needs:
+      - info
+      - base
+    if: |
+      needs.info.outputs.requirements == 'true'
+    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.1
+        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: Run pip-licenses
+        run: |
+          . venv/bin/activate
+          pip-licenses --format=json --output-file=licenses.json
+      - name: Upload licenses
+        uses: actions/upload-artifact@v4.3.4
+        with:
+          name: licenses
+          path: licenses.json
+      - name: Process licenses
+        run: |
+          . venv/bin/activate
+          python -m script.licenses
+
   pylint:
     name: Check pylint
     runs-on: ubuntu-22.04
@@ -585,10 +634,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -609,14 +658,59 @@ jobs:
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y --ignore-wrong-coordinator-module=y homeassistant
+          pylint --ignore-missing-annotations=y homeassistant
       - 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 --ignore-wrong-coordinator-module=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
+          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.1
+        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
@@ -629,10 +723,10 @@ jobs:
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -700,12 +794,13 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -723,7 +818,7 @@ jobs:
           . venv/bin/activate
           python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
       - name: Upload pytest_buckets
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
@@ -744,6 +839,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
       - prepare-pytest-full
     strategy:
@@ -761,12 +857,13 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -785,7 +882,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -820,14 +917,14 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -861,6 +958,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -877,12 +975,13 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -943,7 +1042,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -951,7 +1050,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -984,6 +1083,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1000,12 +1100,13 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1067,7 +1168,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1075,7 +1176,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1097,18 +1198,19 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v4.3.0
+        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
@@ -1126,6 +1228,7 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
+      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1142,12 +1245,13 @@ jobs:
           sudo apt-get -y install \
             bluez \
             ffmpeg \
+            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1205,14 +1309,14 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1231,14 +1335,15 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v4.3.0
+        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.3
+        uses: actions/checkout@v4.1.7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.2
+        uses: github/codeql-action/init@v3.25.12
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.2
+        uses: github/codeql-action/analyze@v3.25.12
         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,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -32,11 +32,11 @@ jobs:
       architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.1.0
+        uses: actions/setup-python@v5.1.1
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -82,14 +82,14 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: env_file
           path: ./.env_file
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -101,7 +101,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@v4.3.3
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -118,20 +118,20 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: requirements_diff
 
       - name: Build wheels
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -156,20 +156,20 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.1.3
+        uses: actions/checkout@v4.1.7
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.1.6
+        uses: actions/download-artifact@v4.1.8
         with:
           name: requirements_all_wheels
 
@@ -203,7 +203,7 @@ jobs:
           sed -i "/numpy/d" homeassistant/package_constraints.txt
 
       - name: Build wheels (old cython)
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -211,14 +211,14 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_old-cython.txt"
           pip: "'cython<3'"
 
       - name: Build wheels (part 1)
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -226,13 +226,13 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
 
       - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -240,13 +240,13 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
 
       - name: Build wheels (part 3)
-        uses: home-assistant/wheels@2024.01.0
+        uses: home-assistant/wheels@2024.07.1
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -254,7 +254,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtac"

.gitignore

@@ -34,6 +34,7 @@ Icon
 
 # GITHUB Proposed Python stuff:
 *.py[cod]
+__pycache__
 
 # C extensions
 *.so

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.4.1
+    rev: v0.5.2
     hooks:
       - id: ruff
         args:
@@ -8,11 +8,11 @@ repos:
       - id: ruff-format
         files: ^((homeassistant|pylint|script|tests)/.+)?[^/]+\.(py|pyi)$
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.6
+    rev: v2.3.0
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=additionals,alle,alot,astroid,bund,caf,convencional,currenty,datas,farenheit,falsy,fo,frequence,haa,hass,iif,incomfort,ines,ist,nam,nd,pres,pullrequests,resset,rime,ser,serie,te,technik,ue,unsecure,vor,withing,zar
+          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn,pres,ser,ue
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
         exclude_types: [csv, json, html]
@@ -61,15 +61,15 @@ repos:
         name: mypy
         entry: script/run-in-env.sh mypy
         language: script
-        types: [python]
+        types_or: [python, pyi]
         require_serial: true
         files: ^(homeassistant|pylint)/.+\.(py|pyi)$
       - id: pylint
         name: pylint
         entry: script/run-in-env.sh pylint -j 0 --ignore-missing-annotations=y
         language: script
-        types: [python]
-        files: ^homeassistant/.+\.py$
+        types_or: [python, 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
@@ -83,7 +83,7 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|\.coveragerc|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py|requirements_test.txt)$
+        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py|requirements_test.txt)$
       - id: hassfest-metadata
         name: hassfest-metadata
         entry: script/run-in-env.sh python3 -m script.hassfest -p metadata

.strict-typing

@@ -21,6 +21,7 @@ homeassistant.helpers.entity_platform
 homeassistant.helpers.entity_values
 homeassistant.helpers.event
 homeassistant.helpers.reload
+homeassistant.helpers.script
 homeassistant.helpers.script_variables
 homeassistant.helpers.singleton
 homeassistant.helpers.sun
@@ -48,6 +49,7 @@ homeassistant.components.adax.*
 homeassistant.components.adguard.*
 homeassistant.components.aftership.*
 homeassistant.components.air_quality.*
+homeassistant.components.airgradient.*
 homeassistant.components.airly.*
 homeassistant.components.airnow.*
 homeassistant.components.airq.*
@@ -65,7 +67,6 @@ homeassistant.components.alexa.*
 homeassistant.components.alpha_vantage.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.amberelectric.*
-homeassistant.components.ambiclimate.*
 homeassistant.components.ambient_network.*
 homeassistant.components.ambient_station.*
 homeassistant.components.amcrest.*
@@ -84,6 +85,7 @@ homeassistant.components.api.*
 homeassistant.components.apple_tv.*
 homeassistant.components.apprise.*
 homeassistant.components.aprs.*
+homeassistant.components.apsystems.*
 homeassistant.components.aqualogic.*
 homeassistant.components.aquostv.*
 homeassistant.components.aranet.*
@@ -96,6 +98,7 @@ homeassistant.components.assist_pipeline.*
 homeassistant.components.asterisk_cdr.*
 homeassistant.components.asterisk_mbox.*
 homeassistant.components.asuswrt.*
+homeassistant.components.autarco.*
 homeassistant.components.auth.*
 homeassistant.components.automation.*
 homeassistant.components.awair.*
@@ -235,6 +238,7 @@ homeassistant.components.homeworks.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
+homeassistant.components.husqvarna_automower.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.ibeacon.*
@@ -243,6 +247,7 @@ homeassistant.components.image.*
 homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
+homeassistant.components.imgw_pib.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -258,6 +263,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.*
@@ -283,6 +289,7 @@ homeassistant.components.logger.*
 homeassistant.components.london_underground.*
 homeassistant.components.lookin.*
 homeassistant.components.luftdaten.*
+homeassistant.components.madvr.*
 homeassistant.components.mailbox.*
 homeassistant.components.map.*
 homeassistant.components.mastodon.*
@@ -299,6 +306,7 @@ homeassistant.components.minecraft_server.*
 homeassistant.components.mjpeg.*
 homeassistant.components.modbus.*
 homeassistant.components.modem_callerid.*
+homeassistant.components.monzo.*
 homeassistant.components.moon.*
 homeassistant.components.mopeka.*
 homeassistant.components.motionmount.*
@@ -337,7 +345,6 @@ homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
 homeassistant.components.plugwise.*
-homeassistant.components.poolsense.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -366,6 +373,7 @@ homeassistant.components.rhasspy.*
 homeassistant.components.ridwell.*
 homeassistant.components.ring.*
 homeassistant.components.rituals_perfume_genie.*
+homeassistant.components.roborock.*
 homeassistant.components.roku.*
 homeassistant.components.romy.*
 homeassistant.components.rpi_power.*
@@ -377,6 +385,7 @@ homeassistant.components.samsungtv.*
 homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.scrape.*
+homeassistant.components.script.*
 homeassistant.components.search.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
@@ -425,6 +434,7 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.text.*
+homeassistant.components.thethingsnetwork.*
 homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*

.vscode/launch.json

@@ -6,38 +6,52 @@
   "configurations": [
     {
       "name": "Home Assistant",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "module": "homeassistant",
       "justMyCode": false,
-      "args": ["--debug", "-c", "config"],
+      "args": [
+        "--debug",
+        "-c",
+        "config"
+      ],
       "preLaunchTask": "Compile English translations"
     },
     {
       "name": "Home Assistant (skip pip)",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "module": "homeassistant",
       "justMyCode": false,
-      "args": ["--debug", "-c", "config", "--skip-pip"],
+      "args": [
+        "--debug",
+        "-c",
+        "config",
+        "--skip-pip"
+      ],
       "preLaunchTask": "Compile English translations"
     },
     {
       "name": "Home Assistant: Changed tests",
-      "type": "python",
+      "type": "debugpy",
       "request": "launch",
       "module": "pytest",
       "justMyCode": false,
-      "args": ["--timeout=10", "--picked"],
+      "args": [
+        "--timeout=10",
+        "--picked"
+      ],
     },
     {
       // Debug by attaching to local Home Assistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/
       "name": "Home Assistant: Attach Local",
-      "type": "python",
+      "type": "debugpy",
       "request": "attach",
-      "port": 5678,
-      "host": "localhost",
+      "connect": {
+        "port": 5678,
+        "host": "localhost"
+      },
       "pathMappings": [
         {
           "localRoot": "${workspaceFolder}",
@@ -49,10 +63,12 @@
       // Debug by attaching to remote Home Assistant server using Remote Python Debugger.
       // See https://www.home-assistant.io/integrations/debugpy/
       "name": "Home Assistant: Attach Remote",
-      "type": "python",
+      "type": "debugpy",
       "request": "attach",
-      "port": 5678,
-      "host": "homeassistant.local",
+      "connect": {
+        "port": 5678,
+        "host": "homeassistant.local"
+      },
       "pathMappings": [
         {
           "localRoot": "${workspaceFolder}",
@@ -61,4 +77,4 @@
       ]
     }
   ]
-}
+}

.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"
 }

.vscode/tasks.json

@@ -76,6 +76,7 @@
       "detail": "Generate code coverage report for a given integration.",
       "type": "shell",
       "command": "python3 -m pytest ./tests/components/${input:integrationName}/ --cov=homeassistant.components.${input:integrationName} --cov-report term-missing --durations-min=1 --durations=0 --numprocesses=auto",
+      "dependsOn": ["Compile English translations"],
       "group": {
         "kind": "test",
         "isDefault": true
@@ -103,7 +104,7 @@
     {
       "label": "Install all Requirements",
       "type": "shell",
-      "command": "pip3 install -r requirements_all.txt",
+      "command": "uv pip install -r requirements_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -117,7 +118,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "pip3 install -r requirements_test_all.txt",
+      "command": "uv pip install -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true

CODEOWNERS

@@ -56,6 +56,8 @@ build.json @home-assistant/supervisor
 /tests/components/agent_dvr/ @ispysoftware
 /homeassistant/components/air_quality/ @home-assistant/core
 /tests/components/air_quality/ @home-assistant/core
+/homeassistant/components/airgradient/ @airgradienthq @joostlek
+/tests/components/airgradient/ @airgradienthq @joostlek
 /homeassistant/components/airly/ @bieniu
 /tests/components/airly/ @bieniu
 /homeassistant/components/airnow/ @asymworks
@@ -78,18 +80,15 @@ build.json @home-assistant/supervisor
 /tests/components/airzone/ @Noltari
 /homeassistant/components/airzone_cloud/ @Noltari
 /tests/components/airzone_cloud/ @Noltari
-/homeassistant/components/aladdin_connect/ @mkmer
-/tests/components/aladdin_connect/ @mkmer
 /homeassistant/components/alarm_control_panel/ @home-assistant/core
 /tests/components/alarm_control_panel/ @home-assistant/core
 /homeassistant/components/alert/ @home-assistant/core @frenck
 /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/ambiclimate/ @danielhiversen
-/tests/components/ambiclimate/ @danielhiversen
 /homeassistant/components/ambient_network/ @thomaskistler
 /tests/components/ambient_network/ @thomaskistler
 /homeassistant/components/ambient_station/ @bachya
@@ -127,8 +126,12 @@ build.json @home-assistant/supervisor
 /tests/components/aprilaire/ @chamberlain2007
 /homeassistant/components/aprs/ @PhilRW
 /tests/components/aprs/ @PhilRW
-/homeassistant/components/aranet/ @aschmitz @thecode
-/tests/components/aranet/ @aschmitz @thecode
+/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
 /tests/components/arcam_fmj/ @elupus
 /homeassistant/components/arris_tg2492lg/ @vanbalken
@@ -152,6 +155,8 @@ build.json @home-assistant/supervisor
 /tests/components/aurora_abb_powerone/ @davet2001
 /homeassistant/components/aussie_broadband/ @nickw444 @Bre77
 /tests/components/aussie_broadband/ @nickw444 @Bre77
+/homeassistant/components/autarco/ @klaasnicolaas
+/tests/components/autarco/ @klaasnicolaas
 /homeassistant/components/auth/ @home-assistant/core
 /tests/components/auth/ @home-assistant/core
 /homeassistant/components/automation/ @home-assistant/core
@@ -161,6 +166,8 @@ build.json @home-assistant/supervisor
 /tests/components/awair/ @ahayworth @danielsjf
 /homeassistant/components/axis/ @Kane610
 /tests/components/axis/ @Kane610
+/homeassistant/components/azure_data_explorer/ @kaareseras
+/tests/components/azure_data_explorer/ @kaareseras
 /homeassistant/components/azure_devops/ @timmo001
 /tests/components/azure_devops/ @timmo001
 /homeassistant/components/azure_event_hub/ @eavanvalkenburg
@@ -180,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
@@ -232,7 +239,8 @@ 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/chacon_dio/ @cnico
+/tests/components/chacon_dio/ @cnico
 /homeassistant/components/cisco_ios/ @fbradyirl
 /homeassistant/components/cisco_mobility_express/ @fbradyirl
 /homeassistant/components/cisco_webex_teams/ @fbradyirl
@@ -338,8 +346,8 @@ build.json @home-assistant/supervisor
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
 /homeassistant/components/dsmr/ @Robbie1221 @frenck
 /tests/components/dsmr/ @Robbie1221 @frenck
-/homeassistant/components/dsmr_reader/ @sorted-bits @glodenox
-/tests/components/dsmr_reader/ @sorted-bits @glodenox
+/homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
+/tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
@@ -354,8 +362,8 @@ build.json @home-assistant/supervisor
 /tests/components/ecoforest/ @pjanuario
 /homeassistant/components/econet/ @w1ll1am23
 /tests/components/econet/ @w1ll1am23
-/homeassistant/components/ecovacs/ @OverloadUT @mib1185 @edenhaus @Augar
-/tests/components/ecovacs/ @OverloadUT @mib1185 @edenhaus @Augar
+/homeassistant/components/ecovacs/ @mib1185 @edenhaus @Augar
+/tests/components/ecovacs/ @mib1185 @edenhaus @Augar
 /homeassistant/components/ecowitt/ @pvizeli
 /tests/components/ecowitt/ @pvizeli
 /homeassistant/components/efergy/ @tkdrob
@@ -375,7 +383,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
@@ -392,8 +400,8 @@ build.json @home-assistant/supervisor
 /tests/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
-/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
-/tests/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
+/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
+/tests/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
@@ -425,6 +433,8 @@ build.json @home-assistant/supervisor
 /tests/components/fan/ @home-assistant/core
 /homeassistant/components/fastdotcom/ @rohankapoorcom @erwindouna
 /tests/components/fastdotcom/ @rohankapoorcom @erwindouna
+/homeassistant/components/feedreader/ @mib1185
+/tests/components/feedreader/ @mib1185
 /homeassistant/components/fibaro/ @rappenze
 /tests/components/fibaro/ @rappenze
 /homeassistant/components/file/ @fabaff
@@ -550,14 +560,14 @@ build.json @home-assistant/supervisor
 /tests/components/group/ @home-assistant/core
 /homeassistant/components/guardian/ @bachya
 /tests/components/guardian/ @bachya
-/homeassistant/components/habitica/ @ASMfreaK @leikoilja
-/tests/components/habitica/ @ASMfreaK @leikoilja
+/homeassistant/components/habitica/ @ASMfreaK @leikoilja @tr4nt0r
+/tests/components/habitica/ @ASMfreaK @leikoilja @tr4nt0r
 /homeassistant/components/hardkernel/ @home-assistant/core
 /tests/components/hardkernel/ @home-assistant/core
 /homeassistant/components/hardware/ @home-assistant/core
 /tests/components/hardware/ @home-assistant/core
-/homeassistant/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
-/tests/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
+/homeassistant/components/harmony/ @ehendrix23 @bdraco @mkeesey @Aohzan
+/tests/components/harmony/ @ehendrix23 @bdraco @mkeesey @Aohzan
 /homeassistant/components/hassio/ @home-assistant/supervisor
 /tests/components/hassio/ @home-assistant/supervisor
 /homeassistant/components/hdmi_cec/ @inytar
@@ -625,8 +635,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
@@ -650,9 +660,12 @@ build.json @home-assistant/supervisor
 /tests/components/image_upload/ @home-assistant/core
 /homeassistant/components/imap/ @jbouwh
 /tests/components/imap/ @jbouwh
+/homeassistant/components/imgw_pib/ @bieniu
+/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
@@ -690,10 +703,16 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iqvia/ @bachya
 /tests/components/iqvia/ @bachya
 /homeassistant/components/irish_rail_transport/ @ttroy50
+/homeassistant/components/isal/ @bdraco
+/tests/components/isal/ @bdraco
 /homeassistant/components/islamic_prayer_times/ @engrbm87 @cpfair
 /tests/components/islamic_prayer_times/ @engrbm87 @cpfair
+/homeassistant/components/israel_rail/ @shaiu
+/tests/components/israel_rail/ @shaiu
 /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
@@ -724,6 +743,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 @JakeBosh
+/tests/components/knocki/ @joostlek @jgatto1 @JakeBosh
 /homeassistant/components/knx/ @Julius2342 @farmio @marvin-w
 /tests/components/knx/ @Julius2342 @farmio @marvin-w
 /homeassistant/components/kodi/ @OnFreund
@@ -764,6 +785,8 @@ build.json @home-assistant/supervisor
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
+/homeassistant/components/lifx/ @Djelibeybi
+/tests/components/lifx/ @Djelibeybi
 /homeassistant/components/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linear_garage_door/ @IceBotYT
@@ -808,11 +831,15 @@ build.json @home-assistant/supervisor
 /tests/components/lutron_caseta/ @swails @bdraco @danaues @eclair4151
 /homeassistant/components/lyric/ @timmo001
 /tests/components/lyric/ @timmo001
+/homeassistant/components/madvr/ @iloveicedgreentea
+/tests/components/madvr/ @iloveicedgreentea
 /homeassistant/components/mastodon/ @fabaff
 /homeassistant/components/matrix/ @PaarthShah
 /tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
 /tests/components/matter/ @home-assistant/matter
+/homeassistant/components/mealie/ @joostlek @andrew-codechimp
+/tests/components/mealie/ @joostlek @andrew-codechimp
 /homeassistant/components/meater/ @Sotolotl @emontnemery
 /tests/components/meater/ @Sotolotl @emontnemery
 /homeassistant/components/medcom_ble/ @elafargue
@@ -824,6 +851,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
@@ -855,8 +884,6 @@ build.json @home-assistant/supervisor
 /tests/components/moat/ @bdraco
 /homeassistant/components/mobile_app/ @home-assistant/core
 /tests/components/mobile_app/ @home-assistant/core
-/homeassistant/components/modbus/ @janiversen
-/tests/components/modbus/ @janiversen
 /homeassistant/components/modem_callerid/ @tkdrob
 /tests/components/modem_callerid/ @tkdrob
 /homeassistant/components/modern_forms/ @wonderslug
@@ -865,6 +892,8 @@ build.json @home-assistant/supervisor
 /tests/components/moehlenhoff_alpha2/ @j-a-n
 /homeassistant/components/monoprice/ @etsinko @OnFreund
 /tests/components/monoprice/ @etsinko @OnFreund
+/homeassistant/components/monzo/ @jakemartin-icl
+/tests/components/monzo/ @jakemartin-icl
 /homeassistant/components/moon/ @fabaff @frenck
 /tests/components/moon/ @fabaff @frenck
 /homeassistant/components/mopeka/ @bdraco
@@ -894,8 +923,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
@@ -966,8 +995,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/ollama/ @synesthesiam
 /tests/components/ollama/ @synesthesiam
 /homeassistant/components/ombi/ @larssont
-/homeassistant/components/omnilogic/ @oliver84 @djtimca @gentoosu
-/tests/components/omnilogic/ @oliver84 @djtimca @gentoosu
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
 /homeassistant/components/oncue/ @bdraco @peterager
@@ -976,6 +1003,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
@@ -1084,6 +1112,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
@@ -1162,8 +1192,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
@@ -1180,6 +1210,8 @@ build.json @home-assistant/supervisor
 /tests/components/rtsp_to_webrtc/ @allenporter
 /homeassistant/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
 /tests/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
+/homeassistant/components/russound_rio/ @noahhusby
+/tests/components/russound_rio/ @noahhusby
 /homeassistant/components/ruuvi_gateway/ @akx
 /tests/components/ruuvi_gateway/ @akx
 /homeassistant/components/ruuvitag_ble/ @akx
@@ -1247,6 +1279,8 @@ build.json @home-assistant/supervisor
 /tests/components/sighthound/ @robmarkcole
 /homeassistant/components/signal_messenger/ @bbernhard
 /tests/components/signal_messenger/ @bbernhard
+/homeassistant/components/simplefin/ @scottg489 @jeeftor
+/tests/components/simplefin/ @scottg489 @jeeftor
 /homeassistant/components/simplepush/ @engrbm87
 /tests/components/simplepush/ @engrbm87
 /homeassistant/components/simplisafe/ @bachya
@@ -1271,8 +1305,6 @@ build.json @home-assistant/supervisor
 /tests/components/smappee/ @bsmappee
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
-/homeassistant/components/smartthings/ @andrewsayre
-/tests/components/smartthings/ @andrewsayre
 /homeassistant/components/smarttub/ @mdz
 /tests/components/smarttub/ @mdz
 /homeassistant/components/smarty/ @z0mbieprocess
@@ -1289,8 +1321,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
@@ -1359,8 +1391,8 @@ build.json @home-assistant/supervisor
 /tests/components/switchbee/ @jafar-atili
 /homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
-/homeassistant/components/switchbot_cloud/ @SeraphicRav
-/tests/components/switchbot_cloud/ @SeraphicRav
+/homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland
+/tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland
 /homeassistant/components/switcher_kis/ @thecode
 /tests/components/switcher_kis/ @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
@@ -1413,7 +1445,8 @@ build.json @home-assistant/supervisor
 /tests/components/thermobeacon/ @bdraco
 /homeassistant/components/thermopro/ @bdraco @h3ss
 /tests/components/thermopro/ @bdraco @h3ss
-/homeassistant/components/thethingsnetwork/ @fabaff
+/homeassistant/components/thethingsnetwork/ @angelnu
+/tests/components/thethingsnetwork/ @angelnu
 /homeassistant/components/thread/ @home-assistant/core
 /tests/components/thread/ @home-assistant/core
 /homeassistant/components/tibber/ @danielhiversen
@@ -1437,8 +1470,8 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/tplink/ @rytilahti @thegardenmonkey @bdraco @sdb9696
-/tests/components/tplink/ @rytilahti @thegardenmonkey @bdraco @sdb9696
+/homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696
+/tests/components/tplink/ @rytilahti @bdraco @sdb9696
 /homeassistant/components/tplink_omada/ @MarkGodwin
 /tests/components/tplink_omada/ @MarkGodwin
 /homeassistant/components/traccar/ @ludeeus
@@ -1477,8 +1510,6 @@ build.json @home-assistant/supervisor
 /tests/components/unifi/ @Kane610
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
 /homeassistant/components/unifiled/ @florisvdk
-/homeassistant/components/unifiprotect/ @AngellusMortis @bdraco
-/tests/components/unifiprotect/ @AngellusMortis @bdraco
 /homeassistant/components/upb/ @gwww
 /tests/components/upb/ @gwww
 /homeassistant/components/upc_connect/ @pvizeli @fabaff

CODE_OF_CONDUCT.md

@@ -5,7 +5,7 @@
 We as members, contributors, and leaders pledge to make participation in our
 community a harassment-free experience for everyone, regardless of age, body
 size, visible or invisible disability, ethnicity, sex characteristics, gender
-identity and expression, level of experience, education, socio-economic status,
+identity and expression, level of experience, education, socioeconomic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.
 

Dockerfile

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

Dockerfile.dev

@@ -35,21 +35,30 @@ RUN \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
+# Install uv
+RUN pip3 install uv
+
 WORKDIR /usr/src
 
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
-    && pip3 install -e hass-release/
+    && uv pip install --system -e hass-release/
 
-WORKDIR /workspaces
+USER vscode
+ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
+RUN uv venv $VIRTUAL_ENV
+ENV PATH="$VIRTUAL_ENV/bin:$PATH"
+
+WORKDIR /tmp
 
 # Install Python dependencies from requirements
 COPY requirements.txt ./
 COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
-RUN pip3 install -r requirements.txt
+RUN uv pip install -r requirements.txt
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN pip3 install -r requirements_test.txt
-RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
+RUN uv pip install -r requirements_test.txt
+
+WORKDIR /workspaces
 
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

README.rst

@@ -7,6 +7,8 @@ Check out `home-assistant.io <https://home-assistant.io>`__ for `a
 demo <https://demo.home-assistant.io>`__, `installation instructions <https://home-assistant.io/getting-started/>`__,
 `tutorials <https://home-assistant.io/getting-started/automation/>`__ and `documentation <https://home-assistant.io/docs/>`__.
 
+This is a project of the `Open Home Foundation <https://www.openhomefoundation.org/>`__.
+
 |screenshot-states|
 
 Featured integrations
@@ -25,4 +27,4 @@ of a component, check the `Home Assistant help section <https://home-assistant.i
 .. |screenshot-states| image:: https://raw.githubusercontent.com/home-assistant/core/dev/.github/assets/screenshot-states.png
    :target: https://demo.home-assistant.io
 .. |screenshot-integrations| image:: https://raw.githubusercontent.com/home-assistant/core/dev/.github/assets/screenshot-integrations.png
-   :target: https://home-assistant.io/integrations/
+   :target: https://home-assistant.io/integrations/

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

codecov.yml

@@ -4,7 +4,7 @@ coverage:
   status:
     project:
       default:
-        target: 90
+        target: auto
         threshold: 0.09
       required:
         target: auto

homeassistant/__main__.py

@@ -3,6 +3,7 @@
 from __future__ import annotations
 
 import argparse
+from contextlib import suppress
 import faulthandler
 import os
 import sys
@@ -208,8 +209,10 @@ def main() -> int:
         exit_code = runner.run(runtime_conf)
         faulthandler.disable()
 
-    if os.path.getsize(fault_file_name) == 0:
-        os.remove(fault_file_name)
+    # It's possible for the fault file to disappear, so suppress obvious errors
+    with suppress(FileNotFoundError):
+        if os.path.getsize(fault_file_name) == 0:
+            os.remove(fault_file_name)
 
     check_threads()
 

homeassistant/auth/__init__.py

@@ -28,15 +28,15 @@ 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 .session import SessionManager
+from .providers.homeassistant import HassAuthProvider
 
 EVENT_USER_ADDED = "user_added"
 EVENT_USER_UPDATED = "user_updated"
 EVENT_USER_REMOVED = "user_removed"
 
-_MfaModuleDict = dict[str, MultiFactorAuthModule]
-_ProviderKey = tuple[str, str | None]
-_ProviderDict = dict[_ProviderKey, AuthProvider]
+type _MfaModuleDict = dict[str, MultiFactorAuthModule]
+type _ProviderKey = tuple[str, str | None]
+type _ProviderDict = dict[_ProviderKey, AuthProvider]
 
 
 class InvalidAuthError(Exception):
@@ -54,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)
@@ -74,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)
@@ -181,7 +188,6 @@ class AuthManager:
         self._remove_expired_job = HassJob(
             self._async_remove_expired_refresh_tokens, job_type=HassJobType.Callback
         )
-        self.session = SessionManager(hass, self)
 
     async def async_setup(self) -> None:
         """Set up the auth manager."""
@@ -192,7 +198,6 @@ class AuthManager:
             )
         )
         self._async_track_next_refresh_token_expiration()
-        await self.session.async_setup()
 
     @property
     def auth_providers(self) -> list[AuthProvider]:
@@ -358,15 +363,15 @@ class AuthManager:
         local_only: bool | None = None,
     ) -> None:
         """Update a user."""
-        kwargs: dict[str, Any] = {}
-
-        for attr_name, value in (
-            ("name", name),
-            ("group_ids", group_ids),
-            ("local_only", local_only),
-        ):
-            if value is not None:
-                kwargs[attr_name] = value
+        kwargs: dict[str, Any] = {
+            attr_name: value
+            for attr_name, value in (
+                ("name", name),
+                ("group_ids", group_ids),
+                ("local_only", local_only),
+            )
+            if value is not None
+        }
         await self._store.async_update_user(user, **kwargs)
 
         if is_active is not None:
@@ -377,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)
@@ -519,6 +531,13 @@ class AuthManager:
         for revoke_callback in callbacks:
             revoke_callback()
 
+    @callback
+    def async_set_expiry(
+        self, refresh_token: models.RefreshToken, *, enable_expiry: bool
+    ) -> None:
+        """Enable or disable expiry of a refresh token."""
+        self._store.async_set_expiry(refresh_token, enable_expiry=enable_expiry)
+
     @callback
     def _async_remove_expired_refresh_tokens(self, _: datetime | None = None) -> None:
         """Remove expired refresh tokens."""

homeassistant/auth/auth_store.py

@@ -62,6 +62,7 @@ class AuthStore:
         self._store = Store[dict[str, list[dict[str, Any]]]](
             hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
         )
+        self._token_id_to_user_id: dict[str, str] = {}
 
     async def async_get_groups(self) -> list[models.Group]:
         """Retrieve all users."""
@@ -104,14 +105,18 @@ class AuthStore:
             "perm_lookup": self._perm_lookup,
         }
 
-        for attr_name, value in (
-            ("is_owner", is_owner),
-            ("is_active", is_active),
-            ("local_only", local_only),
-            ("system_generated", system_generated),
-        ):
-            if value is not None:
-                kwargs[attr_name] = value
+        kwargs.update(
+            {
+                attr_name: value
+                for attr_name, value in (
+                    ("is_owner", is_owner),
+                    ("is_active", is_active),
+                    ("local_only", local_only),
+                    ("system_generated", system_generated),
+                )
+                if value is not None
+            }
+        )
 
         new_user = models.User(**kwargs)
 
@@ -135,7 +140,10 @@ class AuthStore:
 
     async def async_remove_user(self, user: models.User) -> None:
         """Remove a user."""
-        self._users.pop(user.id)
+        user = self._users.pop(user.id)
+        for refresh_token_id in user.refresh_tokens:
+            del self._token_id_to_user_id[refresh_token_id]
+        user.refresh_tokens.clear()
         self._async_schedule_save()
 
     async def async_update_user(
@@ -218,7 +226,9 @@ class AuthStore:
             kwargs["client_icon"] = client_icon
 
         refresh_token = models.RefreshToken(**kwargs)
-        user.refresh_tokens[refresh_token.id] = refresh_token
+        token_id = refresh_token.id
+        user.refresh_tokens[token_id] = refresh_token
+        self._token_id_to_user_id[token_id] = user.id
 
         self._async_schedule_save()
         return refresh_token
@@ -226,19 +236,17 @@ class AuthStore:
     @callback
     def async_remove_refresh_token(self, refresh_token: models.RefreshToken) -> None:
         """Remove a refresh token."""
-        for user in self._users.values():
-            if user.refresh_tokens.pop(refresh_token.id, None):
-                self._async_schedule_save()
-                break
+        refresh_token_id = refresh_token.id
+        if user_id := self._token_id_to_user_id.get(refresh_token_id):
+            del self._users[user_id].refresh_tokens[refresh_token_id]
+            del self._token_id_to_user_id[refresh_token_id]
+            self._async_schedule_save()
 
     @callback
     def async_get_refresh_token(self, token_id: str) -> models.RefreshToken | None:
         """Get refresh token by id."""
-        for user in self._users.values():
-            refresh_token = user.refresh_tokens.get(token_id)
-            if refresh_token is not None:
-                return refresh_token
-
+        if user_id := self._token_id_to_user_id.get(token_id):
+            return self._users[user_id].refresh_tokens.get(token_id)
         return None
 
     @callback
@@ -277,6 +285,29 @@ class AuthStore:
             )
         self._async_schedule_save()
 
+    @callback
+    def async_set_expiry(
+        self, refresh_token: models.RefreshToken, *, enable_expiry: bool
+    ) -> None:
+        """Enable or disable expiry of a refresh token."""
+        if enable_expiry:
+            if refresh_token.expire_at is None:
+                refresh_token.expire_at = (
+                    refresh_token.last_used_at or dt_util.utcnow()
+                ).timestamp() + REFRESH_TOKEN_EXPIRATION
+                self._async_schedule_save()
+        else:
+            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:
@@ -290,8 +321,6 @@ class AuthStore:
         perm_lookup = PermissionLookup(ent_reg, dev_reg)
         self._perm_lookup = perm_lookup
 
-        now_ts = dt_util.utcnow().timestamp()
-
         if data is None or not isinstance(data, dict):
             self._set_defaults()
             return
@@ -445,14 +474,6 @@ class AuthStore:
             else:
                 last_used_at = None
 
-            if (
-                expire_at := rt_dict.get("expire_at")
-            ) is None and token_type == models.TOKEN_TYPE_NORMAL:
-                if last_used_at:
-                    expire_at = last_used_at.timestamp() + REFRESH_TOKEN_EXPIRATION
-                else:
-                    expire_at = now_ts + REFRESH_TOKEN_EXPIRATION
-
             token = models.RefreshToken(
                 id=rt_dict["id"],
                 user=users[rt_dict["user_id"]],
@@ -469,7 +490,7 @@ class AuthStore:
                 jwt_key=rt_dict["jwt_key"],
                 last_used_at=last_used_at,
                 last_used_ip=rt_dict.get("last_used_ip"),
-                expire_at=expire_at,
+                expire_at=rt_dict.get("expire_at"),
                 version=rt_dict.get("version"),
             )
             if "credential_id" in rt_dict:
@@ -478,9 +499,18 @@ class AuthStore:
 
         self._groups = groups
         self._users = users
-
+        self._build_token_id_to_user_id()
         self._async_schedule_save(INITIAL_LOAD_SAVE_DELAY)
 
+    @callback
+    def _build_token_id_to_user_id(self) -> None:
+        """Build a map of token id to user id."""
+        self._token_id_to_user_id = {
+            token_id: user_id
+            for user_id, user in self._users.items()
+            for token_id in user.refresh_tokens
+        }
+
     @callback
     def _async_schedule_save(self, delay: float = DEFAULT_SAVE_DELAY) -> None:
         """Save users."""
@@ -574,6 +604,7 @@ class AuthStore:
         read_only_group = _system_read_only_group()
         groups[read_only_group.id] = read_only_group
         self._groups = groups
+        self._build_token_id_to_user_id()
 
 
 def _system_admin_group() -> models.Group:

homeassistant/auth/mfa_modules/__init__.py

@@ -16,6 +16,7 @@ from homeassistant.data_entry_flow import FlowResult
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.importlib import async_import_module
 from homeassistant.util.decorator import Registry
+from homeassistant.util.hass_dict import HassKey
 
 MULTI_FACTOR_AUTH_MODULES: Registry[str, type[MultiFactorAuthModule]] = Registry()
 
@@ -29,7 +30,7 @@ MULTI_FACTOR_AUTH_MODULE_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-DATA_REQS = "mfa_auth_module_reqs_processed"
+DATA_REQS: HassKey[set[str]] = HassKey("mfa_auth_module_reqs_processed")
 
 _LOGGER = logging.getLogger(__name__)
 

homeassistant/auth/mfa_modules/notify.py

@@ -88,7 +88,7 @@ class NotifySetting:
     target: str | None = attr.ib(default=None)
 
 
-_UsersDict = dict[str, NotifySetting]
+type _UsersDict = dict[str, NotifySetting]
 
 
 @MULTI_FACTOR_AUTH_MODULES.register("notify")

homeassistant/auth/permissions/types.py

@@ -4,17 +4,17 @@ from collections.abc import Mapping
 
 # MyPy doesn't support recursion yet. So writing it out as far as we need.
 
-ValueType = (
+type ValueType = (
     # Example: entities.all = { read: true, control: true }
     Mapping[str, bool] | bool | None
 )
 
 # Example: entities.domains = { light: … }
-SubCategoryDict = Mapping[str, ValueType]
+type SubCategoryDict = Mapping[str, ValueType]
 
-SubCategoryType = SubCategoryDict | bool | None
+type SubCategoryType = SubCategoryDict | bool | None
 
-CategoryType = (
+type CategoryType = (
     # Example: entities.domains
     Mapping[str, SubCategoryType]
     # Example: entities.all
@@ -24,4 +24,4 @@ CategoryType = (
 )
 
 # Example: { entities: … }
-PolicyType = Mapping[str, CategoryType]
+type PolicyType = Mapping[str, CategoryType]

homeassistant/auth/permissions/util.py

@@ -10,8 +10,8 @@ from .const import SUBCAT_ALL
 from .models import PermissionLookup
 from .types import CategoryType, SubCategoryDict, ValueType
 
-LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
-SubCatLookupType = dict[str, LookupFunc]
+type LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
+type SubCatLookupType = dict[str, LookupFunc]
 
 
 def lookup_all(

homeassistant/auth/providers/__init__.py

@@ -17,13 +17,14 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.importlib import async_import_module
 from homeassistant.util import dt as dt_util
 from homeassistant.util.decorator import Registry
+from homeassistant.util.hass_dict import HassKey
 
 from ..auth_store import AuthStore
 from ..const import MFA_SESSION_EXPIRATION
 from ..models import AuthFlowResult, Credentials, RefreshToken, User, UserMeta
 
 _LOGGER = logging.getLogger(__name__)
-DATA_REQS = "auth_prov_reqs_processed"
+DATA_REQS: HassKey[set[str]] = HassKey("auth_prov_reqs_processed")
 
 AUTH_PROVIDERS: Registry[str, type[AuthProvider]] = Registry()
 

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
@@ -54,6 +55,27 @@ class InvalidUser(HomeAssistantError):
     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 InvalidUsername(InvalidUser):
+    """Raised when invalid username is specified.
+
+    Will not be raised when validating authentication.
+    """
+
 
 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(
             {
@@ -189,7 +216,7 @@ class Data:
                 break
 
         if index is None:
-            raise InvalidUser
+            raise InvalidUser(translation_key="user_not_found")
 
         self.users.pop(index)
 
@@ -205,7 +232,50 @@ class Data:
                 user["password"] = self.hash_password(new_password, True).decode()
                 break
         else:
-            raise InvalidUser
+            raise InvalidUser(translation_key="user_not_found")
+
+    @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(translation_key="user_not_found")
 
     async def async_save(self) -> None:
         """Save data."""
@@ -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/auth/providers/trusted_networks.py

@@ -28,8 +28,8 @@ from .. import InvalidAuthError
 from ..models import AuthFlowResult, Credentials, RefreshToken, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
-IPAddress = IPv4Address | IPv6Address
-IPNetwork = IPv4Network | IPv6Network
+type IPAddress = IPv4Address | IPv6Address
+type IPNetwork = IPv4Network | IPv6Network
 
 CONF_TRUSTED_NETWORKS = "trusted_networks"
 CONF_TRUSTED_USERS = "trusted_users"

homeassistant/auth/session.py

@@ -1,205 +0,0 @@
-"""Session auth module."""
-
-from __future__ import annotations
-
-from datetime import datetime, timedelta
-import secrets
-from typing import TYPE_CHECKING, Final, TypedDict
-
-from aiohttp.web import Request
-from aiohttp_session import Session, get_session, new_session
-from cryptography.fernet import Fernet
-
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
-from homeassistant.helpers.event import async_call_later
-from homeassistant.helpers.storage import Store
-from homeassistant.util import dt as dt_util
-
-from .models import RefreshToken
-
-if TYPE_CHECKING:
-    from . import AuthManager
-
-
-TEMP_TIMEOUT = timedelta(minutes=5)
-TEMP_TIMEOUT_SECONDS = TEMP_TIMEOUT.total_seconds()
-
-SESSION_ID = "id"
-STORAGE_VERSION = 1
-STORAGE_KEY = "auth.session"
-
-
-class StrictConnectionTempSessionData:
-    """Data for accessing unauthorized resources for a short period of time."""
-
-    __slots__ = ("cancel_remove", "absolute_expiry")
-
-    def __init__(self, cancel_remove: CALLBACK_TYPE) -> None:
-        """Initialize the temp session data."""
-        self.cancel_remove: Final[CALLBACK_TYPE] = cancel_remove
-        self.absolute_expiry: Final[datetime] = dt_util.utcnow() + TEMP_TIMEOUT
-
-
-class StoreData(TypedDict):
-    """Data to store."""
-
-    unauthorized_sessions: dict[str, str]
-    key: str
-
-
-class SessionManager:
-    """Session manager."""
-
-    def __init__(self, hass: HomeAssistant, auth: AuthManager) -> None:
-        """Initialize the strict connection manager."""
-        self._auth = auth
-        self._hass = hass
-        self._temp_sessions: dict[str, StrictConnectionTempSessionData] = {}
-        self._strict_connection_sessions: dict[str, str] = {}
-        self._store = Store[StoreData](
-            hass, STORAGE_VERSION, STORAGE_KEY, private=True, atomic_writes=True
-        )
-        self._key: str | None = None
-        self._refresh_token_revoke_callbacks: dict[str, CALLBACK_TYPE] = {}
-
-    @property
-    def key(self) -> str:
-        """Return the encryption key."""
-        if self._key is None:
-            self._key = Fernet.generate_key().decode()
-            self._async_schedule_save()
-        return self._key
-
-    async def async_validate_request_for_strict_connection_session(
-        self,
-        request: Request,
-    ) -> bool:
-        """Check if a request has a valid strict connection session."""
-        session = await get_session(request)
-        if session.new or session.empty:
-            return False
-        result = self.async_validate_strict_connection_session(session)
-        if result is False:
-            session.invalidate()
-        return result
-
-    @callback
-    def async_validate_strict_connection_session(
-        self,
-        session: Session,
-    ) -> bool:
-        """Validate a strict connection session."""
-        if not (session_id := session.get(SESSION_ID)):
-            return False
-
-        if token_id := self._strict_connection_sessions.get(session_id):
-            if self._auth.async_get_refresh_token(token_id):
-                return True
-            # refresh token is invalid, delete entry
-            self._strict_connection_sessions.pop(session_id)
-            self._async_schedule_save()
-
-        if data := self._temp_sessions.get(session_id):
-            if dt_util.utcnow() <= data.absolute_expiry:
-                return True
-            # session expired, delete entry
-            self._temp_sessions.pop(session_id).cancel_remove()
-
-        return False
-
-    @callback
-    def _async_register_revoke_token_callback(self, refresh_token_id: str) -> None:
-        """Register a callback to revoke all sessions for a refresh token."""
-        if refresh_token_id in self._refresh_token_revoke_callbacks:
-            return
-
-        @callback
-        def async_invalidate_auth_sessions() -> None:
-            """Invalidate all sessions for a refresh token."""
-            self._strict_connection_sessions = {
-                session_id: token_id
-                for session_id, token_id in self._strict_connection_sessions.items()
-                if token_id != refresh_token_id
-            }
-            self._async_schedule_save()
-
-        self._refresh_token_revoke_callbacks[refresh_token_id] = (
-            self._auth.async_register_revoke_token_callback(
-                refresh_token_id, async_invalidate_auth_sessions
-            )
-        )
-
-    async def async_create_session(
-        self,
-        request: Request,
-        refresh_token: RefreshToken,
-    ) -> None:
-        """Create new session for given refresh token.
-
-        Caller needs to make sure that the refresh token is valid.
-        By creating a session, we are implicitly revoking all other
-        sessions for the given refresh token as there is one refresh
-        token per device/user case.
-        """
-        self._strict_connection_sessions = {
-            session_id: token_id
-            for session_id, token_id in self._strict_connection_sessions.items()
-            if token_id != refresh_token.id
-        }
-
-        self._async_register_revoke_token_callback(refresh_token.id)
-        session_id = await self._async_create_new_session(request)
-        self._strict_connection_sessions[session_id] = refresh_token.id
-        self._async_schedule_save()
-
-    async def async_create_temp_unauthorized_session(self, request: Request) -> None:
-        """Create a temporary unauthorized session."""
-        session_id = await self._async_create_new_session(
-            request, max_age=int(TEMP_TIMEOUT_SECONDS)
-        )
-
-        @callback
-        def remove(_: datetime) -> None:
-            self._temp_sessions.pop(session_id, None)
-
-        self._temp_sessions[session_id] = StrictConnectionTempSessionData(
-            async_call_later(self._hass, TEMP_TIMEOUT_SECONDS, remove)
-        )
-
-    async def _async_create_new_session(
-        self,
-        request: Request,
-        *,
-        max_age: int | None = None,
-    ) -> str:
-        session_id = secrets.token_hex(64)
-
-        session = await new_session(request)
-        session[SESSION_ID] = session_id
-        if max_age is not None:
-            session.max_age = max_age
-        return session_id
-
-    @callback
-    def _async_schedule_save(self, delay: float = 1) -> None:
-        """Save sessions."""
-        self._store.async_delay_save(self._data_to_save, delay)
-
-    @callback
-    def _data_to_save(self) -> StoreData:
-        """Return the data to store."""
-        return StoreData(
-            unauthorized_sessions=self._strict_connection_sessions,
-            key=self.key,
-        )
-
-    async def async_setup(self) -> None:
-        """Set up session manager."""
-        data = await self._store.async_load()
-        if data is None:
-            return
-
-        self._key = data["key"]
-        self._strict_connection_sessions = data["unauthorized_sessions"]
-        for token_id in self._strict_connection_sessions.values():
-            self._async_register_revoke_token_callback(token_id)

homeassistant/block_async_io.py

@@ -1,9 +1,15 @@
 """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
 from typing import Any
 
@@ -12,12 +18,21 @@ from .util.loop import protect_loop
 
 _IN_TESTS = "unittest" in sys.modules
 
+ALLOWED_FILE_PREFIXES = ("/proc",)
+
 
 def _check_import_call_allowed(mapped_args: dict[str, Any]) -> bool:
     # If the module is already imported, we can ignore it.
     return bool((args := mapped_args.get("args")) and args[0] in sys.modules)
 
 
+def _check_file_allowed(mapped_args: dict[str, Any]) -> bool:
+    # If the file is in /proc we can ignore it.
+    args = mapped_args["args"]
+    path = args[0] if type(args[0]) is str else str(args[0])  # noqa: E721
+    return path.startswith(ALLOWED_FILE_PREFIXES)
+
+
 def _check_sleep_call_allowed(mapped_args: dict[str, Any]) -> bool:
     #
     # Avoid extracting the stack unless we need to since it
@@ -25,7 +40,7 @@ def _check_sleep_call_allowed(mapped_args: dict[str, Any]) -> bool:
     # I/O and we are trying to avoid blocking calls.
     #
     # frame[0] is us
-    # frame[1] is check_loop
+    # frame[1] is raise_for_blocking_call
     # frame[2] is protected_loop_func
     # frame[3] is the offender
     with suppress(ValueError):
@@ -33,28 +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."""
-    # Prevent urllib3 and requests doing I/O in event loop
-    HTTPConnection.putrequest = protect_loop(  # type: ignore[method-assign]
-        HTTPConnection.putrequest
-    )
+    calls = _BLOCKED_CALLS.calls
+    if calls:
+        raise RuntimeError("Blocking call detection is already enabled")
 
-    # 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 = threading.get_ident()
+    for blocking_call in _BLOCKING_CALLS:
+        if _IN_TESTS and blocking_call.skip_for_tests:
+            continue
 
-    # Currently disabled. pytz doing I/O when getting timezone.
-    # Prevent files being opened inside the event loop
-    # builtins.open = protect_loop(builtins.open)
-
-    if not _IN_TESTS:
-        # 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

@@ -8,7 +8,8 @@ import contextlib
 from functools import partial
 from itertools import chain
 import logging
-import logging.handlers
+from logging.handlers import RotatingFileHandler, TimedRotatingFileHandler
+import mimetypes
 from operator import contains, itemgetter
 import os
 import platform
@@ -62,6 +63,7 @@ from .components import (
 )
 from .components.sensor import recorder as sensor_recorder  # noqa: F401
 from .const import (
+    BASE_PLATFORMS,
     FORMAT_DATETIME,
     KEY_DATA_LOGGING as DATA_LOGGING,
     REQUIRED_NEXT_PYTHON_HA_RELEASE,
@@ -84,21 +86,25 @@ from .helpers import (
     template,
     translation,
 )
-from .helpers.dispatcher import async_dispatcher_send
+from .helpers.dispatcher import async_dispatcher_send_internal
 from .helpers.storage import get_internal_store_manager
-from .helpers.system_info import async_get_system_info
+from .helpers.system_info import async_get_system_info, is_official_image
 from .helpers.typing import ConfigType
 from .setup import (
-    BASE_PLATFORMS,
-    DATA_SETUP_STARTED,
+    # _setup_started is marked as protected to make it clear
+    # that it is not part of the public API and should not be used
+    # by integrations. It is only used for internal tracking of
+    # which integrations are being set up.
+    _setup_started,
     async_get_setup_timings,
     async_notify_setup_error,
     async_set_domains_to_be_loaded,
     async_setup_component,
 )
 from .util.async_ import create_eager_task
+from .util.hass_dict import HassKey
 from .util.logging import async_activate_log_queue_handler
-from .util.package import async_get_user_site, is_virtual_env
+from .util.package import async_get_user_site, is_docker_env, is_virtual_env
 
 with contextlib.suppress(ImportError):
     # Ensure anyio backend is imported to avoid it being imported in the event loop
@@ -116,7 +122,7 @@ SETUP_ORDER_SORT_KEY = partial(contains, BASE_PLATFORMS)
 ERROR_LOG_FILENAME = "home-assistant.log"
 
 # hass.data key for logging information.
-DATA_REGISTRIES_LOADED = "bootstrap_registries_loaded"
+DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
 
 LOG_SLOW_STARTUP_INTERVAL = 60
 SLOW_STARTUP_CHECK_INTERVAL = 1
@@ -128,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
@@ -208,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.
@@ -243,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,
-    )
+    async 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
+        await 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 = await 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"
@@ -270,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
@@ -296,27 +325,28 @@ async def async_setup_hass(
 
     if config_dict is None:
         recovery_mode = True
+        await stop_hass(hass)
+        hass = await 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 = await 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 = await create_hass()
+
         if old_logging:
             hass.data[DATA_LOGGING] = old_logging
         hass.config.debug = old_config.debug
@@ -366,23 +396,28 @@ def open_hass_ui(hass: core.HomeAssistant) -> None:
         )
 
 
+def _init_blocking_io_modules_in_executor() -> None:
+    """Initialize modules that do blocking I/O in executor."""
+    # Cache the result of platform.uname().processor in the executor.
+    # Multiple modules call this function at startup which
+    # executes a blocking subprocess call. This is a problem for the
+    # asyncio event loop. By priming the cache of uname we can
+    # avoid the blocking call in the event loop.
+    _ = platform.uname().processor
+    # Initialize the mimetypes module to avoid blocking calls
+    # to the filesystem to load the mime.types file.
+    mimetypes.init()
+    # Initialize is_official_image and is_docker_env to avoid blocking calls
+    # to the filesystem.
+    is_official_image()
+    is_docker_env()
+
+
 async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
-    """Load the registries and cache the result of platform.uname().processor."""
+    """Load the registries and modules that will do blocking I/O."""
     if DATA_REGISTRIES_LOADED in hass.data:
         return
     hass.data[DATA_REGISTRIES_LOADED] = None
-
-    def _cache_uname_processor() -> None:
-        """Cache the result of platform.uname().processor in the executor.
-
-        Multiple modules call this function at startup which
-        executes a blocking subprocess call. This is a problem for the
-        asyncio event loop. By primeing the cache of uname we can
-        avoid the blocking call in the event loop.
-        """
-        _ = platform.uname().processor
-
-    # Load the registries and cache the result of platform.uname().processor
     translation.async_setup(hass)
     entity.async_setup(hass)
     template.async_setup(hass)
@@ -395,7 +430,7 @@ async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
         create_eager_task(floor_registry.async_load(hass)),
         create_eager_task(issue_registry.async_load(hass)),
         create_eager_task(label_registry.async_load(hass)),
-        hass.async_add_executor_job(_cache_uname_processor),
+        hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
         create_eager_task(template.async_load_custom_templates(hass)),
         create_eager_task(restore_state.async_load(hass)),
         create_eager_task(hass.config_entries.async_initialize()),
@@ -414,6 +449,9 @@ async def async_from_config_dict(
     start = monotonic()
 
     hass.config_entries = config_entries.ConfigEntries(hass, config)
+    # Prime custom component cache early so we know if registry entries are tied
+    # to a custom integration
+    await loader.async_get_custom_components(hass)
     await async_load_base_functionality(hass)
 
     # Set up core.
@@ -422,7 +460,11 @@ async def async_from_config_dict(
     if not all(
         await asyncio.gather(
             *(
-                create_eager_task(async_setup_component(hass, domain, config))
+                create_eager_task(
+                    async_setup_component(hass, domain, config),
+                    name=f"bootstrap setup {domain}",
+                    loop=hass.loop,
+                )
                 for domain in CORE_INTEGRATIONS
             )
         )
@@ -485,8 +527,7 @@ async def async_from_config_dict(
     return hass
 
 
-@core.callback
-def async_enable_logging(
+async def async_enable_logging(
     hass: core.HomeAssistant,
     verbose: bool = False,
     log_rotate_days: int | None = None,
@@ -569,23 +610,9 @@ def async_enable_logging(
     if (err_path_exists and os.access(err_log_path, os.W_OK)) or (
         not err_path_exists and os.access(err_dir, os.W_OK)
     ):
-        err_handler: (
-            logging.handlers.RotatingFileHandler
-            | logging.handlers.TimedRotatingFileHandler
+        err_handler = await hass.async_add_executor_job(
+            _create_log_file, err_log_path, log_rotate_days
         )
-        if log_rotate_days:
-            err_handler = logging.handlers.TimedRotatingFileHandler(
-                err_log_path, when="midnight", backupCount=log_rotate_days
-            )
-        else:
-            err_handler = _RotatingFileHandlerWithoutShouldRollOver(
-                err_log_path, backupCount=1
-            )
-
-        try:
-            err_handler.doRollover()
-        except OSError as err:
-            _LOGGER.error("Error rolling over log file: %s", err)
 
         err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
         err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
@@ -602,7 +629,29 @@ def async_enable_logging(
     async_activate_log_queue_handler(hass)
 
 
-class _RotatingFileHandlerWithoutShouldRollOver(logging.handlers.RotatingFileHandler):
+def _create_log_file(
+    err_log_path: str, log_rotate_days: int | None
+) -> RotatingFileHandler | TimedRotatingFileHandler:
+    """Create log file and do roll over."""
+    err_handler: RotatingFileHandler | TimedRotatingFileHandler
+    if log_rotate_days:
+        err_handler = TimedRotatingFileHandler(
+            err_log_path, when="midnight", backupCount=log_rotate_days
+        )
+    else:
+        err_handler = _RotatingFileHandlerWithoutShouldRollOver(
+            err_log_path, backupCount=1
+        )
+
+    try:
+        err_handler.doRollover()
+    except OSError as err:
+        _LOGGER.error("Error rolling over log file: %s", err)
+
+    return err_handler
+
+
+class _RotatingFileHandlerWithoutShouldRollOver(RotatingFileHandler):
     """RotatingFileHandler that does not check if it should roll over on every log."""
 
     def shouldRollover(self, record: logging.LogRecord) -> bool:
@@ -676,7 +725,7 @@ class _WatchPendingSetups:
 
         if remaining_with_setup_started:
             _LOGGER.debug("Integration remaining: %s", remaining_with_setup_started)
-        elif waiting_tasks := self._hass._active_tasks:  # pylint: disable=protected-access
+        elif waiting_tasks := self._hass._active_tasks:  # noqa: SLF001
             _LOGGER.debug("Waiting on tasks: %s", waiting_tasks)
         self._async_dispatch(remaining_with_setup_started)
         if (
@@ -696,7 +745,7 @@ class _WatchPendingSetups:
     def _async_dispatch(self, remaining_with_setup_started: dict[str, float]) -> None:
         """Dispatch the signal."""
         if remaining_with_setup_started or not self._previous_was_empty:
-            async_dispatcher_send(
+            async_dispatcher_send_internal(
                 self._hass, SIGNAL_BOOTSTRAP_INTEGRATIONS, remaining_with_setup_started
             )
         self._previous_was_empty = not remaining_with_setup_started
@@ -913,9 +962,7 @@ async def _async_set_up_integrations(
     hass: core.HomeAssistant, config: dict[str, Any]
 ) -> None:
     """Set up all the integrations."""
-    setup_started: dict[tuple[str, str | None], float] = {}
-    hass.data[DATA_SETUP_STARTED] = setup_started
-    watcher = _WatchPendingSetups(hass, setup_started)
+    watcher = _WatchPendingSetups(hass, _setup_started(hass))
     watcher.async_start()
 
     domains_to_setup, integration_cache = await _async_resolve_domains_to_setup(
@@ -982,7 +1029,7 @@ async def _async_set_up_integrations(
         except TimeoutError:
             _LOGGER.warning(
                 "Setup timed out for stage 1 waiting on %s - moving forward",
-                hass._active_tasks,  # pylint: disable=protected-access
+                hass._active_tasks,  # noqa: SLF001
             )
 
     # Add after dependencies when setting up stage 2 domains
@@ -998,7 +1045,7 @@ async def _async_set_up_integrations(
         except TimeoutError:
             _LOGGER.warning(
                 "Setup timed out for stage 2 waiting on %s - moving forward",
-                hass._active_tasks,  # pylint: disable=protected-access
+                hass._active_tasks,  # noqa: SLF001
             )
 
     # Wrap up startup
@@ -1009,7 +1056,7 @@ async def _async_set_up_integrations(
     except TimeoutError:
         _LOGGER.warning(
             "Setup timed out for bootstrap waiting on %s - moving forward",
-            hass._active_tasks,  # pylint: disable=protected-access
+            hass._active_tasks,  # noqa: SLF001
         )
 
     watcher.async_stop()

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/__init__.py

@@ -5,9 +5,7 @@ from __future__ import annotations
 from dataclasses import dataclass, field
 from functools import partial
 
-from jaraco.abode.automation import Automation as AbodeAuto
 from jaraco.abode.client import Client as Abode
-from jaraco.abode.devices.base import Device as AbodeDev
 from jaraco.abode.exceptions import (
     AuthenticationException as AbodeAuthenticationException,
     Exception as AbodeException,
@@ -29,11 +27,11 @@ from homeassistant.const import (
 )
 from homeassistant.core import CALLBACK_TYPE, Event, HomeAssistant, ServiceCall
 from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv, entity
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.dispatcher import dispatcher_send
+from homeassistant.helpers.typing import ConfigType
 
-from .const import ATTRIBUTION, CONF_POLLING, DOMAIN, LOGGER
+from .const import CONF_POLLING, DOMAIN, LOGGER
 
 SERVICE_SETTINGS = "change_setting"
 SERVICE_CAPTURE_IMAGE = "capture_image"
@@ -83,6 +81,12 @@ class AbodeSystem:
     logout_listener: CALLBACK_TYPE | None = None
 
 
+async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
+    """Set up the Abode component."""
+    setup_hass_services(hass)
+    return True
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Abode integration from a config entry."""
     username = entry.data[CONF_USERNAME]
@@ -111,7 +115,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
     await setup_hass_events(hass)
-    await hass.async_add_executor_job(setup_hass_services, hass)
     await hass.async_add_executor_job(setup_abode_events, hass)
 
     return True
@@ -119,10 +122,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    hass.services.async_remove(DOMAIN, SERVICE_SETTINGS)
-    hass.services.async_remove(DOMAIN, SERVICE_CAPTURE_IMAGE)
-    hass.services.async_remove(DOMAIN, SERVICE_TRIGGER_AUTOMATION)
-
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
     await hass.async_add_executor_job(hass.data[DOMAIN].abode.events.stop)
@@ -175,15 +174,15 @@ def setup_hass_services(hass: HomeAssistant) -> None:
             signal = f"abode_trigger_automation_{entity_id}"
             dispatcher_send(hass, signal)
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_SETTINGS, change_setting, schema=CHANGE_SETTING_SCHEMA
     )
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image, schema=CAPTURE_IMAGE_SCHEMA
     )
 
-    hass.services.register(
+    hass.services.async_register(
         DOMAIN, SERVICE_TRIGGER_AUTOMATION, trigger_automation, schema=AUTOMATION_SCHEMA
     )
 
@@ -247,108 +246,3 @@ def setup_abode_events(hass: HomeAssistant) -> None:
         hass.data[DOMAIN].abode.events.add_event_callback(
             event, partial(event_callback, event)
         )
-
-
-class AbodeEntity(entity.Entity):
-    """Representation of an Abode entity."""
-
-    _attr_attribution = ATTRIBUTION
-    _attr_has_entity_name = True
-
-    def __init__(self, data: AbodeSystem) -> None:
-        """Initialize Abode entity."""
-        self._data = data
-        self._attr_should_poll = data.polling
-
-    async def async_added_to_hass(self) -> None:
-        """Subscribe to Abode connection status updates."""
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.add_connection_status_callback,
-            self.unique_id,
-            self._update_connection_status,
-        )
-
-        self.hass.data[DOMAIN].entity_ids.add(self.entity_id)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Unsubscribe from Abode connection status updates."""
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.remove_connection_status_callback, self.unique_id
-        )
-
-    def _update_connection_status(self) -> None:
-        """Update the entity available property."""
-        self._attr_available = self._data.abode.events.connected
-        self.schedule_update_ha_state()
-
-
-class AbodeDevice(AbodeEntity):
-    """Representation of an Abode device."""
-
-    def __init__(self, data: AbodeSystem, device: AbodeDev) -> None:
-        """Initialize Abode device."""
-        super().__init__(data)
-        self._device = device
-        self._attr_unique_id = device.uuid
-
-    async def async_added_to_hass(self) -> None:
-        """Subscribe to device events."""
-        await super().async_added_to_hass()
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.add_device_callback,
-            self._device.id,
-            self._update_callback,
-        )
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Unsubscribe from device events."""
-        await super().async_will_remove_from_hass()
-        await self.hass.async_add_executor_job(
-            self._data.abode.events.remove_all_device_callbacks, self._device.id
-        )
-
-    def update(self) -> None:
-        """Update device state."""
-        self._device.refresh()
-
-    @property
-    def extra_state_attributes(self) -> dict[str, str]:
-        """Return the state attributes."""
-        return {
-            "device_id": self._device.id,
-            "battery_low": self._device.battery_low,
-            "no_response": self._device.no_response,
-            "device_type": self._device.type,
-        }
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device registry information for this entity."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self._device.id)},
-            manufacturer="Abode",
-            model=self._device.type,
-            name=self._device.name,
-        )
-
-    def _update_callback(self, device: AbodeDev) -> None:
-        """Update the device state."""
-        self.schedule_update_ha_state()
-
-
-class AbodeAutomation(AbodeEntity):
-    """Representation of an Abode automation."""
-
-    def __init__(self, data: AbodeSystem, automation: AbodeAuto) -> None:
-        """Initialize for Abode automation."""
-        super().__init__(data)
-        self._automation = automation
-        self._attr_name = automation.name
-        self._attr_unique_id = automation.automation_id
-        self._attr_extra_state_attributes = {
-            "type": "CUE automation",
-        }
-
-    def update(self) -> None:
-        """Update automation state."""
-        self._automation.refresh()

homeassistant/components/abode/alarm_control_panel.py

@@ -17,8 +17,9 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(

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,
@@ -22,8 +15,9 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -33,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
 
@@ -19,8 +18,9 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import Throttle
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN, LOGGER
+from .entity import AbodeDevice
 
 MIN_TIME_BETWEEN_UPDATES = timedelta(seconds=90)
 
@@ -33,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,15 +3,15 @@
 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
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -22,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

@@ -0,0 +1,115 @@
+"""Support for Abode Security System entities."""
+
+from jaraco.abode.automation import Automation as AbodeAuto
+from jaraco.abode.devices.base import Device as AbodeDev
+
+from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.entity import Entity
+
+from . import AbodeSystem
+from .const import ATTRIBUTION, DOMAIN
+
+
+class AbodeEntity(Entity):
+    """Representation of an Abode entity."""
+
+    _attr_attribution = ATTRIBUTION
+    _attr_has_entity_name = True
+
+    def __init__(self, data: AbodeSystem) -> None:
+        """Initialize Abode entity."""
+        self._data = data
+        self._attr_should_poll = data.polling
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to Abode connection status updates."""
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.add_connection_status_callback,
+            self.unique_id,
+            self._update_connection_status,
+        )
+
+        self.hass.data[DOMAIN].entity_ids.add(self.entity_id)
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe from Abode connection status updates."""
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.remove_connection_status_callback, self.unique_id
+        )
+
+    def _update_connection_status(self) -> None:
+        """Update the entity available property."""
+        self._attr_available = self._data.abode.events.connected
+        self.schedule_update_ha_state()
+
+
+class AbodeDevice(AbodeEntity):
+    """Representation of an Abode device."""
+
+    def __init__(self, data: AbodeSystem, device: AbodeDev) -> None:
+        """Initialize Abode device."""
+        super().__init__(data)
+        self._device = device
+        self._attr_unique_id = device.uuid
+
+    async def async_added_to_hass(self) -> None:
+        """Subscribe to device events."""
+        await super().async_added_to_hass()
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.add_device_callback,
+            self._device.id,
+            self._update_callback,
+        )
+
+    async def async_will_remove_from_hass(self) -> None:
+        """Unsubscribe from device events."""
+        await super().async_will_remove_from_hass()
+        await self.hass.async_add_executor_job(
+            self._data.abode.events.remove_all_device_callbacks, self._device.id
+        )
+
+    def update(self) -> None:
+        """Update device state."""
+        self._device.refresh()
+
+    @property
+    def extra_state_attributes(self) -> dict[str, str]:
+        """Return the state attributes."""
+        return {
+            "device_id": self._device.id,
+            "battery_low": self._device.battery_low,
+            "no_response": self._device.no_response,
+            "device_type": self._device.type,
+        }
+
+    @property
+    def device_info(self) -> DeviceInfo:
+        """Return device registry information for this entity."""
+        return DeviceInfo(
+            identifiers={(DOMAIN, self._device.id)},
+            manufacturer="Abode",
+            model=self._device.type,
+            name=self._device.name,
+        )
+
+    def _update_callback(self, device: AbodeDev) -> None:
+        """Update the device state."""
+        self.schedule_update_ha_state()
+
+
+class AbodeAutomation(AbodeEntity):
+    """Representation of an Abode automation."""
+
+    def __init__(self, data: AbodeSystem, automation: AbodeAuto) -> None:
+        """Initialize for Abode automation."""
+        super().__init__(data)
+        self._automation = automation
+        self._attr_name = automation.name
+        self._attr_unique_id = automation.id
+        self._attr_extra_state_attributes = {
+            "type": "CUE automation",
+        }
+
+    def update(self) -> None:
+        """Update automation state."""
+        self._automation.refresh()

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,
@@ -23,8 +22,9 @@ from homeassistant.util.color import (
     color_temperature_mired_to_kelvin,
 )
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -35,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,15 +3,15 @@
 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
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 from .const import DOMAIN
+from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -22,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.2.1"]
 }

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,
@@ -27,12 +18,13 @@ from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeDevice, AbodeSystem
+from . import AbodeSystem
 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,
 }
 
 
@@ -46,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
@@ -54,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),
@@ -77,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
@@ -13,10 +12,11 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeAutomation, AbodeDevice, AbodeSystem
+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(
@@ -88,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/__init__.py

@@ -33,7 +33,10 @@ class AccuWeatherData:
     coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+type AccuWeatherConfigEntry = ConfigEntry[AccuWeatherData]
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry) -> bool:
     """Set up AccuWeather as config entry."""
     api_key: str = entry.data[CONF_API_KEY]
     name: str = entry.data[CONF_NAME]
@@ -64,9 +67,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     await coordinator_observation.async_config_entry_first_refresh()
     await coordinator_daily_forecast.async_config_entry_first_refresh()
 
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = AccuWeatherData(
+    entry.runtime_data = AccuWeatherData(
         coordinator_observation=coordinator_observation,
         coordinator_daily_forecast=coordinator_daily_forecast,
     )
@@ -84,16 +85,8 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, entry: AccuWeatherConfigEntry
+) -> 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
-
-
-async def update_listener(hass: HomeAssistant, entry: ConfigEntry) -> None:
-    """Update listener."""
-    await hass.config_entries.async_reload(entry.entry_id)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/accuweather/diagnostics.py

@@ -5,21 +5,19 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE
 from homeassistant.core import HomeAssistant
 
-from . import AccuWeatherData
-from .const import DOMAIN
+from . import AccuWeatherConfigEntry, AccuWeatherData
 
 TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AccuWeatherConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    accuweather_data: AccuWeatherData = hass.data[DOMAIN][config_entry.entry_id]
+    accuweather_data: AccuWeatherData = config_entry.runtime_data
 
     return {
         "config_entry_data": async_redact_data(dict(config_entry.data), TO_REDACT),

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

@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_CUBIC_METER,
     PERCENTAGE,
@@ -28,7 +27,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AccuWeatherData
+from . import AccuWeatherConfigEntry
 from .const import (
     API_METRIC,
     ATTR_CATEGORY,
@@ -38,7 +37,6 @@ from .const import (
     ATTR_SPEED,
     ATTR_VALUE,
     ATTRIBUTION,
-    DOMAIN,
     MAX_FORECAST_DAYS,
 )
 from .coordinator import (
@@ -57,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",
     ),
 )
 
@@ -351,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]),
@@ -360,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,
@@ -405,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),
@@ -458,17 +342,16 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AccuWeatherConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add AccuWeather entities from a config_entry."""
-
-    accuweather_data: AccuWeatherData = hass.data[DOMAIN][entry.entry_id]
-
     observation_coordinator: AccuWeatherObservationDataUpdateCoordinator = (
-        accuweather_data.coordinator_observation
+        entry.runtime_data.coordinator_observation
     )
     forecast_daily_coordinator: AccuWeatherDailyForecastDataUpdateCoordinator = (
-        accuweather_data.coordinator_daily_forecast
+        entry.runtime_data.coordinator_daily_forecast
     )
 
     sensors: list[AccuWeatherSensor | AccuWeatherForecastSensor] = [
@@ -478,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]
         ]
     )
 
@@ -546,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/system_health.py

@@ -9,6 +9,7 @@ from accuweather.const import ENDPOINT
 from homeassistant.components import system_health
 from homeassistant.core import HomeAssistant, callback
 
+from . import AccuWeatherConfigEntry
 from .const import DOMAIN
 
 
@@ -22,9 +23,11 @@ def async_register(
 
 async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     """Get info for the info page."""
-    remaining_requests = list(hass.data[DOMAIN].values())[
-        0
-    ].coordinator_observation.accuweather.requests_remaining
+    config_entry: AccuWeatherConfigEntry = hass.config_entries.async_entries(DOMAIN)[0]
+
+    remaining_requests = (
+        config_entry.runtime_data.coordinator_observation.accuweather.requests_remaining
+    )
 
     return {
         "can_reach_server": system_health.async_check_can_reach_url(hass, ENDPOINT),

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,
@@ -21,7 +22,6 @@ from homeassistant.components.weather import (
     Forecast,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfLength,
     UnitOfPrecipitationDepth,
@@ -31,10 +31,9 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import TimestampDataUpdateCoordinator
 from homeassistant.util.dt import utc_from_timestamp
 
-from . import AccuWeatherData
+from . import AccuWeatherConfigEntry, AccuWeatherData
 from .const import (
     API_METRIC,
     ATTR_DIRECTION,
@@ -42,7 +41,6 @@ from .const import (
     ATTR_VALUE,
     ATTRIBUTION,
     CONDITION_MAP,
-    DOMAIN,
 )
 from .coordinator import (
     AccuWeatherDailyForecastDataUpdateCoordinator,
@@ -53,20 +51,18 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
+    hass: HomeAssistant,
+    entry: AccuWeatherConfigEntry,
+    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add a AccuWeather weather entity from a config_entry."""
-    accuweather_data: AccuWeatherData = hass.data[DOMAIN][entry.entry_id]
-
-    async_add_entities([AccuWeatherEntity(accuweather_data)])
+    async_add_entities([AccuWeatherEntity(entry.runtime_data)])
 
 
 class AccuWeatherEntity(
     CoordinatorWeatherEntity[
         AccuWeatherObservationDataUpdateCoordinator,
         AccuWeatherDailyForecastDataUpdateCoordinator,
-        TimestampDataUpdateCoordinator,
-        TimestampDataUpdateCoordinator,
     ]
 ):
     """Define an AccuWeather entity."""
@@ -188,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/acmeda/__init__.py

@@ -4,30 +4,35 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN
 from .hub import PulseHub
 
 CONF_HUBS = "hubs"
 
 PLATFORMS = [Platform.COVER, Platform.SENSOR]
 
+type AcmedaConfigEntry = ConfigEntry[PulseHub]
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: AcmedaConfigEntry
+) -> bool:
     """Set up Rollease Acmeda Automate hub from a config entry."""
     hub = PulseHub(hass, config_entry)
 
     if not await hub.async_setup():
         return False
 
-    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = hub
+    config_entry.runtime_data = hub
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: AcmedaConfigEntry
+) -> bool:
     """Unload a config entry."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     unload_ok = await hass.config_entries.async_unload_platforms(
         config_entry, PLATFORMS
@@ -36,7 +41,4 @@ async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) ->
     if not await hub.async_reset():
         return False
 
-    if unload_ok:
-        hass.data[DOMAIN].pop(config_entry.entry_id)
-
     return unload_ok

homeassistant/components/acmeda/cover.py

@@ -9,24 +9,23 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AcmedaConfigEntry
 from .base import AcmedaBase
-from .const import ACMEDA_HUB_UPDATE, DOMAIN
+from .const import ACMEDA_HUB_UPDATE
 from .helpers import async_add_acmeda_entities
-from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     current: set[int] = set()
 

homeassistant/components/acmeda/helpers.py

@@ -2,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import TYPE_CHECKING
+
 from aiopulse import Roller
 
 from homeassistant.config_entries import ConfigEntry
@@ -11,17 +13,20 @@ from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
 from .const import DOMAIN, LOGGER
 
+if TYPE_CHECKING:
+    from . import AcmedaConfigEntry
+
 
 @callback
 def async_add_acmeda_entities(
     hass: HomeAssistant,
     entity_class: type,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     current: set[int],
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add any new entities."""
-    hub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
     LOGGER.debug("Looking for new %s on: %s", entity_class.__name__, hub.host)
 
     api = hub.api.rollers

homeassistant/components/acmeda/sensor.py

@@ -3,25 +3,24 @@
 from __future__ import annotations
 
 from homeassistant.components.sensor import SensorDeviceClass, SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AcmedaConfigEntry
 from .base import AcmedaBase
-from .const import ACMEDA_HUB_UPDATE, DOMAIN
+from .const import ACMEDA_HUB_UPDATE
 from .helpers import async_add_acmeda_entities
-from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AcmedaConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
+    hub = config_entry.runtime_data
 
     current: set[int] = set()
 

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/adguard/__init__.py

@@ -7,7 +7,7 @@ from dataclasses import dataclass
 from adguardhome import AdGuardHome, AdGuardHomeConnectionError
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigEntry
+from homeassistant.config_entries import ConfigEntry, ConfigEntryState
 from homeassistant.const import (
     CONF_HOST,
     CONF_NAME,
@@ -43,6 +43,7 @@ SERVICE_REFRESH_SCHEMA = vol.Schema(
 )
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
+type AdGuardConfigEntry = ConfigEntry[AdGuardData]
 
 
 @dataclass
@@ -53,7 +54,7 @@ class AdGuardData:
     version: str
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
     """Set up AdGuard Home from a config entry."""
     session = async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL])
     adguard = AdGuardHome(
@@ -71,7 +72,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except AdGuardHomeConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
-    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = AdGuardData(adguard, version)
+    entry.runtime_data = AdGuardData(adguard, version)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -116,17 +117,20 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
     """Unload AdGuard Home config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-    if not hass.data[DOMAIN]:
+    loaded_entries = [
+        entry
+        for entry in hass.config_entries.async_entries(DOMAIN)
+        if entry.state == ConfigEntryState.LOADED
+    ]
+    if len(loaded_entries) == 1:
+        # This is the last loaded instance of AdGuard, deregister any services
         hass.services.async_remove(DOMAIN, SERVICE_ADD_URL)
         hass.services.async_remove(DOMAIN, SERVICE_REMOVE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_ENABLE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_DISABLE_URL)
         hass.services.async_remove(DOMAIN, SERVICE_REFRESH)
-        del hass.data[DOMAIN]
 
     return unload_ok

homeassistant/components/adguard/entity.py

@@ -4,11 +4,11 @@ from __future__ import annotations
 
 from adguardhome import AdGuardHomeError
 
-from homeassistant.config_entries import SOURCE_HASSIO, ConfigEntry
+from homeassistant.config_entries import SOURCE_HASSIO
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.entity import Entity
 
-from . import AdGuardData
+from . import AdGuardConfigEntry, AdGuardData
 from .const import DOMAIN, LOGGER
 
 
@@ -21,7 +21,7 @@ class AdGuardHomeEntity(Entity):
     def __init__(
         self,
         data: AdGuardData,
-        entry: ConfigEntry,
+        entry: AdGuardConfigEntry,
     ) -> None:
         """Initialize the AdGuard Home entity."""
         self._entry = entry

homeassistant/components/adguard/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "local_polling",
   "loggers": ["adguardhome"],
-  "requirements": ["adguardhome==0.6.3"]
+  "requirements": ["adguardhome==0.7.0"]
 }

homeassistant/components/adguard/sensor.py

@@ -10,12 +10,11 @@ from typing import Any
 from adguardhome import AdGuardHome
 
 from homeassistant.components.sensor import SensorEntity, SensorEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, UnitOfTime
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AdGuardData
+from . import AdGuardConfigEntry, AdGuardData
 from .const import DOMAIN
 from .entity import AdGuardHomeEntity
 
@@ -85,11 +84,11 @@ SENSORS: tuple[AdGuardHomeEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: AdGuardConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdGuard Home sensor based on a config entry."""
-    data: AdGuardData = hass.data[DOMAIN][entry.entry_id]
+    data = entry.runtime_data
 
     async_add_entities(
         [AdGuardHomeSensor(data, entry, description) for description in SENSORS],
@@ -105,7 +104,7 @@ class AdGuardHomeSensor(AdGuardHomeEntity, SensorEntity):
     def __init__(
         self,
         data: AdGuardData,
-        entry: ConfigEntry,
+        entry: AdGuardConfigEntry,
         description: AdGuardHomeEntityDescription,
     ) -> None:
         """Initialize AdGuard Home sensor."""

homeassistant/components/adguard/switch.py

@@ -10,11 +10,10 @@ from typing import Any
 from adguardhome import AdGuardHome, AdGuardHomeError
 
 from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AdGuardData
+from . import AdGuardConfigEntry, AdGuardData
 from .const import DOMAIN, LOGGER
 from .entity import AdGuardHomeEntity
 
@@ -79,11 +78,11 @@ SWITCHES: tuple[AdGuardHomeSwitchEntityDescription, ...] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: ConfigEntry,
+    entry: AdGuardConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdGuard Home switch based on a config entry."""
-    data: AdGuardData = hass.data[DOMAIN][entry.entry_id]
+    data = entry.runtime_data
 
     async_add_entities(
         [AdGuardHomeSwitch(data, entry, description) for description in SWITCHES],
@@ -99,7 +98,7 @@ class AdGuardHomeSwitch(AdGuardHomeEntity, SwitchEntity):
     def __init__(
         self,
         data: AdGuardData,
-        entry: ConfigEntry,
+        entry: AdGuardConfigEntry,
         description: AdGuardHomeSwitchEntityDescription,
     ) -> None:
         """Initialize AdGuard Home switch."""

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/manifest.json

@@ -5,5 +5,5 @@
   "documentation": "https://www.home-assistant.io/integrations/ads",
   "iot_class": "local_push",
   "loggers": ["pyads"],
-  "requirements": ["pyads==3.2.2"]
+  "requirements": ["pyads==3.4.0"]
 }

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/advantage_air/__init__.py

@@ -12,9 +12,11 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .const import ADVANTAGE_AIR_RETRY, DOMAIN
+from .const import ADVANTAGE_AIR_RETRY
 from .models import AdvantageAirData
 
+type AdvantageAirDataConfigEntry = ConfigEntry[AdvantageAirData]
+
 ADVANTAGE_AIR_SYNC_INTERVAL = 15
 PLATFORMS = [
     Platform.BINARY_SENSOR,
@@ -31,7 +33,9 @@ _LOGGER = logging.getLogger(__name__)
 REQUEST_REFRESH_DELAY = 0.5
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+async def async_setup_entry(
+    hass: HomeAssistant, entry: AdvantageAirDataConfigEntry
+) -> bool:
     """Set up Advantage Air config."""
     ip_address = entry.data[CONF_IP_ADDRESS]
     port = entry.data[CONF_PORT]
@@ -61,19 +65,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
     await coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = AdvantageAirData(coordinator, api)
+    entry.runtime_data = AdvantageAirData(coordinator, api)
 
     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: AdvantageAirDataConfigEntry
+) -> bool:
     """Unload Advantage Air Config."""
-    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/advantage_air/binary_sensor.py

@@ -6,12 +6,11 @@ from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
     BinarySensorEntity,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import EntityCategory
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from . import AdvantageAirDataConfigEntry
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 from .models import AdvantageAirData
 
@@ -20,12 +19,12 @@ PARALLEL_UPDATES = 0
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir Binary Sensor platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[BinarySensorEntity] = []
     if aircons := instance.coordinator.data.get("aircons"):

homeassistant/components/advantage_air/climate.py

@@ -16,19 +16,18 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import ATTR_TEMPERATURE, PRECISION_WHOLE, UnitOfTemperature
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ServiceValidationError
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AdvantageAirDataConfigEntry
 from .const import (
     ADVANTAGE_AIR_AUTOFAN_ENABLED,
     ADVANTAGE_AIR_STATE_CLOSE,
     ADVANTAGE_AIR_STATE_OFF,
     ADVANTAGE_AIR_STATE_ON,
     ADVANTAGE_AIR_STATE_OPEN,
-    DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 from .models import AdvantageAirData
@@ -76,12 +75,12 @@ _LOGGER = logging.getLogger(__name__)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir climate platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[ClimateEntity] = []
     if aircons := instance.coordinator.data.get("aircons"):

homeassistant/components/advantage_air/cover.py

@@ -8,15 +8,11 @@ from homeassistant.components.cover import (
     CoverEntity,
     CoverEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import (
-    ADVANTAGE_AIR_STATE_CLOSE,
-    ADVANTAGE_AIR_STATE_OPEN,
-    DOMAIN as ADVANTAGE_AIR_DOMAIN,
-)
+from . import AdvantageAirDataConfigEntry
+from .const import ADVANTAGE_AIR_STATE_CLOSE, ADVANTAGE_AIR_STATE_OPEN
 from .entity import AdvantageAirThingEntity, AdvantageAirZoneEntity
 from .models import AdvantageAirData
 
@@ -25,12 +21,12 @@ PARALLEL_UPDATES = 0
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir cover platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[CoverEntity] = []
     if aircons := instance.coordinator.data.get("aircons"):

homeassistant/components/advantage_air/diagnostics.py

@@ -5,10 +5,9 @@ from __future__ import annotations
 from typing import Any
 
 from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from . import AdvantageAirDataConfigEntry
 
 TO_REDACT = [
     "dealerPhoneNumber",
@@ -25,10 +24,10 @@ TO_REDACT = [
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AdvantageAirDataConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id].coordinator.data
+    data = config_entry.runtime_data.coordinator.data
 
     # Return only the relevant children
     return {

homeassistant/components/advantage_air/light.py

@@ -3,11 +3,11 @@
 from typing import Any
 
 from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity, AdvantageAirThingEntity
 from .models import AdvantageAirData
@@ -15,12 +15,12 @@ from .models import AdvantageAirData
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir light platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[LightEntity] = []
     if my_lights := instance.coordinator.data.get("myLights"):

homeassistant/components/advantage_air/select.py

@@ -1,11 +1,10 @@
 """Select platform for Advantage Air integration."""
 
 from homeassistant.components.select import SelectEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
+from . import AdvantageAirDataConfigEntry
 from .entity import AdvantageAirAcEntity
 from .models import AdvantageAirData
 
@@ -14,12 +13,12 @@ ADVANTAGE_AIR_INACTIVE = "Inactive"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir select platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     if aircons := instance.coordinator.data.get("aircons"):
         async_add_entities(AdvantageAirMyZone(instance, ac_key) for ac_key in aircons)

homeassistant/components/advantage_air/sensor.py

@@ -12,13 +12,13 @@ from homeassistant.components.sensor import (
     SensorEntity,
     SensorStateClass,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import PERCENTAGE, EntityCategory, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv, entity_platform
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import ADVANTAGE_AIR_STATE_OPEN, DOMAIN as ADVANTAGE_AIR_DOMAIN
+from . import AdvantageAirDataConfigEntry
+from .const import ADVANTAGE_AIR_STATE_OPEN
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
 from .models import AdvantageAirData
 
@@ -31,12 +31,12 @@ PARALLEL_UPDATES = 0
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir sensor platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[SensorEntity] = []
     if aircons := instance.coordinator.data.get("aircons"):

homeassistant/components/advantage_air/switch.py

@@ -3,15 +3,14 @@
 from typing import Any
 
 from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AdvantageAirDataConfigEntry
 from .const import (
     ADVANTAGE_AIR_AUTOFAN_ENABLED,
     ADVANTAGE_AIR_STATE_OFF,
     ADVANTAGE_AIR_STATE_ON,
-    DOMAIN as ADVANTAGE_AIR_DOMAIN,
 )
 from .entity import AdvantageAirAcEntity, AdvantageAirThingEntity
 from .models import AdvantageAirData
@@ -19,12 +18,12 @@ from .models import AdvantageAirData
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir switch platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     entities: list[SwitchEntity] = []
     if aircons := instance.coordinator.data.get("aircons"):

homeassistant/components/advantage_air/update.py

@@ -1,11 +1,11 @@
 """Advantage Air Update platform."""
 
 from homeassistant.components.update import UpdateEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
+from . import AdvantageAirDataConfigEntry
 from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity
 from .models import AdvantageAirData
@@ -13,12 +13,12 @@ from .models import AdvantageAirData
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AdvantageAirDataConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AdvantageAir update platform."""
 
-    instance: AdvantageAirData = hass.data[ADVANTAGE_AIR_DOMAIN][config_entry.entry_id]
+    instance = config_entry.runtime_data
 
     async_add_entities([AdvantageAirApp(instance)])
 

homeassistant/components/aemet/__init__.py

@@ -1,5 +1,6 @@
 """The AEMET OpenData component."""
 
+from dataclasses import dataclass
 import logging
 
 from aemet_opendata.exceptions import AemetError, TownNotFound
@@ -11,19 +12,23 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import aiohttp_client
 
-from .const import (
-    CONF_STATION_UPDATES,
-    DOMAIN,
-    ENTRY_NAME,
-    ENTRY_WEATHER_COORDINATOR,
-    PLATFORMS,
-)
+from .const import CONF_STATION_UPDATES, PLATFORMS
 from .coordinator import WeatherUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 
+type AemetConfigEntry = ConfigEntry[AemetData]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+@dataclass
+class AemetData:
+    """Aemet runtime data."""
+
+    name: str
+    coordinator: WeatherUpdateCoordinator
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: AemetConfigEntry) -> bool:
     """Set up AEMET OpenData as config entry."""
     name = entry.data[CONF_NAME]
     api_key = entry.data[CONF_API_KEY]
@@ -44,11 +49,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     weather_coordinator = WeatherUpdateCoordinator(hass, aemet)
     await weather_coordinator.async_config_entry_first_refresh()
 
-    hass.data.setdefault(DOMAIN, {})
-    hass.data[DOMAIN][entry.entry_id] = {
-        ENTRY_NAME: name,
-        ENTRY_WEATHER_COORDINATOR: weather_coordinator,
-    }
+    entry.runtime_data = AemetData(name=name, coordinator=weather_coordinator)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -64,9 +65,4 @@ async def async_update_options(hass: HomeAssistant, entry: ConfigEntry) -> None:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-
-    if unload_ok:
-        hass.data[DOMAIN].pop(entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/aemet/const.py

@@ -55,8 +55,6 @@ CONF_STATION_UPDATES = "station_updates"
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 DEFAULT_NAME = "AEMET"
 DOMAIN = "aemet"
-ENTRY_NAME = "name"
-ENTRY_WEATHER_COORDINATOR = "weather_coordinator"
 
 ATTR_API_CONDITION = "condition"
 ATTR_API_FORECAST_CONDITION = "condition"

homeassistant/components/aemet/diagnostics.py

@@ -7,7 +7,6 @@ from typing import Any
 from aemet_opendata.const import AOD_COORDS
 
 from homeassistant.components.diagnostics.util import async_redact_data
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_API_KEY,
     CONF_LATITUDE,
@@ -16,8 +15,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
-from .const import DOMAIN, ENTRY_WEATHER_COORDINATOR
-from .coordinator import WeatherUpdateCoordinator
+from . import AemetConfigEntry
 
 TO_REDACT_CONFIG = [
     CONF_API_KEY,
@@ -32,11 +30,10 @@ TO_REDACT_COORD = [
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: ConfigEntry
+    hass: HomeAssistant, config_entry: AemetConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    aemet_entry = hass.data[DOMAIN][config_entry.entry_id]
-    coordinator: WeatherUpdateCoordinator = aemet_entry[ENTRY_WEATHER_COORDINATOR]
+    coordinator = config_entry.runtime_data.coordinator
 
     return {
         "api_data": coordinator.aemet.raw_data(),

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,
@@ -56,6 +55,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import dt as dt_util
 
+from . import AemetConfigEntry
 from .const import (
     ATTR_API_CONDITION,
     ATTR_API_FORECAST_CONDITION,
@@ -85,11 +85,7 @@ from .const import (
     ATTR_API_WIND_BEARING,
     ATTR_API_WIND_MAX_SPEED,
     ATTR_API_WIND_SPEED,
-    ATTRIBUTION,
     CONDITIONS_MAP,
-    DOMAIN,
-    ENTRY_NAME,
-    ENTRY_WEATHER_COORDINATOR,
 )
 from .coordinator import WeatherUpdateCoordinator
 from .entity import AemetEntity
@@ -360,20 +356,23 @@ WEATHER_SENSORS: Final[tuple[AemetSensorEntityDescription, ...]] = (
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AemetConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AEMET OpenData sensor entities based on a config entry."""
-    domain_data = hass.data[DOMAIN][config_entry.entry_id]
-    name: str = domain_data[ENTRY_NAME]
-    coordinator: WeatherUpdateCoordinator = domain_data[ENTRY_WEATHER_COORDINATOR]
+    domain_data = config_entry.runtime_data
+    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
@@ -383,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__(
@@ -391,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

@@ -18,7 +18,6 @@ from homeassistant.components.weather import (
     SingleCoordinatorWeatherEntity,
     WeatherEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfPrecipitationDepth,
     UnitOfPressure,
@@ -28,34 +27,26 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import (
-    ATTRIBUTION,
-    CONDITIONS_MAP,
-    DOMAIN,
-    ENTRY_NAME,
-    ENTRY_WEATHER_COORDINATOR,
-)
+from . import AemetConfigEntry
+from .const import CONDITIONS_MAP
 from .coordinator import WeatherUpdateCoordinator
 from .entity import AemetEntity
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AemetConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AEMET OpenData weather entity based on a config entry."""
-    domain_data = hass.data[DOMAIN][config_entry.entry_id]
-    weather_coordinator = domain_data[ENTRY_WEATHER_COORDINATOR]
+    domain_data = config_entry.runtime_data
+    name = domain_data.name
+    weather_coordinator = domain_data.coordinator
 
-    async_add_entities(
-        [
-            AemetWeather(
-                domain_data[ENTRY_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(
@@ -64,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
@@ -72,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/aftership/__init__.py

@@ -10,16 +10,14 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN
-
 PLATFORMS: list[Platform] = [Platform.SENSOR]
 
+type AfterShipConfigEntry = ConfigEntry[AfterShip]
 
-async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(hass: HomeAssistant, entry: AfterShipConfigEntry) -> bool:
     """Set up AfterShip from a config entry."""
 
-    hass.data.setdefault(DOMAIN, {})
-
     session = async_get_clientsession(hass)
     aftership = AfterShip(api_key=entry.data[CONF_API_KEY], session=session)
 
@@ -28,7 +26,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     except AfterShipException as err:
         raise ConfigEntryNotReady from err
 
-    hass.data[DOMAIN][entry.entry_id] = aftership
+    entry.runtime_data = aftership
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -37,7 +35,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/aftership/sensor.py

@@ -8,7 +8,6 @@ from typing import Any, Final
 from pyaftership import AfterShip, AfterShipException
 
 from homeassistant.components.sensor import SensorEntity
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant, ServiceCall
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.dispatcher import (
@@ -18,6 +17,7 @@ from homeassistant.helpers.dispatcher import (
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import Throttle
 
+from . import AfterShipConfigEntry
 from .const import (
     ADD_TRACKING_SERVICE_SCHEMA,
     ATTR_TRACKINGS,
@@ -41,11 +41,11 @@ PLATFORM_SCHEMA: Final = cv.removed(DOMAIN, raise_if_present=False)
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AfterShipConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up AfterShip sensor entities based on a config entry."""
-    aftership: AfterShip = hass.data[DOMAIN][config_entry.entry_id]
+    aftership = config_entry.runtime_data
 
     async_add_entities([AfterShipSensor(aftership, config_entry.title)], True)
 

homeassistant/components/agent_dvr/__init__.py

@@ -10,18 +10,20 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONNECTION, DOMAIN as AGENT_DOMAIN, SERVER_URL
+from .const import DOMAIN as AGENT_DOMAIN, SERVER_URL
 
 ATTRIBUTION = "ispyconnect.com"
 DEFAULT_BRAND = "Agent DVR by ispyconnect.com"
 
 PLATFORMS = [Platform.ALARM_CONTROL_PANEL, Platform.CAMERA]
 
+AgentDVRConfigEntry = ConfigEntry[Agent]
 
-async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+
+async def async_setup_entry(
+    hass: HomeAssistant, config_entry: AgentDVRConfigEntry
+) -> bool:
     """Set up the Agent component."""
-    hass.data.setdefault(AGENT_DOMAIN, {})
-
     server_origin = config_entry.data[SERVER_URL]
 
     agent_client = Agent(server_origin, async_get_clientsession(hass))
@@ -34,9 +36,11 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     if not agent_client.is_available:
         raise ConfigEntryNotReady
 
+    config_entry.async_on_unload(agent_client.close)
+
     await agent_client.get_devices()
 
-    hass.data[AGENT_DOMAIN][config_entry.entry_id] = {CONNECTION: agent_client}
+    config_entry.runtime_data = agent_client
 
     device_registry = dr.async_get(hass)
 
@@ -54,15 +58,8 @@ async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
+async def async_unload_entry(
+    hass: HomeAssistant, config_entry: AgentDVRConfigEntry
+) -> bool:
     """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(
-        config_entry, PLATFORMS
-    )
-
-    await hass.data[AGENT_DOMAIN][config_entry.entry_id][CONNECTION].close()
-
-    if unload_ok:
-        hass.data[AGENT_DOMAIN].pop(config_entry.entry_id)
-
-    return unload_ok
+    return await hass.config_entries.async_unload_platforms(config_entry, PLATFORMS)

homeassistant/components/agent_dvr/alarm_control_panel.py

@@ -6,7 +6,6 @@ from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
 )
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     STATE_ALARM_ARMED_AWAY,
     STATE_ALARM_ARMED_HOME,
@@ -17,7 +16,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from .const import CONNECTION, DOMAIN as AGENT_DOMAIN
+from . import AgentDVRConfigEntry
+from .const import DOMAIN as AGENT_DOMAIN
 
 CONF_HOME_MODE_NAME = "home"
 CONF_AWAY_MODE_NAME = "away"
@@ -28,13 +28,11 @@ CONST_ALARM_CONTROL_PANEL_NAME = "Alarm Panel"
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AgentDVRConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Agent DVR Alarm Control Panels."""
-    async_add_entities(
-        [AgentBaseStation(hass.data[AGENT_DOMAIN][config_entry.entry_id][CONNECTION])]
-    )
+    async_add_entities([AgentBaseStation(config_entry.runtime_data)])
 
 
 class AgentBaseStation(AlarmControlPanelEntity):
@@ -45,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/agent_dvr/camera.py

@@ -7,7 +7,6 @@ from agent import AgentError
 
 from homeassistant.components.camera import CameraEntityFeature
 from homeassistant.components.mjpeg import MjpegCamera, filter_urllib3_logging
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import (
@@ -15,12 +14,8 @@ from homeassistant.helpers.entity_platform import (
     async_get_current_platform,
 )
 
-from .const import (
-    ATTRIBUTION,
-    CAMERA_SCAN_INTERVAL_SECS,
-    CONNECTION,
-    DOMAIN as AGENT_DOMAIN,
-)
+from . import AgentDVRConfigEntry
+from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN as AGENT_DOMAIN
 
 SCAN_INTERVAL = timedelta(seconds=CAMERA_SCAN_INTERVAL_SECS)
 
@@ -43,14 +38,14 @@ CAMERA_SERVICES = {
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: ConfigEntry,
+    config_entry: AgentDVRConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Agent cameras."""
     filter_urllib3_logging()
     cameras = []
 
-    server = hass.data[AGENT_DOMAIN][config_entry.entry_id][CONNECTION]
+    server = config_entry.runtime_data
     if not server.devices:
         _LOGGER.warning("Could not fetch cameras from Agent server")
         return
@@ -80,11 +75,11 @@ class AgentCamera(MjpegCamera):
         """Initialize as a subclass of MjpegCamera."""
         self.device = device
         self._removed = False
-        self._attr_unique_id = f"{device._client.unique}_{device.typeID}_{device.id}"
+        self._attr_unique_id = f"{device.client.unique}_{device.typeID}_{device.id}"
         super().__init__(
             name=device.name,
-            mjpeg_url=f"{device.client._server_url}{device.mjpeg_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",
-            still_image_url=f"{device.client._server_url}{device.still_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",
+            mjpeg_url=f"{device.client._server_url}{device.mjpeg_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",  # noqa: SLF001
+            still_image_url=f"{device.client._server_url}{device.still_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",  # noqa: SLF001
         )
         self._attr_device_info = DeviceInfo(
             identifiers={(AGENT_DOMAIN, self.unique_id)},

homeassistant/components/agent_dvr/const.py

@@ -9,4 +9,3 @@ SERVICE_UPDATE = "update"
 SIGNAL_UPDATE_AGENT = "agent_update"
 ATTRIBUTION = "Data provided by ispyconnect.com"
 SERVER_URL = "server_url"
-CONNECTION = "connection"

homeassistant/components/air_quality/__init__.py

@@ -9,18 +9,20 @@ from typing import Final, final
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONCENTRATION_MICROGRAMS_PER_CUBIC_METER
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.config_validation import (  # noqa: F401
-    PLATFORM_SCHEMA,
-    PLATFORM_SCHEMA_BASE,
-)
+from homeassistant.helpers import config_validation as cv
 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__)
 
+ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
+PLATFORM_SCHEMA = cv.PLATFORM_SCHEMA
+PLATFORM_SCHEMA_BASE = cv.PLATFORM_SCHEMA_BASE
+SCAN_INTERVAL: Final = timedelta(seconds=30)
+
 ATTR_AQI: Final = "air_quality_index"
 ATTR_CO2: Final = "carbon_dioxide"
 ATTR_CO: Final = "carbon_monoxide"
@@ -33,12 +35,6 @@ ATTR_PM_10: Final = "particulate_matter_10"
 ATTR_PM_2_5: Final = "particulate_matter_2_5"
 ATTR_SO2: Final = "sulphur_dioxide"
 
-DOMAIN: Final = "air_quality"
-
-ENTITY_ID_FORMAT: Final = DOMAIN + ".{}"
-
-SCAN_INTERVAL: Final = timedelta(seconds=30)
-
 PROP_TO_ATTR: Final[dict[str, str]] = {
     "air_quality_index": ATTR_AQI,
     "carbon_dioxide": ATTR_CO2,

homeassistant/components/air_quality/const.py

@@ -0,0 +1,5 @@
+"""Constants for the air_quality entity platform."""
+
+from typing import Final
+
+DOMAIN: Final = "air_quality"