fix dependency

Signed-off-by: Daniel Hjelseth Høyer <github@dahoiv.net>

.core_files.yaml

@@ -14,7 +14,6 @@ core: &core
 base_platforms: &base_platforms
   - homeassistant/components/air_quality/**
   - homeassistant/components/alarm_control_panel/**
-  - homeassistant/components/assist_satellite/**
   - homeassistant/components/binary_sensor/**
   - homeassistant/components/button/**
   - homeassistant/components/calendar/**
@@ -50,7 +49,6 @@ base_platforms: &base_platforms
   - homeassistant/components/tts/**
   - homeassistant/components/update/**
   - homeassistant/components/vacuum/**
-  - homeassistant/components/valve/**
   - homeassistant/components/water_heater/**
   - homeassistant/components/weather/**
 
@@ -62,7 +60,6 @@ components: &components
   - homeassistant/components/auth/**
   - homeassistant/components/automation/**
   - homeassistant/components/backup/**
-  - homeassistant/components/blueprint/**
   - homeassistant/components/bluetooth/**
   - homeassistant/components/cloud/**
   - homeassistant/components/config/**
@@ -79,7 +76,6 @@ components: &components
   - homeassistant/components/group/**
   - homeassistant/components/hassio/**
   - homeassistant/components/homeassistant/**
-  - homeassistant/components/homeassistant_hardware/**
   - homeassistant/components/http/**
   - homeassistant/components/image/**
   - homeassistant/components/input_boolean/**
@@ -112,7 +108,6 @@ components: &components
   - homeassistant/components/tag/**
   - homeassistant/components/template/**
   - homeassistant/components/timer/**
-  - homeassistant/components/trace/**
   - homeassistant/components/usb/**
   - homeassistant/components/webhook/**
   - homeassistant/components/websocket_api/**
@@ -125,21 +120,21 @@ tests: &tests
   - pylint/**
   - requirements_test_pre_commit.txt
   - requirements_test.txt
-  - tests/*.py
   - tests/auth/**
   - tests/backports/**
-  - tests/components/conftest.py
+  - tests/common.py
-  - tests/components/diagnostics/**
   - tests/components/history/**
   - tests/components/logbook/**
   - tests/components/recorder/**
-  - tests/components/repairs/**
   - 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/**
@@ -153,7 +148,6 @@ requirements: &requirements
   - homeassistant/package_constraints.txt
   - requirements*.txt
   - pyproject.toml
-  - script/licenses.py
 
 any:
   - *base_platforms

.devcontainer/devcontainer.json

@@ -2,22 +2,15 @@
   "name": "Home Assistant Dev",
   "context": "..",
   "dockerFile": "../Dockerfile.dev",
-  "postCreateCommand": "git config --global --add safe.directory ${containerWorkspaceFolder} && script/setup",
+  "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": [
+  "runArgs": ["-e", "GIT_EDITOR=code --wait"],
-    "-e",
-    "GIT_EDITOR=code --wait",
-    "--security-opt",
-    "label=disable"
-  ],
   "customizations": {
     "vscode": {
       "extensions": [
@@ -27,17 +20,13 @@
         "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.defaultInterpreterPath": "/home/vscode/.local/ha-venv/bin/python",
+        "python.pythonPath": "/usr/local/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,
@@ -58,13 +47,7 @@
         ],
         "[python]": {
           "editor.defaultFormatter": "charliermarsh.ruff"
-        },
-        "json.schemas": [
-          {
-            "fileMatch": ["homeassistant/components/*/manifest.json"],
-            "url": "./script/json_schemas/manifest_schema.json"
         }
-        ]
       }
     }
   }

.dockerignore

@@ -7,7 +7,6 @@ docs
 # Development
 .devcontainer
 .vscode
-.tool-versions
 
 # Test related files
 tests

.github/FUNDING.yml

@@ -1 +1,2 @@
-custom: https://www.openhomefoundation.org
+custom: https://www.nabucasa.com
+github: balloob

.github/PULL_REQUEST_TEMPLATE.md

@@ -74,6 +74,7 @@ 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

@@ -10,7 +10,7 @@ on:
 
 env:
   BUILD_TYPE: core
-  DEFAULT_PYTHON: "3.13"
+  DEFAULT_PYTHON: "3.12"
   PIP_TIMEOUT: 60
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
@@ -27,12 +27,12 @@ jobs:
       publish: ${{ steps.version.outputs.publish }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
         with:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         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.4.3
+        uses: actions/upload-artifact@v4.3.3
         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.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v6
+        uses: dawidd6/action-download-artifact@v3.1.4
         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@v6
+        uses: dawidd6/action-download-artifact@v3.1.4
         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.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -126,7 +126,7 @@ jobs:
         env:
           UV_PRERELEASE: allow
         run: |
-          python3 -m pip install "$(grep '^uv' < requirements.txt)"
+          python3 -m pip install "$(grep '^uv' < requirements_test.txt)"
           uv pip install packaging tomli
           uv pip install .
           python3 script/version_bump.py nightly --set-nightly-version "${{ needs.init.outputs.version }}"
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: translations
 
@@ -190,14 +190,14 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -242,7 +242,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Set build additional args
         run: |
@@ -256,14 +256,14 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -279,7 +279,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -316,28 +316,27 @@ jobs:
       packages: write
       id-token: write
     strategy:
-      fail-fast: false
       matrix:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.7.0
+        uses: sigstore/cosign-installer@v3.4.0
         with:
           cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.1.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.3.0
+        uses: docker/login-action@v3.1.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -451,15 +450,15 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: translations
 
@@ -483,56 +482,3 @@ jobs:
           export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
 
           twine upload dist/* --skip-existing
-
-  hassfest-image:
-    name: Build and test hassfest image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-    needs: ["init"]
-    if: github.repository_owner == 'home-assistant'
-    env:
-      HASSFEST_IMAGE_NAME: ghcr.io/home-assistant/hassfest
-      HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Docker image
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
-        with:
-          context: . # So action will not pull the repository again
-          file: ./script/hassfest/docker/Dockerfile
-          load: true
-          tags: ${{ env.HASSFEST_IMAGE_TAG }}
-
-      - name: Run hassfest against core
-        run: docker run --rm -v ${{ github.workspace }}/homeassistant:/github/workspace/homeassistant ${{ env.HASSFEST_IMAGE_TAG }} --core-integrations-path=/github/workspace/homeassistant/components
-
-      - name: Push Docker image
-        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        id: push
-        uses: docker/build-push-action@4f58ea79222b3b9dc2c8bbdd6debcef730109a75 # v6.9.0
-        with:
-          context: . # So action will not pull the repository again
-          file: ./script/hassfest/docker/Dockerfile
-          push: true
-          tags: ${{ env.HASSFEST_IMAGE_TAG }},${{ env.HASSFEST_IMAGE_NAME }}:latest
-
-      - name: Generate artifact attestation
-        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@ef244123eb79f2f7a7e75d99086184180e6d0018 # v1.4.4
-        with:
-          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true

.github/workflows/ci.yaml

@@ -31,18 +31,14 @@ on:
         description: "Only run mypy"
         default: false
         type: boolean
-      audit-licenses-only:
-        description: "Only run audit licenses"
-        default: false
-        type: boolean
 
 env:
-  CACHE_VERSION: 11
+  CACHE_VERSION: 8
   UV_CACHE_VERSION: 1
-  MYPY_CACHE_VERSION: 9
+  MYPY_CACHE_VERSION: 8
-  HA_SHORT_VERSION: "2024.12"
+  HA_SHORT_VERSION: "2024.5"
   DEFAULT_PYTHON: "3.12"
-  ALL_PYTHON_VERSIONS: "['3.12', '3.13']"
+  ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -90,16 +86,14 @@ jobs:
       tests_glob: ${{ steps.info.outputs.tests_glob }}
       tests: ${{ steps.info.outputs.tests }}
       skip_coverage: ${{ steps.info.outputs.skip_coverage }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
-        run: |
+        run: >-
-          # Include HA_SHORT_VERSION to force the immediate creation
+          echo "key=venv-${{ env.CACHE_VERSION }}-${{
-          # 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') }}-${{
@@ -222,25 +216,24 @@ jobs:
 
   pre-commit:
     name: Prepare pre-commit base
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: venv
           key: >-
@@ -252,11 +245,11 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install "$(grep '^uv' < requirements.txt)"
+          pip install "$(grep '^uv' < requirements_test.txt)"
           uv pip install "$(cat requirements_test.txt | grep pre-commit)"
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
@@ -271,22 +264,22 @@ jobs:
 
   lint-ruff-format:
     name: Check ruff-format
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -295,7 +288,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -311,22 +304,22 @@ jobs:
 
   lint-ruff:
     name: Check ruff
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -335,7 +328,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -348,25 +341,24 @@ jobs:
           pre-commit run --hook-stage manual ruff --all-files --show-diff-on-failure
         env:
           RUFF_OUTPUT_FORMAT: github
-
   lint-other:
     name: Check other linters
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -375,7 +367,7 @@ jobs:
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
@@ -429,36 +421,21 @@ jobs:
           . venv/bin/activate
           pre-commit run --show-diff-on-failure --hook-stage manual codespell --all-files
 
-  lint-hadolint:
-    name: Check ${{ matrix.file }}
-    runs-on: ubuntu-24.04
-    needs:
-      - info
-    if: |
-      github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        file:
-          - Dockerfile
-          - Dockerfile.dev
-          - script/hassfest/docker/Dockerfile
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
       - name: Register hadolint problem matcher
         run: |
           echo "::add-matcher::.github/workflows/matchers/hadolint.json"
-      - name: Check ${{ matrix.file }}
+      - name: Check Dockerfile
-        uses: docker://hadolint/hadolint:v2.12.0
+        uses: docker://hadolint/hadolint:v1.18.2
         with:
-          args: hadolint ${{ matrix.file }}
+          args: hadolint Dockerfile
+      - name: Check Dockerfile.dev
+        uses: docker://hadolint/hadolint:v1.18.2
+        with:
+          args: hadolint Dockerfile.dev
 
   base:
     name: Prepare dependencies
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs: info
     timeout-minutes: 60
     strategy:
@@ -466,23 +443,23 @@ jobs:
         python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Generate partial uv restore key
         id: generate-uv-key
         run: |
-          uv_version=$(cat requirements.txt | grep uv | cut -d '=' -f 3)
+          uv_version=$(cat requirements_test.txt | grep uv | cut -d '=' -f 3)
           echo "version=${uv_version}" >> $GITHUB_OUTPUT
           echo "key=uv-${{ env.UV_CACHE_VERSION }}-${uv_version}-${{
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: venv
           lookup-only: true
@@ -491,7 +468,7 @@ jobs:
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
@@ -504,12 +481,10 @@ jobs:
       - name: Install additional OS dependencies
         if: steps.cache-venv.outputs.cache-hit != 'true'
         run: |
-          sudo rm /etc/apt/sources.list.d/microsoft-prod.list
           sudo apt-get update
           sudo apt-get -y install \
             bluez \
             ffmpeg \
-            libturbojpeg \
             libavcodec-dev \
             libavdevice-dev \
             libavfilter-dev \
@@ -525,41 +500,35 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install "$(grep '^uv' < requirements.txt)"
+          pip install "$(grep '^uv' < requirements_test.txt)"
           uv pip install -U "pip>=21.3.1" setuptools wheel
           uv pip install -r requirements.txt
           python -m script.gen_requirements_all ci
-          uv pip install -r requirements_all_pytest.txt -r requirements_test.txt
+          uv pip install -r requirements_all_pytest.txt
+          uv pip install -r requirements_test.txt
           uv pip install -e . --config-settings editable_mode=compat
 
   hassfest:
     name: Check hassfest
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - 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.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -573,26 +542,25 @@ jobs:
 
   gen-requirements-all:
     name: Check all requirements
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -604,76 +572,28 @@ jobs:
           . venv/bin/activate
           python -m script.gen_requirements_all validate
 
-  audit-licenses:
-    name: Audit licenses
-    runs-on: ubuntu-24.04
-    needs:
-      - info
-      - base
-    if: |
-      (github.event.inputs.pylint-only != 'true'
-        && github.event.inputs.mypy-only != 'true'
-        || github.event.inputs.audit-licenses-only == 'true')
-      && needs.info.outputs.requirements == 'true'
-    strategy:
-      fail-fast: false
-      matrix:
-        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
-    steps:
-      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
-      - name: Set up Python ${{ matrix.python-version }}
-        id: python
-        uses: actions/setup-python@v5.3.0
-        with:
-          python-version: ${{ matrix.python-version }}
-          check-latest: true
-      - name: Restore full Python ${{ matrix.python-version }} virtual environment
-        id: cache-venv
-        uses: actions/cache/restore@v4.1.2
-        with:
-          path: venv
-          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
-            needs.info.outputs.python_cache_key }}
-      - name: Extract license data
-        run: |
-          . venv/bin/activate
-          python -m script.licenses extract --output-file=licenses-${{ matrix.python-version }}.json
-      - name: Upload licenses
-        uses: actions/upload-artifact@v4.4.3
-        with:
-          name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
-          path: licenses-${{ matrix.python-version }}.json
-      - name: Check licenses
-        run: |
-          . venv/bin/activate
-          python -m script.licenses check licenses-${{ matrix.python-version }}.json
-
   pylint:
     name: Check pylint
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     if: |
       github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       || github.event.inputs.pylint-only == 'true'
     needs:
       - info
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -688,78 +608,30 @@ jobs:
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y homeassistant
+          pylint --ignore-missing-annotations=y --ignore-wrong-coordinator-module=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 homeassistant/components/${{ needs.info.outputs.integrations_glob }}
+          pylint --ignore-missing-annotations=y --ignore-wrong-coordinator-module=y homeassistant/components/${{ needs.info.outputs.integrations_glob }}
-
-  pylint-tests:
-    name: Check pylint on tests
-    runs-on: ubuntu-24.04
-    timeout-minutes: 20
-    if: |
-      (github.event.inputs.mypy-only != 'true'
-        && github.event.inputs.audit-licenses-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.2.2
-      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        id: python
-        uses: actions/setup-python@v5.3.0
-        with:
-          python-version: ${{ env.DEFAULT_PYTHON }}
-          check-latest: true
-      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
-        id: cache-venv
-        uses: actions/cache/restore@v4.1.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 tests
-      - name: Run pylint (partially)
-        if: needs.info.outputs.test_full_suite == 'false'
-        shell: bash
-        run: |
-          . venv/bin/activate
-          python --version
-          pylint tests/components/${{ needs.info.outputs.tests_glob }}
 
   mypy:
     name: Check mypy
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       || github.event.inputs.mypy-only == 'true'
     needs:
       - info
       - base
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -772,7 +644,7 @@ jobs:
             env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
       - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -780,7 +652,7 @@ jobs:
             ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
-        uses: actions/cache@v4.1.2
+        uses: actions/cache@v4.0.2
         with:
           path: .mypy_cache
           key: >-
@@ -808,13 +680,12 @@ jobs:
           mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
   prepare-pytest-full:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -823,24 +694,22 @@ jobs:
     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 \
             bluez \
             ffmpeg \
-            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -852,20 +721,19 @@ 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.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
           overwrite: true
 
   pytest-full:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -874,7 +742,6 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
-      - lint-ruff-format
       - mypy
       - prepare-pytest-full
     strategy:
@@ -887,24 +754,22 @@ jobs:
     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 \
             bluez \
             ffmpeg \
-            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -917,7 +782,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -939,13 +804,11 @@ jobs:
             cov_params+=(--cov-report=xml)
           fi
 
-          echo "Test group ${{ matrix.group }}: $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt)"
           python3 -b -X dev -m pytest \
             -qq \
             --timeout=9 \
             --durations=10 \
-            --numprocesses auto \
+            -n auto \
-            --snapshot-details \
             --dist=loadfile \
             ${cov_params[@]} \
             -o console_output_style=count \
@@ -954,14 +817,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.4.3
+        uses: actions/upload-artifact@v4.3.3
         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.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -973,7 +836,7 @@ jobs:
           ./script/check_dirty
 
   pytest-mariadb:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     services:
       mariadb:
         image: ${{ matrix.mariadb-group }}
@@ -987,7 +850,6 @@ jobs:
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.mariadb_groups != '[]'
     needs:
       - info
@@ -996,7 +858,6 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
-      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1008,24 +869,22 @@ jobs:
     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 \
             bluez \
             ffmpeg \
-            libturbojpeg \
             libmariadb-dev-compat
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1067,8 +926,7 @@ jobs:
           python3 -b -X dev -m pytest \
             -qq \
             --timeout=20 \
-            --numprocesses 1 \
+            -n 1 \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=10 \
@@ -1081,7 +939,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.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1089,7 +947,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1100,7 +958,7 @@ jobs:
           ./script/check_dirty
 
   pytest-postgres:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     services:
       postgres:
         image: ${{ matrix.postgresql-group }}
@@ -1114,7 +972,6 @@ jobs:
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.postgresql_groups != '[]'
     needs:
       - info
@@ -1123,7 +980,6 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
-      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1135,26 +991,22 @@ jobs:
     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 \
             bluez \
             ffmpeg \
-            libturbojpeg
-          sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
-          sudo apt-get -y install \
             postgresql-server-dev-14
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1196,8 +1048,7 @@ jobs:
           python3 -b -X dev -m pytest \
             -qq \
             --timeout=9 \
-            --numprocesses 1 \
+            -n 1 \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
@@ -1211,7 +1062,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.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1219,7 +1070,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1232,7 +1083,7 @@ jobs:
   coverage-full:
     name: Upload test coverage to Codecov (full suite)
     if: needs.info.outputs.skip_coverage != 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pytest-full
@@ -1241,28 +1092,26 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.3.0
         with:
           fail_ci_if_error: true
           flags: full-suite
           token: ${{ secrets.CODECOV_TOKEN }}
-          version: v0.6.0
 
   pytest-partial:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.tests_glob
       && needs.info.outputs.test_full_suite == 'false'
     needs:
@@ -1272,7 +1121,6 @@ jobs:
       - hassfest
       - lint-other
       - lint-ruff
-      - lint-ruff-format
       - mypy
     strategy:
       fail-fast: false
@@ -1284,24 +1132,22 @@ jobs:
     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 \
             bluez \
             ffmpeg \
-            libturbojpeg \
             libgammu-dev
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
       - name: Restore full Python ${{ matrix.python-version }} virtual environment
         id: cache-venv
-        uses: actions/cache/restore@v4.1.2
+        uses: actions/cache/restore@v4.0.2
         with:
           path: venv
           fail-on-cache-miss: true
@@ -1343,8 +1189,7 @@ jobs:
           python3 -b -X dev -m pytest \
             -qq \
             --timeout=9 \
-            --numprocesses auto \
+            -n auto \
-            --snapshot-details \
             ${cov_params[@]} \
             -o console_output_style=count \
             --durations=0 \
@@ -1354,14 +1199,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.4.3
+        uses: actions/upload-artifact@v4.3.3
         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.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1373,22 +1218,21 @@ jobs:
   coverage-partial:
     name: Upload test coverage to Codecov (partial suite)
     if: needs.info.outputs.skip_coverage != 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pytest-partial
     timeout-minutes: 10
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v4.6.0
+        uses: codecov/codecov-action@v4.3.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.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.27.3
+        uses: github/codeql-action/init@v3.25.1
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.27.3
+        uses: github/codeql-action/analyze@v3.25.1
         with:
           category: "/language:python"

.github/workflows/translations.yml

@@ -10,7 +10,7 @@ on:
       - "**strings.json"
 
 env:
-  DEFAULT_PYTHON: "3.12"
+  DEFAULT_PYTHON: "3.11"
 
 jobs:
   upload:
@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         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.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.3.0
+        uses: actions/setup-python@v5.1.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -46,7 +46,7 @@ jobs:
           python -m venv venv
           . venv/bin/activate
           python --version
-          pip install "$(grep '^uv' < requirements.txt)"
+          pip install "$(grep '^uv' < requirements_test.txt)"
           uv pip install -r requirements.txt
 
       - name: Get information
@@ -64,8 +64,11 @@ jobs:
       - name: Write env-file
         run: |
           (
+            echo "GRPC_BUILD_WITH_BORING_SSL_ASM=false"
             echo "GRPC_PYTHON_BUILD_SYSTEM_OPENSSL=true"
             echo "GRPC_PYTHON_BUILD_WITH_CYTHON=true"
+            echo "GRPC_PYTHON_DISABLE_LIBC_COMPATIBILITY=true"
+            echo "GRPC_PYTHON_LDFLAGS=-lpthread -Wl,-wrap,memcpy -static-libgcc"
 
             # Fix out of memory issues with rust
             echo "CARGO_NET_GIT_FETCH_WITH_CLI=true"
@@ -79,15 +82,14 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: env_file
           path: ./.env_file
-          include-hidden-files: true
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -99,7 +101,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@v4.4.3
+        uses: actions/upload-artifact@v4.3.3
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -112,38 +114,32 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp312"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: requirements_diff
 
-      - name: Adjust build env
-        run: |
-          # Don't build wheels for uv as uv requires a greater version of rust as currently available on alpine
-          sed -i "/uv/d" requirements.txt
-          sed -i "/uv/d" requirements_diff.txt
-
       - name: Build wheels
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.01.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "libffi-dev;openssl-dev;yaml-dev;nasm;zlib-dev"
+          apk: "libffi-dev;openssl-dev;yaml-dev;nasm"
-          skip-binary: aiohttp;multidict;yarl
+          skip-binary: aiohttp
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements.txt"
@@ -156,39 +152,27 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp312", "cp313"]
+        abi: ["cp312"]
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v4.1.3
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.1.8
+        uses: actions/download-artifact@v4.1.6
         with:
           name: requirements_all_wheels
 
-      - name: Adjust build env
-        run: |
-          if [ "${{ matrix.arch }}" = "i386" ]; then
-            echo "NPY_DISABLE_SVML=1" >> .env_file
-          fi
-
-          # Do not pin numpy in wheels building
-          sed -i "/numpy/d" homeassistant/package_constraints.txt
-          # Don't build wheels for uv as uv requires a greater version of rust as currently available on alpine
-          sed -i "/uv/d" requirements.txt
-          sed -i "/uv/d" requirements_diff.txt
-
       - name: Split requirements all
         run: |
           # We split requirements all into multiple files.
@@ -198,19 +182,28 @@ jobs:
           split -l $(expr $(expr $(cat requirements_all.txt | wc -l) + 1) / 3) requirements_all_wheels_${{ matrix.arch }}.txt requirements_all.txt
 
       - name: Create requirements for cython<3
-        if: matrix.abi == 'cp312'
         run: |
           # Some dependencies still require 'cython<3'
           # and don't yet use isolated build environments.
           # Build these first.
+          # grpcio: https://github.com/grpc/grpc/issues/33918
           # pydantic: https://github.com/pydantic/pydantic/issues/7689
 
           touch requirements_old-cython.txt
+          cat homeassistant/package_constraints.txt | grep 'grpcio==' >> requirements_old-cython.txt
           cat homeassistant/package_constraints.txt | grep 'pydantic==' >> requirements_old-cython.txt
 
+      - name: Adjust build env
+        run: |
+          if [ "${{ matrix.arch }}" = "i386" ]; then
+            echo "NPY_DISABLE_SVML=1" >> .env_file
+          fi
+
+          # Do not pin numpy in wheels building
+          sed -i "/numpy/d" homeassistant/package_constraints.txt
+
       - name: Build wheels (old cython)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.01.0
-        if: matrix.abi == 'cp312'
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -218,50 +211,50 @@ 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;multidict;SQLAlchemy;propcache;protobuf;pydantic;pymicro-vad;yarl
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           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.11.0
+        uses: home-assistant/wheels@2024.01.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
+          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;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
 
       - name: Build wheels (part 2)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.01.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
+          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;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
 
       - name: Build wheels (part 3)
-        uses: home-assistant/wheels@2024.11.0
+        uses: home-assistant/wheels@2024.01.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
-          apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-dev"
+          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;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtac"

.gitignore

@@ -34,7 +34,6 @@ Icon
 
 # GITHUB Proposed Python stuff:
 *.py[cod]
-__pycache__
 
 # C extensions
 *.so
@@ -79,7 +78,6 @@ pytest-*.txt
 .pydevproject
 
 .python-version
-.tool-versions
 
 # emacs auto backups
 *~

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.3
+    rev: v0.4.1
     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.3.0
+    rev: v2.2.6
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn
+          - --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
           - --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_or: [python, pyi]
+        types: [python]
         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_or: [python, pyi]
+        types: [python]
-        files: ^(homeassistant|tests)/.+\.(py|pyi)$
+        files: ^homeassistant/.+\.py$
       - id: gen_requirements_all
         name: gen_requirements_all
         entry: script/run-in-env.sh python3 -m script.gen_requirements_all
@@ -83,14 +83,14 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|homeassistant/.+/services\.yaml|script/hassfest/(?!metadata|mypy_config).+\.py|requirements.+\.txt)$
+        files: ^(homeassistant/.+/(icons|manifest|strings)\.json|homeassistant/brands/.*\.json|\.coveragerc|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,docker
+        entry: script/run-in-env.sh python3 -m script.hassfest -p metadata
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml|homeassistant/components/go2rtc/const\.py)$
+        files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml)$
       - id: hassfest-mypy-config
         name: hassfest-mypy-config
         entry: script/run-in-env.sh python3 -m script.hassfest -p mypy_config

.strict-typing

@@ -21,7 +21,6 @@ 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
@@ -49,7 +48,6 @@ 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.*
@@ -67,6 +65,7 @@ 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.*
@@ -85,7 +84,6 @@ 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.*
@@ -95,9 +93,9 @@ homeassistant.components.aruba.*
 homeassistant.components.arwn.*
 homeassistant.components.aseko_pool_live.*
 homeassistant.components.assist_pipeline.*
-homeassistant.components.assist_satellite.*
+homeassistant.components.asterisk_cdr.*
+homeassistant.components.asterisk_mbox.*
 homeassistant.components.asuswrt.*
-homeassistant.components.autarco.*
 homeassistant.components.auth.*
 homeassistant.components.automation.*
 homeassistant.components.awair.*
@@ -111,7 +109,6 @@ homeassistant.components.bitcoin.*
 homeassistant.components.blockchain.*
 homeassistant.components.blue_current.*
 homeassistant.components.blueprint.*
-homeassistant.components.bluesound.*
 homeassistant.components.bluetooth.*
 homeassistant.components.bluetooth_adapters.*
 homeassistant.components.bluetooth_tracker.*
@@ -120,11 +117,9 @@ homeassistant.components.bond.*
 homeassistant.components.braviatv.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
-homeassistant.components.bryant_evolution.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
-homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
 homeassistant.components.cert_expiry.*
@@ -142,7 +137,6 @@ homeassistant.components.cpuspeed.*
 homeassistant.components.crownstone.*
 homeassistant.components.date.*
 homeassistant.components.datetime.*
-homeassistant.components.deako.*
 homeassistant.components.deconz.*
 homeassistant.components.default_config.*
 homeassistant.components.demo.*
@@ -170,7 +164,6 @@ homeassistant.components.ecowitt.*
 homeassistant.components.efergy.*
 homeassistant.components.electrasmart.*
 homeassistant.components.electric_kiwi.*
-homeassistant.components.elevenlabs.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
@@ -200,23 +193,17 @@ homeassistant.components.fritzbox.*
 homeassistant.components.fritzbox_callmonitor.*
 homeassistant.components.fronius.*
 homeassistant.components.frontend.*
-homeassistant.components.fujitsu_fglair.*
 homeassistant.components.fully_kiosk.*
-homeassistant.components.fyta.*
 homeassistant.components.generic_hygrostat.*
 homeassistant.components.generic_thermostat.*
 homeassistant.components.geo_location.*
 homeassistant.components.geocaching.*
 homeassistant.components.gios.*
 homeassistant.components.glances.*
-homeassistant.components.go2rtc.*
 homeassistant.components.goalzero.*
 homeassistant.components.google.*
 homeassistant.components.google_assistant_sdk.*
-homeassistant.components.google_cloud.*
-homeassistant.components.google_photos.*
 homeassistant.components.google_sheets.*
-homeassistant.components.govee_ble.*
 homeassistant.components.gpsd.*
 homeassistant.components.greeneye_monitor.*
 homeassistant.components.group.*
@@ -248,7 +235,6 @@ 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.*
@@ -257,7 +243,6 @@ 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.*
@@ -265,7 +250,6 @@ homeassistant.components.integration.*
 homeassistant.components.intent.*
 homeassistant.components.intent_script.*
 homeassistant.components.ios.*
-homeassistant.components.iotty.*
 homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
 homeassistant.components.islamic_prayer_times.*
@@ -274,7 +258,6 @@ 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.*
@@ -286,12 +269,10 @@ homeassistant.components.lawn_mower.*
 homeassistant.components.lcn.*
 homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
-homeassistant.components.lektrico.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
 homeassistant.components.linear_garage_door.*
-homeassistant.components.linkplay.*
 homeassistant.components.litejet.*
 homeassistant.components.litterrobot.*
 homeassistant.components.local_ip.*
@@ -302,8 +283,8 @@ homeassistant.components.logger.*
 homeassistant.components.london_underground.*
 homeassistant.components.lookin.*
 homeassistant.components.luftdaten.*
-homeassistant.components.madvr.*
+homeassistant.components.mailbox.*
-homeassistant.components.manual.*
+homeassistant.components.map.*
 homeassistant.components.mastodon.*
 homeassistant.components.matrix.*
 homeassistant.components.matter.*
@@ -318,19 +299,15 @@ homeassistant.components.minecraft_server.*
 homeassistant.components.mjpeg.*
 homeassistant.components.modbus.*
 homeassistant.components.modem_callerid.*
-homeassistant.components.mold_indicator.*
-homeassistant.components.monzo.*
 homeassistant.components.moon.*
 homeassistant.components.mopeka.*
 homeassistant.components.motionmount.*
 homeassistant.components.mqtt.*
-homeassistant.components.music_assistant.*
 homeassistant.components.my.*
 homeassistant.components.mysensors.*
 homeassistant.components.myuplink.*
 homeassistant.components.nam.*
 homeassistant.components.nanoleaf.*
-homeassistant.components.nasweb.*
 homeassistant.components.neato.*
 homeassistant.components.nest.*
 homeassistant.components.netatmo.*
@@ -340,7 +317,6 @@ homeassistant.components.nfandroidtv.*
 homeassistant.components.nightscout.*
 homeassistant.components.nissan_leaf.*
 homeassistant.components.no_ip.*
-homeassistant.components.nordpool.*
 homeassistant.components.notify.*
 homeassistant.components.notion.*
 homeassistant.components.number.*
@@ -348,9 +324,7 @@ homeassistant.components.nut.*
 homeassistant.components.onboarding.*
 homeassistant.components.oncue.*
 homeassistant.components.onewire.*
-homeassistant.components.onkyo.*
 homeassistant.components.open_meteo.*
-homeassistant.components.openai_conversation.*
 homeassistant.components.openexchangerates.*
 homeassistant.components.opensky.*
 homeassistant.components.openuv.*
@@ -358,12 +332,12 @@ homeassistant.components.oralb.*
 homeassistant.components.otbr.*
 homeassistant.components.overkiz.*
 homeassistant.components.p1_monitor.*
-homeassistant.components.panel_custom.*
 homeassistant.components.peco.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.pi_hole.*
 homeassistant.components.ping.*
 homeassistant.components.plugwise.*
+homeassistant.components.poolsense.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -376,7 +350,6 @@ homeassistant.components.pvoutput.*
 homeassistant.components.qnap_qsw.*
 homeassistant.components.rabbitair.*
 homeassistant.components.radarr.*
-homeassistant.components.radio_browser.*
 homeassistant.components.rainforest_raven.*
 homeassistant.components.rainmachine.*
 homeassistant.components.raspberry_pi.*
@@ -393,7 +366,6 @@ 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.*
@@ -405,16 +377,13 @@ homeassistant.components.samsungtv.*
 homeassistant.components.scene.*
 homeassistant.components.schedule.*
 homeassistant.components.scrape.*
-homeassistant.components.script.*
 homeassistant.components.search.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
 homeassistant.components.sensor.*
-homeassistant.components.sensoterra.*
 homeassistant.components.senz.*
 homeassistant.components.sfr_box.*
-homeassistant.components.shell_command.*
 homeassistant.components.shelly.*
 homeassistant.components.shopping_list.*
 homeassistant.components.simplepush.*
@@ -424,14 +393,10 @@ homeassistant.components.skybell.*
 homeassistant.components.slack.*
 homeassistant.components.sleepiq.*
 homeassistant.components.smhi.*
-homeassistant.components.smlight.*
 homeassistant.components.snooz.*
-homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*
 homeassistant.components.speedtestdotnet.*
-homeassistant.components.spotify.*
 homeassistant.components.sql.*
-homeassistant.components.squeezebox.*
 homeassistant.components.ssdp.*
 homeassistant.components.starlink.*
 homeassistant.components.statistics.*
@@ -444,7 +409,6 @@ homeassistant.components.suez_water.*
 homeassistant.components.sun.*
 homeassistant.components.surepetcare.*
 homeassistant.components.switch.*
-homeassistant.components.switch_as_x.*
 homeassistant.components.switchbee.*
 homeassistant.components.switchbot_cloud.*
 homeassistant.components.switcher_kis.*
@@ -461,7 +425,6 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.text.*
-homeassistant.components.thethingsnetwork.*
 homeassistant.components.threshold.*
 homeassistant.components.tibber.*
 homeassistant.components.tile.*
@@ -492,7 +455,6 @@ homeassistant.components.update.*
 homeassistant.components.uptime.*
 homeassistant.components.uptimerobot.*
 homeassistant.components.usb.*
-homeassistant.components.uvc.*
 homeassistant.components.vacuum.*
 homeassistant.components.vallox.*
 homeassistant.components.valve.*
@@ -513,7 +475,6 @@ homeassistant.components.whois.*
 homeassistant.components.withings.*
 homeassistant.components.wiz.*
 homeassistant.components.wled.*
-homeassistant.components.workday.*
 homeassistant.components.worldclock.*
 homeassistant.components.xiaomi_ble.*
 homeassistant.components.yale_smart_alarm.*

.vscode/launch.json

@@ -6,52 +6,38 @@
   "configurations": [
     {
       "name": "Home Assistant",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
       "module": "homeassistant",
       "justMyCode": false,
-      "args": [
+      "args": ["--debug", "-c", "config"],
-        "--debug",
-        "-c",
-        "config"
-      ],
       "preLaunchTask": "Compile English translations"
     },
     {
       "name": "Home Assistant (skip pip)",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
       "module": "homeassistant",
       "justMyCode": false,
-      "args": [
+      "args": ["--debug", "-c", "config", "--skip-pip"],
-        "--debug",
-        "-c",
-        "config",
-        "--skip-pip"
-      ],
       "preLaunchTask": "Compile English translations"
     },
     {
       "name": "Home Assistant: Changed tests",
-      "type": "debugpy",
+      "type": "python",
       "request": "launch",
       "module": "pytest",
       "justMyCode": false,
-      "args": [
+      "args": ["--timeout=10", "--picked"],
-        "--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": "debugpy",
+      "type": "python",
       "request": "attach",
-      "connect": {
       "port": 5678,
-        "host": "localhost"
+      "host": "localhost",
-      },
       "pathMappings": [
         {
           "localRoot": "${workspaceFolder}",
@@ -63,12 +49,10 @@
       // 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": "debugpy",
+      "type": "python",
       "request": "attach",
-      "connect": {
       "port": 5678,
-        "host": "homeassistant.local"
+      "host": "homeassistant.local",
-      },
       "pathMappings": [
         {
           "localRoot": "${workspaceFolder}",

.vscode/settings.default.json

@@ -4,15 +4,5 @@
   // 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",
-  "json.schemas": [
-        {
-            "fileMatch": [
-                "homeassistant/components/*/manifest.json"
-            ],
-            "url": "./script/json_schemas/manifest_schema.json"
-        }
-    ]
 }

.vscode/tasks.json

@@ -76,7 +76,6 @@
       "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
@@ -104,7 +103,7 @@
     {
       "label": "Install all Requirements",
       "type": "shell",
-      "command": "uv pip install -r requirements_all.txt",
+      "command": "pip3 install -r requirements_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true
@@ -118,7 +117,7 @@
     {
       "label": "Install all Test Requirements",
       "type": "shell",
-      "command": "uv pip install -r requirements_test_all.txt",
+      "command": "pip3 install -r requirements_test_all.txt",
       "group": {
         "kind": "build",
         "isDefault": true

CODEOWNERS

@@ -40,8 +40,6 @@ build.json @home-assistant/supervisor
 # Integrations
 /homeassistant/components/abode/ @shred86
 /tests/components/abode/ @shred86
-/homeassistant/components/acaia/ @zweckj
-/tests/components/acaia/ @zweckj
 /homeassistant/components/accuweather/ @bieniu
 /tests/components/accuweather/ @bieniu
 /homeassistant/components/acmeda/ @atmurray
@@ -50,7 +48,6 @@ build.json @home-assistant/supervisor
 /tests/components/adax/ @danielhiversen
 /homeassistant/components/adguard/ @frenck
 /tests/components/adguard/ @frenck
-/homeassistant/components/ads/ @mrpasztoradam
 /homeassistant/components/advantage_air/ @Bre77
 /tests/components/advantage_air/ @Bre77
 /homeassistant/components/aemet/ @Noltari
@@ -59,8 +56,6 @@ 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
@@ -83,15 +78,18 @@ 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
@@ -111,8 +109,6 @@ build.json @home-assistant/supervisor
 /tests/components/anova/ @Lash-L
 /homeassistant/components/anthemav/ @hyralex
 /tests/components/anthemav/ @hyralex
-/homeassistant/components/anthropic/ @Shulyaka
-/tests/components/anthropic/ @Shulyaka
 /homeassistant/components/aosmith/ @bdr99
 /tests/components/aosmith/ @bdr99
 /homeassistant/components/apache_kafka/ @bachya
@@ -131,12 +127,8 @@ build.json @home-assistant/supervisor
 /tests/components/aprilaire/ @chamberlain2007
 /homeassistant/components/aprs/ @PhilRW
 /tests/components/aprs/ @PhilRW
-/homeassistant/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
+/homeassistant/components/aranet/ @aschmitz @thecode
-/tests/components/apsystems/ @mawoka-myblock @SonnenladenGmbH
+/tests/components/aranet/ @aschmitz @thecode
-/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
@@ -146,8 +138,6 @@ build.json @home-assistant/supervisor
 /tests/components/aseko_pool_live/ @milanmeu
 /homeassistant/components/assist_pipeline/ @balloob @synesthesiam
 /tests/components/assist_pipeline/ @balloob @synesthesiam
-/homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam
-/tests/components/assist_satellite/ @home-assistant/core @synesthesiam
 /homeassistant/components/asuswrt/ @kennedyshead @ollo69
 /tests/components/asuswrt/ @kennedyshead @ollo69
 /homeassistant/components/atag/ @MatsNL
@@ -162,8 +152,6 @@ 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
@@ -173,8 +161,6 @@ 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
@@ -194,8 +180,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 @swistakm
+/homeassistant/components/blebox/ @bbx-a @riokuu @swistakm
-/tests/components/blebox/ @bbx-a @swistakm
+/tests/components/blebox/ @bbx-a @riokuu @swistakm
 /homeassistant/components/blink/ @fronzbot @mkmer
 /tests/components/blink/ @fronzbot @mkmer
 /homeassistant/components/blue_current/ @Floris272 @gleeuwen
@@ -204,8 +190,7 @@ build.json @home-assistant/supervisor
 /tests/components/bluemaestro/ @bdraco
 /homeassistant/components/blueprint/ @home-assistant/core
 /tests/components/blueprint/ @home-assistant/core
-/homeassistant/components/bluesound/ @thrawnarn @LouisChrist
+/homeassistant/components/bluesound/ @thrawnarn
-/tests/components/bluesound/ @thrawnarn @LouisChrist
 /homeassistant/components/bluetooth/ @bdraco
 /tests/components/bluetooth/ @bdraco
 /homeassistant/components/bluetooth_adapters/ @bdraco
@@ -228,21 +213,17 @@ build.json @home-assistant/supervisor
 /tests/components/brottsplatskartan/ @gjohansson-ST
 /homeassistant/components/brunt/ @eavanvalkenburg
 /tests/components/brunt/ @eavanvalkenburg
-/homeassistant/components/bryant_evolution/ @danielsmyers
-/tests/components/bryant_evolution/ @danielsmyers
 /homeassistant/components/bsblan/ @liudger
 /tests/components/bsblan/ @liudger
 /homeassistant/components/bt_smarthub/ @typhoon2099
-/homeassistant/components/bthome/ @Ernst79 @thecode
+/homeassistant/components/bthome/ @Ernst79
-/tests/components/bthome/ @Ernst79 @thecode
+/tests/components/bthome/ @Ernst79
 /homeassistant/components/buienradar/ @mjj4791 @ties @Robbie1221
 /tests/components/buienradar/ @mjj4791 @ties @Robbie1221
 /homeassistant/components/button/ @home-assistant/core
 /tests/components/button/ @home-assistant/core
 /homeassistant/components/calendar/ @home-assistant/core
 /tests/components/calendar/ @home-assistant/core
-/homeassistant/components/cambridge_audio/ @noahhusby
-/tests/components/cambridge_audio/ @noahhusby
 /homeassistant/components/camera/ @home-assistant/core
 /tests/components/camera/ @home-assistant/core
 /homeassistant/components/cast/ @emontnemery
@@ -251,8 +232,7 @@ build.json @home-assistant/supervisor
 /tests/components/ccm15/ @ocalvo
 /homeassistant/components/cert_expiry/ @jjlawren
 /tests/components/cert_expiry/ @jjlawren
-/homeassistant/components/chacon_dio/ @cnico
+/homeassistant/components/circuit/ @braam
-/tests/components/chacon_dio/ @cnico
 /homeassistant/components/cisco_ios/ @fbradyirl
 /homeassistant/components/cisco_mobility_express/ @fbradyirl
 /homeassistant/components/cisco_webex_teams/ @fbradyirl
@@ -301,8 +281,6 @@ build.json @home-assistant/supervisor
 /tests/components/date/ @home-assistant/core
 /homeassistant/components/datetime/ @home-assistant/core
 /tests/components/datetime/ @home-assistant/core
-/homeassistant/components/deako/ @sebirdman @balake @deakolights
-/tests/components/deako/ @sebirdman @balake @deakolights
 /homeassistant/components/debugpy/ @frenck
 /tests/components/debugpy/ @frenck
 /homeassistant/components/deconz/ @Kane610
@@ -358,12 +336,10 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dsmr/ @Robbie1221
+/homeassistant/components/dsmr/ @Robbie1221 @frenck
-/tests/components/dsmr/ @Robbie1221
+/tests/components/dsmr/ @Robbie1221 @frenck
-/homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
+/homeassistant/components/dsmr_reader/ @sorted-bits @glodenox
-/tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
+/tests/components/dsmr_reader/ @sorted-bits @glodenox
-/homeassistant/components/duke_energy/ @hunterjm
-/tests/components/duke_energy/ @hunterjm
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
 /homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
@@ -378,8 +354,8 @@ build.json @home-assistant/supervisor
 /tests/components/ecoforest/ @pjanuario
 /homeassistant/components/econet/ @w1ll1am23
 /tests/components/econet/ @w1ll1am23
-/homeassistant/components/ecovacs/ @mib1185 @edenhaus @Augar
+/homeassistant/components/ecovacs/ @OverloadUT @mib1185 @edenhaus @Augar
-/tests/components/ecovacs/ @mib1185 @edenhaus @Augar
+/tests/components/ecovacs/ @OverloadUT @mib1185 @edenhaus @Augar
 /homeassistant/components/ecowitt/ @pvizeli
 /tests/components/ecowitt/ @pvizeli
 /homeassistant/components/efergy/ @tkdrob
@@ -389,8 +365,6 @@ build.json @home-assistant/supervisor
 /tests/components/electrasmart/ @jafar-atili
 /homeassistant/components/electric_kiwi/ @mikey0000
 /tests/components/electric_kiwi/ @mikey0000
-/homeassistant/components/elevenlabs/ @sorgfresser
-/tests/components/elevenlabs/ @sorgfresser
 /homeassistant/components/elgato/ @frenck
 /tests/components/elgato/ @frenck
 /homeassistant/components/elkm1/ @gwww @bdraco
@@ -401,8 +375,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/elvia/ @ludeeus
 /tests/components/elvia/ @ludeeus
 /homeassistant/components/emby/ @mezz64
-/homeassistant/components/emoncms/ @borpin @alexandrecuer
+/homeassistant/components/emoncms/ @borpin
-/tests/components/emoncms/ @borpin @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -419,8 +392,8 @@ build.json @home-assistant/supervisor
 /tests/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
-/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
+/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
-/tests/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
+/tests/components/enphase_envoy/ @bdraco @cgarwood @dgomes @joostlek @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
@@ -444,7 +417,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/evil_genius_labs/ @balloob
 /tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
-/tests/components/evohome/ @zxdavb
 /homeassistant/components/ezviz/ @RenierM26 @baqs
 /tests/components/ezviz/ @RenierM26 @baqs
 /homeassistant/components/faa_delays/ @ntilley905
@@ -453,8 +425,6 @@ 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
@@ -498,8 +468,8 @@ build.json @home-assistant/supervisor
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
-/homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
+/homeassistant/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
-/tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
+/tests/components/fritz/ @mammuth @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
 /tests/components/fritzbox/ @mib1185 @flabbamann
 /homeassistant/components/fritzbox_callmonitor/ @cdce8p
@@ -510,8 +480,6 @@ build.json @home-assistant/supervisor
 /tests/components/frontend/ @home-assistant/frontend
 /homeassistant/components/frontier_silicon/ @wlcrs
 /tests/components/frontier_silicon/ @wlcrs
-/homeassistant/components/fujitsu_fglair/ @crevetor
-/tests/components/fujitsu_fglair/ @crevetor
 /homeassistant/components/fully_kiosk/ @cgarwood
 /tests/components/fully_kiosk/ @cgarwood
 /homeassistant/components/fyta/ @dontinelli
@@ -527,7 +495,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/generic_hygrostat/ @Shulyaka
 /tests/components/generic_hygrostat/ @Shulyaka
 /homeassistant/components/geniushub/ @manzanotti
-/tests/components/geniushub/ @manzanotti
 /homeassistant/components/geo_json_events/ @exxamalte
 /tests/components/geo_json_events/ @exxamalte
 /homeassistant/components/geo_location/ @home-assistant/core
@@ -546,8 +513,6 @@ build.json @home-assistant/supervisor
 /tests/components/github/ @timmo001 @ludeeus
 /homeassistant/components/glances/ @engrbm87
 /tests/components/glances/ @engrbm87
-/homeassistant/components/go2rtc/ @home-assistant/core
-/tests/components/go2rtc/ @home-assistant/core
 /homeassistant/components/goalzero/ @tkdrob
 /tests/components/goalzero/ @tkdrob
 /homeassistant/components/gogogate2/ @vangorra
@@ -560,14 +525,11 @@ build.json @home-assistant/supervisor
 /tests/components/google_assistant/ @home-assistant/cloud
 /homeassistant/components/google_assistant_sdk/ @tronikos
 /tests/components/google_assistant_sdk/ @tronikos
-/homeassistant/components/google_cloud/ @lufton @tronikos
+/homeassistant/components/google_cloud/ @lufton
-/tests/components/google_cloud/ @lufton @tronikos
 /homeassistant/components/google_generative_ai_conversation/ @tronikos
 /tests/components/google_generative_ai_conversation/ @tronikos
 /homeassistant/components/google_mail/ @tkdrob
 /tests/components/google_mail/ @tkdrob
-/homeassistant/components/google_photos/ @allenporter
-/tests/components/google_photos/ @allenporter
 /homeassistant/components/google_sheets/ @tkdrob
 /tests/components/google_sheets/ @tkdrob
 /homeassistant/components/google_tasks/ @allenporter
@@ -588,14 +550,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 @tr4nt0r
+/homeassistant/components/habitica/ @ASMfreaK @leikoilja
-/tests/components/habitica/ @ASMfreaK @leikoilja @tr4nt0r
+/tests/components/habitica/ @ASMfreaK @leikoilja
 /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 @bdraco @mkeesey @Aohzan
+/homeassistant/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
-/tests/components/harmony/ @ehendrix23 @bdraco @mkeesey @Aohzan
+/tests/components/harmony/ @ehendrix23 @bramkragten @bdraco @mkeesey @Aohzan
 /homeassistant/components/hassio/ @home-assistant/supervisor
 /tests/components/hassio/ @home-assistant/supervisor
 /homeassistant/components/hdmi_cec/ @inytar
@@ -619,8 +581,8 @@ build.json @home-assistant/supervisor
 /tests/components/hlk_sw16/ @jameshilliard
 /homeassistant/components/holiday/ @jrieger @gjohansson-ST
 /tests/components/holiday/ @jrieger @gjohansson-ST
-/homeassistant/components/home_connect/ @DavidMStraub @Diegorro98
+/homeassistant/components/home_connect/ @DavidMStraub
-/tests/components/home_connect/ @DavidMStraub @Diegorro98
+/tests/components/home_connect/ @DavidMStraub
 /homeassistant/components/homeassistant/ @home-assistant/core
 /tests/components/homeassistant/ @home-assistant/core
 /homeassistant/components/homeassistant_alerts/ @home-assistant/core
@@ -645,8 +607,6 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/html5/ @alexyao2015
-/tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
@@ -661,14 +621,12 @@ build.json @home-assistant/supervisor
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/husqvarna_automower/ @Thomas55555
 /tests/components/husqvarna_automower/ @Thomas55555
-/homeassistant/components/husqvarna_automower_ble/ @alistair23
-/tests/components/husqvarna_automower_ble/ @alistair23
 /homeassistant/components/huum/ @frwickst
 /tests/components/huum/ @frwickst
 /homeassistant/components/hvv_departures/ @vigonotion
 /tests/components/hvv_departures/ @vigonotion
-/homeassistant/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
+/homeassistant/components/hydrawise/ @dknowles2 @ptcryan
-/tests/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
+/tests/components/hydrawise/ @dknowles2 @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
 /homeassistant/components/ialarm/ @RyuzakiKK
@@ -692,12 +650,9 @@ 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/ @jbouwh
+/homeassistant/components/incomfort/ @zxdavb
-/tests/components/incomfort/ @jbouwh
 /homeassistant/components/influxdb/ @mdegat01
 /tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
@@ -727,8 +682,6 @@ build.json @home-assistant/supervisor
 /tests/components/ios/ @robbiet480
 /homeassistant/components/iotawatt/ @gtdiehl @jyavenard
 /tests/components/iotawatt/ @gtdiehl @jyavenard
-/homeassistant/components/iotty/ @pburgio @shapournemati-iotty
-/tests/components/iotty/ @pburgio @shapournemati-iotty
 /homeassistant/components/iperf3/ @rohankapoorcom
 /homeassistant/components/ipma/ @dgomes
 /tests/components/ipma/ @dgomes
@@ -737,20 +690,10 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iqvia/ @bachya
 /tests/components/iqvia/ @bachya
 /homeassistant/components/irish_rail_transport/ @ttroy50
-/homeassistant/components/iron_os/ @tr4nt0r
-/tests/components/iron_os/ @tr4nt0r
-/homeassistant/components/isal/ @bdraco
-/tests/components/isal/ @bdraco
-/homeassistant/components/iskra/ @iskramis
-/tests/components/iskra/ @iskramis
 /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
@@ -781,8 +724,6 @@ 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
@@ -819,22 +760,14 @@ build.json @home-assistant/supervisor
 /tests/components/leaone/ @bdraco
 /homeassistant/components/led_ble/ @bdraco
 /tests/components/led_ble/ @bdraco
-/homeassistant/components/lektrico/ @lektrico
-/tests/components/lektrico/ @lektrico
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
-/homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
-/tests/components/lg_thinq/ @LG-ThinQ-Integration
 /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
 /tests/components/linear_garage_door/ @IceBotYT
-/homeassistant/components/linkplay/ @Velleman
-/tests/components/linkplay/ @Velleman
 /homeassistant/components/linux_battery/ @fabaff
 /homeassistant/components/litejet/ @joncar
 /tests/components/litejet/ @joncar
@@ -854,6 +787,8 @@ build.json @home-assistant/supervisor
 /tests/components/logbook/ @home-assistant/core
 /homeassistant/components/logger/ @home-assistant/core
 /tests/components/logger/ @home-assistant/core
+/homeassistant/components/logi_circle/ @evanjd
+/tests/components/logi_circle/ @evanjd
 /homeassistant/components/london_underground/ @jpbede
 /tests/components/london_underground/ @jpbede
 /homeassistant/components/lookin/ @ANMalko @bdraco
@@ -869,20 +804,15 @@ build.json @home-assistant/supervisor
 /tests/components/lupusec/ @majuss @suaveolent
 /homeassistant/components/lutron/ @cdheiser @wilburCForce
 /tests/components/lutron/ @cdheiser @wilburCForce
-/homeassistant/components/lutron_caseta/ @swails @danaues @eclair4151
+/homeassistant/components/lutron_caseta/ @swails @bdraco @danaues @eclair4151
-/tests/components/lutron_caseta/ @swails @danaues @eclair4151
+/tests/components/lutron_caseta/ @swails @bdraco @danaues @eclair4151
 /homeassistant/components/lyric/ @timmo001
 /tests/components/lyric/ @timmo001
-/homeassistant/components/madvr/ @iloveicedgreentea
+/homeassistant/components/mastodon/ @fabaff
-/tests/components/madvr/ @iloveicedgreentea
-/homeassistant/components/mastodon/ @fabaff @andrew-codechimp
-/tests/components/mastodon/ @fabaff @andrew-codechimp
 /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
@@ -894,8 +824,6 @@ 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
@@ -927,18 +855,16 @@ 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
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
-/homeassistant/components/monarch_money/ @jeeftor
-/tests/components/monarch_money/ @jeeftor
 /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
@@ -956,8 +882,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/msteams/ @peroyvind
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
-/homeassistant/components/music_assistant/ @music-assistant
-/tests/components/music_assistant/ @music-assistant
 /homeassistant/components/mutesync/ @currentoor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
@@ -970,10 +894,8 @@ build.json @home-assistant/supervisor
 /tests/components/myuplink/ @pajzo @astrandb
 /homeassistant/components/nam/ @bieniu
 /tests/components/nam/ @bieniu
-/homeassistant/components/nanoleaf/ @milanmeu @joostlek
+/homeassistant/components/nanoleaf/ @milanmeu
-/tests/components/nanoleaf/ @milanmeu @joostlek
+/tests/components/nanoleaf/ @milanmeu
-/homeassistant/components/nasweb/ @nasWebio
-/tests/components/nasweb/ @nasWebio
 /homeassistant/components/neato/ @Santobert
 /tests/components/neato/ @Santobert
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM
@@ -1002,8 +924,6 @@ build.json @home-assistant/supervisor
 /tests/components/nfandroidtv/ @tkdrob
 /homeassistant/components/nibe_heatpump/ @elupus
 /tests/components/nibe_heatpump/ @elupus
-/homeassistant/components/nice_go/ @IceBotYT
-/tests/components/nice_go/ @IceBotYT
 /homeassistant/components/nightscout/ @marciogranzotto
 /tests/components/nightscout/ @marciogranzotto
 /homeassistant/components/nilu/ @hfurubotten
@@ -1014,8 +934,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/noaa_tides/ @jdelaney72
 /homeassistant/components/nobo_hub/ @echoromeo @oyvindwe
 /tests/components/nobo_hub/ @echoromeo @oyvindwe
-/homeassistant/components/nordpool/ @gjohansson-ST
-/tests/components/nordpool/ @gjohansson-ST
 /homeassistant/components/notify/ @home-assistant/core
 /tests/components/notify/ @home-assistant/core
 /homeassistant/components/notify_events/ @matrozov @papajojo
@@ -1038,8 +956,6 @@ build.json @home-assistant/supervisor
 /tests/components/nut/ @bdraco @ollo69 @pestevez
 /homeassistant/components/nws/ @MatthewFlamm @kamiyo
 /tests/components/nws/ @MatthewFlamm @kamiyo
-/homeassistant/components/nyt_games/ @joostlek
-/tests/components/nyt_games/ @joostlek
 /homeassistant/components/nzbget/ @chriscla
 /tests/components/nzbget/ @chriscla
 /homeassistant/components/obihai/ @dshokouhi @ejpenney
@@ -1050,6 +966,8 @@ 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
@@ -1058,8 +976,6 @@ build.json @home-assistant/supervisor
 /tests/components/ondilo_ico/ @JeromeHXP
 /homeassistant/components/onewire/ @garbled1 @epenet
 /tests/components/onewire/ @garbled1 @epenet
-/homeassistant/components/onkyo/ @arturpragacz
-/tests/components/onkyo/ @arturpragacz
 /homeassistant/components/onvif/ @hunterjm
 /tests/components/onvif/ @hunterjm
 /homeassistant/components/open_meteo/ @frenck
@@ -1095,16 +1011,16 @@ build.json @home-assistant/supervisor
 /tests/components/otbr/ @home-assistant/core
 /homeassistant/components/ourgroceries/ @OnFreund
 /tests/components/ourgroceries/ @OnFreund
-/homeassistant/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
+/homeassistant/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117
-/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
+/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117
 /homeassistant/components/ovo_energy/ @timmo001
 /tests/components/ovo_energy/ @timmo001
 /homeassistant/components/p1_monitor/ @klaasnicolaas
 /tests/components/p1_monitor/ @klaasnicolaas
-/homeassistant/components/palazzetti/ @dotvav
-/tests/components/palazzetti/ @dotvav
 /homeassistant/components/panel_custom/ @home-assistant/frontend
 /tests/components/panel_custom/ @home-assistant/frontend
+/homeassistant/components/panel_iframe/ @home-assistant/frontend
+/tests/components/panel_iframe/ @home-assistant/frontend
 /homeassistant/components/peco/ @IceBotYT
 /tests/components/peco/ @IceBotYT
 /homeassistant/components/pegel_online/ @mib1185
@@ -1119,6 +1035,8 @@ build.json @home-assistant/supervisor
 /tests/components/pi_hole/ @shenxn
 /homeassistant/components/picnic/ @corneyl
 /tests/components/picnic/ @corneyl
+/homeassistant/components/pilight/ @trekky12
+/tests/components/pilight/ @trekky12
 /homeassistant/components/ping/ @jpbede
 /tests/components/ping/ @jpbede
 /homeassistant/components/plaato/ @JohNan
@@ -1148,8 +1066,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
 /homeassistant/components/proxmoxve/ @jhollowe @Corbeno
-/homeassistant/components/prusalink/ @balloob
+/homeassistant/components/prusalink/ @balloob @Skaronator
-/tests/components/prusalink/ @balloob
+/tests/components/prusalink/ @balloob @Skaronator
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pure_energie/ @klaasnicolaas
@@ -1166,8 +1084,6 @@ 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
@@ -1246,14 +1162,14 @@ build.json @home-assistant/supervisor
 /tests/components/rituals_perfume_genie/ @milanmeu @frenck
 /homeassistant/components/rmvtransport/ @cgtobi
 /tests/components/rmvtransport/ @cgtobi
-/homeassistant/components/roborock/ @Lash-L
+/homeassistant/components/roborock/ @humbertogontijo @Lash-L
-/tests/components/roborock/ @Lash-L
+/tests/components/roborock/ @humbertogontijo @Lash-L
 /homeassistant/components/roku/ @ctalkington
 /tests/components/roku/ @ctalkington
 /homeassistant/components/romy/ @xeniter
 /tests/components/romy/ @xeniter
-/homeassistant/components/roomba/ @pschmitt @cyr-ius @shenxn @Orhideous
+/homeassistant/components/roomba/ @pschmitt @cyr-ius @shenxn @Xitee1 @Orhideous
-/tests/components/roomba/ @pschmitt @cyr-ius @shenxn @Orhideous
+/tests/components/roomba/ @pschmitt @cyr-ius @shenxn @Xitee1 @Orhideous
 /homeassistant/components/roon/ @pavoni
 /tests/components/roon/ @pavoni
 /homeassistant/components/rpi_power/ @shenxn @swetoast
@@ -1264,8 +1180,6 @@ 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
@@ -1310,8 +1224,6 @@ build.json @home-assistant/supervisor
 /tests/components/sensorpro/ @bdraco
 /homeassistant/components/sensorpush/ @bdraco
 /tests/components/sensorpush/ @bdraco
-/homeassistant/components/sensoterra/ @markruys
-/tests/components/sensoterra/ @markruys
 /homeassistant/components/sentry/ @dcramer @frenck
 /tests/components/sentry/ @dcramer @frenck
 /homeassistant/components/senz/ @milanmeu
@@ -1335,8 +1247,6 @@ 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
@@ -1346,8 +1256,6 @@ build.json @home-assistant/supervisor
 /tests/components/siren/ @home-assistant/core @raman325
 /homeassistant/components/sisyphus/ @jkeljo
 /homeassistant/components/sky_hub/ @rogerselwyn
-/homeassistant/components/sky_remote/ @dunnmj @saty9
-/tests/components/sky_remote/ @dunnmj @saty9
 /homeassistant/components/skybell/ @tkdrob
 /tests/components/skybell/ @tkdrob
 /homeassistant/components/slack/ @tkdrob @fletcherau
@@ -1363,14 +1271,13 @@ 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
-/tests/components/smarty/ @z0mbieprocess
 /homeassistant/components/smhi/ @gjohansson-ST
 /tests/components/smhi/ @gjohansson-ST
-/homeassistant/components/smlight/ @tl-sl
-/tests/components/smlight/ @tl-sl
 /homeassistant/components/sms/ @ocalvo
 /tests/components/sms/ @ocalvo
 /homeassistant/components/snapcast/ @luar123
@@ -1379,11 +1286,11 @@ build.json @home-assistant/supervisor
 /tests/components/snmp/ @nmaggioni
 /homeassistant/components/snooz/ @AustinBrunkhorst
 /tests/components/snooz/ @AustinBrunkhorst
-/homeassistant/components/solaredge/ @frenck @bdraco
+/homeassistant/components/solaredge/ @frenck
-/tests/components/solaredge/ @frenck @bdraco
+/tests/components/solaredge/ @frenck
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
-/homeassistant/components/solarlog/ @Ernst79 @dontinelli
+/homeassistant/components/solarlog/ @Ernst79
-/tests/components/solarlog/ @Ernst79 @dontinelli
+/tests/components/solarlog/ @Ernst79
 /homeassistant/components/solax/ @squishykid
 /tests/components/solax/ @squishykid
 /homeassistant/components/soma/ @ratsept @sebfortier2288
@@ -1400,13 +1307,15 @@ build.json @home-assistant/supervisor
 /tests/components/spaceapi/ @fabaff
 /homeassistant/components/speedtestdotnet/ @rohankapoorcom @engrbm87
 /tests/components/speedtestdotnet/ @rohankapoorcom @engrbm87
+/homeassistant/components/spider/ @peternijssen
+/tests/components/spider/ @peternijssen
 /homeassistant/components/splunk/ @Bre77
 /homeassistant/components/spotify/ @frenck @joostlek
 /tests/components/spotify/ @frenck @joostlek
 /homeassistant/components/sql/ @gjohansson-ST @dougiteixeira
 /tests/components/sql/ @gjohansson-ST @dougiteixeira
-/homeassistant/components/squeezebox/ @rajlaud @pssc @peteS-UK
+/homeassistant/components/squeezebox/ @rajlaud
-/tests/components/squeezebox/ @rajlaud @pssc @peteS-UK
+/tests/components/squeezebox/ @rajlaud
 /homeassistant/components/srp_energy/ @briglx
 /tests/components/srp_energy/ @briglx
 /homeassistant/components/starline/ @anonym-tsk
@@ -1430,8 +1339,8 @@ build.json @home-assistant/supervisor
 /tests/components/stt/ @home-assistant/core
 /homeassistant/components/subaru/ @G-Two
 /tests/components/subaru/ @G-Two
-/homeassistant/components/suez_water/ @ooii @jb101010-2
+/homeassistant/components/suez_water/ @ooii
-/tests/components/suez_water/ @ooii @jb101010-2
+/tests/components/suez_water/ @ooii
 /homeassistant/components/sun/ @Swamp-Ig
 /tests/components/sun/ @Swamp-Ig
 /homeassistant/components/sunweg/ @rokam
@@ -1450,10 +1359,10 @@ 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 @laurence-presland @Gigatrappeur
+/homeassistant/components/switchbot_cloud/ @SeraphicRav
-/tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
+/tests/components/switchbot_cloud/ @SeraphicRav
-/homeassistant/components/switcher_kis/ @thecode @YogevBokobza
+/homeassistant/components/switcher_kis/ @thecode
-/tests/components/switcher_kis/ @thecode @YogevBokobza
+/tests/components/switcher_kis/ @thecode
 /homeassistant/components/switchmate/ @danielhiversen @qiz-li
 /homeassistant/components/syncthing/ @zhulik
 /tests/components/syncthing/ @zhulik
@@ -1489,10 +1398,8 @@ build.json @home-assistant/supervisor
 /tests/components/tedee/ @patrickhilker @zweckj
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/template/ @PhracturedBlue @home-assistant/core
+/homeassistant/components/template/ @PhracturedBlue @tetienne @home-assistant/core
-/tests/components/template/ @PhracturedBlue @home-assistant/core
+/tests/components/template/ @PhracturedBlue @tetienne @home-assistant/core
-/homeassistant/components/tesla_fleet/ @Bre77
-/tests/components/tesla_fleet/ @Bre77
 /homeassistant/components/tesla_wall_connector/ @einarhauks
 /tests/components/tesla_wall_connector/ @einarhauks
 /homeassistant/components/teslemetry/ @Bre77
@@ -1506,8 +1413,7 @@ build.json @home-assistant/supervisor
 /tests/components/thermobeacon/ @bdraco
 /homeassistant/components/thermopro/ @bdraco @h3ss
 /tests/components/thermopro/ @bdraco @h3ss
-/homeassistant/components/thethingsnetwork/ @angelnu
+/homeassistant/components/thethingsnetwork/ @fabaff
-/tests/components/thethingsnetwork/ @angelnu
 /homeassistant/components/thread/ @home-assistant/core
 /tests/components/thread/ @home-assistant/core
 /homeassistant/components/tibber/ @danielhiversen
@@ -1531,10 +1437,8 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/touchline_sl/ @jnsgruk
+/homeassistant/components/tplink/ @rytilahti @thegardenmonkey @bdraco @sdb9696
-/tests/components/touchline_sl/ @jnsgruk
+/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
@@ -1557,8 +1461,6 @@ build.json @home-assistant/supervisor
 /tests/components/transmission/ @engrbm87 @JPHutchins
 /homeassistant/components/trend/ @jpbede
 /tests/components/trend/ @jpbede
-/homeassistant/components/triggercmd/ @rvmey
-/tests/components/triggercmd/ @rvmey
 /homeassistant/components/tts/ @home-assistant/core
 /tests/components/tts/ @home-assistant/core
 /homeassistant/components/tuya/ @Tuya @zlinoliver @frenck
@@ -1575,6 +1477,8 @@ 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
@@ -1663,8 +1567,6 @@ build.json @home-assistant/supervisor
 /tests/components/webostv/ @thecode
 /homeassistant/components/websocket_api/ @home-assistant/core
 /tests/components/websocket_api/ @home-assistant/core
-/homeassistant/components/weheat/ @jesperraemaekers
-/tests/components/weheat/ @jesperraemaekers
 /homeassistant/components/wemo/ @esev
 /tests/components/wemo/ @esev
 /homeassistant/components/whirlpool/ @abmantis @mkmer
@@ -1682,8 +1584,6 @@ build.json @home-assistant/supervisor
 /tests/components/wiz/ @sbidy
 /homeassistant/components/wled/ @frenck
 /tests/components/wled/ @frenck
-/homeassistant/components/wmspro/ @mback2k
-/tests/components/wmspro/ @mback2k
 /homeassistant/components/wolflink/ @adamkrol93 @mtielen
 /tests/components/wolflink/ @adamkrol93 @mtielen
 /homeassistant/components/workday/ @fabaff @gjohansson-ST
@@ -1704,8 +1604,6 @@ build.json @home-assistant/supervisor
 /tests/components/xiaomi_miio/ @rytilahti @syssi @starkillerOG
 /homeassistant/components/xiaomi_tv/ @simse
 /homeassistant/components/xmpp/ @fabaff @flowolf
-/homeassistant/components/yale/ @bdraco
-/tests/components/yale/ @bdraco
 /homeassistant/components/yale_smart_alarm/ @gjohansson-ST
 /tests/components/yale_smart_alarm/ @gjohansson-ST
 /homeassistant/components/yalexs_ble/ @bdraco

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, socioeconomic status,
+identity and expression, level of experience, education, socio-economic status,
 nationality, personal appearance, race, religion, or sexual identity
 and orientation.
 

Dockerfile

@@ -7,13 +7,12 @@ FROM ${BUILD_FROM}
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
     S6_SERVICES_GRACETIME=240000 \
-    UV_SYSTEM_PYTHON=true \
+    UV_SYSTEM_PYTHON=true
-    UV_NO_CACHE=true
 
 ARG QEMU_CPU
 
 # Install uv
-RUN pip3 install uv==0.5.0
+RUN pip3 install uv==0.1.35
 
 WORKDIR /usr/src
 
@@ -30,9 +29,15 @@ RUN \
     if ls homeassistant/home_assistant_*.whl 1> /dev/null 2>&1; then \
         uv pip install homeassistant/home_assistant_*.whl; \
     fi \
-    && uv pip install \
+    && if [ "${BUILD_ARCH}" = "i386" ]; then \
+        linux32 uv pip install \
             --no-build \
-        -r homeassistant/requirements_all.txt
+            -r homeassistant/requirements_all.txt; \
+    else \
+        uv pip install \
+            --no-build \
+            -r homeassistant/requirements_all.txt; \
+    fi
 
 ## Setup Home Assistant Core
 COPY . homeassistant/
@@ -45,19 +50,4 @@ RUN \
 # Home Assistant S6-Overlay
 COPY rootfs /
 
-# Needs to be redefined inside the FROM statement to be set for RUN commands
-ARG BUILD_ARCH
-# Get go2rtc binary
-RUN \
-    case "${BUILD_ARCH}" in \
-        "aarch64") go2rtc_suffix='arm64' ;; \
-        "armhf") go2rtc_suffix='armv6' ;; \
-        "armv7") go2rtc_suffix='arm' ;; \
-        *) go2rtc_suffix=${BUILD_ARCH} ;; \
-    esac \
-    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.7/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
-    && chmod +x /bin/go2rtc \
-    # Verify go2rtc can be executed
-    && go2rtc --version
-
 WORKDIR /config

Dockerfile.dev

@@ -35,34 +35,21 @@ RUN \
     && apt-get clean \
     && rm -rf /var/lib/apt/lists/*
 
-# Add go2rtc binary
-COPY --from=ghcr.io/alexxit/go2rtc:latest /usr/local/bin/go2rtc /bin/go2rtc
-
-# Install uv
-RUN pip3 install uv
-
 WORKDIR /usr/src
 
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
-    && uv pip install --system -e hass-release/ \
+    && pip3 install -e hass-release/
-    && chown -R vscode /usr/src/hass-release/data
 
-USER vscode
+WORKDIR /workspaces
-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 uv pip install -r requirements.txt
+RUN pip3 install -r requirements.txt
 COPY requirements_test.txt requirements_test_pre_commit.txt ./
-RUN uv pip install -r requirements_test.txt
+RUN pip3 install -r requirements_test.txt
-
+RUN rm -rf requirements.txt requirements_test.txt requirements_test_pre_commit.txt homeassistant/
-WORKDIR /workspaces
 
 # Set the default shell to bash instead of sh
 ENV SHELL /bin/bash

README.rst

@@ -20,14 +20,9 @@ components <https://developers.home-assistant.io/docs/creating_component_index/>
 If you run into issues while using Home Assistant or during development
 of a component, check the `Home Assistant help section <https://home-assistant.io/help/>`__ of our website for further help and information.
 
-|ohf-logo|
-
 .. |Chat Status| image:: https://img.shields.io/discord/330944238910963714.svg
    :target: https://www.home-assistant.io/join-chat/
 .. |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/
-.. |ohf-logo| image:: https://www.openhomefoundation.org/badges/home-assistant.png
-   :alt: Home Assistant - A project from the Open Home Foundation
-   :target: https://www.openhomefoundation.org/

build.yaml

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

codecov.yml

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

homeassistant/__main__.py

@@ -3,13 +3,11 @@
 from __future__ import annotations
 
 import argparse
-from contextlib import suppress
 import faulthandler
 import os
 import sys
 import threading
 
-from .backup_restore import restore_backup
 from .const import REQUIRED_PYTHON_VER, RESTART_EXIT_CODE, __version__
 
 FAULT_LOG_FILENAME = "home-assistant.log.fault"
@@ -183,9 +181,6 @@ def main() -> int:
         return scripts.run(args.script)
 
     config_dir = os.path.abspath(os.path.join(os.getcwd(), args.config))
-    if restore_backup(config_dir):
-        return RESTART_EXIT_CODE
-
     ensure_config_path(config_dir)
 
     # pylint: disable-next=import-outside-toplevel
@@ -213,8 +208,6 @@ def main() -> int:
         exit_code = runner.run(runtime_conf)
         faulthandler.disable()
 
-    # 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)
 

homeassistant/auth/__init__.py

@@ -12,6 +12,7 @@ from typing import Any, cast
 
 import jwt
 
+from homeassistant import data_entry_flow
 from homeassistant.core import (
     CALLBACK_TYPE,
     HassJob,
@@ -19,24 +20,23 @@ from homeassistant.core import (
     HomeAssistant,
     callback,
 )
-from homeassistant.data_entry_flow import FlowHandler, FlowManager, FlowResultType
 from homeassistant.helpers.event import async_track_point_in_utc_time
 from homeassistant.util import dt as dt_util
 
 from . import auth_store, jwt_wrapper, models
 from .const import ACCESS_TOKEN_EXPIRATION, GROUP_ID_ADMIN, REFRESH_TOKEN_EXPIRATION
 from .mfa_modules import MultiFactorAuthModule, auth_mfa_module_from_config
-from .models import AuthFlowContext, AuthFlowResult
+from .models import AuthFlowResult
 from .providers import AuthProvider, LoginFlow, auth_provider_from_config
-from .providers.homeassistant import HassAuthProvider
+from .session import SessionManager
 
 EVENT_USER_ADDED = "user_added"
 EVENT_USER_UPDATED = "user_updated"
 EVENT_USER_REMOVED = "user_removed"
 
-type _MfaModuleDict = dict[str, MultiFactorAuthModule]
+_MfaModuleDict = dict[str, MultiFactorAuthModule]
-type _ProviderKey = tuple[str, str | None]
+_ProviderKey = tuple[str, str | None]
-type _ProviderDict = dict[_ProviderKey, AuthProvider]
+_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 no duplicated auth providers or
+    CORE_CONFIG_SCHEMA will make sure do duplicated auth providers or
     mfa modules exist in configs.
     """
     store = auth_store.AuthStore(hass)
@@ -74,13 +74,6 @@ 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)
@@ -98,7 +91,7 @@ async def auth_manager_from_config(
 
 
 class AuthManagerFlowManager(
-    FlowManager[AuthFlowContext, AuthFlowResult, tuple[str, str]]
+    data_entry_flow.FlowManager[AuthFlowResult, tuple[str, str]]
 ):
     """Manage authentication flows."""
 
@@ -113,7 +106,7 @@ class AuthManagerFlowManager(
         self,
         handler_key: tuple[str, str],
         *,
-        context: AuthFlowContext | None = None,
+        context: dict[str, Any] | None = None,
         data: dict[str, Any] | None = None,
     ) -> LoginFlow:
         """Create a login flow."""
@@ -124,17 +117,13 @@ class AuthManagerFlowManager(
 
     async def async_finish_flow(
         self,
-        flow: FlowHandler[AuthFlowContext, AuthFlowResult, tuple[str, str]],
+        flow: data_entry_flow.FlowHandler[AuthFlowResult, tuple[str, str]],
         result: AuthFlowResult,
     ) -> AuthFlowResult:
-        """Return a user as result of login flow.
+        """Return a user as result of login flow."""
-
-        This method is called when a flow step returns FlowResultType.ABORT or
-        FlowResultType.CREATE_ENTRY.
-        """
         flow = cast(LoginFlow, flow)
 
-        if result["type"] != FlowResultType.CREATE_ENTRY:
+        if result["type"] != data_entry_flow.FlowResultType.CREATE_ENTRY:
             return result
 
         # we got final result
@@ -192,6 +181,7 @@ 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."""
@@ -202,6 +192,7 @@ class AuthManager:
             )
         )
         self._async_track_next_refresh_token_expiration()
+        await self.session.async_setup()
 
     @property
     def auth_providers(self) -> list[AuthProvider]:
@@ -367,15 +358,15 @@ class AuthManager:
         local_only: bool | None = None,
     ) -> None:
         """Update a user."""
-        kwargs: dict[str, Any] = {
+        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
+            if value is not None:
-        }
+                kwargs[attr_name] = value
         await self._store.async_update_user(user, **kwargs)
 
         if is_active is not None:
@@ -386,13 +377,6 @@ 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)
@@ -535,13 +519,6 @@ 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,7 +62,6 @@ 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."""
@@ -105,18 +104,14 @@ class AuthStore:
             "perm_lookup": self._perm_lookup,
         }
 
-        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
+            if value is not None:
-            }
+                kwargs[attr_name] = value
-        )
 
         new_user = models.User(**kwargs)
 
@@ -140,10 +135,7 @@ class AuthStore:
 
     async def async_remove_user(self, user: models.User) -> None:
         """Remove a user."""
-        user = self._users.pop(user.id)
+        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(
@@ -226,9 +218,7 @@ class AuthStore:
             kwargs["client_icon"] = client_icon
 
         refresh_token = models.RefreshToken(**kwargs)
-        token_id = refresh_token.id
+        user.refresh_tokens[refresh_token.id] = refresh_token
-        user.refresh_tokens[token_id] = refresh_token
-        self._token_id_to_user_id[token_id] = user.id
 
         self._async_schedule_save()
         return refresh_token
@@ -236,17 +226,19 @@ class AuthStore:
     @callback
     def async_remove_refresh_token(self, refresh_token: models.RefreshToken) -> None:
         """Remove a refresh token."""
-        refresh_token_id = refresh_token.id
+        for user in self._users.values():
-        if user_id := self._token_id_to_user_id.get(refresh_token_id):
+            if user.refresh_tokens.pop(refresh_token.id, None):
-            del self._users[user_id].refresh_tokens[refresh_token_id]
-            del self._token_id_to_user_id[refresh_token_id]
                 self._async_schedule_save()
+                break
 
     @callback
     def async_get_refresh_token(self, token_id: str) -> models.RefreshToken | None:
         """Get refresh token by id."""
-        if user_id := self._token_id_to_user_id.get(token_id):
+        for user in self._users.values():
-            return self._users[user_id].refresh_tokens.get(token_id)
+            refresh_token = user.refresh_tokens.get(token_id)
+            if refresh_token is not None:
+                return refresh_token
+
         return None
 
     @callback
@@ -285,29 +277,6 @@ 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:
@@ -321,6 +290,8 @@ 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
@@ -474,6 +445,14 @@ 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"]],
@@ -490,7 +469,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=rt_dict.get("expire_at"),
+                expire_at=expire_at,
                 version=rt_dict.get("version"),
             )
             if "credential_id" in rt_dict:
@@ -499,17 +478,8 @@ class AuthStore:
 
         self._groups = groups
         self._users = users
-        self._build_token_id_to_user_id()
-        self._async_schedule_save(INITIAL_LOAD_SAVE_DELAY)
 
-    @callback
+        self._async_schedule_save(INITIAL_LOAD_SAVE_DELAY)
-    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:
@@ -604,7 +574,6 @@ 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,7 +16,6 @@ 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()
 
@@ -30,7 +29,7 @@ MULTI_FACTOR_AUTH_MODULE_SCHEMA = vol.Schema(
     extra=vol.ALLOW_EXTRA,
 )
 
-DATA_REQS: HassKey[set[str]] = HassKey("mfa_auth_module_reqs_processed")
+DATA_REQS = "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)
 
 
-type _UsersDict = dict[str, NotifySetting]
+_UsersDict = dict[str, NotifySetting]
 
 
 @MULTI_FACTOR_AUTH_MODULES.register("notify")

homeassistant/auth/models.py

@@ -3,7 +3,7 @@
 from __future__ import annotations
 
 from datetime import datetime, timedelta
-from ipaddress import IPv4Address, IPv6Address
+from functools import cached_property
 import secrets
 from typing import Any, NamedTuple
 import uuid
@@ -11,10 +11,9 @@ import uuid
 import attr
 from attr import Attribute
 from attr.setters import validate
-from propcache import cached_property
 
 from homeassistant.const import __version__
-from homeassistant.data_entry_flow import FlowContext, FlowResult
+from homeassistant.data_entry_flow import FlowResult
 from homeassistant.util import dt as dt_util
 
 from . import permissions as perm_mdl
@@ -24,16 +23,7 @@ TOKEN_TYPE_NORMAL = "normal"
 TOKEN_TYPE_SYSTEM = "system"
 TOKEN_TYPE_LONG_LIVED_ACCESS_TOKEN = "long_lived_access_token"
 
-
+AuthFlowResult = FlowResult[tuple[str, str]]
-class AuthFlowContext(FlowContext, total=False):
-    """Typed context dict for auth flow."""
-
-    credential_only: bool
-    ip_address: IPv4Address | IPv6Address
-    redirect_uri: str
-
-
-AuthFlowResult = FlowResult[AuthFlowContext, tuple[str, str]]
 
 
 @attr.s(slots=True)

homeassistant/auth/permissions/events.py

@@ -18,12 +18,9 @@ from homeassistant.const import (
     EVENT_THEMES_UPDATED,
 )
 from homeassistant.helpers.area_registry import EVENT_AREA_REGISTRY_UPDATED
-from homeassistant.helpers.category_registry import EVENT_CATEGORY_REGISTRY_UPDATED
 from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED
-from homeassistant.helpers.floor_registry import EVENT_FLOOR_REGISTRY_UPDATED
 from homeassistant.helpers.issue_registry import EVENT_REPAIRS_ISSUE_REGISTRY_UPDATED
-from homeassistant.helpers.label_registry import EVENT_LABEL_REGISTRY_UPDATED
 from homeassistant.util.event_type import EventType
 
 # These are events that do not contain any sensitive data
@@ -44,7 +41,4 @@ SUBSCRIBE_ALLOWLIST: Final[set[EventType[Any] | str]] = {
     EVENT_SHOPPING_LIST_UPDATED,
     EVENT_STATE_CHANGED,
     EVENT_THEMES_UPDATED,
-    EVENT_LABEL_REGISTRY_UPDATED,
-    EVENT_CATEGORY_REGISTRY_UPDATED,
-    EVENT_FLOOR_REGISTRY_UPDATED,
 }

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.
 
-type ValueType = (
+ValueType = (
     # Example: entities.all = { read: true, control: true }
     Mapping[str, bool] | bool | None
 )
 
 # Example: entities.domains = { light: … }
-type SubCategoryDict = Mapping[str, ValueType]
+SubCategoryDict = Mapping[str, ValueType]
 
-type SubCategoryType = SubCategoryDict | bool | None
+SubCategoryType = SubCategoryDict | bool | None
 
-type CategoryType = (
+CategoryType = (
     # Example: entities.domains
     Mapping[str, SubCategoryType]
     # Example: entities.all
@@ -24,4 +24,4 @@ type CategoryType = (
 )
 
 # Example: { entities: … }
-type PolicyType = Mapping[str, CategoryType]
+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
 
-type LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
+LookupFunc = Callable[[PermissionLookup, SubCategoryDict, str], ValueType | None]
-type SubCatLookupType = dict[str, LookupFunc]
+SubCatLookupType = dict[str, LookupFunc]
 
 
 def lookup_all(

homeassistant/auth/providers/__init__.py

@@ -10,29 +10,20 @@ from typing import Any
 import voluptuous as vol
 from voluptuous.humanize import humanize_error
 
-from homeassistant import requirements
+from homeassistant import data_entry_flow, requirements
 from homeassistant.const import CONF_ID, CONF_NAME, CONF_TYPE
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.data_entry_flow import FlowHandler
 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 (
+from ..models import AuthFlowResult, Credentials, RefreshToken, User, UserMeta
-    AuthFlowContext,
-    AuthFlowResult,
-    Credentials,
-    RefreshToken,
-    User,
-    UserMeta,
-)
 
 _LOGGER = logging.getLogger(__name__)
-DATA_REQS: HassKey[set[str]] = HassKey("auth_prov_reqs_processed")
+DATA_REQS = "auth_prov_reqs_processed"
 
 AUTH_PROVIDERS: Registry[str, type[AuthProvider]] = Registry()
 
@@ -105,7 +96,7 @@ class AuthProvider:
 
     # Implement by extending class
 
-    async def async_login_flow(self, context: AuthFlowContext | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return the data flow for logging in with auth provider.
 
         Auth provider should extend LoginFlow and return an instance.
@@ -192,7 +183,7 @@ async def load_auth_provider_module(
     return module
 
 
-class LoginFlow(FlowHandler[AuthFlowContext, AuthFlowResult, tuple[str, str]]):
+class LoginFlow(data_entry_flow.FlowHandler[AuthFlowResult, tuple[str, str]]):
     """Handler for the login flow."""
 
     _flow_result = AuthFlowResult

homeassistant/auth/providers/command_line.py

@@ -13,7 +13,7 @@ import voluptuous as vol
 from homeassistant.const import CONF_COMMAND
 from homeassistant.exceptions import HomeAssistantError
 
-from ..models import AuthFlowContext, AuthFlowResult, Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 CONF_ARGS = "args"
@@ -59,7 +59,7 @@ class CommandLineAuthProvider(AuthProvider):
         super().__init__(*args, **kwargs)
         self._user_meta: dict[str, dict[str, Any]] = {}
 
-    async def async_login_flow(self, context: AuthFlowContext | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return CommandLineLoginFlow(self)
 

homeassistant/auth/providers/homeassistant.py

@@ -14,10 +14,9 @@ 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 AuthFlowContext, AuthFlowResult, Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 STORAGE_VERSION = 1
@@ -55,27 +54,6 @@ 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."""
@@ -89,15 +67,13 @@ 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.
-        # Deprecated in June 2019 and will be removed in 2026.7
+        # Remove in 2020 or when we launch 1.0.
         self.is_legacy = False
 
     @callback
-    def normalize_username(
+    def normalize_username(self, username: str) -> str:
-        self, username: str, *, force_normalize: bool = False
-    ) -> str:
         """Normalize a username based on the mode."""
-        if self.is_legacy and not force_normalize:
+        if self.is_legacy:
             return username
 
         return username.strip().casefold()
@@ -107,50 +83,45 @@ class Data:
         if (data := await self._store.async_load()) is None:
             data = cast(dict[str, list[dict[str, str]]], {"users": []})
 
-        self._async_check_for_not_normalized_usernames(data)
+        seen: set[str] = set()
-        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"]
 
-            if self.normalize_username(username, force_normalize=True) != username:
+            # check if we have duplicates
+            if (folded := username.casefold()) in seen:
+                self.is_legacy = True
+
                 logging.getLogger(__name__).warning(
                     (
                         "Home Assistant auth provider is running in legacy mode "
-                        "because we detected usernames that are normalized (lowercase and without spaces)."
+                        "because we detected usernames that are case-insensitive"
-                        " Please change the username: '%s'."
+                        "equivalent. Please change the username: '%s'."
                     ),
                     username,
                 )
-                not_normalized_usernames.add(username)
 
-        if not_normalized_usernames:
+                break
+
+            seen.add(folded)
+
+            # check if we have unstripped usernames
+            if username != username.strip():
                 self.is_legacy = True
-            ir.async_create_issue(
+
-                self.hass,
+                logging.getLogger(__name__).warning(
-                "auth",
+                    (
-                "homeassistant_provider_not_normalized_usernames",
+                        "Home Assistant auth provider is running in legacy mode "
-                breaks_in_ha_version="2026.7.0",
+                        "because we detected usernames that start or end in a "
-                is_fixable=False,
+                        "space. Please change the username: '%s'."
-                severity=ir.IssueSeverity.WARNING,
+                    ),
-                translation_key="homeassistant_provider_not_normalized_usernames",
+                    username,
-                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"
                 )
 
+                break
+
+        self._data = data
+
     @property
     def users(self) -> list[dict[str, str]]:
         """Return users."""
@@ -191,11 +162,13 @@ class Data:
         return hashed
 
     def add_auth(self, username: str, password: str) -> None:
-        """Add a new authenticated user/pass.
+        """Add a new authenticated user/pass."""
+        username = self.normalize_username(username)
 
-        Raises InvalidUsername if the new username is invalid.
+        if any(
-        """
+            self.normalize_username(user["username"]) == username for user in self.users
-        self._validate_new_username(username)
+        ):
+            raise InvalidUser
 
         self.users.append(
             {
@@ -216,7 +189,7 @@ class Data:
                 break
 
         if index is None:
-            raise InvalidUser(translation_key="user_not_found")
+            raise InvalidUser
 
         self.users.pop(index)
 
@@ -232,50 +205,7 @@ class Data:
                 user["password"] = self.hash_password(new_password, True).decode()
                 break
         else:
-            raise InvalidUser(translation_key="user_not_found")
+            raise InvalidUser
-
-    @callback
-    def _validate_new_username(self, new_username: str) -> None:
-        """Validate that username is normalized and unique.
-
-        Raises InvalidUsername if the new username is invalid.
-        """
-        normalized_username = self.normalize_username(
-            new_username, force_normalize=True
-        )
-        if normalized_username != new_username:
-            raise InvalidUsername(
-                translation_key="username_not_normalized",
-                translation_placeholders={"new_username": new_username},
-            )
-
-        if any(
-            self.normalize_username(user["username"]) == normalized_username
-            for user in self.users
-        ):
-            raise InvalidUsername(
-                translation_key="username_already_exists",
-                translation_placeholders={"username": new_username},
-            )
-
-    @callback
-    def change_username(self, username: str, new_username: str) -> None:
-        """Update the username.
-
-        Raises InvalidUser if user cannot be found.
-        Raises InvalidUsername if the new username is invalid.
-        """
-        username = self.normalize_username(username)
-        self._validate_new_username(new_username)
-
-        for user in self.users:
-            if self.normalize_username(user["username"]) == username:
-                user["username"] = new_username
-                assert self._data is not None
-                self._async_check_for_not_normalized_usernames(self._data)
-                break
-        else:
-            raise InvalidUser(translation_key="user_not_found")
 
     async def async_save(self) -> None:
         """Save data."""
@@ -305,7 +235,7 @@ class HassAuthProvider(AuthProvider):
             await data.async_load()
             self.data = data
 
-    async def async_login_flow(self, context: AuthFlowContext | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return HassLoginFlow(self)
 
@@ -348,20 +278,6 @@ 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/insecure_example.py

@@ -4,14 +4,14 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 import hmac
-from typing import cast
+from typing import Any, cast
 
 import voluptuous as vol
 
 from homeassistant.core import callback
 from homeassistant.exceptions import HomeAssistantError
 
-from ..models import AuthFlowContext, AuthFlowResult, Credentials, UserMeta
+from ..models import AuthFlowResult, Credentials, UserMeta
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
 USER_SCHEMA = vol.Schema(
@@ -36,7 +36,7 @@ class InvalidAuthError(HomeAssistantError):
 class ExampleAuthProvider(AuthProvider):
     """Example auth provider based on hardcoded usernames and passwords."""
 
-    async def async_login_flow(self, context: AuthFlowContext | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         return ExampleLoginFlow(self)
 

homeassistant/auth/providers/legacy_api_password.py

@@ -0,0 +1,123 @@
+"""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

@@ -25,17 +25,11 @@ import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.network import is_cloud_connection
 
 from .. import InvalidAuthError
-from ..models import (
+from ..models import AuthFlowResult, Credentials, RefreshToken, UserMeta
-    AuthFlowContext,
-    AuthFlowResult,
-    Credentials,
-    RefreshToken,
-    UserMeta,
-)
 from . import AUTH_PROVIDER_SCHEMA, AUTH_PROVIDERS, AuthProvider, LoginFlow
 
-type IPAddress = IPv4Address | IPv6Address
+IPAddress = IPv4Address | IPv6Address
-type IPNetwork = IPv4Network | IPv6Network
+IPNetwork = IPv4Network | IPv6Network
 
 CONF_TRUSTED_NETWORKS = "trusted_networks"
 CONF_TRUSTED_USERS = "trusted_users"
@@ -104,7 +98,7 @@ class TrustedNetworksAuthProvider(AuthProvider):
         """Trusted Networks auth provider does not support MFA."""
         return False
 
-    async def async_login_flow(self, context: AuthFlowContext | None) -> LoginFlow:
+    async def async_login_flow(self, context: dict[str, Any] | None) -> LoginFlow:
         """Return a flow to login."""
         assert context is not None
         ip_addr = cast(IPAddress, context.get("ip_address"))

homeassistant/auth/session.py

@@ -0,0 +1,205 @@
+"""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/backports/functools.py

@@ -9,7 +9,6 @@ import it.
 
 from __future__ import annotations
 
-# pylint: disable-next=hass-deprecated-import
 from functools import cached_property as _cached_property, partial
 
 from homeassistant.helpers.deprecation import (

homeassistant/backup_restore.py

@@ -1,126 +0,0 @@
-"""Home Assistant module to handle restoring backups."""
-
-from dataclasses import dataclass
-import json
-import logging
-from pathlib import Path
-import shutil
-import sys
-from tempfile import TemporaryDirectory
-
-from awesomeversion import AwesomeVersion
-import securetar
-
-from .const import __version__ as HA_VERSION
-
-RESTORE_BACKUP_FILE = ".HA_RESTORE"
-KEEP_PATHS = ("backups",)
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class RestoreBackupFileContent:
-    """Definition for restore backup file content."""
-
-    backup_file_path: Path
-
-
-def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent | None:
-    """Return the contents of the restore backup file."""
-    instruction_path = config_dir.joinpath(RESTORE_BACKUP_FILE)
-    try:
-        instruction_content = json.loads(instruction_path.read_text(encoding="utf-8"))
-        return RestoreBackupFileContent(
-            backup_file_path=Path(instruction_content["path"])
-        )
-    except (FileNotFoundError, json.JSONDecodeError):
-        return None
-
-
-def _clear_configuration_directory(config_dir: Path) -> None:
-    """Delete all files and directories in the config directory except for the backups directory."""
-    keep_paths = [config_dir.joinpath(path) for path in KEEP_PATHS]
-    config_contents = sorted(
-        [entry for entry in config_dir.iterdir() if entry not in keep_paths]
-    )
-
-    for entry in config_contents:
-        entrypath = config_dir.joinpath(entry)
-
-        if entrypath.is_file():
-            entrypath.unlink()
-        elif entrypath.is_dir():
-            shutil.rmtree(entrypath)
-
-
-def _extract_backup(config_dir: Path, backup_file_path: Path) -> None:
-    """Extract the backup file to the config directory."""
-    with (
-        TemporaryDirectory() as tempdir,
-        securetar.SecureTarFile(
-            backup_file_path,
-            gzip=False,
-            mode="r",
-        ) as ostf,
-    ):
-        ostf.extractall(
-            path=Path(tempdir, "extracted"),
-            members=securetar.secure_path(ostf),
-            filter="fully_trusted",
-        )
-        backup_meta_file = Path(tempdir, "extracted", "backup.json")
-        backup_meta = json.loads(backup_meta_file.read_text(encoding="utf8"))
-
-        if (
-            backup_meta_version := AwesomeVersion(
-                backup_meta["homeassistant"]["version"]
-            )
-        ) > HA_VERSION:
-            raise ValueError(
-                f"You need at least Home Assistant version {backup_meta_version} to restore this backup"
-            )
-
-        with securetar.SecureTarFile(
-            Path(
-                tempdir,
-                "extracted",
-                f"homeassistant.tar{'.gz' if backup_meta["compressed"] else ''}",
-            ),
-            gzip=backup_meta["compressed"],
-            mode="r",
-        ) as istf:
-            for member in istf.getmembers():
-                if member.name == "data":
-                    continue
-                member.name = member.name.replace("data/", "")
-            _clear_configuration_directory(config_dir)
-            istf.extractall(
-                path=config_dir,
-                members=[
-                    member
-                    for member in securetar.secure_path(istf)
-                    if member.name != "data"
-                ],
-                filter="fully_trusted",
-            )
-
-
-def restore_backup(config_dir_path: str) -> bool:
-    """Restore the backup file if any.
-
-    Returns True if a restore backup file was found and restored, False otherwise.
-    """
-    config_dir = Path(config_dir_path)
-    if not (restore_content := restore_backup_file_content(config_dir)):
-        return False
-
-    logging.basicConfig(stream=sys.stdout, level=logging.INFO)
-    backup_file_path = restore_content.backup_file_path
-    _LOGGER.info("Restoring %s", backup_file_path)
-    try:
-        _extract_backup(config_dir, backup_file_path)
-    except FileNotFoundError as err:
-        raise ValueError(f"Backup file {backup_file_path} does not exist") from err
-    _LOGGER.info("Restore complete, restarting")
-    return True

homeassistant/block_async_io.py

@@ -1,17 +1,9 @@
 """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
-from pathlib import Path
-from ssl import SSLContext
 import sys
-import threading
 import time
 from typing import Any
 
@@ -20,21 +12,12 @@ 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
@@ -42,7 +25,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 raise_for_blocking_call
+    # frame[1] is check_loop
     # frame[2] is protected_loop_func
     # frame[3] is the offender
     with suppress(ValueError):
@@ -50,203 +33,28 @@ 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,
-    ),
-    BlockingCall(
-        original_func=SSLContext.load_default_certs,
-        object=SSLContext,
-        function="load_default_certs",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=SSLContext.load_verify_locations,
-        object=SSLContext,
-        function="load_verify_locations",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=SSLContext.load_cert_chain,
-        object=SSLContext,
-        function="load_cert_chain",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.open,
-        object=Path,
-        function="open",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.read_text,
-        object=Path,
-        function="read_text",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.read_bytes,
-        object=Path,
-        function="read_bytes",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.write_text,
-        object=Path,
-        function="write_text",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.write_bytes,
-        object=Path,
-        function="write_bytes",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-)
-
-
-@dataclass(slots=True)
-class BlockedCalls:
-    """Class to track which calls are blocked."""
-
-    calls: set[BlockingCall]
-
-
-_BLOCKED_CALLS = BlockedCalls(set())
-
-
 def enable() -> None:
     """Enable the detection of blocking calls in the event loop."""
-    calls = _BLOCKED_CALLS.calls
+    # Prevent urllib3 and requests doing I/O in event loop
-    if calls:
+    HTTPConnection.putrequest = protect_loop(  # type: ignore[method-assign]
-        raise RuntimeError("Blocking call detection is already enabled")
+        HTTPConnection.putrequest
-
+    )
-    loop_thread_id = threading.get_ident()
+
-    for blocking_call in _BLOCKING_CALLS:
+    # Prevent sleeping in event loop. Non-strict since 2022.02
-        if _IN_TESTS and blocking_call.skip_for_tests:
+    time.sleep = protect_loop(
-            continue
+        time.sleep, strict=False, check_allowed=_check_sleep_call_allowed
-
+    )
-        protected_function = protect_loop(
+
-            blocking_call.original_func,
+    # Currently disabled. pytz doing I/O when getting timezone.
-            strict=blocking_call.strict,
+    # Prevent files being opened inside the event loop
-            strict_core=blocking_call.strict_core,
+    # builtins.open = protect_loop(builtins.open)
-            check_allowed=blocking_call.check_allowed,
+
-            loop_thread_id=loop_thread_id,
+    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,
         )
-        setattr(blocking_call.object, blocking_call.function, protected_function)
-        calls.add(blocking_call)

homeassistant/bootstrap.py

@@ -8,8 +8,7 @@ import contextlib
 from functools import partial
 from itertools import chain
 import logging
-from logging.handlers import RotatingFileHandler, TimedRotatingFileHandler
+import logging.handlers
-import mimetypes
 from operator import contains, itemgetter
 import os
 import platform
@@ -63,14 +62,12 @@ 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,
     REQUIRED_NEXT_PYTHON_VER,
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
 )
-from .core_config import async_process_ha_core_config
 from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
@@ -87,25 +84,21 @@ from .helpers import (
     template,
     translation,
 )
-from .helpers.dispatcher import async_dispatcher_send_internal
+from .helpers.dispatcher import async_dispatcher_send
 from .helpers.storage import get_internal_store_manager
-from .helpers.system_info import async_get_system_info, is_official_image
+from .helpers.system_info import async_get_system_info
 from .helpers.typing import ConfigType
 from .setup import (
-    # _setup_started is marked as protected to make it clear
+    BASE_PLATFORMS,
-    # that it is not part of the public API and should not be used
+    DATA_SETUP_STARTED,
-    # 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_docker_env, is_virtual_env
+from .util.package import async_get_user_site, is_virtual_env
 
 with contextlib.suppress(ImportError):
     # Ensure anyio backend is imported to avoid it being imported in the event loop
@@ -123,7 +116,7 @@ SETUP_ORDER_SORT_KEY = partial(contains, BASE_PLATFORMS)
 ERROR_LOG_FILENAME = "home-assistant.log"
 
 # hass.data key for logging information.
-DATA_REGISTRIES_LOADED: HassKey[None] = HassKey("bootstrap_registries_loaded")
+DATA_REGISTRIES_LOADED = "bootstrap_registries_loaded"
 
 LOG_SLOW_STARTUP_INTERVAL = 60
 SLOW_STARTUP_CHECK_INTERVAL = 1
@@ -135,15 +128,8 @@ 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
@@ -222,12 +208,10 @@ CRITICAL_INTEGRATIONS = {
 }
 
 SETUP_ORDER = (
-    # Load logging and http deps as soon as possible
+    # Load logging as soon as possible
-    ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
+    ("logging", LOGGING_INTEGRATIONS),
-    # Setup frontend
+    # Setup frontend and recorder
-    ("frontend", FRONTEND_INTEGRATIONS),
+    ("frontend, recorder", {*FRONTEND_INTEGRATIONS, *RECORDER_INTEGRATIONS}),
-    # Setup recorder
-    ("recorder", RECORDER_INTEGRATIONS),
     # Start up debuggers. Start these first in case they want to wait.
     ("debugger", DEBUGGER_INTEGRATIONS),
 )
@@ -259,13 +243,9 @@ async def async_setup_hass(
     runtime_config: RuntimeConfig,
 ) -> core.HomeAssistant | None:
     """Set up Home Assistant."""
-
-    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)
 
-        await async_enable_logging(
+    async_enable_logging(
         hass,
         runtime_config.verbose,
         runtime_config.log_rotate_days,
@@ -273,25 +253,9 @@ async def async_setup_hass(
         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()
-
     if runtime_config.skip_pip or runtime_config.skip_pip_packages:
         _LOGGER.warning(
             "Skipping pip installation of required modules. This may cause issues"
@@ -303,6 +267,7 @@ 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
@@ -328,31 +293,29 @@ 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)
 
-        recovery_mode = True
+        hass = core.HomeAssistant(old_config.config_dir)
-        await stop_hass(hass)
-        hass = await create_hass()
-
         if old_logging:
             hass.data[DATA_LOGGING] = old_logging
-        hass.config.debug = old_config.debug
         hass.config.skip_pip = old_config.skip_pip
         hass.config.skip_pip_packages = old_config.skip_pip_packages
         hass.config.internal_url = old_config.internal_url
@@ -399,28 +362,23 @@ 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 modules that will do blocking I/O."""
+    """Load the registries and cache the result of platform.uname().processor."""
     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)
@@ -433,7 +391,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(_init_blocking_io_modules_in_executor),
+        hass.async_add_executor_job(_cache_uname_processor),
         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()),
@@ -452,9 +410,6 @@ 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.
@@ -463,11 +418,7 @@ async def async_from_config_dict(
     if not all(
         await asyncio.gather(
             *(
-                create_eager_task(
+                create_eager_task(async_setup_component(hass, domain, config))
-                    async_setup_component(hass, domain, config),
-                    name=f"bootstrap setup {domain}",
-                    loop=hass.loop,
-                )
                 for domain in CORE_INTEGRATIONS
             )
         )
@@ -480,7 +431,7 @@ async def async_from_config_dict(
     core_config = config.get(core.DOMAIN, {})
 
     try:
-        await async_process_ha_core_config(hass, core_config)
+        await conf_util.async_process_ha_core_config(hass, core_config)
     except vol.Invalid as config_err:
         conf_util.async_log_schema_error(config_err, core.DOMAIN, core_config, hass)
         async_notify_setup_error(hass, core.DOMAIN)
@@ -515,7 +466,7 @@ async def async_from_config_dict(
         issue_registry.async_create_issue(
             hass,
             core.DOMAIN,
-            f"python_version_{required_python_version}",
+            "python_version",
             is_fixable=False,
             severity=issue_registry.IssueSeverity.WARNING,
             breaks_in_ha_version=REQUIRED_NEXT_PYTHON_HA_RELEASE,
@@ -530,7 +481,8 @@ async def async_from_config_dict(
     return hass
 
 
-async def async_enable_logging(
+@core.callback
+def async_enable_logging(
     hass: core.HomeAssistant,
     verbose: bool = False,
     log_rotate_days: int | None = None,
@@ -587,10 +539,10 @@ async def async_enable_logging(
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
     logging.getLogger("httpx").setLevel(logging.WARNING)
 
-    sys.excepthook = lambda *args: logging.getLogger().exception(
+    sys.excepthook = lambda *args: logging.getLogger(None).exception(
         "Uncaught exception", exc_info=args
     )
-    threading.excepthook = lambda args: logging.getLogger().exception(
+    threading.excepthook = lambda args: logging.getLogger(None).exception(
         "Uncaught thread exception",
         exc_info=(  # type: ignore[arg-type]
             args.exc_type,
@@ -613,31 +565,12 @@ async 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 = await hass.async_add_executor_job(
+        err_handler: (
-            _create_log_file, err_log_path, log_rotate_days
+            logging.handlers.RotatingFileHandler
+            | logging.handlers.TimedRotatingFileHandler
         )
-
-        err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
-
-        logger = logging.getLogger()
-        logger.addHandler(err_handler)
-        logger.setLevel(logging.INFO if verbose else logging.WARNING)
-
-        # Save the log file location for access by other components.
-        hass.data[DATA_LOGGING] = err_log_path
-    else:
-        _LOGGER.error("Unable to set up error log %s (access denied)", err_log_path)
-
-    async_activate_log_queue_handler(hass)
-
-
-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_handler = logging.handlers.TimedRotatingFileHandler(
                 err_log_path, when="midnight", backupCount=log_rotate_days
             )
         else:
@@ -650,10 +583,22 @@ def _create_log_file(
         except OSError as err:
             _LOGGER.error("Error rolling over log file: %s", err)
 
-    return err_handler
+        err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
+        err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
+
+        logger = logging.getLogger("")
+        logger.addHandler(err_handler)
+        logger.setLevel(logging.INFO if verbose else logging.WARNING)
+
+        # Save the log file location for access by other components.
+        hass.data[DATA_LOGGING] = err_log_path
+    else:
+        _LOGGER.error("Unable to set up error log %s (access denied)", err_log_path)
+
+    async_activate_log_queue_handler(hass)
 
 
-class _RotatingFileHandlerWithoutShouldRollOver(RotatingFileHandler):
+class _RotatingFileHandlerWithoutShouldRollOver(logging.handlers.RotatingFileHandler):
     """RotatingFileHandler that does not check if it should roll over on every log."""
 
     def shouldRollover(self, record: logging.LogRecord) -> bool:
@@ -727,7 +672,7 @@ class _WatchPendingSetups:
 
         if remaining_with_setup_started:
             _LOGGER.debug("Integration remaining: %s", remaining_with_setup_started)
-        elif waiting_tasks := self._hass._active_tasks:  # noqa: SLF001
+        elif waiting_tasks := self._hass._active_tasks:  # pylint: disable=protected-access
             _LOGGER.debug("Waiting on tasks: %s", waiting_tasks)
         self._async_dispatch(remaining_with_setup_started)
         if (
@@ -747,7 +692,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_internal(
+            async_dispatcher_send(
                 self._hass, SIGNAL_BOOTSTRAP_INTEGRATIONS, remaining_with_setup_started
             )
         self._previous_was_empty = not remaining_with_setup_started
@@ -782,7 +727,7 @@ async def async_setup_multi_components(
     # to wait to be imported, and the sooner we can get the base platforms
     # loaded the sooner we can start loading the rest of the integrations.
     futures = {
-        domain: hass.async_create_task_internal(
+        domain: hass.async_create_task(
             async_setup_component(hass, domain, config),
             f"setup component {domain}",
             eager_start=True,
@@ -908,13 +853,7 @@ async def _async_resolve_domains_to_setup(
             await asyncio.gather(*resolve_dependencies_tasks)
 
         for itg in integrations_to_process:
-            try:
+            for dep in itg.all_dependencies:
-                all_deps = itg.all_dependencies
-            except RuntimeError:
-                # Integration.all_dependencies raises RuntimeError if
-                # dependencies could not be resolved
-                continue
-            for dep in all_deps:
                 if dep in domains_to_setup:
                     continue
                 domains_to_setup.add(dep)
@@ -970,7 +909,9 @@ async def _async_set_up_integrations(
     hass: core.HomeAssistant, config: dict[str, Any]
 ) -> None:
     """Set up all the integrations."""
-    watcher = _WatchPendingSetups(hass, _setup_started(hass))
+    setup_started: dict[tuple[str, str | None], float] = {}
+    hass.data[DATA_SETUP_STARTED] = setup_started
+    watcher = _WatchPendingSetups(hass, setup_started)
     watcher.async_start()
 
     domains_to_setup, integration_cache = await _async_resolve_domains_to_setup(
@@ -1037,7 +978,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,  # noqa: SLF001
+                hass._active_tasks,  # pylint: disable=protected-access
             )
 
     # Add after dependencies when setting up stage 2 domains
@@ -1053,7 +994,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,  # noqa: SLF001
+                hass._active_tasks,  # pylint: disable=protected-access
             )
 
     # Wrap up startup
@@ -1064,7 +1005,7 @@ async def _async_set_up_integrations(
     except TimeoutError:
         _LOGGER.warning(
             "Setup timed out for bootstrap waiting on %s - moving forward",
-            hass._active_tasks,  # noqa: SLF001
+            hass._active_tasks,  # pylint: disable=protected-access
         )
 
     watcher.async_stop()

homeassistant/brands/ambient_weather.json

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

homeassistant/brands/aqara.json

@@ -1,5 +0,0 @@
-{
-  "domain": "aqara",
-  "name": "Aqara",
-  "iot_standards": ["matter", "zigbee"]
-}

homeassistant/brands/asterisk.json

@@ -0,0 +1,5 @@
+{
+  "domain": "asterisk",
+  "name": "Asterisk",
+  "integrations": ["asterisk_cdr", "asterisk_mbox"]
+}

homeassistant/brands/fujitsu.json

@@ -1,5 +0,0 @@
-{
-  "domain": "fujitsu",
-  "name": "Fujitsu",
-  "integrations": ["fujitsu_anywair", "fujitsu_fglair"]
-}

homeassistant/brands/google.json

@@ -5,10 +5,10 @@
     "google_assistant",
     "google_assistant_sdk",
     "google_cloud",
+    "google_domains",
     "google_generative_ai_conversation",
     "google_mail",
     "google_maps",
-    "google_photos",
     "google_pubsub",
     "google_sheets",
     "google_tasks",

homeassistant/brands/husqvarna.json

@@ -1,5 +0,0 @@
-{
-  "domain": "husqvarna",
-  "name": "Husqvarna",
-  "integrations": ["husqvarna_automower", "husqvarna_automower_ble"]
-}

homeassistant/brands/lg.json

@@ -1,5 +1,5 @@
 {
   "domain": "lg",
   "name": "LG",
-  "integrations": ["lg_netcast", "lg_soundbar", "lg_thinq", "webostv"]
+  "integrations": ["lg_netcast", "lg_soundbar", "webostv"]
 }

homeassistant/brands/logitech.json

@@ -1,5 +1,5 @@
 {
   "domain": "logitech",
   "name": "Logitech",
-  "integrations": ["harmony", "squeezebox"]
+  "integrations": ["harmony", "ue_smart_radio", "squeezebox"]
 }

homeassistant/brands/roth.json

@@ -1,5 +0,0 @@
-{
-  "domain": "roth",
-  "name": "Roth",
-  "integrations": ["touchline", "touchline_sl"]
-}

homeassistant/brands/ruuvi.json

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

homeassistant/brands/sky.json

@@ -1,5 +0,0 @@
-{
-  "domain": "sky",
-  "name": "Sky",
-  "integrations": ["sky_hub", "sky_remote"]
-}

homeassistant/brands/tesla.json

@@ -1,5 +1,5 @@
 {
   "domain": "tesla",
   "name": "Tesla",
-  "integrations": ["powerwall", "tesla_wall_connector", "tesla_fleet"]
+  "integrations": ["powerwall", "tesla_wall_connector"]
 }

homeassistant/brands/weatherflow.json

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

homeassistant/brands/yale.json

@@ -1,11 +1,5 @@
 {
   "domain": "yale",
   "name": "Yale",
-  "integrations": [
+  "integrations": ["august", "yale_smart_alarm", "yalexs_ble", "yale_home"]
-    "august",
-    "yale_smart_alarm",
-    "yalexs_ble",
-    "yale_home",
-    "yale"
-  ]
 }

homeassistant/components/__init__.py

@@ -6,3 +6,52 @@ Component design guidelines:
   format "<DOMAIN>.<OBJECT_ID>".
 - Each component should publish services only under its own domain.
 """
+
+from __future__ import annotations
+
+import logging
+
+from homeassistant.core import HomeAssistant, split_entity_id
+from homeassistant.helpers.frame import report
+from homeassistant.helpers.group import expand_entity_ids
+
+_LOGGER = logging.getLogger(__name__)
+
+
+def is_on(hass: HomeAssistant, entity_id: str | None = None) -> bool:
+    """Load up the module to call the is_on method.
+
+    If there is no entity id given we will check all.
+    """
+    report(
+        (
+            "uses homeassistant.components.is_on."
+            " This is deprecated and will stop working in Home Assistant 2024.9, it"
+            " should be updated to use the function of the platform directly."
+        ),
+        error_if_core=True,
+    )
+
+    if entity_id:
+        entity_ids = expand_entity_ids(hass, [entity_id])
+    else:
+        entity_ids = hass.states.entity_ids()
+
+    for ent_id in entity_ids:
+        domain = split_entity_id(ent_id)[0]
+
+        try:
+            component = getattr(hass.components, domain)
+
+        except ImportError:
+            _LOGGER.error("Failed to call %s.is_on: component not found", domain)
+            continue
+
+        if not hasattr(component, "is_on"):
+            _LOGGER.warning("Integration %s has no is_on method", domain)
+            continue
+
+        if component.is_on(ent_id):
+            return True
+
+    return False

homeassistant/components/abode/__init__.py

@@ -4,10 +4,10 @@ from __future__ import annotations
 
 from dataclasses import dataclass, field
 from functools import partial
-from pathlib import Path
 
+from jaraco.abode.automation import Automation as AbodeAuto
 from jaraco.abode.client import Client as Abode
-import jaraco.abode.config
+from jaraco.abode.devices.base import Device as AbodeDev
 from jaraco.abode.exceptions import (
     AuthenticationException as AbodeAuthenticationException,
     Exception as AbodeException,
@@ -29,11 +29,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
+from homeassistant.helpers import config_validation as cv, entity
+from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import dispatcher_send
-from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_POLLING, DOMAIN, LOGGER
+from .const import ATTRIBUTION, CONF_POLLING, DOMAIN, LOGGER
 
 SERVICE_SETTINGS = "change_setting"
 SERVICE_CAPTURE_IMAGE = "capture_image"
@@ -83,21 +83,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]
     password = entry.data[CONF_PASSWORD]
     polling = entry.data[CONF_POLLING]
 
-    # Configure abode library to use config directory for storing data
-    jaraco.abode.config.paths.override(user_data=Path(hass.config.path("Abode")))
-
     # For previous config entries where unique_id is None
     if entry.unique_id is None:
         hass.config_entries.async_update_entry(
@@ -120,6 +111,7 @@ 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
@@ -127,6 +119,10 @@ 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)
@@ -179,15 +175,15 @@ def setup_hass_services(hass: HomeAssistant) -> None:
             signal = f"abode_trigger_automation_{entity_id}"
             dispatcher_send(hass, signal)
 
-    hass.services.async_register(
+    hass.services.register(
         DOMAIN, SERVICE_SETTINGS, change_setting, schema=CHANGE_SETTING_SCHEMA
     )
 
-    hass.services.async_register(
+    hass.services.register(
         DOMAIN, SERVICE_CAPTURE_IMAGE, capture_image, schema=CAPTURE_IMAGE_SCHEMA
     )
 
-    hass.services.async_register(
+    hass.services.register(
         DOMAIN, SERVICE_TRIGGER_AUTOMATION, trigger_automation, schema=AUTOMATION_SCHEMA
     )
 
@@ -251,3 +247,108 @@ 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

@@ -7,15 +7,18 @@ from jaraco.abode.devices.alarm import Alarm
 from homeassistant.components.alarm_control_panel import (
     AlarmControlPanelEntity,
     AlarmControlPanelEntityFeature,
-    AlarmControlPanelState,
 )
 from homeassistant.config_entries import ConfigEntry
+from homeassistant.const import (
+    STATE_ALARM_ARMED_AWAY,
+    STATE_ALARM_ARMED_HOME,
+    STATE_ALARM_DISARMED,
+)
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeSystem
+from . import AbodeDevice, AbodeSystem
 from .const import DOMAIN
-from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -40,14 +43,14 @@ class AbodeAlarm(AbodeDevice, AlarmControlPanelEntity):
     _device: Alarm
 
     @property
-    def alarm_state(self) -> AlarmControlPanelState | None:
+    def state(self) -> str | None:
         """Return the state of the device."""
         if self._device.is_standby:
-            return AlarmControlPanelState.DISARMED
+            return STATE_ALARM_DISARMED
         if self._device.is_away:
-            return AlarmControlPanelState.ARMED_AWAY
+            return STATE_ALARM_ARMED_AWAY
         if self._device.is_home:
-            return AlarmControlPanelState.ARMED_HOME
+            return STATE_ALARM_ARMED_HOME
         return None
 
     def alarm_disarm(self, code: str | None = None) -> None:

homeassistant/components/abode/binary_sensor.py

@@ -4,7 +4,14 @@ from __future__ import annotations
 
 from typing import cast
 
-from jaraco.abode.devices.binary_sensor import BinarySensor
+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,
@@ -15,9 +22,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util.enum import try_parse_enum
 
-from . import AbodeSystem
+from . import AbodeDevice, AbodeSystem
 from .const import DOMAIN
-from .entity import AbodeDevice
 
 
 async def async_setup_entry(
@@ -27,11 +33,11 @@ async def async_setup_entry(
     data: AbodeSystem = hass.data[DOMAIN]
 
     device_types = [
-        "connectivity",
+        TYPE_CONNECTIVITY,
-        "moisture",
+        TYPE_MOISTURE,
-        "motion",
+        TYPE_MOTION,
-        "occupancy",
+        TYPE_OCCUPANCY,
-        "door",
+        TYPE_OPENING,
     ]
 
     async_add_entities(

homeassistant/components/abode/camera.py

@@ -8,6 +8,7 @@ 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
 
@@ -18,9 +19,8 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.util import Throttle
 
-from . import AbodeSystem
+from . import AbodeDevice, 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="camera")
+        for device in data.abode.get_devices(generic_type=TYPE_CAMERA)
     )
 
 

homeassistant/components/abode/config_flow.py

@@ -102,7 +102,15 @@ class AbodeFlowHandler(ConfigFlow, domain=DOMAIN):
         existing_entry = await self.async_set_unique_id(self._username)
 
         if existing_entry:
-            return self.async_update_reload_and_abort(existing_entry, data=config_data)
+            self.hass.config_entries.async_update_entry(
+                existing_entry, data=config_data
+            )
+            # Reload the Abode config entry otherwise devices will remain unavailable
+            self.hass.async_create_task(
+                self.hass.config_entries.async_reload(existing_entry.entry_id)
+            )
+
+            return self.async_abort(reason="reauth_successful")
 
         return self.async_create_entry(
             title=cast(str, self._username), data=config_data

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 AbodeSystem
+from . import AbodeDevice, 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="cover")
+        for device in data.abode.get_devices(generic_type=TYPE_COVER)
     )
 
 

homeassistant/components/abode/entity.py

@@ -1,115 +0,0 @@
-"""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/icons.json

@@ -7,14 +7,8 @@
     }
   },
   "services": {
-    "capture_image": {
+    "capture_image": "mdi:camera",
-      "service": "mdi:camera"
+    "change_setting": "mdi:cog",
-    },
+    "trigger_automation": "mdi:play"
-    "change_setting": {
-      "service": "mdi:cog"
-    },
-    "trigger_automation": {
-      "service": "mdi:play"
-    }
   }
 }

homeassistant/components/abode/light.py

@@ -6,6 +6,7 @@ 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,
@@ -22,9 +23,8 @@ from homeassistant.util.color import (
     color_temperature_mired_to_kelvin,
 )
 
-from . import AbodeSystem
+from . import AbodeDevice, 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="light")
+        for device in data.abode.get_devices(generic_type=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 AbodeSystem
+from . import AbodeDevice, 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="lock")
+        for device in data.abode.get_devices(generic_type=TYPE_LOCK)
     )
 
 

homeassistant/components/abode/manifest.json

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

homeassistant/components/abode/sensor.py

@@ -7,6 +7,15 @@ 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,
@@ -18,13 +27,12 @@ from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeSystem
+from . import AbodeDevice, AbodeSystem
 from .const import DOMAIN
-from .entity import AbodeDevice
 
 ABODE_TEMPERATURE_UNIT_HA_UNIT = {
-    "°F": UnitOfTemperature.FAHRENHEIT,
+    UNIT_FAHRENHEIT: UnitOfTemperature.FAHRENHEIT,
-    "°C": UnitOfTemperature.CELSIUS,
+    UNIT_CELSIUS: UnitOfTemperature.CELSIUS,
 }
 
 
@@ -38,7 +46,7 @@ class AbodeSensorDescription(SensorEntityDescription):
 
 SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
-        key="temperature",
+        key=TEMP_STATUS_KEY,
         device_class=SensorDeviceClass.TEMPERATURE,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
@@ -46,13 +54,13 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
         value_fn=lambda device: cast(float, device.temp),
     ),
     AbodeSensorDescription(
-        key="humidity",
+        key=HUMI_STATUS_KEY,
         device_class=SensorDeviceClass.HUMIDITY,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
-        key="lux",
+        key=LUX_STATUS_KEY,
         device_class=SensorDeviceClass.ILLUMINANCE,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
@@ -69,8 +77,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="sensor")
+        for device in data.abode.get_devices(generic_type=TYPE_SENSOR)
-        if description.key in device.get_value("statuses")
+        if description.key in device.get_value(STATUSES_KEY)
     )
 
 

homeassistant/components/abode/switch.py

@@ -5,6 +5,7 @@ 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
@@ -12,11 +13,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 
-from . import AbodeSystem
+from . import AbodeAutomation, AbodeDevice, AbodeSystem
 from .const import DOMAIN
-from .entity import AbodeAutomation, AbodeDevice
 
-DEVICE_TYPES = ["switch", "valve"]
+DEVICE_TYPES = [TYPE_SWITCH, TYPE_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.enabled)
+        return bool(self._automation.is_enabled)

homeassistant/components/acaia/__init__.py

@@ -1,29 +0,0 @@
-"""Initialize the Acaia component."""
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AcaiaConfigEntry, AcaiaCoordinator
-
-PLATFORMS = [
-    Platform.BUTTON,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
-    """Set up acaia as config entry."""
-
-    coordinator = AcaiaCoordinator(hass, entry)
-    await coordinator.async_config_entry_first_refresh()
-
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: AcaiaConfigEntry) -> bool:
-    """Unload a config entry."""
-
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/acaia/button.py

@@ -1,61 +0,0 @@
-"""Button entities for Acaia scales."""
-
-from collections.abc import Callable, Coroutine
-from dataclasses import dataclass
-from typing import Any
-
-from aioacaia.acaiascale import AcaiaScale
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from .coordinator import AcaiaConfigEntry
-from .entity import AcaiaEntity
-
-
-@dataclass(kw_only=True, frozen=True)
-class AcaiaButtonEntityDescription(ButtonEntityDescription):
-    """Description for acaia button entities."""
-
-    press_fn: Callable[[AcaiaScale], Coroutine[Any, Any, None]]
-
-
-BUTTONS: tuple[AcaiaButtonEntityDescription, ...] = (
-    AcaiaButtonEntityDescription(
-        key="tare",
-        translation_key="tare",
-        press_fn=lambda scale: scale.tare(),
-    ),
-    AcaiaButtonEntityDescription(
-        key="reset_timer",
-        translation_key="reset_timer",
-        press_fn=lambda scale: scale.reset_timer(),
-    ),
-    AcaiaButtonEntityDescription(
-        key="start_stop",
-        translation_key="start_stop",
-        press_fn=lambda scale: scale.start_stop_timer(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AcaiaConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up button entities and services."""
-
-    coordinator = entry.runtime_data
-    async_add_entities(AcaiaButton(coordinator, description) for description in BUTTONS)
-
-
-class AcaiaButton(AcaiaEntity, ButtonEntity):
-    """Representation of an Acaia button."""
-
-    entity_description: AcaiaButtonEntityDescription
-
-    async def async_press(self) -> None:
-        """Handle the button press."""
-        await self.entity_description.press_fn(self._scale)

homeassistant/components/acaia/config_flow.py

@@ -1,149 +0,0 @@
-"""Config flow for Acaia integration."""
-
-import logging
-from typing import Any
-
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError, AcaiaUnknownDevice
-from aioacaia.helpers import is_new_scale
-import voluptuous as vol
-
-from homeassistant.components.bluetooth import (
-    BluetoothServiceInfoBleak,
-    async_discovered_service_info,
-)
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS, CONF_NAME
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    SelectSelectorMode,
-)
-
-from .const import CONF_IS_NEW_STYLE_SCALE, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class AcaiaConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for acaia."""
-
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        self._discovered: dict[str, Any] = {}
-        self._discovered_devices: dict[str, str] = {}
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initialized by the user."""
-
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            mac = format_mac(user_input[CONF_ADDRESS])
-            try:
-                is_new_style_scale = await is_new_scale(mac)
-            except AcaiaDeviceNotFound:
-                errors["base"] = "device_not_found"
-            except AcaiaError:
-                _LOGGER.exception("Error occurred while connecting to the scale")
-                errors["base"] = "unknown"
-            except AcaiaUnknownDevice:
-                return self.async_abort(reason="unsupported_device")
-            else:
-                await self.async_set_unique_id(mac)
-                self._abort_if_unique_id_configured()
-
-            if not errors:
-                return self.async_create_entry(
-                    title=self._discovered_devices[user_input[CONF_ADDRESS]],
-                    data={
-                        CONF_ADDRESS: mac,
-                        CONF_IS_NEW_STYLE_SCALE: is_new_style_scale,
-                    },
-                )
-
-        for device in async_discovered_service_info(self.hass):
-            self._discovered_devices[device.address] = device.name
-
-        if not self._discovered_devices:
-            return self.async_abort(reason="no_devices_found")
-
-        options = [
-            SelectOptionDict(
-                value=device_mac,
-                label=f"{device_name} ({device_mac})",
-            )
-            for device_mac, device_name in self._discovered_devices.items()
-        ]
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_ADDRESS): SelectSelector(
-                        SelectSelectorConfig(
-                            options=options,
-                            mode=SelectSelectorMode.DROPDOWN,
-                        )
-                    )
-                }
-            ),
-            errors=errors,
-        )
-
-    async def async_step_bluetooth(
-        self, discovery_info: BluetoothServiceInfoBleak
-    ) -> ConfigFlowResult:
-        """Handle a discovered Bluetooth device."""
-
-        self._discovered[CONF_ADDRESS] = mac = format_mac(discovery_info.address)
-        self._discovered[CONF_NAME] = discovery_info.name
-
-        await self.async_set_unique_id(mac)
-        self._abort_if_unique_id_configured()
-
-        try:
-            self._discovered[CONF_IS_NEW_STYLE_SCALE] = await is_new_scale(
-                discovery_info.address
-            )
-        except AcaiaDeviceNotFound:
-            _LOGGER.debug("Device not found during discovery")
-            return self.async_abort(reason="device_not_found")
-        except AcaiaError:
-            _LOGGER.debug(
-                "Error occurred while connecting to the scale during discovery",
-                exc_info=True,
-            )
-            return self.async_abort(reason="unknown")
-        except AcaiaUnknownDevice:
-            _LOGGER.debug("Unsupported device during discovery")
-            return self.async_abort(reason="unsupported_device")
-
-        return await self.async_step_bluetooth_confirm()
-
-    async def async_step_bluetooth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle confirmation of Bluetooth discovery."""
-
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self._discovered[CONF_NAME],
-                data={
-                    CONF_ADDRESS: self._discovered[CONF_ADDRESS],
-                    CONF_IS_NEW_STYLE_SCALE: self._discovered[CONF_IS_NEW_STYLE_SCALE],
-                },
-            )
-
-        self.context["title_placeholders"] = placeholders = {
-            CONF_NAME: self._discovered[CONF_NAME]
-        }
-
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="bluetooth_confirm",
-            description_placeholders=placeholders,
-        )

homeassistant/components/acaia/const.py

@@ -1,4 +0,0 @@
-"""Constants for component."""
-
-DOMAIN = "acaia"
-CONF_IS_NEW_STYLE_SCALE = "is_new_style_scale"

homeassistant/components/acaia/coordinator.py

@@ -1,86 +0,0 @@
-"""Coordinator for Acaia integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from aioacaia.acaiascale import AcaiaScale
-from aioacaia.exceptions import AcaiaDeviceNotFound, AcaiaError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
-
-from .const import CONF_IS_NEW_STYLE_SCALE
-
-SCAN_INTERVAL = timedelta(seconds=15)
-
-_LOGGER = logging.getLogger(__name__)
-
-type AcaiaConfigEntry = ConfigEntry[AcaiaCoordinator]
-
-
-class AcaiaCoordinator(DataUpdateCoordinator[None]):
-    """Class to handle fetching data from the scale."""
-
-    config_entry: AcaiaConfigEntry
-
-    def __init__(self, hass: HomeAssistant, entry: AcaiaConfigEntry) -> None:
-        """Initialize coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name="acaia coordinator",
-            update_interval=SCAN_INTERVAL,
-            config_entry=entry,
-        )
-
-        self._scale = AcaiaScale(
-            address_or_ble_device=entry.data[CONF_ADDRESS],
-            name=entry.title,
-            is_new_style_scale=entry.data[CONF_IS_NEW_STYLE_SCALE],
-            notify_callback=self.async_update_listeners,
-        )
-
-    @property
-    def scale(self) -> AcaiaScale:
-        """Return the scale object."""
-        return self._scale
-
-    async def _async_update_data(self) -> None:
-        """Fetch data."""
-
-        # scale is already connected, return
-        if self._scale.connected:
-            return
-
-        # scale is not connected, try to connect
-        try:
-            await self._scale.connect(setup_tasks=False)
-        except (AcaiaDeviceNotFound, AcaiaError, TimeoutError) as ex:
-            _LOGGER.debug(
-                "Could not connect to scale: %s, Error: %s",
-                self.config_entry.data[CONF_ADDRESS],
-                ex,
-            )
-            self._scale.device_disconnected_handler(notify=False)
-            return
-
-        # connected, set up background tasks
-        if not self._scale.heartbeat_task or self._scale.heartbeat_task.done():
-            self._scale.heartbeat_task = self.config_entry.async_create_background_task(
-                hass=self.hass,
-                target=self._scale.send_heartbeats(),
-                name="acaia_heartbeat_task",
-            )
-
-        if not self._scale.process_queue_task or self._scale.process_queue_task.done():
-            self._scale.process_queue_task = (
-                self.config_entry.async_create_background_task(
-                    hass=self.hass,
-                    target=self._scale.process_queue(),
-                    name="acaia_process_queue_task",
-                )
-            )

homeassistant/components/acaia/entity.py

@@ -1,40 +0,0 @@
-"""Base class for Acaia entities."""
-
-from dataclasses import dataclass
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AcaiaCoordinator
-
-
-@dataclass
-class AcaiaEntity(CoordinatorEntity[AcaiaCoordinator]):
-    """Common elements for all entities."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AcaiaCoordinator,
-        entity_description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self.entity_description = entity_description
-        self._scale = coordinator.scale
-        self._attr_unique_id = f"{self._scale.mac}_{entity_description.key}"
-
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._scale.mac)},
-            manufacturer="Acaia",
-            model=self._scale.model,
-            suggested_area="Kitchen",
-        )
-
-    @property
-    def available(self) -> bool:
-        """Returns whether entity is available."""
-        return super().available and self._scale.connected

homeassistant/components/acaia/icons.json

@@ -1,15 +0,0 @@
-{
-  "entity": {
-    "button": {
-      "tare": {
-        "default": "mdi:scale-balance"
-      },
-      "reset_timer": {
-        "default": "mdi:timer-refresh"
-      },
-      "start_stop": {
-        "default": "mdi:timer-play"
-      }
-    }
-  }
-}

homeassistant/components/acaia/manifest.json

@@ -1,29 +0,0 @@
-{
-  "domain": "acaia",
-  "name": "Acaia",
-  "bluetooth": [
-    {
-      "manufacturer_id": 16962
-    },
-    {
-      "local_name": "ACAIA*"
-    },
-    {
-      "local_name": "PYXIS-*"
-    },
-    {
-      "local_name": "LUNAR-*"
-    },
-    {
-      "local_name": "PROCHBT001"
-    }
-  ],
-  "codeowners": ["@zweckj"],
-  "config_flow": true,
-  "dependencies": ["bluetooth_adapters"],
-  "documentation": "https://www.home-assistant.io/integrations/acaia",
-  "integration_type": "device",
-  "iot_class": "local_push",
-  "loggers": ["aioacaia"],
-  "requirements": ["aioacaia==0.1.6"]
-}

homeassistant/components/acaia/strings.json

@@ -1,38 +0,0 @@
-{
-  "config": {
-    "flow_title": "{name}",
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "unsupported_device": "This device is not supported."
-    },
-    "error": {
-      "device_not_found": "Device could not be found.",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "bluetooth_confirm": {
-        "description": "[%key:component::bluetooth::config::step::bluetooth_confirm::description%]"
-      },
-      "user": {
-        "description": "[%key:component::bluetooth::config::step::user::description%]",
-        "data": {
-          "address": "[%key:common::config_flow::data::device%]"
-        }
-      }
-    }
-  },
-  "entity": {
-    "button": {
-      "tare": {
-        "name": "Tare"
-      },
-      "reset_timer": {
-        "name": "Reset timer"
-      },
-      "start_stop": {
-        "name": "Start/stop timer"
-      }
-    }
-  }
-}

homeassistant/components/accuweather/__init__.py

@@ -2,11 +2,13 @@
 
 from __future__ import annotations
 
+from dataclasses import dataclass
 import logging
 
 from accuweather import AccuWeather
 
 from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_NAME, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -14,9 +16,7 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
 from .const import DOMAIN, UPDATE_INTERVAL_DAILY_FORECAST, UPDATE_INTERVAL_OBSERVATION
 from .coordinator import (
-    AccuWeatherConfigEntry,
     AccuWeatherDailyForecastDataUpdateCoordinator,
-    AccuWeatherData,
     AccuWeatherObservationDataUpdateCoordinator,
 )
 
@@ -25,7 +25,15 @@ _LOGGER = logging.getLogger(__name__)
 PLATFORMS = [Platform.SENSOR, Platform.WEATHER]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry) -> bool:
+@dataclass
+class AccuWeatherData:
+    """Data for AccuWeather integration."""
+
+    coordinator_observation: AccuWeatherObservationDataUpdateCoordinator
+    coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
+
+
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up AccuWeather as config entry."""
     api_key: str = entry.data[CONF_API_KEY]
     name: str = entry.data[CONF_NAME]
@@ -39,7 +47,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
 
     coordinator_observation = AccuWeatherObservationDataUpdateCoordinator(
         hass,
-        entry,
         accuweather,
         name,
         "observation",
@@ -48,7 +55,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
 
     coordinator_daily_forecast = AccuWeatherDailyForecastDataUpdateCoordinator(
         hass,
-        entry,
         accuweather,
         name,
         "daily forecast",
@@ -58,7 +64,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
     await coordinator_observation.async_config_entry_first_refresh()
     await coordinator_daily_forecast.async_config_entry_first_refresh()
 
-    entry.runtime_data = AccuWeatherData(
+    entry.async_on_unload(entry.add_update_listener(update_listener))
+
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = AccuWeatherData(
         coordinator_observation=coordinator_observation,
         coordinator_daily_forecast=coordinator_daily_forecast,
     )
@@ -76,8 +84,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
     return True
 
 
-async def async_unload_entry(
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    hass: HomeAssistant, entry: AccuWeatherConfigEntry
-) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    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)

homeassistant/components/accuweather/coordinator.py

@@ -1,9 +1,6 @@
 """The AccuWeather coordinator."""
 
-from __future__ import annotations
-
 from asyncio import timeout
-from dataclasses import dataclass
 from datetime import timedelta
 import logging
 from typing import TYPE_CHECKING, Any
@@ -11,7 +8,6 @@ from typing import TYPE_CHECKING, Any
 from accuweather import AccuWeather, ApiError, InvalidApiKeyError, RequestsExceededError
 from aiohttp.client_exceptions import ClientConnectorError
 
-from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
 from homeassistant.helpers.update_coordinator import (
@@ -27,17 +23,6 @@ EXCEPTIONS = (ApiError, ClientConnectorError, InvalidApiKeyError, RequestsExceed
 _LOGGER = logging.getLogger(__name__)
 
 
-@dataclass
-class AccuWeatherData:
-    """Data for AccuWeather integration."""
-
-    coordinator_observation: AccuWeatherObservationDataUpdateCoordinator
-    coordinator_daily_forecast: AccuWeatherDailyForecastDataUpdateCoordinator
-
-
-type AccuWeatherConfigEntry = ConfigEntry[AccuWeatherData]
-
-
 class AccuWeatherObservationDataUpdateCoordinator(
     DataUpdateCoordinator[dict[str, Any]]
 ):
@@ -46,7 +31,6 @@ class AccuWeatherObservationDataUpdateCoordinator(
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: AccuWeatherConfigEntry,
         accuweather: AccuWeather,
         name: str,
         coordinator_type: str,
@@ -64,7 +48,6 @@ class AccuWeatherObservationDataUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=config_entry,
             name=f"{name} ({coordinator_type})",
             update_interval=update_interval,
         )
@@ -90,7 +73,6 @@ class AccuWeatherDailyForecastDataUpdateCoordinator(
     def __init__(
         self,
         hass: HomeAssistant,
-        config_entry: AccuWeatherConfigEntry,
         accuweather: AccuWeather,
         name: str,
         coordinator_type: str,
@@ -108,7 +90,6 @@ class AccuWeatherDailyForecastDataUpdateCoordinator(
         super().__init__(
             hass,
             _LOGGER,
-            config_entry=config_entry,
             name=f"{name} ({coordinator_type})",
             update_interval=update_interval,
         )

homeassistant/components/accuweather/diagnostics.py

@@ -5,19 +5,21 @@ 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 .coordinator import AccuWeatherConfigEntry, AccuWeatherData
+from . import AccuWeatherData
+from .const import DOMAIN
 
 TO_REDACT = {CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE}
 
 
 async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: AccuWeatherConfigEntry
+    hass: HomeAssistant, config_entry: ConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    accuweather_data: AccuWeatherData = config_entry.runtime_data
+    accuweather_data: AccuWeatherData = hass.data[DOMAIN][config_entry.entry_id]
 
     return {
         "config_entry_data": async_redact_data(dict(config_entry.data), TO_REDACT),

homeassistant/components/accuweather/icons.json

@@ -1,51 +0,0 @@
-{
-  "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,13 +12,13 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONCENTRATION_PARTS_PER_CUBIC_METER,
     PERCENTAGE,
     UV_INDEX,
     UnitOfIrradiance,
     UnitOfLength,
-    UnitOfPressure,
     UnitOfSpeed,
     UnitOfTemperature,
     UnitOfTime,
@@ -28,6 +28,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 .const import (
     API_METRIC,
     ATTR_CATEGORY,
@@ -37,10 +38,10 @@ from .const import (
     ATTR_SPEED,
     ATTR_VALUE,
     ATTRIBUTION,
+    DOMAIN,
     MAX_FORECAST_DAYS,
 )
 from .coordinator import (
-    AccuWeatherConfigEntry,
     AccuWeatherDailyForecastDataUpdateCoordinator,
     AccuWeatherObservationDataUpdateCoordinator,
 )
@@ -56,174 +57,284 @@ class AccuWeatherSensorDescription(SensorEntityDescription):
     attr_fn: Callable[[dict[str, Any]], dict[str, Any]] = lambda _: {}
 
 
-FORECAST_SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
+@dataclass(frozen=True, kw_only=True)
-    AccuWeatherSensorDescription(
+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="air_quality",
+            translation_key=f"air_quality_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="cloud_cover_day",
+            translation_key=f"cloud_cover_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="cloud_cover_night",
+            translation_key=f"cloud_cover_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="grass_pollen",
+            translation_key=f"grass_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="HoursOfSun",
+            icon="mdi:weather-partly-cloudy",
             native_unit_of_measurement=UnitOfTime.HOURS,
             value_fn=lambda data: cast(float, data),
-        translation_key="hours_of_sun",
+            translation_key=f"hours_of_sun_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="LongPhraseDay",
             value_fn=lambda data: cast(str, data),
-        translation_key="condition_day",
+            translation_key=f"condition_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="LongPhraseNight",
             value_fn=lambda data: cast(str, data),
-        translation_key="condition_night",
+            translation_key=f"condition_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="mold_pollen",
+            translation_key=f"mold_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="ragweed_pollen",
+            translation_key=f"ragweed_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             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",
+            translation_key=f"realfeel_temperature_max_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             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",
+            translation_key=f"realfeel_temperature_min_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="realfeel_temperature_shade_max",
+            translation_key=f"realfeel_temperature_shade_max_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="realfeel_temperature_shade_min",
+            translation_key=f"realfeel_temperature_shade_min_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="SolarIrradianceDay",
-        device_class=SensorDeviceClass.IRRADIANCE,
+            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="solar_irradiance_day",
+            translation_key=f"solar_irradiance_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="SolarIrradianceNight",
-        device_class=SensorDeviceClass.IRRADIANCE,
+            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="solar_irradiance_night",
+            translation_key=f"solar_irradiance_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="ThunderstormProbabilityDay",
+            icon="mdi:weather-lightning",
             native_unit_of_measurement=PERCENTAGE,
             value_fn=lambda data: cast(int, data),
-        translation_key="thunderstorm_probability_day",
+            translation_key=f"thunderstorm_probability_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        AccuWeatherForecastSensorDescription(
             key="ThunderstormProbabilityNight",
+            icon="mdi:weather-lightning",
             native_unit_of_measurement=PERCENTAGE,
             value_fn=lambda data: cast(int, data),
-        translation_key="thunderstorm_probability_night",
+            translation_key=f"thunderstorm_probability_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="tree_pollen",
+            translation_key=f"tree_pollen_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="uv_index_forecast",
+            translation_key=f"uv_index_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="wind_gust_speed_day",
+            translation_key=f"wind_gust_speed_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="wind_gust_speed_night",
+            translation_key=f"wind_gust_speed_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="wind_speed_day",
+            translation_key=f"wind_speed_day_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
-    AccuWeatherSensorDescription(
+    *(
+        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="wind_speed_night",
+            translation_key=f"wind_speed_night_{day}d",
+            day=day,
+        )
+        for day in range(MAX_FORECAST_DAYS + 1)
     ),
 )
 
@@ -240,6 +351,7 @@ 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]),
@@ -248,6 +360,7 @@ 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,
@@ -280,15 +393,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
         translation_key="realfeel_temperature_shade",
     ),
-    AccuWeatherSensorDescription(
-        key="RelativeHumidity",
-        device_class=SensorDeviceClass.HUMIDITY,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
-        value_fn=lambda data: cast(int, data),
-        translation_key="humidity",
-    ),
     AccuWeatherSensorDescription(
         key="Precipitation",
         device_class=SensorDeviceClass.PRECIPITATION_INTENSITY,
@@ -298,36 +402,18 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
         attr_fn=lambda data: {"type": data["PrecipitationType"]},
         translation_key="precipitation",
     ),
-    AccuWeatherSensorDescription(
-        key="Pressure",
-        device_class=SensorDeviceClass.PRESSURE,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        native_unit_of_measurement=UnitOfPressure.HPA,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
-        translation_key="pressure",
-    ),
     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="Temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        entity_registry_enabled_default=False,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        value_fn=lambda data: cast(float, data[API_METRIC][ATTR_VALUE]),
-        translation_key="temperature",
-    ),
     AccuWeatherSensorDescription(
         key="UVIndex",
+        icon="mdi:weather-sunny",
         state_class=SensorStateClass.MEASUREMENT,
-        entity_registry_enabled_default=False,
         native_unit_of_measurement=UV_INDEX,
         value_fn=lambda data: cast(int, data),
         attr_fn=lambda data: {ATTR_LEVEL: data["UVIndexText"]},
@@ -354,7 +440,6 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
     AccuWeatherSensorDescription(
         key="Wind",
         device_class=SensorDeviceClass.WIND_SPEED,
-        entity_registry_enabled_default=False,
         state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement=UnitOfSpeed.KILOMETERS_PER_HOUR,
         value_fn=lambda data: cast(float, data[ATTR_SPEED][API_METRIC][ATTR_VALUE]),
@@ -373,16 +458,17 @@ SENSOR_TYPES: tuple[AccuWeatherSensorDescription, ...] = (
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
-    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 = (
-        entry.runtime_data.coordinator_observation
+        accuweather_data.coordinator_observation
     )
     forecast_daily_coordinator: AccuWeatherDailyForecastDataUpdateCoordinator = (
-        entry.runtime_data.coordinator_daily_forecast
+        accuweather_data.coordinator_daily_forecast
     )
 
     sensors: list[AccuWeatherSensor | AccuWeatherForecastSensor] = [
@@ -392,10 +478,9 @@ async def async_setup_entry(
 
     sensors.extend(
         [
-            AccuWeatherForecastSensor(forecast_daily_coordinator, description, day)
+            AccuWeatherForecastSensor(forecast_daily_coordinator, description)
-            for day in range(MAX_FORECAST_DAYS + 1)
             for description in FORECAST_SENSOR_TYPES
-            if description.key in forecast_daily_coordinator.data[day]
+            if description.key in forecast_daily_coordinator.data[description.day]
         ]
     )
 
@@ -461,27 +546,25 @@ class AccuWeatherForecastSensor(
 
     _attr_attribution = ATTRIBUTION
     _attr_has_entity_name = True
-    entity_description: AccuWeatherSensorDescription
+    entity_description: AccuWeatherForecastSensorDescription
 
     def __init__(
         self,
         coordinator: AccuWeatherDailyForecastDataUpdateCoordinator,
-        description: AccuWeatherSensorDescription,
+        description: AccuWeatherForecastSensorDescription,
-        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, forecast_day
+            coordinator.data, description.key, self.forecast_day
         )
         self._attr_unique_id = (
-            f"{coordinator.location_key}-{description.key}-{forecast_day}".lower()
+            f"{coordinator.location_key}-{description.key}-{self.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": {
+      "air_quality_0d": {
-        "name": "Air quality day {forecast_day}",
+        "name": "Air quality today",
         "state": {
           "good": "Good",
           "hazardous": "Hazardous",
@@ -32,6 +32,50 @@
           "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"
       },
@@ -41,52 +85,240 @@
       "cloud_cover": {
         "name": "Cloud cover"
       },
-      "cloud_cover_day": {
+      "cloud_cover_day_0d": {
-        "name": "Cloud cover day {forecast_day}"
+        "name": "Cloud cover today"
       },
-      "cloud_cover_night": {
+      "cloud_cover_day_1d": {
-        "name": "Cloud cover night {forecast_day}"
+        "name": "Cloud cover day 1"
       },
-      "condition_day": {
+      "cloud_cover_day_2d": {
-        "name": "Condition day {forecast_day}"
+        "name": "Cloud cover day 2"
       },
-      "condition_night": {
+      "cloud_cover_day_3d": {
-        "name": "Condition night {forecast_day}"
+        "name": "Cloud cover day 3"
+      },
+      "cloud_cover_day_4d": {
+        "name": "Cloud cover day 4"
+      },
+      "cloud_cover_night_0d": {
+        "name": "Cloud cover tonight"
+      },
+      "cloud_cover_night_1d": {
+        "name": "Cloud cover night 1"
+      },
+      "cloud_cover_night_2d": {
+        "name": "Cloud cover night 2"
+      },
+      "cloud_cover_night_3d": {
+        "name": "Cloud cover night 3"
+      },
+      "cloud_cover_night_4d": {
+        "name": "Cloud cover night 4"
+      },
+      "condition_day_0d": {
+        "name": "Condition today"
+      },
+      "condition_day_1d": {
+        "name": "Condition day 1"
+      },
+      "condition_day_2d": {
+        "name": "Condition day 2"
+      },
+      "condition_day_3d": {
+        "name": "Condition day 3"
+      },
+      "condition_day_4d": {
+        "name": "Condition day 4"
+      },
+      "condition_night_0d": {
+        "name": "Condition tonight"
+      },
+      "condition_night_1d": {
+        "name": "Condition night 1"
+      },
+      "condition_night_2d": {
+        "name": "Condition night 2"
+      },
+      "condition_night_3d": {
+        "name": "Condition night 3"
+      },
+      "condition_night_4d": {
+        "name": "Condition night 4"
       },
       "dew_point": {
         "name": "Dew point"
       },
-      "grass_pollen": {
+      "grass_pollen_0d": {
-        "name": "Grass pollen day {forecast_day}",
+        "name": "Grass pollen today",
         "state_attributes": {
           "level": {
             "name": "Level",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
-      "hours_of_sun": {
+      "grass_pollen_1d": {
-        "name": "Hours of sun day {forecast_day}"
+        "name": "Grass pollen day 1",
-      },
-      "mold_pollen": {
-        "name": "Mold pollen day {forecast_day}",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "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%]"
             }
           }
         }
@@ -102,18 +334,82 @@
           "falling": "Falling"
         }
       },
-      "ragweed_pollen": {
+      "ragweed_pollen_0d": {
-        "name": "Ragweed pollen day {forecast_day}",
+        "name": "Ragweed pollen today",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "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%]"
             }
           }
         }
@@ -121,45 +417,205 @@
       "realfeel_temperature": {
         "name": "RealFeel temperature"
       },
-      "realfeel_temperature_max": {
+      "realfeel_temperature_max_0d": {
-        "name": "RealFeel temperature max day {forecast_day}"
+        "name": "RealFeel temperature max today"
       },
-      "realfeel_temperature_min": {
+      "realfeel_temperature_max_1d": {
-        "name": "RealFeel temperature min day {forecast_day}"
+        "name": "RealFeel temperature max day 1"
+      },
+      "realfeel_temperature_max_2d": {
+        "name": "RealFeel temperature max day 2"
+      },
+      "realfeel_temperature_max_3d": {
+        "name": "RealFeel temperature max day 3"
+      },
+      "realfeel_temperature_max_4d": {
+        "name": "RealFeel temperature max day 4"
+      },
+      "realfeel_temperature_min_0d": {
+        "name": "RealFeel temperature min today"
+      },
+      "realfeel_temperature_min_1d": {
+        "name": "RealFeel temperature min day 1"
+      },
+      "realfeel_temperature_min_2d": {
+        "name": "RealFeel temperature min day 2"
+      },
+      "realfeel_temperature_min_3d": {
+        "name": "RealFeel temperature min day 3"
+      },
+      "realfeel_temperature_min_4d": {
+        "name": "RealFeel temperature min day 4"
       },
       "realfeel_temperature_shade": {
         "name": "RealFeel temperature shade"
       },
-      "realfeel_temperature_shade_max": {
+      "realfeel_temperature_shade_max_0d": {
-        "name": "RealFeel temperature shade max day {forecast_day}"
+        "name": "RealFeel temperature shade max today"
       },
-      "realfeel_temperature_shade_min": {
+      "realfeel_temperature_shade_max_1d": {
-        "name": "RealFeel temperature shade min day {forecast_day}"
+        "name": "RealFeel temperature shade max day 1"
       },
-      "solar_irradiance_day": {
+      "realfeel_temperature_shade_max_2d": {
-        "name": "Solar irradiance day {forecast_day}"
+        "name": "RealFeel temperature shade max day 2"
       },
-      "solar_irradiance_night": {
+      "realfeel_temperature_shade_max_3d": {
-        "name": "Solar irradiance night {forecast_day}"
+        "name": "RealFeel temperature shade max day 3"
       },
-      "thunderstorm_probability_day": {
+      "realfeel_temperature_shade_max_4d": {
-        "name": "Thunderstorm probability day {forecast_day}"
+        "name": "RealFeel temperature shade max day 4"
       },
-      "thunderstorm_probability_night": {
+      "realfeel_temperature_shade_min_0d": {
-        "name": "Thunderstorm probability night {forecast_day}"
+        "name": "RealFeel temperature shade min today"
       },
-      "tree_pollen": {
+      "realfeel_temperature_shade_min_1d": {
-        "name": "Tree pollen day {forecast_day}",
+        "name": "RealFeel temperature shade min day 1"
+      },
+      "realfeel_temperature_shade_min_2d": {
+        "name": "RealFeel temperature shade min day 2"
+      },
+      "realfeel_temperature_shade_min_3d": {
+        "name": "RealFeel temperature shade min day 3"
+      },
+      "realfeel_temperature_shade_min_4d": {
+        "name": "RealFeel temperature shade min day 4"
+      },
+      "solar_irradiance_day_0d": {
+        "name": "Solar irradiance today"
+      },
+      "solar_irradiance_day_1d": {
+        "name": "Solar irradiance day 1"
+      },
+      "solar_irradiance_day_2d": {
+        "name": "Solar irradiance day 2"
+      },
+      "solar_irradiance_day_3d": {
+        "name": "Solar irradiance day 3"
+      },
+      "solar_irradiance_day_4d": {
+        "name": "Solar irradiance day 4"
+      },
+      "solar_irradiance_night_0d": {
+        "name": "Solar irradiance tonight"
+      },
+      "solar_irradiance_night_1d": {
+        "name": "Solar irradiance night 1"
+      },
+      "solar_irradiance_night_2d": {
+        "name": "Solar irradiance night 2"
+      },
+      "solar_irradiance_night_3d": {
+        "name": "Solar irradiance night 3"
+      },
+      "solar_irradiance_night_4d": {
+        "name": "Solar irradiance night 4"
+      },
+      "thunderstorm_probability_day_0d": {
+        "name": "Thunderstorm probability today"
+      },
+      "thunderstorm_probability_day_1d": {
+        "name": "Thunderstorm probability day 1"
+      },
+      "thunderstorm_probability_day_2d": {
+        "name": "Thunderstorm probability day 2"
+      },
+      "thunderstorm_probability_day_3d": {
+        "name": "Thunderstorm probability day 3"
+      },
+      "thunderstorm_probability_day_4d": {
+        "name": "Thunderstorm probability day 4"
+      },
+      "thunderstorm_probability_night_0d": {
+        "name": "Thunderstorm probability tonight"
+      },
+      "thunderstorm_probability_night_1d": {
+        "name": "Thunderstorm probability night 1"
+      },
+      "thunderstorm_probability_night_2d": {
+        "name": "Thunderstorm probability night 2"
+      },
+      "thunderstorm_probability_night_3d": {
+        "name": "Thunderstorm probability night 3"
+      },
+      "thunderstorm_probability_night_4d": {
+        "name": "Thunderstorm probability night 4"
+      },
+      "tree_pollen_0d": {
+        "name": "Tree pollen today",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "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%]"
             }
           }
         }
@@ -168,30 +624,94 @@
         "name": "UV index",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::unhealthy%]"
             }
           }
         }
       },
-      "uv_index_forecast": {
+      "uv_index_0d": {
-        "name": "UV index day {forecast_day}",
+        "name": "UV index today",
         "state_attributes": {
           "level": {
-            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
+            "name": "[%key:component::accuweather::entity::sensor::grass_pollen_0d::state_attributes::level::name%]",
             "state": {
-              "good": "[%key:component::accuweather::entity::sensor::air_quality::state::good%]",
+              "good": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::good%]",
-              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality::state::hazardous%]",
+              "hazardous": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::hazardous%]",
-              "high": "[%key:component::accuweather::entity::sensor::air_quality::state::high%]",
+              "high": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::high%]",
-              "low": "[%key:component::accuweather::entity::sensor::air_quality::state::low%]",
+              "low": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::low%]",
-              "moderate": "[%key:component::accuweather::entity::sensor::air_quality::state::moderate%]",
+              "moderate": "[%key:component::accuweather::entity::sensor::air_quality_0d::state::moderate%]",
-              "unhealthy": "[%key:component::accuweather::entity::sensor::air_quality::state::unhealthy%]"
+              "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%]"
             }
           }
         }
@@ -208,17 +728,65 @@
       "wind_gust_speed": {
         "name": "[%key:component::weather::entity_component::_::state_attributes::wind_gust_speed::name%]"
       },
-      "wind_gust_speed_day": {
+      "wind_gust_speed_day_0d": {
-        "name": "Wind gust speed day {forecast_day}"
+        "name": "Wind gust speed today"
       },
-      "wind_gust_speed_night": {
+      "wind_gust_speed_day_1d": {
-        "name": "Wind gust speed night {forecast_day}"
+        "name": "Wind gust speed day 1"
       },
-      "wind_speed_day": {
+      "wind_gust_speed_day_2d": {
-        "name": "Wind speed day {forecast_day}"
+        "name": "Wind gust speed day 2"
       },
-      "wind_speed_night": {
+      "wind_gust_speed_day_3d": {
-        "name": "Wind speed night {forecast_day}"
+        "name": "Wind gust speed day 3"
+      },
+      "wind_gust_speed_day_4d": {
+        "name": "Wind gust speed day 4"
+      },
+      "wind_gust_speed_night_0d": {
+        "name": "Wind gust speed tonight"
+      },
+      "wind_gust_speed_night_1d": {
+        "name": "Wind gust speed night 1"
+      },
+      "wind_gust_speed_night_2d": {
+        "name": "Wind gust speed night 2"
+      },
+      "wind_gust_speed_night_3d": {
+        "name": "Wind gust speed night 3"
+      },
+      "wind_gust_speed_night_4d": {
+        "name": "Wind gust speed night 4"
+      },
+      "wind_speed_day_0d": {
+        "name": "Wind speed today"
+      },
+      "wind_speed_day_1d": {
+        "name": "Wind speed day 1"
+      },
+      "wind_speed_day_2d": {
+        "name": "Wind speed day 2"
+      },
+      "wind_speed_day_3d": {
+        "name": "Wind speed day 3"
+      },
+      "wind_speed_day_4d": {
+        "name": "Wind speed day 4"
+      },
+      "wind_speed_night_0d": {
+        "name": "Wind speed tonight"
+      },
+      "wind_speed_night_1d": {
+        "name": "Wind speed night 1"
+      },
+      "wind_speed_night_2d": {
+        "name": "Wind speed night 2"
+      },
+      "wind_speed_night_3d": {
+        "name": "Wind speed night 3"
+      },
+      "wind_speed_night_4d": {
+        "name": "Wind speed night 4"
       }
     }
   },

homeassistant/components/accuweather/system_health.py

@@ -10,7 +10,6 @@ from homeassistant.components import system_health
 from homeassistant.core import HomeAssistant, callback
 
 from .const import DOMAIN
-from .coordinator import AccuWeatherConfigEntry
 
 
 @callback
@@ -23,11 +22,9 @@ def async_register(
 
 async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     """Get info for the info page."""
-    config_entry: AccuWeatherConfigEntry = hass.config_entries.async_entries(DOMAIN)[0]
+    remaining_requests = list(hass.data[DOMAIN].values())[
-
+        0
-    remaining_requests = (
+    ].accuweather.requests_remaining
-        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,7 +7,6 @@ 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,
@@ -22,6 +21,7 @@ from homeassistant.components.weather import (
     Forecast,
     WeatherEntityFeature,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     UnitOfLength,
     UnitOfPrecipitationDepth,
@@ -31,8 +31,10 @@ 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 .const import (
     API_METRIC,
     ATTR_DIRECTION,
@@ -40,11 +42,10 @@ from .const import (
     ATTR_VALUE,
     ATTRIBUTION,
     CONDITION_MAP,
+    DOMAIN,
 )
 from .coordinator import (
-    AccuWeatherConfigEntry,
     AccuWeatherDailyForecastDataUpdateCoordinator,
-    AccuWeatherData,
     AccuWeatherObservationDataUpdateCoordinator,
 )
 
@@ -52,18 +53,20 @@ PARALLEL_UPDATES = 1
 
 
 async def async_setup_entry(
-    hass: HomeAssistant,
+    hass: HomeAssistant, entry: ConfigEntry, async_add_entities: AddEntitiesCallback
-    entry: AccuWeatherConfigEntry,
-    async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Add a AccuWeather weather entity from a config_entry."""
-    async_add_entities([AccuWeatherEntity(entry.runtime_data)])
+    accuweather_data: AccuWeatherData = hass.data[DOMAIN][entry.entry_id]
+
+    async_add_entities([AccuWeatherEntity(accuweather_data)])
 
 
 class AccuWeatherEntity(
     CoordinatorWeatherEntity[
         AccuWeatherObservationDataUpdateCoordinator,
         AccuWeatherDailyForecastDataUpdateCoordinator,
+        TimestampDataUpdateCoordinator,
+        TimestampDataUpdateCoordinator,
     ]
 ):
     """Define an AccuWeather entity."""
@@ -185,7 +188,6 @@ 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,10 +9,7 @@ from typing import Any
 import serial
 import voluptuous as vol
 
-from homeassistant.components.switch import (
+from homeassistant.components.switch import PLATFORM_SCHEMA, SwitchEntity
-    PLATFORM_SCHEMA as SWITCH_PLATFORM_SCHEMA,
-    SwitchEntity,
-)
 from homeassistant.const import (
     CONF_FILENAME,
     CONF_NAME,
@@ -41,7 +38,7 @@ from .const import (
 
 _LOGGER = logging.getLogger(__name__)
 
-PLATFORM_SCHEMA = SWITCH_PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA = PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_FILENAME): cv.isdevice,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
@@ -81,7 +78,7 @@ class AcerSwitch(SwitchEntity):
         write_timeout: int,
     ) -> None:
         """Init of the Acer projector."""
-        self.serial = serial.Serial(
+        self.ser = serial.Serial(
             port=serial_port, timeout=timeout, write_timeout=write_timeout
         )
         self._serial_port = serial_port
@@ -99,16 +96,16 @@ class AcerSwitch(SwitchEntity):
         # was disconnected during runtime.
         # This way the projector can be reconnected and will still work
         try:
-            if not self.serial.is_open:
+            if not self.ser.is_open:
-                self.serial.open()
+                self.ser.open()
-            self.serial.write(msg.encode("utf-8"))
+            self.ser.write(msg.encode("utf-8"))
             # Size is an experience value there is no real limit.
             # AFAIK there is no limit and no end character so we will usually
             # need to wait for timeout
-            ret = self.serial.read_until(size=20).decode("utf-8")
+            ret = self.ser.read_until(size=20).decode("utf-8")
         except serial.SerialException:
             _LOGGER.error("Problem communicating with %s", self._serial_port)
-        self.serial.close()
+        self.ser.close()
         return ret
 
     def _write_read_format(self, msg: str) -> str:

homeassistant/components/acmeda/__init__.py

@@ -3,53 +3,31 @@
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-import homeassistant.helpers.entity_registry as er
 
+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."""
-
-    await _migrate_unique_ids(hass, config_entry)
-
     hub = PulseHub(hass, config_entry)
 
     if not await hub.async_setup():
         return False
 
-    config_entry.runtime_data = hub
+    hass.data.setdefault(DOMAIN, {})[config_entry.entry_id] = hub
     await hass.config_entries.async_forward_entry_setups(config_entry, PLATFORMS)
 
     return True
 
 
-async def _migrate_unique_ids(hass: HomeAssistant, entry: AcmedaConfigEntry) -> None:
+async def async_unload_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
-    """Migrate pre-config flow unique ids."""
-    entity_registry = er.async_get(hass)
-    registry_entries = er.async_entries_for_config_entry(
-        entity_registry, entry.entry_id
-    )
-    for reg_entry in registry_entries:
-        if isinstance(reg_entry.unique_id, int):  # type: ignore[unreachable]
-            entity_registry.async_update_entity(  # type: ignore[unreachable]
-                reg_entry.entity_id, new_unique_id=str(reg_entry.unique_id)
-            )
-
-
-async def async_unload_entry(
-    hass: HomeAssistant, config_entry: AcmedaConfigEntry
-) -> bool:
     """Unload a config entry."""
-    hub = config_entry.runtime_data
+    hub = hass.data[DOMAIN][config_entry.entry_id]
 
     unload_ok = await hass.config_entries.async_unload_platforms(
         config_entry, PLATFORMS
@@ -58,4 +36,7 @@ async def async_unload_entry(
     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/base.py

@@ -11,7 +11,7 @@ from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from .const import ACMEDA_ENTITY_REMOVE, DOMAIN, LOGGER
 
 
-class AcmedaEntity(entity.Entity):
+class AcmedaBase(entity.Entity):
     """Base representation of an Acmeda roller."""
 
     _attr_should_poll = False
@@ -67,7 +67,7 @@ class AcmedaEntity(entity.Entity):
     @property
     def unique_id(self) -> str:
         """Return the unique ID of this roller."""
-        return str(self.roller.id)
+        return self.roller.id  # type: ignore[no-any-return]
 
     @property
     def device_id(self) -> str:

homeassistant/components/acmeda/cover.py

@@ -9,23 +9,24 @@ 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
+from .const import ACMEDA_HUB_UPDATE, DOMAIN
-from .entity import AcmedaEntity
 from .helpers import async_add_acmeda_entities
+from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: AcmedaConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub = config_entry.runtime_data
+    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
 
     current: set[int] = set()
 
@@ -44,7 +45,7 @@ async def async_setup_entry(
     )
 
 
-class AcmedaCover(AcmedaEntity, CoverEntity):
+class AcmedaCover(AcmedaBase, CoverEntity):
     """Representation of an Acmeda cover device."""
 
     _attr_name = None

homeassistant/components/acmeda/helpers.py

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

homeassistant/components/acmeda/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/acmeda",
   "iot_class": "local_push",
   "loggers": ["aiopulse"],
-  "requirements": ["aiopulse==0.4.6"]
+  "requirements": ["aiopulse==0.4.4"]
 }

homeassistant/components/acmeda/sensor.py

@@ -3,24 +3,25 @@
 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
+from .const import ACMEDA_HUB_UPDATE, DOMAIN
-from .entity import AcmedaEntity
 from .helpers import async_add_acmeda_entities
+from .hub import PulseHub
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    config_entry: AcmedaConfigEntry,
+    config_entry: ConfigEntry,
     async_add_entities: AddEntitiesCallback,
 ) -> None:
     """Set up the Acmeda Rollers from a config entry."""
-    hub = config_entry.runtime_data
+    hub: PulseHub = hass.data[DOMAIN][config_entry.entry_id]
 
     current: set[int] = set()
 
@@ -39,7 +40,7 @@ async def async_setup_entry(
     )
 
 
-class AcmedaBattery(AcmedaEntity, SensorEntity):
+class AcmedaBattery(AcmedaBase, SensorEntity):
     """Representation of an Acmeda cover sensor."""
 
     _attr_device_class = SensorDeviceClass.BATTERY

homeassistant/components/actiontec/device_tracker.py

@@ -9,8 +9,8 @@ from typing import Final
 import voluptuous as vol
 
 from homeassistant.components.device_tracker import (
-    DOMAIN as DEVICE_TRACKER_DOMAIN,
+    DOMAIN,
-    PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
+    PLATFORM_SCHEMA as BASE_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 = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
+PLATFORM_SCHEMA: Final = BASE_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_HOST): cv.string,
         vol.Required(CONF_PASSWORD): cv.string,
@@ -36,7 +36,7 @@ def get_scanner(
     hass: HomeAssistant, config: ConfigType
 ) -> ActiontecDeviceScanner | None:
     """Validate the configuration and return an Actiontec scanner."""
-    scanner = ActiontecDeviceScanner(config[DEVICE_TRACKER_DOMAIN])
+    scanner = ActiontecDeviceScanner(config[DOMAIN])
     return scanner if scanner.success_init else None
 
 
@@ -51,6 +51,7 @@ class ActiontecDeviceScanner(DeviceScanner):
         self.last_results: list[Device] = []
         data = self.get_actiontec_data()
         self.success_init = data is not None
+        _LOGGER.info("Scanner initialized")
 
     def scan_devices(self) -> list[str]:
         """Scan for new devices and return a list with found device IDs."""
@@ -69,7 +70,7 @@ class ActiontecDeviceScanner(DeviceScanner):
 
         Return boolean if scanning successful.
         """
-        _LOGGER.debug("Scanning")
+        _LOGGER.info("Scanning")
         if not self.success_init:
             return False
 
@@ -78,7 +79,7 @@ class ActiontecDeviceScanner(DeviceScanner):
         self.last_results = [
             device for device in actiontec_data if device.timevalid > -60
         ]
-        _LOGGER.debug("Scan successful")
+        _LOGGER.info("Scan successful")
         return True
 
     def get_actiontec_data(self) -> list[Device] | None:

homeassistant/components/adax/config_flow.py

@@ -130,7 +130,7 @@ class AdaxConfigFlow(ConfigFlow, domain=DOMAIN):
             async_get_clientsession(self.hass), account_id, password
         )
         if token is None:
-            _LOGGER.debug("Adax: Failed to login to retrieve token")
+            _LOGGER.info("Adax: Failed to login to retrieve token")
             errors["base"] = "cannot_connect"
             return self.async_show_form(
                 step_id="cloud",

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, ConfigEntryState
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_HOST,
     CONF_NAME,
@@ -43,7 +43,6 @@ SERVICE_REFRESH_SCHEMA = vol.Schema(
 )
 
 PLATFORMS = [Platform.SENSOR, Platform.SWITCH]
-type AdGuardConfigEntry = ConfigEntry[AdGuardData]
 
 
 @dataclass
@@ -54,7 +53,7 @@ class AdGuardData:
     version: str
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up AdGuard Home from a config entry."""
     session = async_get_clientsession(hass, entry.data[CONF_VERIFY_SSL])
     adguard = AdGuardHome(
@@ -72,7 +71,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> b
     except AdGuardHomeConnectionError as exception:
         raise ConfigEntryNotReady from exception
 
-    entry.runtime_data = AdGuardData(adguard, version)
+    hass.data.setdefault(DOMAIN, {})[entry.entry_id] = AdGuardData(adguard, version)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 
@@ -117,20 +116,17 @@ async def async_setup_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> b
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: AdGuardConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload AdGuard Home config entry."""
     unload_ok = await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
-    loaded_entries = [
+    if unload_ok:
-        entry
+        hass.data[DOMAIN].pop(entry.entry_id)
-        for entry in hass.config_entries.async_entries(DOMAIN)
+    if not hass.data[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