Include pending_components in WS command get_config

2025-04-01 07:50:27 +02:00
4686 changed files with 72291 additions and 249128 deletions
--- a/.github/ISSUE_TEMPLATE/bug_report.yml
+++ b/.github/ISSUE_TEMPLATE/bug_report.yml
@@ -1,6 +1,5 @@
 name: Report an issue with Home Assistant Core
 description: Report an issue with Home Assistant Core.
-type: Bug
 body:
  - type: markdown
    attributes:
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -32,7 +32,7 @@ jobs:
          fetch-depth: 0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -94,7 +94,7 @@ jobs:

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@v10
+        uses: dawidd6/action-download-artifact@v9
        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@v10
+        uses: dawidd6/action-download-artifact@v9
        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.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

@@ -175,7 +175,7 @@ jobs:
          sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt

      - name: Download translations
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: translations

@@ -324,7 +324,7 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.8.2
+        uses: sigstore/cosign-installer@v3.8.1
        with:
          cosign-release: "v2.2.3"

@@ -457,12 +457,12 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

      - name: Download translations
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: translations

@@ -509,7 +509,7 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build Docker image
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
        with:
          context: . # So action will not pull the repository again
          file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
      - name: Push Docker image
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
        id: push
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
        with:
          context: . # So action will not pull the repository again
          file: ./script/hassfest/docker/Dockerfile
@@ -531,7 +531,7 @@ jobs:

      - name: Generate artifact attestation
        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
+        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
        with:
          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
          subject-digest: ${{ steps.push.outputs.digest }}
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 2
+  CACHE_VERSION: 12
  UV_CACHE_VERSION: 1
-  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.7"
+  MYPY_CACHE_VERSION: 9
+  HA_SHORT_VERSION: "2025.5"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13']"
  # 10.3 is the oldest supported version
@@ -249,7 +249,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -259,7 +259,7 @@ jobs:
        with:
          path: venv
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Create Python virtual environment
        if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -276,7 +276,7 @@ jobs:
          path: ${{ env.PRE_COMMIT_CACHE }}
          lookup-only: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Install pre-commit dependencies
        if: steps.cache-precommit.outputs.cache-hit != 'true'
@@ -294,7 +294,7 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
@@ -306,7 +306,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
@@ -315,7 +315,7 @@ jobs:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Run ruff-format
        run: |
@@ -334,7 +334,7 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
@@ -346,7 +346,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
@@ -355,7 +355,7 @@ jobs:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Run ruff
        run: |
@@ -374,7 +374,7 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        id: python
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
@@ -386,7 +386,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
@@ -395,7 +395,7 @@ jobs:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
              needs.info.outputs.pre-commit_cache_key }}

      - name: Register yamllint problem matcher
@@ -484,7 +484,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -501,7 +501,7 @@ jobs:
        with:
          path: venv
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore uv wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -509,10 +509,10 @@ jobs:
        with:
          path: ${{ env.UV_CACHE_DIR }}
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            steps.generate-uv-key.outputs.key }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-uv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-uv-${{
            env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
            env.HA_SHORT_VERSION }}-
      - name: Install additional OS dependencies
@@ -587,7 +587,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -598,7 +598,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Run hassfest
        run: |
@@ -620,7 +620,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -631,7 +631,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Run gen_requirements_all.py
        run: |
@@ -653,7 +653,7 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Dependency review
-        uses: actions/dependency-review-action@v4.7.1
+        uses: actions/dependency-review-action@v4.5.0
        with:
          license-check: false # We use our own license audit checks

@@ -677,7 +677,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -688,7 +688,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Extract license data
        run: |
@@ -720,7 +720,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -731,7 +731,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register pylint problem matcher
        run: |
@@ -767,7 +767,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -778,7 +778,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register pylint problem matcher
        run: |
@@ -812,7 +812,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -830,17 +830,17 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
        uses: actions/cache@v4.2.3
        with:
          path: .mypy_cache
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            steps.generate-mypy-key.outputs.key }}
          restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-mypy-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-mypy-${{
            env.MYPY_CACHE_VERSION }}-${{ steps.generate-mypy-key.outputs.version }}-${{
            env.HA_SHORT_VERSION }}-
      - name: Register mypy problem matcher
@@ -889,7 +889,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -900,7 +900,7 @@ jobs:
          path: venv
          fail-on-cache-miss: true
          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Run split_tests.py
        run: |
@@ -944,13 +944,12 @@ jobs:
            bluez \
            ffmpeg \
            libturbojpeg \
-            libgammu-dev \
-            libxml2-utils
+            libgammu-dev
      - 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.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -960,8 +959,7 @@ jobs:
        with:
          path: venv
          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register Python problem matcher
        run: |
@@ -970,7 +968,7 @@ jobs:
        run: |
          echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
      - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: pytest_buckets
      - name: Compile English translations
@@ -1021,12 +1019,6 @@ jobs:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
          overwrite: true
-      - name: Beautify test results
-        # For easier identification of parsing errors
-        if: needs.info.outputs.skip_coverage != 'true'
-        run: |
-          xmllint --format "junit.xml" > "junit.xml-tmp"
-          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
        uses: actions/upload-artifact@v4.6.2
@@ -1077,13 +1069,12 @@ jobs:
            bluez \
            ffmpeg \
            libturbojpeg \
-            libmariadb-dev-compat \
-            libxml2-utils
+            libmariadb-dev-compat
      - 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.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -1093,8 +1084,7 @@ jobs:
        with:
          path: venv
          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register Python problem matcher
        run: |
@@ -1162,12 +1152,6 @@ jobs:
            steps.pytest-partial.outputs.mariadb }}
          path: coverage.xml
          overwrite: true
-      - name: Beautify test results
-        # For easier identification of parsing errors
-        if: needs.info.outputs.skip_coverage != 'true'
-        run: |
-          xmllint --format "junit.xml" > "junit.xml-tmp"
-          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
        uses: actions/upload-artifact@v4.6.2
@@ -1216,8 +1200,7 @@ jobs:
          sudo apt-get -y install \
            bluez \
            ffmpeg \
-            libturbojpeg \
-            libxml2-utils
+            libturbojpeg
          sudo /usr/share/postgresql-common/pgdg/apt.postgresql.org.sh -y
          sudo apt-get -y install \
            postgresql-server-dev-14
@@ -1225,7 +1208,7 @@ jobs:
        uses: actions/checkout@v4.2.2
      - name: Set up Python ${{ matrix.python-version }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -1235,8 +1218,7 @@ jobs:
        with:
          path: venv
          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register Python problem matcher
        run: |
@@ -1305,12 +1287,6 @@ jobs:
            steps.pytest-partial.outputs.postgresql }}
          path: coverage.xml
          overwrite: true
-      - name: Beautify test results
-        # For easier identification of parsing errors
-        if: needs.info.outputs.skip_coverage != 'true'
-        run: |
-          xmllint --format "junit.xml" > "junit.xml-tmp"
-          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
        uses: actions/upload-artifact@v4.6.2
@@ -1336,12 +1312,12 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.0
        with:
          fail_ci_if_error: true
          flags: full-suite
@@ -1378,13 +1354,12 @@ jobs:
            bluez \
            ffmpeg \
            libturbojpeg \
-            libgammu-dev \
-            libxml2-utils
+            libgammu-dev
      - 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.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ matrix.python-version }}
          check-latest: true
@@ -1394,8 +1369,7 @@ jobs:
        with:
          path: venv
          fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Register Python problem matcher
        run: |
@@ -1458,12 +1432,6 @@ jobs:
          name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
          path: coverage.xml
          overwrite: true
-      - name: Beautify test results
-        # For easier identification of parsing errors
-        if: needs.info.outputs.skip_coverage != 'true'
-        run: |
-          xmllint --format "junit.xml" > "junit.xml-tmp"
-          mv "junit.xml-tmp" "junit.xml"
      - name: Upload test results artifact
        if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
        uses: actions/upload-artifact@v4.6.2
@@ -1486,12 +1454,12 @@ jobs:
      - name: Check out code from GitHub
        uses: actions/checkout@v4.2.2
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
        if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.0
        with:
          fail_ci_if_error: true
          token: ${{ secrets.CODECOV_TOKEN }}
@@ -1511,7 +1479,7 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          pattern: test-results-*
      - name: Upload test results to Codecov
--- a/.github/workflows/codeql.yml
+++ b/.github/workflows/codeql.yml
@@ -24,11 +24,11 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.28.18
+        uses: github/codeql-action/init@v3.28.13
        with:
          languages: python

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.28.18
+        uses: github/codeql-action/analyze@v3.28.13
        with:
          category: "/language:python"
--- a/.github/workflows/translations.yml
+++ b/.github/workflows/translations.yml
@@ -22,7 +22,7 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}

--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -36,7 +36,7 @@ jobs:

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
        with:
          python-version: ${{ env.DEFAULT_PYTHON }}
          check-latest: true
@@ -138,17 +138,17 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Download env_file
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: env_file

      - name: Download build_constraints
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: build_constraints

      - name: Download requirements_diff
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: requirements_diff

@@ -187,22 +187,22 @@ jobs:
        uses: actions/checkout@v4.2.2

      - name: Download env_file
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: env_file

      - name: Download build_constraints
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: build_constraints

      - name: Download requirements_diff
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: requirements_diff

      - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
        with:
          name: requirements_all_wheels

--- a/.strict-typing
+++ b/.strict-typing
@@ -66,7 +66,6 @@ homeassistant.components.alarm_control_panel.*
 homeassistant.components.alert.*
 homeassistant.components.alexa.*
 homeassistant.components.alpha_vantage.*
-homeassistant.components.amazon_devices.*
 homeassistant.components.amazon_polly.*
 homeassistant.components.amberelectric.*
 homeassistant.components.ambient_network.*
@@ -271,7 +270,6 @@ homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
 homeassistant.components.imgw_pib.*
-homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
@@ -293,7 +291,6 @@ homeassistant.components.kaleidescape.*
 homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
-homeassistant.components.kulersky.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -334,7 +331,6 @@ homeassistant.components.media_player.*
 homeassistant.components.media_source.*
 homeassistant.components.met_eireann.*
 homeassistant.components.metoffice.*
-homeassistant.components.miele.*
 homeassistant.components.mikrotik.*
 homeassistant.components.min_max.*
 homeassistant.components.minecraft_server.*
@@ -366,10 +362,8 @@ homeassistant.components.no_ip.*
 homeassistant.components.nordpool.*
 homeassistant.components.notify.*
 homeassistant.components.notion.*
-homeassistant.components.ntfy.*
 homeassistant.components.number.*
 homeassistant.components.nut.*
-homeassistant.components.ohme.*
 homeassistant.components.onboarding.*
 homeassistant.components.oncue.*
 homeassistant.components.onedrive.*
@@ -387,10 +381,8 @@ homeassistant.components.overseerr.*
 homeassistant.components.p1_monitor.*
 homeassistant.components.pandora.*
 homeassistant.components.panel_custom.*
-homeassistant.components.paperless_ngx.*
 homeassistant.components.peblar.*
 homeassistant.components.peco.*
-homeassistant.components.pegel_online.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.person.*
 homeassistant.components.pi_hole.*
@@ -437,6 +429,7 @@ homeassistant.components.roku.*
 homeassistant.components.romy.*
 homeassistant.components.rpi_power.*
 homeassistant.components.rss_feed_template.*
+homeassistant.components.rtsp_to_webrtc.*
 homeassistant.components.russound_rio.*
 homeassistant.components.ruuvi_gateway.*
 homeassistant.components.ruuvitag_ble.*
@@ -466,7 +459,6 @@ homeassistant.components.slack.*
 homeassistant.components.sleepiq.*
 homeassistant.components.smhi.*
 homeassistant.components.smlight.*
-homeassistant.components.smtp.*
 homeassistant.components.snooz.*
 homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*
--- a/70
+++ b/70
@@ -46,8 +46,8 @@ build.json @home-assistant/supervisor
 /tests/components/accuweather/ @bieniu
 /homeassistant/components/acmeda/ @atmurray
 /tests/components/acmeda/ @atmurray
-/homeassistant/components/adax/ @danielhiversen @lazytarget
-/tests/components/adax/ @danielhiversen @lazytarget
+/homeassistant/components/adax/ @danielhiversen
+/tests/components/adax/ @danielhiversen
 /homeassistant/components/adguard/ @frenck
 /tests/components/adguard/ @frenck
 /homeassistant/components/ads/ @mrpasztoradam
@@ -89,8 +89,6 @@ build.json @home-assistant/supervisor
 /tests/components/alert/ @home-assistant/core @frenck
 /homeassistant/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
 /tests/components/alexa/ @home-assistant/cloud @ochlocracy @jbouwh
-/homeassistant/components/amazon_devices/ @chemelli74
-/tests/components/amazon_devices/ @chemelli74
 /homeassistant/components/amazon_polly/ @jschlyter
 /homeassistant/components/amberelectric/ @madpilot
 /tests/components/amberelectric/ @madpilot
@@ -173,8 +171,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/avea/ @pattyland
 /homeassistant/components/awair/ @ahayworth @danielsjf
 /tests/components/awair/ @ahayworth @danielsjf
-/homeassistant/components/aws_s3/ @tomasbedrich
-/tests/components/aws_s3/ @tomasbedrich
 /homeassistant/components/axis/ @Kane610
 /tests/components/axis/ @Kane610
 /homeassistant/components/azure_data_explorer/ @kaareseras
@@ -204,8 +200,8 @@ build.json @home-assistant/supervisor
 /tests/components/blebox/ @bbx-a @swistakm
 /homeassistant/components/blink/ @fronzbot @mkmer
 /tests/components/blink/ @fronzbot @mkmer
-/homeassistant/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
-/tests/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
+/homeassistant/components/blue_current/ @Floris272 @gleeuwen
+/tests/components/blue_current/ @Floris272 @gleeuwen
 /homeassistant/components/bluemaestro/ @bdraco
 /tests/components/bluemaestro/ @bdraco
 /homeassistant/components/blueprint/ @home-assistant/core
@@ -305,7 +301,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/crownstone/ @Crownstone @RicArch97
 /tests/components/crownstone/ @Crownstone @RicArch97
 /homeassistant/components/cups/ @fabaff
-/tests/components/cups/ @fabaff
 /homeassistant/components/daikin/ @fredrike
 /tests/components/daikin/ @fredrike
 /homeassistant/components/date/ @home-assistant/core
@@ -437,7 +432,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
-/homeassistant/components/ephember/ @ttroy50 @roberty99
+/homeassistant/components/ephember/ @ttroy50
 /homeassistant/components/epic_games_store/ @hacf-fr @Quentame
 /tests/components/epic_games_store/ @hacf-fr @Quentame
 /homeassistant/components/epion/ @lhgravendeel
@@ -458,8 +453,8 @@ build.json @home-assistant/supervisor
 /tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
 /tests/components/evohome/ @zxdavb
-/homeassistant/components/ezviz/ @RenierM26
-/tests/components/ezviz/ @RenierM26
+/homeassistant/components/ezviz/ @RenierM26 @baqs
+/tests/components/ezviz/ @RenierM26 @baqs
 /homeassistant/components/faa_delays/ @ntilley905
 /tests/components/faa_delays/ @ntilley905
 /homeassistant/components/fan/ @home-assistant/core
@@ -709,12 +704,8 @@ build.json @home-assistant/supervisor
 /tests/components/image_upload/ @home-assistant/core
 /homeassistant/components/imap/ @jbouwh
 /tests/components/imap/ @jbouwh
-/homeassistant/components/imeon_inverter/ @Imeon-Energy
-/tests/components/imeon_inverter/ @Imeon-Energy
 /homeassistant/components/imgw_pib/ @bieniu
 /tests/components/imgw_pib/ @bieniu
-/homeassistant/components/immich/ @mib1185
-/tests/components/immich/ @mib1185
 /homeassistant/components/improv_ble/ @emontnemery
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
@@ -944,8 +935,6 @@ build.json @home-assistant/supervisor
 /tests/components/metoffice/ @MrHarcombe @avee87
 /homeassistant/components/microbees/ @microBeesTech
 /tests/components/microbees/ @microBeesTech
-/homeassistant/components/miele/ @astrandb
-/tests/components/miele/ @astrandb
 /homeassistant/components/mikrotik/ @engrbm87
 /tests/components/mikrotik/ @engrbm87
 /homeassistant/components/mill/ @danielhiversen
@@ -1058,8 +1047,6 @@ build.json @home-assistant/supervisor
 /tests/components/nsw_fuel_station/ @nickw444
 /homeassistant/components/nsw_rural_fire_service_feed/ @exxamalte
 /tests/components/nsw_rural_fire_service_feed/ @exxamalte
-/homeassistant/components/ntfy/ @tr4nt0r
-/tests/components/ntfy/ @tr4nt0r
 /homeassistant/components/nuheat/ @tstabrawa
 /tests/components/nuheat/ @tstabrawa
 /homeassistant/components/nuki/ @pschmitt @pvizeli @pree
@@ -1088,6 +1075,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/ombi/ @larssont
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
+/homeassistant/components/oncue/ @bdraco @peterager
+/tests/components/oncue/ @bdraco @peterager
 /homeassistant/components/ondilo_ico/ @JeromeHXP
 /tests/components/ondilo_ico/ @JeromeHXP
 /homeassistant/components/onedrive/ @zweckj
@@ -1116,8 +1105,8 @@ build.json @home-assistant/supervisor
 /tests/components/opentherm_gw/ @mvn23
 /homeassistant/components/openuv/ @bachya
 /tests/components/openuv/ @bachya
-/homeassistant/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
-/tests/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
+/homeassistant/components/openweathermap/ @fabaff @freekode @nzapponi
+/tests/components/openweathermap/ @fabaff @freekode @nzapponi
 /homeassistant/components/opnsense/ @mtreinish
 /tests/components/opnsense/ @mtreinish
 /homeassistant/components/opower/ @tronikos
@@ -1143,8 +1132,6 @@ build.json @home-assistant/supervisor
 /tests/components/palazzetti/ @dotvav
 /homeassistant/components/panel_custom/ @home-assistant/frontend
 /tests/components/panel_custom/ @home-assistant/frontend
-/homeassistant/components/paperless_ngx/ @fvgarrel
-/tests/components/paperless_ngx/ @fvgarrel
 /homeassistant/components/peblar/ @frenck
 /tests/components/peblar/ @frenck
 /homeassistant/components/peco/ @IceBotYT
@@ -1183,8 +1170,6 @@ build.json @home-assistant/supervisor
 /tests/components/powerwall/ @bdraco @jrester @daniel-simpson
 /homeassistant/components/private_ble_device/ @Jc2k
 /tests/components/private_ble_device/ @Jc2k
-/homeassistant/components/probe_plus/ @pantherale0
-/tests/components/probe_plus/ @pantherale0
 /homeassistant/components/profiler/ @bdraco
 /tests/components/profiler/ @bdraco
 /homeassistant/components/progettihwsw/ @ardaseremet
@@ -1231,7 +1216,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/qnap_qsw/ @Noltari
 /tests/components/qnap_qsw/ @Noltari
 /homeassistant/components/quantum_gateway/ @cisasteelersfan
-/tests/components/quantum_gateway/ @cisasteelersfan
 /homeassistant/components/qvr_pro/ @oblogic7
 /homeassistant/components/qwikswitch/ @kellerza
 /tests/components/qwikswitch/ @kellerza
@@ -1270,8 +1254,6 @@ build.json @home-assistant/supervisor
 /tests/components/recovery_mode/ @home-assistant/core
 /homeassistant/components/refoss/ @ashionky
 /tests/components/refoss/ @ashionky
-/homeassistant/components/rehlko/ @bdraco @peterager
-/tests/components/rehlko/ @bdraco @peterager
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/remote_calendar/ @Thomas55555
@@ -1317,6 +1299,8 @@ build.json @home-assistant/supervisor
 /tests/components/rpi_power/ @shenxn @swetoast
 /homeassistant/components/rss_feed_template/ @home-assistant/core
 /tests/components/rss_feed_template/ @home-assistant/core
+/homeassistant/components/rtsp_to_webrtc/ @allenporter
+/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
@@ -1403,6 +1387,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/siren/ @home-assistant/core @raman325
 /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
@@ -1420,8 +1405,6 @@ build.json @home-assistant/supervisor
 /tests/components/sma/ @kellerza @rklomp @erwindouna
 /homeassistant/components/smappee/ @bsmappee
 /tests/components/smappee/ @bsmappee
-/homeassistant/components/smarla/ @explicatis @rlint-explicatis
-/tests/components/smarla/ @explicatis @rlint-explicatis
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
 /homeassistant/components/smartthings/ @joostlek
@@ -1451,8 +1434,8 @@ build.json @home-assistant/supervisor
 /tests/components/solarlog/ @Ernst79 @dontinelli
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
-/homeassistant/components/soma/ @ratsept
-/tests/components/soma/ @ratsept
+/homeassistant/components/soma/ @ratsept @sebfortier2288
+/tests/components/soma/ @ratsept @sebfortier2288
 /homeassistant/components/sonarr/ @ctalkington
 /tests/components/sonarr/ @ctalkington
 /homeassistant/components/songpal/ @rytilahti @shenxn
@@ -1484,8 +1467,7 @@ build.json @home-assistant/supervisor
 /tests/components/steam_online/ @tkdrob
 /homeassistant/components/steamist/ @bdraco
 /tests/components/steamist/ @bdraco
-/homeassistant/components/stiebel_eltron/ @fucm @ThyMYthOS
-/tests/components/stiebel_eltron/ @fucm @ThyMYthOS
+/homeassistant/components/stiebel_eltron/ @fucm
 /homeassistant/components/stookwijzer/ @fwestenberg
 /tests/components/stookwijzer/ @fwestenberg
 /homeassistant/components/stream/ @hunterjm @uvjustin @allenporter
@@ -1496,8 +1478,8 @@ build.json @home-assistant/supervisor
 /tests/components/subaru/ @G-Two
 /homeassistant/components/suez_water/ @ooii @jb101010-2
 /tests/components/suez_water/ @ooii @jb101010-2
-/homeassistant/components/sun/ @home-assistant/core
-/tests/components/sun/ @home-assistant/core
+/homeassistant/components/sun/ @Swamp-Ig
+/tests/components/sun/ @Swamp-Ig
 /homeassistant/components/supla/ @mwegrzynek
 /homeassistant/components/surepetcare/ @benleb @danielhiversen
 /tests/components/surepetcare/ @benleb @danielhiversen
@@ -1510,8 +1492,8 @@ build.json @home-assistant/supervisor
 /tests/components/switch_as_x/ @home-assistant/core
 /homeassistant/components/switchbee/ @jafar-atili
 /tests/components/switchbee/ @jafar-atili
-/homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
-/tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
+/homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
+/tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
 /tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
 /homeassistant/components/switcher_kis/ @thecode @YogevBokobza
@@ -1551,8 +1533,8 @@ build.json @home-assistant/supervisor
 /tests/components/tedee/ @patrickhilker @zweckj
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/template/ @Petro31 @home-assistant/core
-/tests/components/template/ @Petro31 @home-assistant/core
+/homeassistant/components/template/ @Petro31 @PhracturedBlue @home-assistant/core
+/tests/components/template/ @Petro31 @PhracturedBlue @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
 /tests/components/tesla_fleet/ @Bre77
 /homeassistant/components/tesla_wall_connector/ @einarhauks
@@ -1688,8 +1670,8 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
 /tests/components/vodafone_station/ @paoloantinori @chemelli74
-/homeassistant/components/voip/ @balloob @synesthesiam @jaminh
-/tests/components/voip/ @balloob @synesthesiam @jaminh
+/homeassistant/components/voip/ @balloob @synesthesiam
+/tests/components/voip/ @balloob @synesthesiam
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvooncall/ @molobrakos
@@ -1806,8 +1788,6 @@ build.json @home-assistant/supervisor
 /tests/components/zeversolar/ @kvanzuijlen
 /homeassistant/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
 /tests/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
-/homeassistant/components/zimi/ @markhannon
-/tests/components/zimi/ @markhannon
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core
--- a/2
+++ b/2
@@ -31,7 +31,7 @@ RUN \
    && go2rtc --version

 # Install uv
-RUN pip3 install uv==0.7.1
+RUN pip3 install uv==0.6.10

 WORKDIR /usr/src

--- a/build.yaml
+++ b/build.yaml
@@ -1,10 +1,10 @@
 image: ghcr.io/home-assistant/{arch}-homeassistant
 build_from:
-  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.05.0
-  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.05.0
-  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.05.0
-  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.05.0
-  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.05.0
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.02.1
+  armhf: ghcr.io/home-assistant/armhf-homeassistant-base:2025.02.1
+  armv7: ghcr.io/home-assistant/armv7-homeassistant-base:2025.02.1
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.02.1
+  i386: ghcr.io/home-assistant/i386-homeassistant-base:2025.02.1
 codenotary:
  signer: notary@home-assistant.io
  base_image: notary@home-assistant.io
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -53,7 +53,6 @@ from .components import (
    logbook as logbook_pre_import,  # noqa: F401
    lovelace as lovelace_pre_import,  # noqa: F401
    onboarding as onboarding_pre_import,  # noqa: F401
-    person as person_pre_import,  # noqa: F401
    recorder as recorder_import,  # noqa: F401 - not named pre_import since it has requirements
    repairs as repairs_pre_import,  # noqa: F401
    search as search_pre_import,  # noqa: F401
@@ -171,6 +170,8 @@ FRONTEND_INTEGRATIONS = {
 # Stage 0 is divided into substages. Each substage has a name, a set of integrations and a timeout.
 # The substage containing recorder should have no timeout, as it could cancel a database migration.
 # Recorder freezes "recorder" timeout during a migration, but it does not freeze other timeouts.
+# The substages preceding it should also have no timeout, until we ensure that the recorder
+# is not accidentally promoted as a dependency of any of the integrations in them.
 # If we add timeouts to the frontend substages, we should make sure they don't apply in recovery mode.
 STAGE_0_INTEGRATIONS = (
    # Load logging and http deps as soon as possible
@@ -858,14 +859,8 @@ async def _async_set_up_integrations(
    integrations, all_integrations = await _async_resolve_domains_and_preload(
        hass, config
    )
-    # Detect all cycles
-    integrations_after_dependencies = (
-        await loader.resolve_integrations_after_dependencies(
-            hass, all_integrations.values(), set(all_integrations)
-        )
-    )
-    all_domains = set(integrations_after_dependencies)
-    domains = set(integrations) & all_domains
+    all_domains = set(all_integrations)
+    domains = set(integrations)

    _LOGGER.info(
        "Domains to be set up: %s | %s",
@@ -873,8 +868,6 @@ async def _async_set_up_integrations(
        all_domains - domains,
    )

-    async_set_domains_to_be_loaded(hass, all_domains)
-
    # Initialize recorder
    if "recorder" in all_domains:
        recorder.async_initialize_recorder(hass)
@@ -907,12 +900,24 @@ async def _async_set_up_integrations(
        stage_dep_domains_unfiltered = {
            dep
            for domain in stage_domains
-            for dep in integrations_after_dependencies[domain]
+            for dep in all_integrations[domain].all_dependencies
            if dep not in stage_domains
        }
        stage_dep_domains = stage_dep_domains_unfiltered - hass.config.components

        stage_all_domains = stage_domains | stage_dep_domains
+        stage_all_integrations = {
+            domain: all_integrations[domain] for domain in stage_all_domains
+        }
+        # Detect all cycles
+        stage_integrations_after_dependencies = (
+            await loader.resolve_integrations_after_dependencies(
+                hass, stage_all_integrations.values(), stage_all_domains
+            )
+        )
+        stage_all_domains = set(stage_integrations_after_dependencies)
+        stage_domains &= stage_all_domains
+        stage_dep_domains &= stage_all_domains

        _LOGGER.info(
            "Setting up stage %s: %s | %s\nDependencies: %s | %s",
@@ -923,15 +928,13 @@ async def _async_set_up_integrations(
            stage_dep_domains_unfiltered - stage_dep_domains,
        )

+        async_set_domains_to_be_loaded(hass, stage_all_domains)
+
        if timeout is None:
            await _async_setup_multi_components(hass, stage_all_domains, config)
            continue
        try:
-            async with hass.timeout.async_timeout(
-                timeout,
-                cool_down=COOLDOWN_TIME,
-                cancel_message=f"Bootstrap stage {name} timeout",
-            ):
+            async with hass.timeout.async_timeout(timeout, cool_down=COOLDOWN_TIME):
                await _async_setup_multi_components(hass, stage_all_domains, config)
        except TimeoutError:
            _LOGGER.warning(
@@ -943,11 +946,7 @@ async def _async_set_up_integrations(
    # Wrap up startup
    _LOGGER.debug("Waiting for startup to wrap up")
    try:
-        async with hass.timeout.async_timeout(
-            WRAP_UP_TIMEOUT,
-            cool_down=COOLDOWN_TIME,
-            cancel_message="Bootstrap startup wrap up timeout",
-        ):
+        async with hass.timeout.async_timeout(WRAP_UP_TIMEOUT, cool_down=COOLDOWN_TIME):
            await hass.async_block_till_done()
    except TimeoutError:
        _LOGGER.warning(
--- a/homeassistant/brands/amazon.json
+++ b/homeassistant/brands/amazon.json
@@ -1,13 +1,5 @@
 {
  "domain": "amazon",
  "name": "Amazon",
-  "integrations": [
-    "alexa",
-    "amazon_devices",
-    "amazon_polly",
-    "aws",
-    "aws_s3",
-    "fire_tv",
-    "route53"
-  ]
+  "integrations": ["alexa", "amazon_polly", "aws", "fire_tv", "route53"]
 }
--- a/homeassistant/brands/eve.json
+++ b/homeassistant/brands/eve.json
@@ -1,5 +0,0 @@
-{
-  "domain": "eve",
-  "name": "Eve",
-  "iot_standards": ["matter"]
-}
--- a/homeassistant/brands/google.json
+++ b/homeassistant/brands/google.json
@@ -6,7 +6,6 @@
    "google_assistant_sdk",
    "google_cloud",
    "google_drive",
-    "google_gemini",
    "google_generative_ai_conversation",
    "google_mail",
    "google_maps",
--- a/homeassistant/brands/nuki.json
+++ b/homeassistant/brands/nuki.json
@@ -1,6 +0,0 @@
-{
-  "domain": "nuki",
-  "name": "Nuki",
-  "integrations": ["nuki"],
-  "iot_standards": ["matter"]
-}
--- a/homeassistant/brands/shelly.json
+++ b/homeassistant/brands/shelly.json
@@ -1,6 +0,0 @@
-{
-  "domain": "shelly",
-  "name": "shelly",
-  "integrations": ["shelly"],
-  "iot_standards": ["zwave"]
-}
--- a/homeassistant/components/accuweather/const.py
+++ b/homeassistant/components/accuweather/const.py
@@ -67,7 +67,6 @@ POLLEN_CATEGORY_MAP = {
    2: "moderate",
    3: "high",
    4: "very_high",
-    5: "extreme",
 }
 UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)
--- a/homeassistant/components/accuweather/strings.json
+++ b/homeassistant/components/accuweather/strings.json
@@ -72,11 +72,10 @@
          "level": {
            "name": "Level",
            "state": {
-              "extreme": "Extreme",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "High",
+              "low": "Low",
              "moderate": "Moderate",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "Very high"
            }
          }
        }
@@ -90,11 +89,10 @@
          "level": {
            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
            "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
            }
          }
        }
@@ -125,11 +123,10 @@
          "level": {
            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
            "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
            }
          }
        }
@@ -170,11 +167,10 @@
          "level": {
            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
            "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
            }
          }
        }
@@ -185,11 +181,10 @@
          "level": {
            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
            "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
            }
          }
        }
@@ -200,11 +195,10 @@
          "level": {
            "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
            "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
              "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
            }
          }
        }
--- a/homeassistant/components/acmeda/config_flow.py
+++ b/homeassistant/components/acmeda/config_flow.py
@@ -40,10 +40,9 @@ class AcmedaFlowHandler(ConfigFlow, domain=DOMAIN):
            entry.unique_id for entry in self._async_current_entries()
        }

-        hubs: list[aiopulse.Hub] = []
        with suppress(TimeoutError):
            async with timeout(5):
-                hubs = [
+                hubs: list[aiopulse.Hub] = [
                    hub
                    async for hub in aiopulse.Hub.discover()
                    if hub.id not in already_configured
--- a/homeassistant/components/adax/init.py
+++ b/homeassistant/components/adax/init.py
@@ -2,38 +2,25 @@

 from __future__ import annotations

+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant

-from .const import CONNECTION_TYPE, LOCAL
-from .coordinator import AdaxCloudCoordinator, AdaxConfigEntry, AdaxLocalCoordinator
-
 PLATFORMS = [Platform.CLIMATE]


-async def async_setup_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Set up Adax from a config entry."""
-    if entry.data.get(CONNECTION_TYPE) == LOCAL:
-        local_coordinator = AdaxLocalCoordinator(hass, entry)
-        entry.runtime_data = local_coordinator
-    else:
-        cloud_coordinator = AdaxCloudCoordinator(hass, entry)
-        entry.runtime_data = cloud_coordinator
-
-    await entry.runtime_data.async_config_entry_first_refresh()
-
    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
    return True


-async def async_unload_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    """Unload a config entry."""
    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)


-async def async_migrate_entry(
-    hass: HomeAssistant, config_entry: AdaxConfigEntry
-) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
    """Migrate old entry."""
    # convert title and unique_id to string
    if config_entry.version == 1:
--- a/homeassistant/components/adax/climate.py
+++ b/homeassistant/components/adax/climate.py
@@ -12,42 +12,57 @@ from homeassistant.components.climate import (
    ClimateEntityFeature,
    HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
    ATTR_TEMPERATURE,
+    CONF_IP_ADDRESS,
+    CONF_PASSWORD,
+    CONF_TOKEN,
    CONF_UNIQUE_ID,
    PRECISION_WHOLE,
    UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity

-from . import AdaxConfigEntry
-from .const import CONNECTION_TYPE, DOMAIN, LOCAL
-from .coordinator import AdaxCloudCoordinator, AdaxLocalCoordinator
+from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL


 async def async_setup_entry(
    hass: HomeAssistant,
-    entry: AdaxConfigEntry,
+    entry: ConfigEntry,
    async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
    """Set up the Adax thermostat with config flow."""
    if entry.data.get(CONNECTION_TYPE) == LOCAL:
-        local_coordinator = cast(AdaxLocalCoordinator, entry.runtime_data)
-        async_add_entities(
-            [LocalAdaxDevice(local_coordinator, entry.data[CONF_UNIQUE_ID])],
+        adax_data_handler = AdaxLocal(
+            entry.data[CONF_IP_ADDRESS],
+            entry.data[CONF_TOKEN],
+            websession=async_get_clientsession(hass, verify_ssl=False),
        )
-    else:
-        cloud_coordinator = cast(AdaxCloudCoordinator, entry.runtime_data)
        async_add_entities(
-            AdaxDevice(cloud_coordinator, device_id)
-            for device_id in cloud_coordinator.data
+            [LocalAdaxDevice(adax_data_handler, entry.data[CONF_UNIQUE_ID])], True
        )
+        return
+
+    adax_data_handler = Adax(
+        entry.data[ACCOUNT_ID],
+        entry.data[CONF_PASSWORD],
+        websession=async_get_clientsession(hass),
+    )
+
+    async_add_entities(
+        (
+            AdaxDevice(room, adax_data_handler)
+            for room in await adax_data_handler.get_rooms()
+        ),
+        True,
+    )


-class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
+class AdaxDevice(ClimateEntity):
    """Representation of a heater."""

    _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
@@ -61,37 +76,20 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
    _attr_target_temperature_step = PRECISION_WHOLE
    _attr_temperature_unit = UnitOfTemperature.CELSIUS

-    def __init__(
-        self,
-        coordinator: AdaxCloudCoordinator,
-        device_id: str,
-    ) -> None:
+    def __init__(self, heater_data: dict[str, Any], adax_data_handler: Adax) -> None:
        """Initialize the heater."""
-        super().__init__(coordinator)
-        self._adax_data_handler: Adax = coordinator.adax_data_handler
-        self._device_id = device_id
+        self._device_id = heater_data["id"]
+        self._adax_data_handler = adax_data_handler

-        self._attr_name = self.room["name"]
-        self._attr_unique_id = f"{self.room['homeId']}_{self._device_id}"
+        self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device_id)},
+            identifiers={(DOMAIN, heater_data["id"])},
            # Instead of setting the device name to the entity name, adax
            # should be updated to set has_entity_name = True, and set the entity
            # name to None
            name=cast(str | None, self.name),
            manufacturer="Adax",
        )
-        self._apply_data(self.room)
-
-    @property
-    def available(self) -> bool:
-        """Whether the entity is available or not."""
-        return super().available and self._device_id in self.coordinator.data
-
-    @property
-    def room(self) -> dict[str, Any]:
-        """Gets the data for this particular device."""
-        return self.coordinator.data[self._device_id]

    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
        """Set hvac mode."""
@@ -106,9 +104,7 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
            )
        else:
            return
-
-        # Request data refresh from source to verify that update was successful
-        await self.coordinator.async_request_refresh()
+        await self._adax_data_handler.update()

    async def async_set_temperature(self, **kwargs: Any) -> None:
        """Set new target temperature."""
@@ -118,31 +114,28 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
            self._device_id, temperature, True
        )

-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if room := self.room:
-            self._apply_data(room)
-        super()._handle_coordinator_update()
-
-    def _apply_data(self, room: dict[str, Any]) -> None:
-        """Update the appropriate attributues based on received data."""
-        self._attr_current_temperature = room.get("temperature")
-        self._attr_target_temperature = room.get("targetTemperature")
-        if room["heatingEnabled"]:
-            self._attr_hvac_mode = HVACMode.HEAT
-            self._attr_icon = "mdi:radiator"
-        else:
-            self._attr_hvac_mode = HVACMode.OFF
-            self._attr_icon = "mdi:radiator-off"
+    async def async_update(self) -> None:
+        """Get the latest data."""
+        for room in await self._adax_data_handler.get_rooms():
+            if room["id"] != self._device_id:
+                continue
+            self._attr_name = room["name"]
+            self._attr_current_temperature = room.get("temperature")
+            self._attr_target_temperature = room.get("targetTemperature")
+            if room["heatingEnabled"]:
+                self._attr_hvac_mode = HVACMode.HEAT
+                self._attr_icon = "mdi:radiator"
+            else:
+                self._attr_hvac_mode = HVACMode.OFF
+                self._attr_icon = "mdi:radiator-off"
+            return


-class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
+class LocalAdaxDevice(ClimateEntity):
    """Representation of a heater."""

    _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
-    _attr_hvac_mode = HVACMode.OFF
-    _attr_icon = "mdi:radiator-off"
+    _attr_hvac_mode = HVACMode.HEAT
    _attr_max_temp = 35
    _attr_min_temp = 5
    _attr_supported_features = (
@@ -153,10 +146,9 @@ class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
    _attr_target_temperature_step = PRECISION_WHOLE
    _attr_temperature_unit = UnitOfTemperature.CELSIUS

-    def __init__(self, coordinator: AdaxLocalCoordinator, unique_id: str) -> None:
+    def __init__(self, adax_data_handler: AdaxLocal, unique_id: str) -> None:
        """Initialize the heater."""
-        super().__init__(coordinator)
-        self._adax_data_handler: AdaxLocal = coordinator.adax_data_handler
+        self._adax_data_handler = adax_data_handler
        self._attr_unique_id = unique_id
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, unique_id)},
@@ -177,20 +169,17 @@ class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
            return
        await self._adax_data_handler.set_target_temperature(temperature)

-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if data := self.coordinator.data:
-            self._attr_current_temperature = data["current_temperature"]
-            self._attr_available = self._attr_current_temperature is not None
-            if (target_temp := data["target_temperature"]) == 0:
-                self._attr_hvac_mode = HVACMode.OFF
-                self._attr_icon = "mdi:radiator-off"
-                if target_temp == 0:
-                    self._attr_target_temperature = self._attr_min_temp
-            else:
-                self._attr_hvac_mode = HVACMode.HEAT
-                self._attr_icon = "mdi:radiator"
-                self._attr_target_temperature = target_temp
-
-        super()._handle_coordinator_update()
+    async def async_update(self) -> None:
+        """Get the latest data."""
+        data = await self._adax_data_handler.get_status()
+        self._attr_current_temperature = data["current_temperature"]
+        self._attr_available = self._attr_current_temperature is not None
+        if (target_temp := data["target_temperature"]) == 0:
+            self._attr_hvac_mode = HVACMode.OFF
+            self._attr_icon = "mdi:radiator-off"
+            if target_temp == 0:
+                self._attr_target_temperature = self._attr_min_temp
+        else:
+            self._attr_hvac_mode = HVACMode.HEAT
+            self._attr_icon = "mdi:radiator"
+            self._attr_target_temperature = target_temp
--- a/homeassistant/components/adax/const.py
+++ b/homeassistant/components/adax/const.py
@@ -1,6 +1,5 @@
 """Constants for the Adax integration."""

-import datetime
 from typing import Final

 ACCOUNT_ID: Final = "account_id"
@@ -10,5 +9,3 @@ DOMAIN: Final = "adax"
 LOCAL = "Local"
 WIFI_SSID = "wifi_ssid"
 WIFI_PSWD = "wifi_pswd"
-
-SCAN_INTERVAL = datetime.timedelta(seconds=60)
--- a/homeassistant/components/adax/coordinator.py
+++ b/homeassistant/components/adax/coordinator.py
@@ -1,71 +0,0 @@
-"""DataUpdateCoordinator for the Adax component."""
-
-import logging
-from typing import Any, cast
-
-from adax import Adax
-from adax_local import Adax as AdaxLocal
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_TOKEN
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import ACCOUNT_ID, SCAN_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type AdaxConfigEntry = ConfigEntry[AdaxCloudCoordinator | AdaxLocalCoordinator]
-
-
-class AdaxCloudCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
-    """Coordinator for updating data to and from Adax (cloud)."""
-
-    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
-        """Initialize the Adax coordinator used for Cloud mode."""
-        super().__init__(
-            hass,
-            config_entry=entry,
-            logger=_LOGGER,
-            name="AdaxCloud",
-            update_interval=SCAN_INTERVAL,
-        )
-
-        self.adax_data_handler = Adax(
-            entry.data[ACCOUNT_ID],
-            entry.data[CONF_PASSWORD],
-            websession=async_get_clientsession(hass),
-        )
-
-    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
-        """Fetch data from the Adax."""
-        rooms = await self.adax_data_handler.get_rooms() or []
-        return {r["id"]: r for r in rooms}
-
-
-class AdaxLocalCoordinator(DataUpdateCoordinator[dict[str, Any] | None]):
-    """Coordinator for updating data to and from Adax (local)."""
-
-    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
-        """Initialize the Adax coordinator used for Local mode."""
-        super().__init__(
-            hass,
-            config_entry=entry,
-            logger=_LOGGER,
-            name="AdaxLocal",
-            update_interval=SCAN_INTERVAL,
-        )
-
-        self.adax_data_handler = AdaxLocal(
-            entry.data[CONF_IP_ADDRESS],
-            entry.data[CONF_TOKEN],
-            websession=async_get_clientsession(hass, verify_ssl=False),
-        )
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Fetch data from the Adax."""
-        if result := await self.adax_data_handler.get_status():
-            return cast(dict[str, Any], result)
-        raise UpdateFailed("Got invalid status from device")
--- a/homeassistant/components/adax/manifest.json
+++ b/homeassistant/components/adax/manifest.json
@@ -1,7 +1,7 @@
 {
  "domain": "adax",
  "name": "Adax",
-  "codeowners": ["@danielhiversen", "@lazytarget"],
+  "codeowners": ["@danielhiversen"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/adax",
  "iot_class": "local_polling",
--- a/homeassistant/components/advantage_air/light.py
+++ b/homeassistant/components/advantage_air/light.py
@@ -8,7 +8,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
-from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN
+from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity, AdvantageAirThingEntity
 from .models import AdvantageAirData

@@ -52,8 +52,8 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
        self._id: str = light["id"]
        self._attr_unique_id += f"-{self._id}"
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._attr_unique_id)},
-            via_device=(DOMAIN, self.coordinator.data["system"]["rid"]),
+            identifiers={(ADVANTAGE_AIR_DOMAIN, self._attr_unique_id)},
+            via_device=(ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"]),
            manufacturer="Advantage Air",
            model=light.get("moduleType"),
            name=light["name"],
--- a/homeassistant/components/advantage_air/update.py
+++ b/homeassistant/components/advantage_air/update.py
@@ -6,7 +6,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AdvantageAirDataConfigEntry
-from .const import DOMAIN
+from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity
 from .models import AdvantageAirData

@@ -32,7 +32,9 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
        """Initialize the Advantage Air App."""
        super().__init__(instance)
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.data["system"]["rid"])},
+            identifiers={
+                (ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"])
+            },
            manufacturer="Advantage Air",
            model=self.coordinator.data["system"]["sysType"],
            name=self.coordinator.data["system"]["name"],
--- a/homeassistant/components/agent_dvr/init.py
+++ b/homeassistant/components/agent_dvr/init.py
@@ -10,7 +10,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

-from .const import DOMAIN, SERVER_URL
+from .const import DOMAIN as AGENT_DOMAIN, SERVER_URL

 ATTRIBUTION = "ispyconnect.com"
 DEFAULT_BRAND = "Agent DVR by ispyconnect.com"
@@ -46,7 +46,7 @@ async def async_setup_entry(

    device_registry.async_get_or_create(
        config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, agent_client.unique)},
+        identifiers={(AGENT_DOMAIN, agent_client.unique)},
        manufacturer="iSpyConnect",
        name=f"Agent {agent_client.name}",
        model="Agent DVR",
--- a/homeassistant/components/agent_dvr/alarm_control_panel.py
+++ b/homeassistant/components/agent_dvr/alarm_control_panel.py
@@ -12,7 +12,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AgentDVRConfigEntry
-from .const import DOMAIN
+from .const import DOMAIN as AGENT_DOMAIN

 CONF_HOME_MODE_NAME = "home"
 CONF_AWAY_MODE_NAME = "away"
@@ -47,7 +47,7 @@ class AgentBaseStation(AlarmControlPanelEntity):
        self._client = client
        self._attr_unique_id = f"{client.unique}_CP"
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, client.unique)},
+            identifiers={(AGENT_DOMAIN, client.unique)},
            name=f"{client.name} {CONST_ALARM_CONTROL_PANEL_NAME}",
            manufacturer="Agent",
            model=CONST_ALARM_CONTROL_PANEL_NAME,
--- a/homeassistant/components/agent_dvr/camera.py
+++ b/homeassistant/components/agent_dvr/camera.py
@@ -15,7 +15,7 @@ from homeassistant.helpers.entity_platform import (
 )

 from . import AgentDVRConfigEntry
-from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN
+from .const import ATTRIBUTION, CAMERA_SCAN_INTERVAL_SECS, DOMAIN as AGENT_DOMAIN

 SCAN_INTERVAL = timedelta(seconds=CAMERA_SCAN_INTERVAL_SECS)

@@ -82,7 +82,7 @@ class AgentCamera(MjpegCamera):
            still_image_url=f"{device.client._server_url}{device.still_image_url}&size={device.mjpegStreamWidth}x{device.mjpegStreamHeight}",  # noqa: SLF001
        )
        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.unique_id)},
+            identifiers={(AGENT_DOMAIN, self.unique_id)},
            manufacturer="Agent",
            model="Camera",
            name=f"{device.client.name} {device.name}",
--- a/homeassistant/components/airgradient/entity.py
+++ b/homeassistant/components/airgradient/entity.py
@@ -6,7 +6,6 @@ from typing import Any, Concatenate
 from airgradient import AirGradientConnectionError, AirGradientError, get_model_name

 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

@@ -30,7 +29,6 @@ class AirGradientEntity(CoordinatorEntity[AirGradientCoordinator]):
            model_id=measures.model,
            serial_number=coordinator.serial_number,
            sw_version=measures.firmware_version,
-            connections={(dr.CONNECTION_NETWORK_MAC, coordinator.serial_number)},
        )


--- a/homeassistant/components/airthings/init.py
+++ b/homeassistant/components/airthings/init.py
@@ -5,22 +5,23 @@ from __future__ import annotations
 from datetime import timedelta
 import logging

-from airthings import Airthings
+from airthings import Airthings, AirthingsDevice, AirthingsError

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_ID, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

-from .const import CONF_SECRET
-from .coordinator import AirthingsDataUpdateCoordinator
+from .const import CONF_SECRET, DOMAIN

 _LOGGER = logging.getLogger(__name__)

 PLATFORMS: list[Platform] = [Platform.SENSOR]
 SCAN_INTERVAL = timedelta(minutes=6)

-type AirthingsConfigEntry = ConfigEntry[AirthingsDataUpdateCoordinator]
+type AirthingsDataCoordinatorType = DataUpdateCoordinator[dict[str, AirthingsDevice]]
+type AirthingsConfigEntry = ConfigEntry[AirthingsDataCoordinatorType]


 async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) -> bool:
@@ -31,8 +32,21 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) ->
        async_get_clientsession(hass),
    )

-    coordinator = AirthingsDataUpdateCoordinator(hass, airthings)
+    async def _update_method() -> dict[str, AirthingsDevice]:
+        """Get the latest data from Airthings."""
+        try:
+            return await airthings.update_devices()  # type: ignore[no-any-return]
+        except AirthingsError as err:
+            raise UpdateFailed(f"Unable to fetch data: {err}") from err

+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        config_entry=entry,
+        name=DOMAIN,
+        update_method=_update_method,
+        update_interval=SCAN_INTERVAL,
+    )
    await coordinator.async_config_entry_first_refresh()

    entry.runtime_data = coordinator
--- a/homeassistant/components/airthings/coordinator.py
+++ b/homeassistant/components/airthings/coordinator.py
@@ -1,36 +0,0 @@
-"""The Airthings integration."""
-
-from datetime import timedelta
-import logging
-
-from airthings import Airthings, AirthingsDevice, AirthingsError
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-SCAN_INTERVAL = timedelta(minutes=6)
-
-
-class AirthingsDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AirthingsDevice]]):
-    """Coordinator for Airthings data updates."""
-
-    def __init__(self, hass: HomeAssistant, airthings: Airthings) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=DOMAIN,
-            update_method=self._update_method,
-            update_interval=SCAN_INTERVAL,
-        )
-        self.airthings = airthings
-
-    async def _update_method(self) -> dict[str, AirthingsDevice]:
-        """Get the latest data from Airthings."""
-        try:
-            return await self.airthings.update_devices()  # type: ignore[no-any-return]
-        except AirthingsError as err:
-            raise UpdateFailed(f"Unable to fetch data: {err}") from err
--- a/homeassistant/components/airthings/manifest.json
+++ b/homeassistant/components/airthings/manifest.json
@@ -3,19 +3,6 @@
  "name": "Airthings",
  "codeowners": ["@danielhiversen", "@LaStrada"],
  "config_flow": true,
-  "dhcp": [
-    {
-      "hostname": "airthings-view"
-    },
-    {
-      "hostname": "airthings-hub",
-      "macaddress": "D0141190*"
-    },
-    {
-      "hostname": "airthings-hub",
-      "macaddress": "70B3D52A0*"
-    }
-  ],
  "documentation": "https://www.home-assistant.io/integrations/airthings",
  "iot_class": "cloud_polling",
  "loggers": ["airthings"],
--- a/homeassistant/components/airthings/sensor.py
+++ b/homeassistant/components/airthings/sensor.py
@@ -14,12 +14,10 @@ from homeassistant.const import (
    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
    CONCENTRATION_PARTS_PER_BILLION,
    CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
    PERCENTAGE,
    SIGNAL_STRENGTH_DECIBELS,
    EntityCategory,
    UnitOfPressure,
-    UnitOfSoundPressure,
    UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant
@@ -28,9 +26,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

-from . import AirthingsConfigEntry
+from . import AirthingsConfigEntry, AirthingsDataCoordinatorType
 from .const import DOMAIN
-from .coordinator import AirthingsDataUpdateCoordinator

 SENSORS: dict[str, SensorEntityDescription] = {
    "radonShortTermAvg": SensorEntityDescription(
@@ -56,12 +53,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
        native_unit_of_measurement=UnitOfPressure.MBAR,
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    "sla": SensorEntityDescription(
-        key="sla",
-        device_class=SensorDeviceClass.SOUND_PRESSURE,
-        native_unit_of_measurement=UnitOfSoundPressure.WEIGHTED_DECIBEL_A,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
    "battery": SensorEntityDescription(
        key="battery",
        device_class=SensorDeviceClass.BATTERY,
@@ -87,12 +78,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
        translation_key="light",
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    "lux": SensorEntityDescription(
-        key="lux",
-        device_class=SensorDeviceClass.ILLUMINANCE,
-        native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
    "virusRisk": SensorEntityDescription(
        key="virusRisk",
        translation_key="virus_risk",
@@ -148,7 +133,7 @@ async def async_setup_entry(


 class AirthingsHeaterEnergySensor(
-    CoordinatorEntity[AirthingsDataUpdateCoordinator], SensorEntity
+    CoordinatorEntity[AirthingsDataCoordinatorType], SensorEntity
 ):
    """Representation of a Airthings Sensor device."""

@@ -157,7 +142,7 @@ class AirthingsHeaterEnergySensor(

    def __init__(
        self,
-        coordinator: AirthingsDataUpdateCoordinator,
+        coordinator: AirthingsDataCoordinatorType,
        airthings_device: AirthingsDevice,
        entity_description: SensorEntityDescription,
    ) -> None:
--- a/homeassistant/components/airtouch4/climate.py
+++ b/homeassistant/components/airtouch4/climate.py
@@ -142,7 +142,7 @@ class AirtouchAC(CoordinatorEntity, ClimateEntity):
        return AT_TO_HA_STATE[self._airtouch.acs[self._ac_number].AcMode]

    @property
-    def hvac_modes(self) -> list[HVACMode]:
+    def hvac_modes(self):
        """Return the list of available operation modes."""
        airtouch_modes = self._airtouch.GetSupportedCoolingModesForAc(self._ac_number)
        modes = [AT_TO_HA_STATE[mode] for mode in airtouch_modes]
@@ -226,12 +226,12 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
        return super()._handle_coordinator_update()

    @property
-    def min_temp(self) -> float:
+    def min_temp(self):
        """Return Minimum Temperature for AC of this group."""
        return self._airtouch.acs[self._unit.BelongsToAc].MinSetpoint

    @property
-    def max_temp(self) -> float:
+    def max_temp(self):
        """Return Max Temperature for AC of this group."""
        return self._airtouch.acs[self._unit.BelongsToAc].MaxSetpoint

--- a/homeassistant/components/airzone/manifest.json
+++ b/homeassistant/components/airzone/manifest.json
@@ -11,5 +11,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone",
  "iot_class": "local_polling",
  "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.0"]
+  "requirements": ["aioairzone==0.9.9"]
 }
--- a/homeassistant/components/airzone/sensor.py
+++ b/homeassistant/components/airzone/sensor.py
@@ -9,8 +9,6 @@ from aioairzone.const import (
    AZD_HUMIDITY,
    AZD_TEMP,
    AZD_TEMP_UNIT,
-    AZD_THERMOSTAT_BATTERY,
-    AZD_THERMOSTAT_SIGNAL,
    AZD_WEBSERVER,
    AZD_WIFI_RSSI,
    AZD_ZONES,
@@ -75,20 +73,6 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    SensorEntityDescription(
-        device_class=SensorDeviceClass.BATTERY,
-        key=AZD_THERMOSTAT_BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SensorEntityDescription(
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        key=AZD_THERMOSTAT_SIGNAL,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="thermostat_signal",
-    ),
 )


--- a/homeassistant/components/airzone/strings.json
+++ b/homeassistant/components/airzone/strings.json
@@ -76,9 +76,6 @@
    "sensor": {
      "rssi": {
        "name": "RSSI"
-      },
-      "thermostat_signal": {
-        "name": "Signal strength"
      }
    }
  }
--- a/homeassistant/components/airzone_cloud/manifest.json
+++ b/homeassistant/components/airzone_cloud/manifest.json
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
  "iot_class": "cloud_push",
  "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.6.12"]
+  "requirements": ["aioairzone-cloud==0.6.11"]
 }
--- a/homeassistant/components/airzone_cloud/strings.json
+++ b/homeassistant/components/airzone_cloud/strings.json
@@ -34,7 +34,7 @@
        "state": {
          "off": "[%key:common::state::off%]",
          "on": "[%key:common::state::on%]",
-          "auto": "[%key:common::state::auto%]"
+          "auto": "Auto"
        }
      },
      "modes": {
--- a/homeassistant/components/alarmdecoder/strings.json
+++ b/homeassistant/components/alarmdecoder/strings.json
@@ -2,7 +2,7 @@
  "config": {
    "step": {
      "user": {
-        "title": "Choose AlarmDecoder protocol",
+        "title": "Choose AlarmDecoder Protocol",
        "data": {
          "protocol": "Protocol"
        }
@@ -12,8 +12,8 @@
        "data": {
          "host": "[%key:common::config_flow::data::host%]",
          "port": "[%key:common::config_flow::data::port%]",
-          "device_baudrate": "Device baud rate",
-          "device_path": "Device path"
+          "device_baudrate": "Device Baud Rate",
+          "device_path": "Device Path"
        },
        "data_description": {
          "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
@@ -44,36 +44,36 @@
      "arm_settings": {
        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
        "data": {
-          "auto_bypass": "Auto-bypass on arm",
-          "code_arm_required": "Code required for arming",
-          "alt_night_mode": "Alternative night mode"
+          "auto_bypass": "Auto Bypass on Arm",
+          "code_arm_required": "Code Required for Arming",
+          "alt_night_mode": "Alternative Night Mode"
        }
      },
      "zone_select": {
        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
        "description": "Enter the zone number you'd like to to add, edit, or remove.",
        "data": {
-          "zone_number": "Zone number"
+          "zone_number": "Zone Number"
        }
      },
      "zone_details": {
        "title": "[%key:component::alarmdecoder::options::step::init::title%]",
-        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
+        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave Zone Name blank.",
        "data": {
-          "zone_name": "Zone name",
-          "zone_type": "Zone type",
-          "zone_rfid": "RF serial",
-          "zone_loop": "RF loop",
-          "zone_relayaddr": "Relay address",
-          "zone_relaychan": "Relay channel"
+          "zone_name": "Zone Name",
+          "zone_type": "Zone Type",
+          "zone_rfid": "RF Serial",
+          "zone_loop": "RF Loop",
+          "zone_relayaddr": "Relay Address",
+          "zone_relaychan": "Relay Channel"
        }
      }
    },
    "error": {
-      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together.",
+      "relay_inclusive": "Relay Address and Relay Channel are codependent and must be included together.",
      "int": "The field below must be an integer.",
-      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
-      "loop_range": "'RF loop' must be an integer between 1 and 4."
+      "loop_rfid": "RF Loop cannot be used without RF Serial.",
+      "loop_range": "RF Loop must be an integer between 1 and 4."
    }
  },
  "services": {
--- a/homeassistant/components/alexa/entities.py
+++ b/homeassistant/components/alexa/entities.py
@@ -719,7 +719,7 @@ class LockCapabilities(AlexaEntity):
        yield Alexa(self.entity)


-@ENTITY_ADAPTERS.register(media_player.DOMAIN)
+@ENTITY_ADAPTERS.register(media_player.const.DOMAIN)
 class MediaPlayerCapabilities(AlexaEntity):
    """Class to represent MediaPlayer capabilities."""

@@ -757,7 +757,9 @@ class MediaPlayerCapabilities(AlexaEntity):

        if supported & media_player.MediaPlayerEntityFeature.SELECT_SOURCE:
            inputs = AlexaInputController.get_valid_inputs(
-                self.entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST, [])
+                self.entity.attributes.get(
+                    media_player.const.ATTR_INPUT_SOURCE_LIST, []
+                )
            )
            if len(inputs) > 0:
                yield AlexaInputController(self.entity)
@@ -774,7 +776,8 @@ class MediaPlayerCapabilities(AlexaEntity):
            and domain != "denonavr"
        ):
            inputs = AlexaEqualizerController.get_valid_inputs(
-                self.entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST) or []
+                self.entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
+                or []
            )
            if len(inputs) > 0:
                yield AlexaEqualizerController(self.entity)
--- a/homeassistant/components/alexa/handlers.py
+++ b/homeassistant/components/alexa/handlers.py
@@ -566,7 +566,7 @@ async def async_api_set_volume(

    data: dict[str, Any] = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
    }

    await hass.services.async_call(
@@ -589,7 +589,7 @@ async def async_api_select_input(

    # Attempt to map the ALL UPPERCASE payload name to a source.
    # Strips trailing 1 to match single input devices.
-    source_list = entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST) or []
+    source_list = entity.attributes.get(media_player.const.ATTR_INPUT_SOURCE_LIST) or []
    for source in source_list:
        formatted_source = (
            source.lower().replace("-", "").replace("_", "").replace(" ", "")
@@ -611,7 +611,7 @@ async def async_api_select_input(

    data: dict[str, Any] = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_INPUT_SOURCE: media_input,
+        media_player.const.ATTR_INPUT_SOURCE: media_input,
    }

    await hass.services.async_call(
@@ -636,7 +636,7 @@ async def async_api_adjust_volume(
    volume_delta = int(directive.payload["volume"])

    entity = directive.entity
-    current_level = entity.attributes[media_player.ATTR_MEDIA_VOLUME_LEVEL]
+    current_level = entity.attributes[media_player.const.ATTR_MEDIA_VOLUME_LEVEL]

    # read current state
    try:
@@ -648,7 +648,7 @@ async def async_api_adjust_volume(

    data: dict[str, Any] = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
    }

    await hass.services.async_call(
@@ -709,7 +709,7 @@ async def async_api_set_mute(
    entity = directive.entity
    data: dict[str, Any] = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_MUTED: mute,
+        media_player.const.ATTR_MEDIA_VOLUME_MUTED: mute,
    }

    await hass.services.async_call(
@@ -1708,13 +1708,15 @@ async def async_api_changechannel(

    data: dict[str, Any] = {
        ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_CONTENT_ID: channel,
-        media_player.ATTR_MEDIA_CONTENT_TYPE: (media_player.MediaType.CHANNEL),
+        media_player.const.ATTR_MEDIA_CONTENT_ID: channel,
+        media_player.const.ATTR_MEDIA_CONTENT_TYPE: (
+            media_player.const.MEDIA_TYPE_CHANNEL
+        ),
    }

    await hass.services.async_call(
        entity.domain,
-        media_player.SERVICE_PLAY_MEDIA,
+        media_player.const.SERVICE_PLAY_MEDIA,
        data,
        blocking=False,
        context=context,
@@ -1823,13 +1825,13 @@ async def async_api_set_eq_mode(
    context: ha.Context,
 ) -> AlexaResponse:
    """Process a SetMode request for EqualizerController."""
-    mode: str = directive.payload["mode"]
+    mode = directive.payload["mode"]
    entity = directive.entity
    data: dict[str, Any] = {ATTR_ENTITY_ID: entity.entity_id}

-    sound_mode_list = entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST)
+    sound_mode_list = entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
    if sound_mode_list and mode.lower() in sound_mode_list:
-        data[media_player.ATTR_SOUND_MODE] = mode.lower()
+        data[media_player.const.ATTR_SOUND_MODE] = mode.lower()
    else:
        msg = f"failed to map sound mode {mode} to a mode on {entity.entity_id}"
        raise AlexaInvalidValueError(msg)
--- a/homeassistant/components/alexa/state_report.py
+++ b/homeassistant/components/alexa/state_report.py
@@ -3,10 +3,10 @@
 from __future__ import annotations

 from asyncio import timeout
-from collections.abc import Mapping
 from http import HTTPStatus
 import json
 import logging
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, cast
 from uuid import uuid4

@@ -260,10 +260,10 @@ async def async_enable_proactive_mode(
    def extra_significant_check(
        hass: HomeAssistant,
        old_state: str,
-        old_attrs: Mapping[Any, Any],
+        old_attrs: dict[Any, Any] | MappingProxyType[Any, Any],
        old_extra_arg: Any,
        new_state: str,
-        new_attrs: Mapping[Any, Any],
+        new_attrs: dict[str, Any] | MappingProxyType[Any, Any],
        new_extra_arg: Any,
    ) -> bool:
        """Check if the serialized data has changed."""
--- a/homeassistant/components/amazon_devices/init.py
+++ b/homeassistant/components/amazon_devices/init.py
@@ -1,32 +0,0 @@
-"""Amazon Devices integration."""
-
-from homeassistant.const import Platform
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AmazonConfigEntry, AmazonDevicesCoordinator
-
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.NOTIFY,
-    Platform.SWITCH,
-]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AmazonConfigEntry) -> bool:
-    """Set up Amazon Devices platform."""
-
-    coordinator = AmazonDevicesCoordinator(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: AmazonConfigEntry) -> bool:
-    """Unload a config entry."""
-    await entry.runtime_data.api.close()
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
--- a/homeassistant/components/amazon_devices/binary_sensor.py
+++ b/homeassistant/components/amazon_devices/binary_sensor.py
@@ -1,71 +0,0 @@
-"""Support for binary sensors."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import Final
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonBinarySensorEntityDescription(BinarySensorEntityDescription):
-    """Amazon Devices binary sensor entity description."""
-
-    is_on_fn: Callable[[AmazonDevice], bool]
-
-
-BINARY_SENSORS: Final = (
-    AmazonBinarySensorEntityDescription(
-        key="online",
-        device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        is_on_fn=lambda _device: _device.online,
-    ),
-    AmazonBinarySensorEntityDescription(
-        key="bluetooth",
-        translation_key="bluetooth",
-        is_on_fn=lambda _device: _device.bluetooth_state,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Amazon Devices binary sensors based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonBinarySensorEntity(coordinator, serial_num, sensor_desc)
-        for sensor_desc in BINARY_SENSORS
-        for serial_num in coordinator.data
-    )
-
-
-class AmazonBinarySensorEntity(AmazonEntity, BinarySensorEntity):
-    """Binary sensor device."""
-
-    entity_description: AmazonBinarySensorEntityDescription
-
-    @property
-    def is_on(self) -> bool:
-        """Return True if the binary sensor is on."""
-        return self.entity_description.is_on_fn(self.device)
--- a/homeassistant/components/amazon_devices/config_flow.py
+++ b/homeassistant/components/amazon_devices/config_flow.py
@@ -1,63 +0,0 @@
-"""Config flow for Amazon Devices integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from aioamazondevices.api import AmazonEchoApi
-from aioamazondevices.exceptions import CannotAuthenticate, CannotConnect
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_CODE, CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.selector import CountrySelector
-
-from .const import CONF_LOGIN_DATA, DOMAIN
-
-
-class AmazonDevicesConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Amazon Devices."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors = {}
-        if user_input:
-            client = AmazonEchoApi(
-                user_input[CONF_COUNTRY],
-                user_input[CONF_USERNAME],
-                user_input[CONF_PASSWORD],
-            )
-            try:
-                data = await client.login_mode_interactive(user_input[CONF_CODE])
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except CannotAuthenticate:
-                errors["base"] = "invalid_auth"
-            else:
-                await self.async_set_unique_id(data["customer_info"]["user_id"])
-                self._abort_if_unique_id_configured()
-                user_input.pop(CONF_CODE)
-                return self.async_create_entry(
-                    title=user_input[CONF_USERNAME],
-                    data=user_input | {CONF_LOGIN_DATA: data},
-                )
-            finally:
-                await client.close()
-
-        return self.async_show_form(
-            step_id="user",
-            errors=errors,
-            data_schema=vol.Schema(
-                {
-                    vol.Required(
-                        CONF_COUNTRY, default=self.hass.config.country
-                    ): CountrySelector(),
-                    vol.Required(CONF_USERNAME): cv.string,
-                    vol.Required(CONF_PASSWORD): cv.string,
-                    vol.Required(CONF_CODE): cv.string,
-                }
-            ),
-        )
--- a/homeassistant/components/amazon_devices/const.py
+++ b/homeassistant/components/amazon_devices/const.py
@@ -1,8 +0,0 @@
-"""Amazon Devices constants."""
-
-import logging
-
-_LOGGER = logging.getLogger(__package__)
-
-DOMAIN = "amazon_devices"
-CONF_LOGIN_DATA = "login_data"
--- a/homeassistant/components/amazon_devices/coordinator.py
+++ b/homeassistant/components/amazon_devices/coordinator.py
@@ -1,58 +0,0 @@
-"""Support for Amazon Devices."""
-
-from datetime import timedelta
-
-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
-from aioamazondevices.exceptions import (
-    CannotAuthenticate,
-    CannotConnect,
-    CannotRetrieveData,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_COUNTRY, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import _LOGGER, CONF_LOGIN_DATA
-
-SCAN_INTERVAL = 30
-
-type AmazonConfigEntry = ConfigEntry[AmazonDevicesCoordinator]
-
-
-class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
-    """Base coordinator for Amazon Devices."""
-
-    config_entry: AmazonConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: AmazonConfigEntry,
-    ) -> None:
-        """Initialize the scanner."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            name=entry.title,
-            config_entry=entry,
-            update_interval=timedelta(seconds=SCAN_INTERVAL),
-        )
-        self.api = AmazonEchoApi(
-            entry.data[CONF_COUNTRY],
-            entry.data[CONF_USERNAME],
-            entry.data[CONF_PASSWORD],
-            entry.data[CONF_LOGIN_DATA],
-        )
-
-    async def _async_update_data(self) -> dict[str, AmazonDevice]:
-        """Update device data."""
-        try:
-            await self.api.login_mode_stored_data()
-            return await self.api.get_devices_data()
-        except (CannotConnect, CannotRetrieveData) as err:
-            raise UpdateFailed(f"Error occurred while updating {self.name}") from err
-        except CannotAuthenticate as err:
-            raise ConfigEntryError("Could not authenticate") from err
--- a/homeassistant/components/amazon_devices/diagnostics.py
+++ b/homeassistant/components/amazon_devices/diagnostics.py
@@ -1,66 +0,0 @@
-"""Diagnostics support for Amazon Devices integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_NAME, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceEntry
-
-from .coordinator import AmazonConfigEntry
-
-TO_REDACT = {CONF_PASSWORD, CONF_USERNAME, CONF_NAME, "title"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: AmazonConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-
-    coordinator = entry.runtime_data
-
-    devices: list[dict[str, dict[str, Any]]] = [
-        build_device_data(device) for device in coordinator.data.values()
-    ]
-
-    return {
-        "entry": async_redact_data(entry.as_dict(), TO_REDACT),
-        "device_info": {
-            "last_update success": coordinator.last_update_success,
-            "last_exception": repr(coordinator.last_exception),
-            "devices": devices,
-        },
-    }
-
-
-async def async_get_device_diagnostics(
-    hass: HomeAssistant, entry: AmazonConfigEntry, device_entry: DeviceEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a device."""
-
-    coordinator = entry.runtime_data
-
-    assert device_entry.serial_number
-
-    return build_device_data(coordinator.data[device_entry.serial_number])
-
-
-def build_device_data(device: AmazonDevice) -> dict[str, Any]:
-    """Build device data for diagnostics."""
-    return {
-        "account name": device.account_name,
-        "capabilities": device.capabilities,
-        "device family": device.device_family,
-        "device type": device.device_type,
-        "device cluster members": device.device_cluster_members,
-        "online": device.online,
-        "serial number": device.serial_number,
-        "software version": device.software_version,
-        "do not disturb": device.do_not_disturb,
-        "response style": device.response_style,
-        "bluetooth state": device.bluetooth_state,
-    }
--- a/homeassistant/components/amazon_devices/entity.py
+++ b/homeassistant/components/amazon_devices/entity.py
@@ -1,57 +0,0 @@
-"""Defines a base Amazon Devices entity."""
-
-from aioamazondevices.api import AmazonDevice
-from aioamazondevices.const import SPEAKER_GROUP_MODEL
-
-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 AmazonDevicesCoordinator
-
-
-class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
-    """Defines a base Amazon Devices entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AmazonDevicesCoordinator,
-        serial_num: str,
-        description: EntityDescription,
-    ) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._serial_num = serial_num
-        model_details = coordinator.api.get_model_details(self.device)
-        model = model_details["model"] if model_details else None
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, serial_num)},
-            name=self.device.account_name,
-            model=model,
-            model_id=self.device.device_type,
-            manufacturer="Amazon",
-            hw_version=model_details["hw_version"] if model_details else None,
-            sw_version=(
-                self.device.software_version if model != SPEAKER_GROUP_MODEL else None
-            ),
-            serial_number=serial_num if model != SPEAKER_GROUP_MODEL else None,
-        )
-        self.entity_description = description
-        self._attr_unique_id = f"{serial_num}-{description.key}"
-
-    @property
-    def device(self) -> AmazonDevice:
-        """Return the device."""
-        return self.coordinator.data[self._serial_num]
-
-    @property
-    def available(self) -> bool:
-        """Return True if entity is available."""
-        return (
-            super().available
-            and self._serial_num in self.coordinator.data
-            and self.device.online
-        )
--- a/homeassistant/components/amazon_devices/icons.json
+++ b/homeassistant/components/amazon_devices/icons.json
@@ -1,12 +0,0 @@
-{
-  "entity": {
-    "binary_sensor": {
-      "bluetooth": {
-        "default": "mdi:bluetooth",
-        "state": {
-          "off": "mdi:bluetooth-off"
-        }
-      }
-    }
-  }
-}
--- a/homeassistant/components/amazon_devices/manifest.json
+++ b/homeassistant/components/amazon_devices/manifest.json
@@ -1,122 +0,0 @@
-{
-  "domain": "amazon_devices",
-  "name": "Amazon Devices",
-  "codeowners": ["@chemelli74"],
-  "config_flow": true,
-  "dhcp": [
-    { "macaddress": "007147*" },
-    { "macaddress": "00FC8B*" },
-    { "macaddress": "0812A5*" },
-    { "macaddress": "086AE5*" },
-    { "macaddress": "08849D*" },
-    { "macaddress": "089115*" },
-    { "macaddress": "08A6BC*" },
-    { "macaddress": "08C224*" },
-    { "macaddress": "0CDC91*" },
-    { "macaddress": "0CEE99*" },
-    { "macaddress": "1009F9*" },
-    { "macaddress": "109693*" },
-    { "macaddress": "10BF67*" },
-    { "macaddress": "10CE02*" },
-    { "macaddress": "140AC5*" },
-    { "macaddress": "149138*" },
-    { "macaddress": "1848BE*" },
-    { "macaddress": "1C12B0*" },
-    { "macaddress": "1C4D66*" },
-    { "macaddress": "1C93C4*" },
-    { "macaddress": "1CFE2B*" },
-    { "macaddress": "244CE3*" },
-    { "macaddress": "24CE33*" },
-    { "macaddress": "2873F6*" },
-    { "macaddress": "2C71FF*" },
-    { "macaddress": "34AFB3*" },
-    { "macaddress": "34D270*" },
-    { "macaddress": "38F73D*" },
-    { "macaddress": "3C5CC4*" },
-    { "macaddress": "3CE441*" },
-    { "macaddress": "440049*" },
-    { "macaddress": "40A2DB*" },
-    { "macaddress": "40A9CF*" },
-    { "macaddress": "40B4CD*" },
-    { "macaddress": "443D54*" },
-    { "macaddress": "44650D*" },
-    { "macaddress": "485F2D*" },
-    { "macaddress": "48785E*" },
-    { "macaddress": "48B423*" },
-    { "macaddress": "4C1744*" },
-    { "macaddress": "4CEFC0*" },
-    { "macaddress": "5007C3*" },
-    { "macaddress": "50D45C*" },
-    { "macaddress": "50DCE7*" },
-    { "macaddress": "50F5DA*" },
-    { "macaddress": "5C415A*" },
-    { "macaddress": "6837E9*" },
-    { "macaddress": "6854FD*" },
-    { "macaddress": "689A87*" },
-    { "macaddress": "68B691*" },
-    { "macaddress": "68DBF5*" },
-    { "macaddress": "68F63B*" },
-    { "macaddress": "6C0C9A*" },
-    { "macaddress": "6C5697*" },
-    { "macaddress": "7458F3*" },
-    { "macaddress": "74C246*" },
-    { "macaddress": "74D637*" },
-    { "macaddress": "74E20C*" },
-    { "macaddress": "74ECB2*" },
-    { "macaddress": "786C84*" },
-    { "macaddress": "78A03F*" },
-    { "macaddress": "7C6166*" },
-    { "macaddress": "7C6305*" },
-    { "macaddress": "7CD566*" },
-    { "macaddress": "8871E5*" },
-    { "macaddress": "901195*" },
-    { "macaddress": "90235B*" },
-    { "macaddress": "90A822*" },
-    { "macaddress": "90F82E*" },
-    { "macaddress": "943A91*" },
-    { "macaddress": "98226E*" },
-    { "macaddress": "98CCF3*" },
-    { "macaddress": "9CC8E9*" },
-    { "macaddress": "A002DC*" },
-    { "macaddress": "A0D2B1*" },
-    { "macaddress": "A40801*" },
-    { "macaddress": "A8E621*" },
-    { "macaddress": "AC416A*" },
-    { "macaddress": "AC63BE*" },
-    { "macaddress": "ACCCFC*" },
-    { "macaddress": "B0739C*" },
-    { "macaddress": "B0CFCB*" },
-    { "macaddress": "B0F7C4*" },
-    { "macaddress": "B85F98*" },
-    { "macaddress": "C091B9*" },
-    { "macaddress": "C095CF*" },
-    { "macaddress": "C49500*" },
-    { "macaddress": "C86C3D*" },
-    { "macaddress": "CC9EA2*" },
-    { "macaddress": "CCF735*" },
-    { "macaddress": "DC54D7*" },
-    { "macaddress": "D8BE65*" },
-    { "macaddress": "D8FBD6*" },
-    { "macaddress": "DC91BF*" },
-    { "macaddress": "DCA0D0*" },
-    { "macaddress": "E0F728*" },
-    { "macaddress": "EC2BEB*" },
-    { "macaddress": "EC8AC4*" },
-    { "macaddress": "ECA138*" },
-    { "macaddress": "F02F9E*" },
-    { "macaddress": "F0272D*" },
-    { "macaddress": "F0F0A4*" },
-    { "macaddress": "F4032A*" },
-    { "macaddress": "F854B8*" },
-    { "macaddress": "FC492D*" },
-    { "macaddress": "FC65DE*" },
-    { "macaddress": "FCA183*" },
-    { "macaddress": "FCE9D8*" }
-  ],
-  "documentation": "https://www.home-assistant.io/integrations/amazon_devices",
-  "integration_type": "hub",
-  "iot_class": "cloud_polling",
-  "loggers": ["aioamazondevices"],
-  "quality_scale": "bronze",
-  "requirements": ["aioamazondevices==3.0.4"]
-}
--- a/homeassistant/components/amazon_devices/notify.py
+++ b/homeassistant/components/amazon_devices/notify.py
@@ -1,74 +0,0 @@
-"""Support for notification entity."""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any, Final
-
-from aioamazondevices.api import AmazonDevice, AmazonEchoApi
-
-from homeassistant.components.notify import NotifyEntity, NotifyEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonNotifyEntityDescription(NotifyEntityDescription):
-    """Amazon Devices notify entity description."""
-
-    method: Callable[[AmazonEchoApi, AmazonDevice, str], Awaitable[None]]
-    subkey: str
-
-
-NOTIFY: Final = (
-    AmazonNotifyEntityDescription(
-        key="speak",
-        translation_key="speak",
-        subkey="AUDIO_PLAYER",
-        method=lambda api, device, message: api.call_alexa_speak(device, message),
-    ),
-    AmazonNotifyEntityDescription(
-        key="announce",
-        translation_key="announce",
-        subkey="AUDIO_PLAYER",
-        method=lambda api, device, message: api.call_alexa_announcement(
-            device, message
-        ),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Amazon Devices notification entity based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonNotifyEntity(coordinator, serial_num, sensor_desc)
-        for sensor_desc in NOTIFY
-        for serial_num in coordinator.data
-        if sensor_desc.subkey in coordinator.data[serial_num].capabilities
-    )
-
-
-class AmazonNotifyEntity(AmazonEntity, NotifyEntity):
-    """Binary sensor notify platform."""
-
-    entity_description: AmazonNotifyEntityDescription
-
-    async def async_send_message(
-        self, message: str, title: str | None = None, **kwargs: Any
-    ) -> None:
-        """Send a message."""
-
-        await self.entity_description.method(self.coordinator.api, self.device, message)
--- a/homeassistant/components/amazon_devices/quality_scale.yaml
+++ b/homeassistant/components/amazon_devices/quality_scale.yaml
@@ -1,74 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: no actions
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: no actions
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: entities do not explicitly subscribe to events
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: todo
-  config-entry-unloading: done
-  docs-configuration-parameters: todo
-  docs-installation-parameters: todo
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: todo
-  test-coverage:
-    status: todo
-    comment: all tests missing
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: Network information not relevant
-  discovery: done
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: no known use cases for repair issues or flows, yet
-  stale-devices:
-    status: todo
-    comment: automate the cleanup process
-
-  # Platinum
-  async-dependency: done
-  inject-websession: todo
-  strict-typing: done
--- a/homeassistant/components/amazon_devices/strings.json
+++ b/homeassistant/components/amazon_devices/strings.json
@@ -1,60 +0,0 @@
-{
-  "common": {
-    "data_country": "Country code",
-    "data_code": "One-time password (OTP code)",
-    "data_description_country": "The country of your Amazon account.",
-    "data_description_username": "The email address of your Amazon account.",
-    "data_description_password": "The password of your Amazon account.",
-    "data_description_code": "The one-time password to log in to your account. Currently, only tokens from OTP applications are supported."
-  },
-  "config": {
-    "flow_title": "{username}",
-    "step": {
-      "user": {
-        "data": {
-          "country": "[%key:component::amazon_devices::common::data_country%]",
-          "username": "[%key:common::config_flow::data::username%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "code": "[%key:component::amazon_devices::common::data_description_code%]"
-        },
-        "data_description": {
-          "country": "[%key:component::amazon_devices::common::data_description_country%]",
-          "username": "[%key:component::amazon_devices::common::data_description_username%]",
-          "password": "[%key:component::amazon_devices::common::data_description_password%]",
-          "code": "[%key:component::amazon_devices::common::data_description_code%]"
-        }
-      }
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_service%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "bluetooth": {
-        "name": "Bluetooth"
-      }
-    },
-    "notify": {
-      "speak": {
-        "name": "Speak"
-      },
-      "announce": {
-        "name": "Announce"
-      }
-    },
-    "switch": {
-      "do_not_disturb": {
-        "name": "Do not disturb"
-      }
-    }
-  }
-}
--- a/homeassistant/components/amazon_devices/switch.py
+++ b/homeassistant/components/amazon_devices/switch.py
@@ -1,84 +0,0 @@
-"""Support for switches."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any, Final
-
-from aioamazondevices.api import AmazonDevice
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AmazonConfigEntry
-from .entity import AmazonEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class AmazonSwitchEntityDescription(SwitchEntityDescription):
-    """Amazon Devices switch entity description."""
-
-    is_on_fn: Callable[[AmazonDevice], bool]
-    subkey: str
-    method: str
-
-
-SWITCHES: Final = (
-    AmazonSwitchEntityDescription(
-        key="do_not_disturb",
-        subkey="AUDIO_PLAYER",
-        translation_key="do_not_disturb",
-        is_on_fn=lambda _device: _device.do_not_disturb,
-        method="set_do_not_disturb",
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AmazonConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Amazon Devices switches based on a config entry."""
-
-    coordinator = entry.runtime_data
-
-    async_add_entities(
-        AmazonSwitchEntity(coordinator, serial_num, switch_desc)
-        for switch_desc in SWITCHES
-        for serial_num in coordinator.data
-        if switch_desc.subkey in coordinator.data[serial_num].capabilities
-    )
-
-
-class AmazonSwitchEntity(AmazonEntity, SwitchEntity):
-    """Switch device."""
-
-    entity_description: AmazonSwitchEntityDescription
-
-    async def _switch_set_state(self, state: bool) -> None:
-        """Set desired switch state."""
-        method = getattr(self.coordinator.api, self.entity_description.method)
-
-        if TYPE_CHECKING:
-            assert method is not None
-
-        await method(self.device, state)
-        await self.coordinator.async_request_refresh()
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self._switch_set_state(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self._switch_set_state(False)
-
-    @property
-    def is_on(self) -> bool:
-        """Return True if switch is on."""
-        return self.entity_description.is_on_fn(self.device)
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -24,7 +24,7 @@ from homeassistant.components.recorder import (
    get_instance as get_recorder_instance,
 )
 from homeassistant.config_entries import SOURCE_IGNORE
-from homeassistant.const import ATTR_DOMAIN, BASE_PLATFORMS, __version__ as HA_VERSION
+from homeassistant.const import ATTR_DOMAIN, __version__ as HA_VERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import entity_registry as er
@@ -225,8 +225,7 @@ class Analytics:
                LOGGER.error(err)
                return

-            configuration_set = _domains_from_yaml_config(yaml_configuration)
-
+            configuration_set = set(yaml_configuration)
            er_platforms = {
                entity.platform
                for entity in ent_reg.entities.values()
@@ -371,13 +370,3 @@ class Analytics:
            for entry in entries
            if entry.source != SOURCE_IGNORE and entry.disabled_by is None
        )
-
-
-def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:
-    """Extract domains from the YAML configuration."""
-    domains = set(yaml_configuration)
-    for platforms in conf_util.extract_platform_integrations(
-        yaml_configuration, BASE_PLATFORMS
-    ).values():
-        domains.update(platforms)
-    return domains
--- a/homeassistant/components/analytics_insights/strings.json
+++ b/homeassistant/components/analytics_insights/strings.json
@@ -3,12 +3,12 @@
    "step": {
      "user": {
        "data": {
-          "tracked_addons": "Add-ons",
+          "tracked_addons": "Addons",
          "tracked_integrations": "Integrations",
          "tracked_custom_integrations": "Custom integrations"
        },
        "data_description": {
-          "tracked_addons": "Select the add-ons you want to track",
+          "tracked_addons": "Select the addons you want to track",
          "tracked_integrations": "Select the integrations you want to track",
          "tracked_custom_integrations": "Select the custom integrations you want to track"
        }
--- a/homeassistant/components/androidtv_remote/entity.py
+++ b/homeassistant/components/androidtv_remote/entity.py
@@ -73,7 +73,7 @@ class AndroidTVRemoteBaseEntity(Entity):
            self._api.send_key_command(key_code, direction)
        except ConnectionClosed as exc:
            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
            ) from exc

    def _send_launch_app_command(self, app_link: str) -> None:
@@ -85,5 +85,5 @@ class AndroidTVRemoteBaseEntity(Entity):
            self._api.send_launch_app_command(app_link)
        except ConnectionClosed as exc:
            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
            ) from exc
--- a/homeassistant/components/androidtv_remote/manifest.json
+++ b/homeassistant/components/androidtv_remote/manifest.json
@@ -7,6 +7,6 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["androidtvremote2"],
-  "requirements": ["androidtvremote2==0.2.2"],
+  "requirements": ["androidtvremote2==0.2.1"],
  "zeroconf": ["_androidtvremote2._tcp.local."]
 }
--- a/homeassistant/components/androidtv_remote/media_player.py
+++ b/homeassistant/components/androidtv_remote/media_player.py
@@ -21,7 +21,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

 from . import AndroidTVRemoteConfigEntry
-from .const import CONF_APP_ICON, CONF_APP_NAME, DOMAIN
+from .const import CONF_APP_ICON, CONF_APP_NAME
 from .entity import AndroidTVRemoteBaseEntity

 PARALLEL_UPDATES = 0
@@ -233,5 +233,5 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
                await asyncio.sleep(delay_secs)
        except ConnectionClosed as exc:
            raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
            ) from exc
--- a/homeassistant/components/androidtv_remote/strings.json
+++ b/homeassistant/components/androidtv_remote/strings.json
@@ -51,17 +51,8 @@
          "app_id": "Application ID",
          "app_icon": "Application icon",
          "app_delete": "Check to delete this application"
-        },
-        "data_description": {
-          "app_id": "E.g. com.plexapp.android for https://play.google.com/store/apps/details?id=com.plexapp.android",
-          "app_icon": "Image URL. From the Play Store app page, right click on the icon and select 'Copy image address' and then paste it here. Alternatively, download the image, upload it under /config/www/ and use the URL /local/filename"
        }
      }
    }
-  },
-  "exceptions": {
-    "connection_closed": {
-      "message": "Connection to the Android TV device is closed"
-    }
  }
 }
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -2,7 +2,6 @@

 from __future__ import annotations

-from collections.abc import Mapping
 from functools import partial
 import logging
 from types import MappingProxyType
@@ -53,7 +52,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(

 RECOMMENDED_OPTIONS = {
    CONF_RECOMMENDED: True,
-    CONF_LLM_HASS_API: [llm.LLM_API_ASSIST],
+    CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
    CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
 }

@@ -135,8 +134,9 @@ class AnthropicOptionsFlow(OptionsFlow):

        if user_input is not None:
            if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
-                if not user_input.get(CONF_LLM_HASS_API):
-                    user_input.pop(CONF_LLM_HASS_API, None)
+                if user_input[CONF_LLM_HASS_API] == "none":
+                    user_input.pop(CONF_LLM_HASS_API)
+
                if user_input.get(
                    CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET
                ) >= user_input.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS):
@@ -151,16 +151,12 @@ class AnthropicOptionsFlow(OptionsFlow):
                options = {
                    CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
                    CONF_PROMPT: user_input[CONF_PROMPT],
-                    CONF_LLM_HASS_API: user_input.get(CONF_LLM_HASS_API),
+                    CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
                }

        suggested_values = options.copy()
        if not suggested_values.get(CONF_PROMPT):
            suggested_values[CONF_PROMPT] = llm.DEFAULT_INSTRUCTIONS_PROMPT
-        if (
-            suggested_llm_apis := suggested_values.get(CONF_LLM_HASS_API)
-        ) and isinstance(suggested_llm_apis, str):
-            suggested_values[CONF_LLM_HASS_API] = [suggested_llm_apis]

        schema = self.add_suggested_values_to_schema(
            vol.Schema(anthropic_config_option_schema(self.hass, options)),
@@ -176,22 +172,28 @@ class AnthropicOptionsFlow(OptionsFlow):

 def anthropic_config_option_schema(
    hass: HomeAssistant,
-    options: Mapping[str, Any],
+    options: dict[str, Any] | MappingProxyType[str, Any],
 ) -> dict:
    """Return a schema for Anthropic completion options."""
    hass_apis: list[SelectOptionDict] = [
+        SelectOptionDict(
+            label="No control",
+            value="none",
+        )
+    ]
+    hass_apis.extend(
        SelectOptionDict(
            label=api.name,
            value=api.id,
        )
        for api in llm.async_get_apis(hass)
-    ]
+    )

    schema = {
        vol.Optional(CONF_PROMPT): TemplateSelector(),
-        vol.Optional(
-            CONF_LLM_HASS_API,
-        ): SelectSelector(SelectSelectorConfig(options=hass_apis, multiple=True)),
+        vol.Optional(CONF_LLM_HASS_API, default="none"): SelectSelector(
+            SelectSelectorConfig(options=hass_apis)
+        ),
        vol.Required(
            CONF_RECOMMENDED, default=options.get(CONF_RECOMMENDED, False)
        ): bool,
--- a/homeassistant/components/anthropic/const.py
+++ b/homeassistant/components/anthropic/const.py
@@ -17,11 +17,4 @@ CONF_THINKING_BUDGET = "thinking_budget"
 RECOMMENDED_THINKING_BUDGET = 0
 MIN_THINKING_BUDGET = 1024

-THINKING_MODELS = [
-    "claude-3-7-sonnet-20250219",
-    "claude-3-7-sonnet-latest",
-    "claude-opus-4-20250514",
-    "claude-opus-4-0",
-    "claude-sonnet-4-20250514",
-    "claude-sonnet-4-0",
-]
+THINKING_MODELS = ["claude-3-7-sonnet-20250219", "claude-3-7-sonnet-latest"]
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -9,13 +9,11 @@ from anthropic import AsyncStream
 from anthropic._types import NOT_GIVEN
 from anthropic.types import (
    InputJSONDelta,
-    MessageDeltaUsage,
    MessageParam,
    MessageStreamEvent,
    RawContentBlockDeltaEvent,
    RawContentBlockStartEvent,
    RawContentBlockStopEvent,
-    RawMessageDeltaEvent,
    RawMessageStartEvent,
    RawMessageStopEvent,
    RedactedThinkingBlock,
@@ -33,7 +31,6 @@ from anthropic.types import (
    ToolResultBlockParam,
    ToolUseBlock,
    ToolUseBlockParam,
-    Usage,
 )
 from voluptuous_openapi import convert

@@ -165,8 +162,7 @@ def _convert_content(
    return messages


-async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
-    chat_log: conversation.ChatLog,
+async def _transform_stream(
    result: AsyncStream[MessageStreamEvent],
    messages: list[MessageParam],
 ) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
@@ -211,7 +207,6 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
        | None
    ) = None
    current_tool_args: str
-    input_usage: Usage | None = None

    async for response in result:
        LOGGER.debug("Received response: %s", response)
@@ -220,7 +215,6 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
            if response.message.role != "assistant":
                raise ValueError("Unexpected message role")
            current_message = MessageParam(role=response.message.role, content=[])
-            input_usage = response.message.usage
        elif isinstance(response, RawContentBlockStartEvent):
            if isinstance(response.content_block, ToolUseBlock):
                current_block = ToolUseBlockParam(
@@ -271,56 +265,32 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
            if current_block is None:
                raise ValueError("Unexpected stop event without a current block")
            if current_block["type"] == "tool_use":
-                # tool block
-                tool_args = json.loads(current_tool_args) if current_tool_args else {}
-                current_block["input"] = tool_args
+                tool_block = cast(ToolUseBlockParam, current_block)
+                tool_args = json.loads(current_tool_args)
+                tool_block["input"] = tool_args
                yield {
                    "tool_calls": [
                        llm.ToolInput(
-                            id=current_block["id"],
-                            tool_name=current_block["name"],
+                            id=tool_block["id"],
+                            tool_name=tool_block["name"],
                            tool_args=tool_args,
                        )
                    ]
                }
            elif current_block["type"] == "thinking":
-                # thinking block
-                LOGGER.debug("Thinking: %s", current_block["thinking"])
+                thinking_block = cast(ThinkingBlockParam, current_block)
+                LOGGER.debug("Thinking: %s", thinking_block["thinking"])

            if current_message is None:
                raise ValueError("Unexpected stop event without a current message")
            current_message["content"].append(current_block)  # type: ignore[union-attr]
            current_block = None
-        elif isinstance(response, RawMessageDeltaEvent):
-            if (usage := response.usage) is not None:
-                chat_log.async_trace(_create_token_stats(input_usage, usage))
-            if response.delta.stop_reason == "refusal":
-                raise HomeAssistantError("Potential policy violation detected")
        elif isinstance(response, RawMessageStopEvent):
            if current_message is not None:
                messages.append(current_message)
                current_message = None


-def _create_token_stats(
-    input_usage: Usage | None, response_usage: MessageDeltaUsage
-) -> dict[str, Any]:
-    """Create token stats for conversation agent tracing."""
-    input_tokens = 0
-    cached_input_tokens = 0
-    if input_usage:
-        input_tokens = input_usage.input_tokens
-        cached_input_tokens = input_usage.cache_creation_input_tokens or 0
-    output_tokens = response_usage.output_tokens
-    return {
-        "stats": {
-            "input_tokens": input_tokens,
-            "cached_input_tokens": cached_input_tokens,
-            "output_tokens": output_tokens,
-        }
-    }
-
-
 class AnthropicConversationEntity(
    conversation.ConversationEntity, conversation.AbstractConversationAgent
 ):
@@ -328,7 +298,6 @@ class AnthropicConversationEntity(

    _attr_has_entity_name = True
    _attr_name = None
-    _attr_supports_streaming = True

    def __init__(self, entry: AnthropicConfigEntry) -> None:
        """Initialize the agent."""
@@ -424,8 +393,7 @@ class AnthropicConversationEntity(
                    [
                        content
                        async for content in chat_log.async_add_delta_content_stream(
-                            user_input.agent_id,
-                            _transform_stream(chat_log, stream, messages),
+                            user_input.agent_id, _transform_stream(stream, messages)
                        )
                        if not isinstance(content, conversation.AssistantContent)
                    ]
--- a/homeassistant/components/anthropic/manifest.json
+++ b/homeassistant/components/anthropic/manifest.json
@@ -8,5 +8,5 @@
  "documentation": "https://www.home-assistant.io/integrations/anthropic",
  "integration_type": "service",
  "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.52.0"]
+  "requirements": ["anthropic==0.47.2"]
 }
--- a/homeassistant/components/apcupsd/binary_sensor.py
+++ b/homeassistant/components/apcupsd/binary_sensor.py
@@ -53,8 +53,10 @@ class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
        """Initialize the APCUPSd binary device."""
        super().__init__(coordinator, context=description.key.upper())

+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
        self._attr_device_info = coordinator.device_info

    @property
--- a/homeassistant/components/apcupsd/config_flow.py
+++ b/homeassistant/components/apcupsd/config_flow.py
@@ -46,7 +46,11 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):
            return self.async_show_form(step_id="user", data_schema=_SCHEMA)

        host, port = user_input[CONF_HOST], user_input[CONF_PORT]
+
+        # Abort if an entry with same host and port is present.
        self._async_abort_entries_match({CONF_HOST: host, CONF_PORT: port})
+
+        # Test the connection to the host and get the current status for serial number.
        try:
            async with asyncio.timeout(CONNECTION_TIMEOUT):
                data = APCUPSdData(await aioapcaccess.request_status(host, port))
@@ -63,30 +67,3 @@ class ConfigFlowHandler(ConfigFlow, domain=DOMAIN):

        title = data.name or data.model or data.serial_no or "APC UPS"
        return self.async_create_entry(title=title, data=user_input)
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration of an existing entry."""
-
-        if user_input is None:
-            return self.async_show_form(step_id="reconfigure", data_schema=_SCHEMA)
-
-        host, port = user_input[CONF_HOST], user_input[CONF_PORT]
-        self._async_abort_entries_match({CONF_HOST: host, CONF_PORT: port})
-        try:
-            async with asyncio.timeout(CONNECTION_TIMEOUT):
-                data = APCUPSdData(await aioapcaccess.request_status(host, port))
-        except (OSError, asyncio.IncompleteReadError, TimeoutError):
-            errors = {"base": "cannot_connect"}
-            return self.async_show_form(
-                step_id="reconfigure", data_schema=_SCHEMA, errors=errors
-            )
-
-        await self.async_set_unique_id(data.serial_no)
-        self._abort_if_unique_id_mismatch(reason="wrong_apcupsd_daemon")
-
-        return self.async_update_reload_and_abort(
-            self._get_reconfigure_entry(),
-            data_updates=user_input,
-        )
--- a/homeassistant/components/apcupsd/coordinator.py
+++ b/homeassistant/components/apcupsd/coordinator.py
@@ -85,16 +85,11 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
        self._host = host
        self._port = port

-    @property
-    def unique_device_id(self) -> str:
-        """Return a unique ID of the device, which is the serial number (if available) or the config entry ID."""
-        return self.data.serial_no or self.config_entry.entry_id
-
    @property
    def device_info(self) -> DeviceInfo:
        """Return the DeviceInfo of this APC UPS, if serial number is available."""
        return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_device_id)},
+            identifiers={(DOMAIN, self.data.serial_no or self.config_entry.entry_id)},
            model=self.data.model,
            manufacturer="APC",
            name=self.data.name or "APC UPS",
@@ -113,7 +108,4 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
                data = await aioapcaccess.request_status(self._host, self._port)
                return APCUPSdData(data)
            except (OSError, asyncio.IncompleteReadError) as error:
-                raise UpdateFailed(
-                    translation_domain=DOMAIN,
-                    translation_key="cannot_connect",
-                ) from error
+                raise UpdateFailed(error) from error
--- a/homeassistant/components/apcupsd/sensor.py
+++ b/homeassistant/components/apcupsd/sensor.py
@@ -458,8 +458,11 @@ class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
        """Initialize the sensor."""
        super().__init__(coordinator=coordinator, context=description.key.upper())

+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
+
        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
        self._attr_device_info = coordinator.device_info

        # Initial update of attributes.
--- a/homeassistant/components/apcupsd/strings.json
+++ b/homeassistant/components/apcupsd/strings.json
@@ -1,9 +1,7 @@
 {
  "config": {
    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "wrong_apcupsd_daemon": "The reconfigured APC UPS Daemon is not the same as the one already configured.",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
    },
    "error": {
      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
@@ -95,7 +93,7 @@
        "name": "Internal temperature"
      },
      "last_self_test": {
-        "name": "Last self-test"
+        "name": "Last self test"
      },
      "last_transfer": {
        "name": "Last transfer"
@@ -179,7 +177,7 @@
        "name": "Restore requirement"
      },
      "self_test_result": {
-        "name": "Self-test result"
+        "name": "Self test result"
      },
      "sensitivity": {
        "name": "Sensitivity"
@@ -197,7 +195,7 @@
        "name": "Status"
      },
      "self_test_interval": {
-        "name": "Self-test interval"
+        "name": "Self test interval"
      },
      "time_left": {
        "name": "Time left"
@@ -221,10 +219,5 @@
        "name": "Transfer to battery"
      }
    }
-  },
-  "exceptions": {
-    "cannot_connect": {
-      "message": "Cannot connect to APC UPS Daemon."
-    }
  }
 }
--- a/homeassistant/components/apple_tv/config_flow.py
+++ b/homeassistant/components/apple_tv/config_flow.py
@@ -20,7 +20,6 @@ import voluptuous as vol
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
    SOURCE_IGNORE,
-    SOURCE_REAUTH,
    SOURCE_ZEROCONF,
    ConfigEntry,
    ConfigFlow,
@@ -382,9 +381,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
                        CONF_IDENTIFIERS: list(combined_identifiers),
                    },
                )
-                # Don't reload ignored entries or in the middle of reauth,
-                # e.g. if the user is entering a new PIN
-                if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
+                if entry.source != SOURCE_IGNORE:
                    self.hass.config_entries.async_schedule_reload(entry.entry_id)
            if not allow_exist:
                raise DeviceAlreadyConfigured
--- a/homeassistant/components/apple_tv/media_player.py
+++ b/homeassistant/components/apple_tv/media_player.py
@@ -120,7 +120,6 @@ class AppleTvMediaPlayer(
        """Initialize the Apple TV media player."""
        super().__init__(name, identifier, manager)
        self._playing: Playing | None = None
-        self._playing_last_updated: datetime | None = None
        self._app_list: dict[str, str] = {}

    @callback
@@ -210,7 +209,6 @@ class AppleTvMediaPlayer(
        This is a callback function from pyatv.interface.PushListener.
        """
        self._playing = playstatus
-        self._playing_last_updated = dt_util.utcnow()
        self.async_write_ha_state()

    @callback
@@ -318,7 +316,7 @@ class AppleTvMediaPlayer(
    def media_position_updated_at(self) -> datetime | None:
        """Last valid time of media position."""
        if self.state in {MediaPlayerState.PLAYING, MediaPlayerState.PAUSED}:
-            return self._playing_last_updated
+            return dt_util.utcnow()
        return None

    async def async_play_media(
--- a/homeassistant/components/aprilaire/humidifier.py
+++ b/homeassistant/components/aprilaire/humidifier.py
@@ -62,8 +62,6 @@ async def async_setup_entry(
                target_humidity_key=Attribute.HUMIDIFICATION_SETPOINT,
                min_humidity=10,
                max_humidity=50,
-                auto_status_key=Attribute.HUMIDIFICATION_AVAILABLE,
-                auto_status_value=1,
                default_humidity=30,
                set_humidity_fn=coordinator.client.set_humidification_setpoint,
            )
@@ -79,8 +77,6 @@ async def async_setup_entry(
                action_map=DEHUMIDIFIER_ACTION_MAP,
                current_humidity_key=Attribute.INDOOR_HUMIDITY_CONTROLLING_SENSOR_VALUE,
                target_humidity_key=Attribute.DEHUMIDIFICATION_SETPOINT,
-                auto_status_key=None,
-                auto_status_value=None,
                min_humidity=40,
                max_humidity=90,
                default_humidity=60,
@@ -104,8 +100,6 @@ class AprilaireHumidifierDescription(HumidifierEntityDescription):
    target_humidity_key: str
    min_humidity: int
    max_humidity: int
-    auto_status_key: str | None
-    auto_status_value: int | None
    default_humidity: int
    set_humidity_fn: Callable[[int], Awaitable]

@@ -169,31 +163,14 @@ class AprilaireHumidifierEntity(BaseAprilaireEntity, HumidifierEntity):
    def min_humidity(self) -> float:
        """Return the minimum humidity."""

-        if self.is_auto_humidity_mode():
-            return 1
-
        return self.entity_description.min_humidity

    @property
    def max_humidity(self) -> float:
        """Return the maximum humidity."""

-        if self.is_auto_humidity_mode():
-            return 7
-
        return self.entity_description.max_humidity

-    def is_auto_humidity_mode(self) -> bool:
-        """Return whether the humidifier is in auto mode."""
-
-        if self.entity_description.auto_status_key is None:
-            return False
-
-        return (
-            self.coordinator.data.get(self.entity_description.auto_status_key)
-            == self.entity_description.auto_status_value
-        )
-
    async def async_set_humidity(self, humidity: int) -> None:
        """Set the humidity."""

--- a/homeassistant/components/aprilaire/manifest.json
+++ b/homeassistant/components/aprilaire/manifest.json
@@ -7,5 +7,5 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["pyaprilaire"],
-  "requirements": ["pyaprilaire==0.9.1"]
+  "requirements": ["pyaprilaire==0.8.1"]
 }
--- a/homeassistant/components/apsystems/manifest.json
+++ b/homeassistant/components/apsystems/manifest.json
@@ -6,6 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/apsystems",
  "integration_type": "device",
  "iot_class": "local_polling",
-  "loggers": ["APsystemsEZ1"],
-  "requirements": ["apsystems-ez1==2.6.0"]
+  "requirements": ["apsystems-ez1==2.5.0"]
 }
--- a/homeassistant/components/apsystems/strings.json
+++ b/homeassistant/components/apsystems/strings.json
@@ -21,7 +21,7 @@
  "entity": {
    "binary_sensor": {
      "off_grid_status": {
-        "name": "Off-grid status"
+        "name": "Off grid status"
      },
      "dc_1_short_circuit_error_status": {
        "name": "DC 1 short circuit error status"
--- a/homeassistant/components/aquacell/icons.json
+++ b/homeassistant/components/aquacell/icons.json
@@ -1,9 +1,6 @@
 {
  "entity": {
    "sensor": {
-      "last_update": {
-        "default": "mdi:update"
-      },
      "salt_left_side_percentage": {
        "default": "mdi:basket-fill"
      },
--- a/homeassistant/components/aquacell/sensor.py
+++ b/homeassistant/components/aquacell/sensor.py
@@ -4,7 +4,6 @@ from __future__ import annotations

 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime

 from aioaquacell import Softener

@@ -29,7 +28,7 @@ PARALLEL_UPDATES = 1
 class SoftenerSensorEntityDescription(SensorEntityDescription):
    """Describes Softener sensor entity."""

-    value_fn: Callable[[Softener], StateType | datetime]
+    value_fn: Callable[[Softener], StateType]


 SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
@@ -78,12 +77,6 @@ SENSORS: tuple[SoftenerSensorEntityDescription, ...] = (
            "low",
        ],
    ),
-    SoftenerSensorEntityDescription(
-        key="last_update",
-        translation_key="last_update",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda softener: softener.lastUpdate,
-    ),
 )


@@ -118,6 +111,6 @@ class SoftenerSensor(AquacellEntity, SensorEntity):
        self.entity_description = description

    @property
-    def native_value(self) -> StateType | datetime:
+    def native_value(self) -> StateType:
        """Return the state of the sensor."""
        return self.entity_description.value_fn(self.softener)
--- a/homeassistant/components/aquacell/strings.json
+++ b/homeassistant/components/aquacell/strings.json
@@ -21,9 +21,6 @@
  },
  "entity": {
    "sensor": {
-      "last_update": {
-        "name": "Last update"
-      },
      "salt_left_side_percentage": {
        "name": "Salt left side percentage"
      },
@@ -39,9 +36,9 @@
      "wi_fi_strength": {
        "name": "Wi-Fi strength",
        "state": {
-          "low": "[%key:common::state::low%]",
-          "medium": "[%key:common::state::medium%]",
-          "high": "[%key:common::state::high%]"
+          "low": "Low",
+          "medium": "Medium",
+          "high": "High"
        }
      }
    }
--- a/homeassistant/components/aranet/sensor.py
+++ b/homeassistant/components/aranet/sensor.py
@@ -92,7 +92,7 @@ SENSOR_DESCRIPTIONS = {
        key="radiation_rate",
        translation_key="radiation_rate",
        name="Radiation Dose Rate",
-        native_unit_of_measurement="µSv/h",
+        native_unit_of_measurement="μSv/h",
        state_class=SensorStateClass.MEASUREMENT,
        suggested_display_precision=2,
        scale=0.001,
--- a/homeassistant/components/aranet/strings.json
+++ b/homeassistant/components/aranet/strings.json
@@ -26,7 +26,7 @@
    "sensor": {
      "threshold": {
        "state": {
-          "error": "[%key:common::state::error%]",
+          "error": "Error",
          "green": "Green",
          "yellow": "Yellow",
          "red": "Red"
--- a/homeassistant/components/assist_pipeline/pipeline.py
+++ b/homeassistant/components/assist_pipeline/pipeline.py
@@ -20,6 +20,9 @@ import hass_nabucasa
 import voluptuous as vol

 from homeassistant.components import conversation, stt, tts, wake_word, websocket_api
+from homeassistant.components.tts import (
+    generate_media_source_id as tts_generate_media_source_id,
+)
 from homeassistant.const import ATTR_SUPPORTED_FEATURES, MATCH_ALL
 from homeassistant.core import Context, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
@@ -89,8 +92,6 @@ KEY_ASSIST_PIPELINE: HassKey[PipelineData] = HassKey(DOMAIN)
 KEY_PIPELINE_CONVERSATION_DATA: HassKey[dict[str, PipelineConversationData]] = HassKey(
    "pipeline_conversation_data"
 )
-# Number of response parts to handle before streaming the response
-STREAM_RESPONSE_CHARS = 60


 def validate_language(data: dict[str, Any]) -> Any:
@@ -554,7 +555,7 @@ class PipelineRun:
    event_callback: PipelineEventCallback
    language: str = None  # type: ignore[assignment]
    runner_data: Any | None = None
-    intent_agent: conversation.AgentInfo | None = None
+    intent_agent: str | None = None
    tts_audio_output: str | dict[str, Any] | None = None
    wake_word_settings: WakeWordSettings | None = None
    audio_settings: AudioSettings = field(default_factory=AudioSettings)
@@ -590,9 +591,6 @@ class PipelineRun:
    _intent_agent_only = False
    """If request should only be handled by agent, ignoring sentence triggers and local processing."""

-    _streamed_response_text = False
-    """If the conversation agent streamed response text to TTS result."""
-
    def __post_init__(self) -> None:
        """Set language for pipeline."""
        self.language = self.pipeline.language or self.hass.config.language
@@ -654,11 +652,6 @@ class PipelineRun:
                "token": self.tts_stream.token,
                "url": self.tts_stream.url,
                "mime_type": self.tts_stream.content_type,
-                "stream_response": (
-                    self.tts_stream.supports_streaming_input
-                    and self.intent_agent
-                    and self.intent_agent.supports_streaming
-                ),
            }

        self.process_event(PipelineEvent(PipelineEventType.RUN_START, data))
@@ -906,12 +899,12 @@ class PipelineRun:
    ) -> str:
        """Run speech-to-text portion of pipeline. Returns the spoken text."""
        # Create a background task to prepare the conversation agent
-        if self.end_stage >= PipelineStage.INTENT and self.intent_agent:
+        if self.end_stage >= PipelineStage.INTENT:
            self.hass.async_create_background_task(
                conversation.async_prepare_agent(
-                    self.hass, self.intent_agent.id, self.language
+                    self.hass, self.intent_agent, self.language
                ),
-                f"prepare conversation agent {self.intent_agent.id}",
+                f"prepare conversation agent {self.intent_agent}",
            )

        if isinstance(self.stt_provider, stt.Provider):
@@ -1052,7 +1045,7 @@ class PipelineRun:
                    message=f"Intent recognition engine {engine} is not found",
                )

-        self.intent_agent = agent_info
+        self.intent_agent = agent_info.id

    async def recognize_intent(
        self,
@@ -1085,7 +1078,7 @@ class PipelineRun:
            PipelineEvent(
                PipelineEventType.INTENT_START,
                {
-                    "engine": self.intent_agent.id,
+                    "engine": self.intent_agent,
                    "language": input_language,
                    "intent_input": intent_input,
                    "conversation_id": conversation_id,
@@ -1102,11 +1095,11 @@ class PipelineRun:
                conversation_id=conversation_id,
                device_id=device_id,
                language=input_language,
-                agent_id=self.intent_agent.id,
+                agent_id=self.intent_agent,
                extra_system_prompt=conversation_extra_system_prompt,
            )

-            agent_id = self.intent_agent.id
+            agent_id = self.intent_agent
            processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
            intent_response: intent.IntentResponse | None = None
            if not processed_locally and not self._intent_agent_only:
@@ -1128,7 +1121,7 @@ class PipelineRun:
                # If the LLM has API access, we filter out some sentences that are
                # interfering with LLM operation.
                if (
-                    intent_agent_state := self.hass.states.get(self.intent_agent.id)
+                    intent_agent_state := self.hass.states.get(self.intent_agent)
                ) and intent_agent_state.attributes.get(
                    ATTR_SUPPORTED_FEATURES, 0
                ) & conversation.ConversationEntityFeature.CONTROL:
@@ -1150,13 +1143,6 @@ class PipelineRun:
                    agent_id = conversation.HOME_ASSISTANT_AGENT
                    processed_locally = True

-            if self.tts_stream and self.tts_stream.supports_streaming_input:
-                tts_input_stream: asyncio.Queue[str | None] | None = asyncio.Queue()
-            else:
-                tts_input_stream = None
-            chat_log_role = None
-            delta_character_count = 0
-
            @callback
            def chat_log_delta_listener(
                chat_log: conversation.ChatLog, delta: dict
@@ -1170,61 +1156,6 @@ class PipelineRun:
                        },
                    )
                )
-                if tts_input_stream is None:
-                    return
-
-                nonlocal chat_log_role
-
-                if role := delta.get("role"):
-                    chat_log_role = role
-
-                # We are only interested in assistant deltas
-                if chat_log_role != "assistant":
-                    return
-
-                if content := delta.get("content"):
-                    tts_input_stream.put_nowait(content)
-
-                if self._streamed_response_text:
-                    return
-
-                nonlocal delta_character_count
-
-                # Streamed responses are not cached. That's why we only start streaming text after
-                # we have received enough characters that indicates it will be a long response
-                # or if we have received text, and then a tool call.
-
-                # Tool call after we already received text
-                start_streaming = delta_character_count > 0 and delta.get("tool_calls")
-
-                # Count characters in the content and test if we exceed streaming threshold
-                if not start_streaming and content:
-                    delta_character_count += len(content)
-                    start_streaming = delta_character_count > STREAM_RESPONSE_CHARS
-
-                if not start_streaming:
-                    return
-
-                self._streamed_response_text = True
-
-                async def tts_input_stream_generator() -> AsyncGenerator[str]:
-                    """Yield TTS input stream."""
-                    while (tts_input := await tts_input_stream.get()) is not None:
-                        yield tts_input
-
-                # Concatenate all existing queue items
-                parts = []
-                while not tts_input_stream.empty():
-                    parts.append(tts_input_stream.get_nowait())
-                tts_input_stream.put_nowait(
-                    "".join(
-                        # At this point parts is only strings, None indicates end of queue
-                        cast(list[str], parts)
-                    )
-                )
-
-                assert self.tts_stream is not None
-                self.tts_stream.async_set_message_stream(tts_input_stream_generator())

            with (
                chat_session.async_get_chat_session(
@@ -1268,8 +1199,6 @@ class PipelineRun:
                    speech = conversation_result.response.speech.get("plain", {}).get(
                        "speech", ""
                    )
-                    if tts_input_stream and self._streamed_response_text:
-                        tts_input_stream.put_nowait(None)

        except Exception as src_error:
            _LOGGER.exception("Unexpected error during intent recognition")
@@ -1347,11 +1276,26 @@ class PipelineRun:
            )
        )

-        if not self._streamed_response_text:
-            self.tts_stream.async_set_message(tts_input)
+        try:
+            # Synthesize audio and get URL
+            tts_media_id = tts_generate_media_source_id(
+                self.hass,
+                tts_input,
+                engine=self.tts_stream.engine,
+                language=self.tts_stream.language,
+                options=self.tts_stream.options,
+            )
+        except Exception as src_error:
+            _LOGGER.exception("Unexpected error during text-to-speech")
+            raise TextToSpeechError(
+                code="tts-failed",
+                message="Unexpected error during text-to-speech",
+            ) from src_error
+
+        self.tts_stream.async_set_message(tts_input)

        tts_output = {
-            "media_id": self.tts_stream.media_source_id,
+            "media_id": tts_media_id,
            "token": self.tts_stream.token,
            "url": self.tts_stream.url,
            "mime_type": self.tts_stream.content_type,
--- a/homeassistant/components/assist_satellite/init.py
+++ b/homeassistant/components/assist_satellite/init.py
@@ -60,8 +60,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                {
                    vol.Optional("message"): str,
                    vol.Optional("media_id"): str,
-                    vol.Optional("preannounce"): bool,
-                    vol.Optional("preannounce_media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
                }
            ),
            cv.has_at_least_one_key("message", "media_id"),
@@ -76,8 +75,7 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                {
                    vol.Optional("start_message"): str,
                    vol.Optional("start_media_id"): str,
-                    vol.Optional("preannounce"): bool,
-                    vol.Optional("preannounce_media_id"): str,
+                    vol.Optional("preannounce_media_id"): vol.Any(str, None),
                    vol.Optional("extra_system_prompt"): str,
                }
            ),
--- a/homeassistant/components/assist_satellite/entity.py
+++ b/homeassistant/components/assist_satellite/entity.py
@@ -180,8 +180,7 @@ class AssistSatelliteEntity(entity.Entity):
        self,
        message: str | None = None,
        media_id: str | None = None,
-        preannounce: bool = True,
-        preannounce_media_id: str = PREANNOUNCE_URL,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
    ) -> None:
        """Play and show an announcement on the satellite.

@@ -191,8 +190,8 @@ class AssistSatelliteEntity(entity.Entity):
        If media_id is provided, it is played directly. It is possible
        to omit the message and the satellite will not show any text.

-        If preannounce is True, a sound is played before the announcement.
        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is None, no sound is played.

        Calls async_announce with message and media id.
        """
@@ -202,9 +201,7 @@ class AssistSatelliteEntity(entity.Entity):
            message = ""

        announcement = await self._resolve_announcement_media_id(
-            message,
-            media_id,
-            preannounce_media_id=preannounce_media_id if preannounce else None,
+            message, media_id, preannounce_media_id
        )

        if self._is_announcing:
@@ -232,8 +229,7 @@ class AssistSatelliteEntity(entity.Entity):
        start_message: str | None = None,
        start_media_id: str | None = None,
        extra_system_prompt: str | None = None,
-        preannounce: bool = True,
-        preannounce_media_id: str = PREANNOUNCE_URL,
+        preannounce_media_id: str | None = PREANNOUNCE_URL,
    ) -> None:
        """Start a conversation from the satellite.

@@ -243,8 +239,8 @@ class AssistSatelliteEntity(entity.Entity):
        If start_media_id is provided, it is played directly. It is possible
        to omit the message and the satellite will not show any text.

-        If preannounce is True, a sound is played before the start message or media.
-        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is provided, it is played before the announcement.
+        If preannounce_media_id is None, no sound is played.

        Calls async_start_conversation.
        """
@@ -261,9 +257,7 @@ class AssistSatelliteEntity(entity.Entity):
            start_message = ""

        announcement = await self._resolve_announcement_media_id(
-            start_message,
-            start_media_id,
-            preannounce_media_id=preannounce_media_id if preannounce else None,
+            start_message, start_media_id, preannounce_media_id
        )

        if self._is_announcing:
--- a/homeassistant/components/assist_satellite/services.yaml
+++ b/homeassistant/components/assist_satellite/services.yaml
@@ -15,11 +15,6 @@ announce:
      required: false
      selector:
        text:
-    preannounce:
-      required: false
-      default: true
-      selector:
-        boolean:
    preannounce_media_id:
      required: false
      selector:
@@ -45,11 +40,6 @@ start_conversation:
      required: false
      selector:
        text:
-    preannounce:
-      required: false
-      default: true
-      selector:
-        boolean:
    preannounce_media_id:
      required: false
      selector:
--- a/homeassistant/components/assist_satellite/strings.json
+++ b/homeassistant/components/assist_satellite/strings.json
@@ -24,13 +24,9 @@
          "name": "Media ID",
          "description": "The media ID to announce instead of using text-to-speech."
        },
-        "preannounce": {
-          "name": "Preannounce",
-          "description": "Play a sound before the announcement."
-        },
        "preannounce_media_id": {
-          "name": "Preannounce media ID",
-          "description": "Custom media ID to play before the announcement."
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the announcement."
        }
      }
    },
@@ -50,13 +46,9 @@
          "name": "Extra system prompt",
          "description": "Provide background information to the AI about the request."
        },
-        "preannounce": {
-          "name": "Preannounce",
-          "description": "Play a sound before the start message or media."
-        },
        "preannounce_media_id": {
-          "name": "Preannounce media ID",
-          "description": "Custom media ID to play before the start message or media."
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the start message or media."
        }
      }
    }
--- a/homeassistant/components/assist_satellite/websocket_api.py
+++ b/homeassistant/components/assist_satellite/websocket_api.py
@@ -199,7 +199,7 @@ async def websocket_test_connection(
    hass.async_create_background_task(
        satellite.async_internal_announce(
            media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}",
-            preannounce=False,
+            preannounce_media_id=None,
        ),
        f"assist_satellite_connection_test_{msg['entity_id']}",
    )
--- a/homeassistant/components/asuswrt/router.py
+++ b/homeassistant/components/asuswrt/router.py
@@ -2,9 +2,10 @@

 from __future__ import annotations

-from collections.abc import Callable, Mapping
+from collections.abc import Callable
 from datetime import datetime, timedelta
 import logging
+from types import MappingProxyType
 from typing import Any

 from pyasuswrt import AsusWrtError
@@ -362,7 +363,7 @@ class AsusWrtRouter:
        """Add a function to call when router is closed."""
        self._on_close.append(func)

-    def update_options(self, new_options: Mapping[str, Any]) -> bool:
+    def update_options(self, new_options: MappingProxyType[str, Any]) -> bool:
        """Update router options."""
        req_reload = False
        for name, new_opt in new_options.items():
--- a/homeassistant/components/august/manifest.json
+++ b/homeassistant/components/august/manifest.json
@@ -28,5 +28,5 @@
  "documentation": "https://www.home-assistant.io/integrations/august",
  "iot_class": "cloud_push",
  "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.6.0"]
+  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.7"]
 }
--- a/homeassistant/components/august/strings.json
+++ b/homeassistant/components/august/strings.json
@@ -18,7 +18,7 @@
    },
    "step": {
      "validation": {
-        "title": "Two-factor authentication",
+        "title": "Two factor authentication",
        "data": {
          "verification_code": "Verification code"
        },
--- a/homeassistant/components/aurora_abb_powerone/strings.json
+++ b/homeassistant/components/aurora_abb_powerone/strings.json
@@ -4,8 +4,8 @@
      "user": {
        "description": "The inverter must be connected via an RS485 adaptor, please select serial port and the inverter's address as configured on the LCD panel",
        "data": {
-          "port": "RS485 or USB-RS485 adaptor port",
-          "address": "Inverter address"
+          "port": "RS485 or USB-RS485 Adaptor Port",
+          "address": "Inverter Address"
        }
      }
    },
@@ -16,7 +16,7 @@
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_serial_ports": "No com ports found. The integration needs a valid RS485 device to communicate."
+      "no_serial_ports": "No com ports found.  Need a valid RS485 device to communicate."
    }
  },
  "entity": {
--- a/homeassistant/components/auth/strings.json
+++ b/homeassistant/components/auth/strings.json
@@ -5,7 +5,7 @@
      "step": {
        "init": {
          "title": "Set up two-factor authentication using TOTP",
-          "description": "To activate two-factor authentication using time-based one-time passwords, scan the QR code with your authentication app. If you don't have one, we recommend either [Google Authenticator](https://support.google.com/accounts/answer/1066447) or [Authy](https://authy.com/).\n\n{qr_code}\n\nAfter scanning the code, enter the six-digit code from your app to verify the setup. If you have problems scanning the QR code, do a manual setup with code **`{code}`**."
+          "description": "To activate two factor authentication using time-based one-time passwords, scan the QR code with your authentication app. If you don't have one, we recommend either [Google Authenticator](https://support.google.com/accounts/answer/1066447) or [Authy](https://authy.com/).\n\n{qr_code}\n\nAfter scanning the code, enter the six digit code from your app to verify the setup. If you have problems scanning the QR code, do a manual setup with code **`{code}`**."
        }
      },
      "error": {
@@ -13,7 +13,7 @@
      }
    },
    "notify": {
-      "title": "Notify one-time password",
+      "title": "Notify One-Time Password",
      "step": {
        "init": {
          "title": "Set up one-time password delivered by notify component",
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -18,7 +18,6 @@ from homeassistant.const import (
    ATTR_ENTITY_ID,
    ATTR_MODE,
    ATTR_NAME,
-    CONF_ACTIONS,
    CONF_ALIAS,
    CONF_CONDITIONS,
    CONF_DEVICE_ID,
@@ -28,7 +27,6 @@ from homeassistant.const import (
    CONF_MODE,
    CONF_PATH,
    CONF_PLATFORM,
-    CONF_TRIGGERS,
    CONF_VARIABLES,
    CONF_ZONE,
    EVENT_HOMEASSISTANT_STARTED,
@@ -88,9 +86,11 @@ from homeassistant.util.hass_dict import HassKey

 from .config import AutomationConfig, ValidationStatus
 from .const import (
+    CONF_ACTIONS,
    CONF_INITIAL_STATE,
    CONF_TRACE,
    CONF_TRIGGER_VARIABLES,
+    CONF_TRIGGERS,
    DEFAULT_INITIAL_STATE,
    DOMAIN,
    LOGGER,
--- a/homeassistant/components/automation/config.py
+++ b/homeassistant/components/automation/config.py
@@ -14,15 +14,11 @@ from homeassistant.components import blueprint
 from homeassistant.components.trace import TRACE_CONFIG_SCHEMA
 from homeassistant.config import config_per_platform, config_without_domain
 from homeassistant.const import (
-    CONF_ACTION,
-    CONF_ACTIONS,
    CONF_ALIAS,
    CONF_CONDITION,
    CONF_CONDITIONS,
    CONF_DESCRIPTION,
    CONF_ID,
-    CONF_TRIGGER,
-    CONF_TRIGGERS,
    CONF_VARIABLES,
 )
 from homeassistant.core import HomeAssistant
@@ -34,10 +30,14 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.yaml.input import UndefinedSubstitution

 from .const import (
+    CONF_ACTION,
+    CONF_ACTIONS,
    CONF_HIDE_ENTITY,
    CONF_INITIAL_STATE,
    CONF_TRACE,
+    CONF_TRIGGER,
    CONF_TRIGGER_VARIABLES,
+    CONF_TRIGGERS,
    DOMAIN,
    LOGGER,
 )
@@ -58,9 +58,34 @@ _MINIMAL_PLATFORM_SCHEMA = vol.Schema(
 def _backward_compat_schema(value: Any | None) -> Any:
    """Backward compatibility for automations."""

-    value = cv.renamed(CONF_TRIGGER, CONF_TRIGGERS)(value)
-    value = cv.renamed(CONF_ACTION, CONF_ACTIONS)(value)
-    return cv.renamed(CONF_CONDITION, CONF_CONDITIONS)(value)
+    if not isinstance(value, dict):
+        return value
+
+    # `trigger` has been renamed to `triggers`
+    if CONF_TRIGGER in value:
+        if CONF_TRIGGERS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'trigger' and 'triggers'. Please use 'triggers' only."
+            )
+        value[CONF_TRIGGERS] = value.pop(CONF_TRIGGER)
+
+    # `condition` has been renamed to `conditions`
+    if CONF_CONDITION in value:
+        if CONF_CONDITIONS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'condition' and 'conditions'. Please use 'conditions' only."
+            )
+        value[CONF_CONDITIONS] = value.pop(CONF_CONDITION)
+
+    # `action` has been renamed to `actions`
+    if CONF_ACTION in value:
+        if CONF_ACTIONS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'action' and 'actions'. Please use 'actions' only."
+            )
+        value[CONF_ACTIONS] = value.pop(CONF_ACTION)
+
+    return value


 PLATFORM_SCHEMA = vol.All(
--- a/homeassistant/components/automation/const.py
+++ b/homeassistant/components/automation/const.py
@@ -2,6 +2,10 @@

 import logging

+CONF_ACTION = "action"
+CONF_ACTIONS = "actions"
+CONF_TRIGGER = "trigger"
+CONF_TRIGGERS = "triggers"
 CONF_TRIGGER_VARIABLES = "trigger_variables"
 DOMAIN = "automation"

--- a/homeassistant/components/aws_s3/init.py
+++ b/homeassistant/components/aws_s3/init.py
@@ -1,82 +0,0 @@
-"""The AWS S3 integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import cast
-
-from aiobotocore.client import AioBaseClient as S3Client
-from aiobotocore.session import AioSession
-from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-
-from .const import (
-    CONF_ACCESS_KEY_ID,
-    CONF_BUCKET,
-    CONF_ENDPOINT_URL,
-    CONF_SECRET_ACCESS_KEY,
-    DATA_BACKUP_AGENT_LISTENERS,
-    DOMAIN,
-)
-
-type S3ConfigEntry = ConfigEntry[S3Client]
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
-    """Set up S3 from a config entry."""
-
-    data = cast(dict, entry.data)
-    try:
-        session = AioSession()
-        # pylint: disable-next=unnecessary-dunder-call
-        client = await session.create_client(
-            "s3",
-            endpoint_url=data.get(CONF_ENDPOINT_URL),
-            aws_secret_access_key=data[CONF_SECRET_ACCESS_KEY],
-            aws_access_key_id=data[CONF_ACCESS_KEY_ID],
-        ).__aenter__()
-        await client.head_bucket(Bucket=data[CONF_BUCKET])
-    except ClientError as err:
-        raise ConfigEntryError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_credentials",
-        ) from err
-    except ParamValidationError as err:
-        if "Invalid bucket name" in str(err):
-            raise ConfigEntryError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_bucket_name",
-            ) from err
-    except ValueError as err:
-        raise ConfigEntryError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_endpoint_url",
-        ) from err
-    except ConnectionError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="cannot_connect",
-        ) from err
-
-    entry.runtime_data = client
-
-    def notify_backup_listeners() -> None:
-        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
-            listener()
-
-    entry.async_on_unload(entry.async_on_state_change(notify_backup_listeners))
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
-    """Unload a config entry."""
-    client = entry.runtime_data
-    await client.__aexit__(None, None, None)
-    return True
--- a/homeassistant/components/aws_s3/backup.py
+++ b/homeassistant/components/aws_s3/backup.py
@@ -1,330 +0,0 @@
-"""Backup platform for the AWS S3 integration."""
-
-from collections.abc import AsyncIterator, Callable, Coroutine
-import functools
-import json
-import logging
-from time import time
-from typing import Any
-
-from botocore.exceptions import BotoCoreError
-
-from homeassistant.components.backup import (
-    AgentBackup,
-    BackupAgent,
-    BackupAgentError,
-    BackupNotFound,
-    suggested_filename,
-)
-from homeassistant.core import HomeAssistant, callback
-
-from . import S3ConfigEntry
-from .const import CONF_BUCKET, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-CACHE_TTL = 300
-
-# S3 part size requirements: 5 MiB to 5 GiB per part
-# https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
-# We set the threshold to 20 MiB to avoid too many parts.
-# Note that each part is allocated in the memory.
-MULTIPART_MIN_PART_SIZE_BYTES = 20 * 2**20
-
-
-def handle_boto_errors[T](
-    func: Callable[..., Coroutine[Any, Any, T]],
-) -> Callable[..., Coroutine[Any, Any, T]]:
-    """Handle BotoCoreError exceptions by converting them to BackupAgentError."""
-
-    @functools.wraps(func)
-    async def wrapper(*args: Any, **kwargs: Any) -> T:
-        """Catch BotoCoreError and raise BackupAgentError."""
-        try:
-            return await func(*args, **kwargs)
-        except BotoCoreError as err:
-            error_msg = f"Failed during {func.__name__}"
-            raise BackupAgentError(error_msg) from err
-
-    return wrapper
-
-
-async def async_get_backup_agents(
-    hass: HomeAssistant,
-) -> list[BackupAgent]:
-    """Return a list of backup agents."""
-    entries: list[S3ConfigEntry] = hass.config_entries.async_loaded_entries(DOMAIN)
-    return [S3BackupAgent(hass, entry) for entry in entries]
-
-
-@callback
-def async_register_backup_agents_listener(
-    hass: HomeAssistant,
-    *,
-    listener: Callable[[], None],
-    **kwargs: Any,
-) -> Callable[[], None]:
-    """Register a listener to be called when agents are added or removed.
-
-    :return: A function to unregister the listener.
-    """
-    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove the listener."""
-        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
-        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
-            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
-
-    return remove_listener
-
-
-def suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
-    """Return the suggested filenames for the backup and metadata files."""
-    base_name = suggested_filename(backup).rsplit(".", 1)[0]
-    return f"{base_name}.tar", f"{base_name}.metadata.json"
-
-
-class S3BackupAgent(BackupAgent):
-    """Backup agent for the S3 integration."""
-
-    domain = DOMAIN
-
-    def __init__(self, hass: HomeAssistant, entry: S3ConfigEntry) -> None:
-        """Initialize the S3 agent."""
-        super().__init__()
-        self._client = entry.runtime_data
-        self._bucket: str = entry.data[CONF_BUCKET]
-        self.name = entry.title
-        self.unique_id = entry.entry_id
-        self._backup_cache: dict[str, AgentBackup] = {}
-        self._cache_expiration = time()
-
-    @handle_boto_errors
-    async def async_download_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file.
-
-        :param backup_id: The ID of the backup that was returned in async_list_backups.
-        :return: An async iterator that yields bytes.
-        """
-        backup = await self._find_backup_by_id(backup_id)
-        tar_filename, _ = suggested_filenames(backup)
-
-        response = await self._client.get_object(Bucket=self._bucket, Key=tar_filename)
-        return response["Body"].iter_chunks()
-
-    async def async_upload_backup(
-        self,
-        *,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        backup: AgentBackup,
-        **kwargs: Any,
-    ) -> None:
-        """Upload a backup.
-
-        :param open_stream: A function returning an async iterator that yields bytes.
-        :param backup: Metadata about the backup that should be uploaded.
-        """
-        tar_filename, metadata_filename = suggested_filenames(backup)
-
-        try:
-            if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
-                await self._upload_simple(tar_filename, open_stream)
-            else:
-                await self._upload_multipart(tar_filename, open_stream)
-
-            # Upload the metadata file
-            metadata_content = json.dumps(backup.as_dict())
-            await self._client.put_object(
-                Bucket=self._bucket,
-                Key=metadata_filename,
-                Body=metadata_content,
-            )
-        except BotoCoreError as err:
-            raise BackupAgentError("Failed to upload backup") from err
-        else:
-            # Reset cache after successful upload
-            self._cache_expiration = time()
-
-    async def _upload_simple(
-        self,
-        tar_filename: str,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ) -> None:
-        """Upload a small file using simple upload.
-
-        :param tar_filename: The target filename for the backup.
-        :param open_stream: A function returning an async iterator that yields bytes.
-        """
-        _LOGGER.debug("Starting simple upload for %s", tar_filename)
-        stream = await open_stream()
-        file_data = bytearray()
-        async for chunk in stream:
-            file_data.extend(chunk)
-
-        await self._client.put_object(
-            Bucket=self._bucket,
-            Key=tar_filename,
-            Body=bytes(file_data),
-        )
-
-    async def _upload_multipart(
-        self,
-        tar_filename: str,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
-        """Upload a large file using multipart upload.
-
-        :param tar_filename: The target filename for the backup.
-        :param open_stream: A function returning an async iterator that yields bytes.
-        """
-        _LOGGER.debug("Starting multipart upload for %s", tar_filename)
-        multipart_upload = await self._client.create_multipart_upload(
-            Bucket=self._bucket,
-            Key=tar_filename,
-        )
-        upload_id = multipart_upload["UploadId"]
-        try:
-            parts = []
-            part_number = 1
-            buffer_size = 0  # bytes
-            buffer: list[bytes] = []
-
-            stream = await open_stream()
-            async for chunk in stream:
-                buffer_size += len(chunk)
-                buffer.append(chunk)
-
-                # If buffer size meets minimum part size, upload it as a part
-                if buffer_size >= MULTIPART_MIN_PART_SIZE_BYTES:
-                    _LOGGER.debug(
-                        "Uploading part number %d, size %d", part_number, buffer_size
-                    )
-                    part = await self._client.upload_part(
-                        Bucket=self._bucket,
-                        Key=tar_filename,
-                        PartNumber=part_number,
-                        UploadId=upload_id,
-                        Body=b"".join(buffer),
-                    )
-                    parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                    part_number += 1
-                    buffer_size = 0
-                    buffer = []
-
-            # Upload the final buffer as the last part (no minimum size requirement)
-            if buffer:
-                _LOGGER.debug(
-                    "Uploading final part number %d, size %d", part_number, buffer_size
-                )
-                part = await self._client.upload_part(
-                    Bucket=self._bucket,
-                    Key=tar_filename,
-                    PartNumber=part_number,
-                    UploadId=upload_id,
-                    Body=b"".join(buffer),
-                )
-                parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-
-            await self._client.complete_multipart_upload(
-                Bucket=self._bucket,
-                Key=tar_filename,
-                UploadId=upload_id,
-                MultipartUpload={"Parts": parts},
-            )
-
-        except BotoCoreError:
-            try:
-                await self._client.abort_multipart_upload(
-                    Bucket=self._bucket,
-                    Key=tar_filename,
-                    UploadId=upload_id,
-                )
-            except BotoCoreError:
-                _LOGGER.exception("Failed to abort multipart upload")
-            raise
-
-    @handle_boto_errors
-    async def async_delete_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> None:
-        """Delete a backup file.
-
-        :param backup_id: The ID of the backup that was returned in async_list_backups.
-        """
-        backup = await self._find_backup_by_id(backup_id)
-        tar_filename, metadata_filename = suggested_filenames(backup)
-
-        # Delete both the backup file and its metadata file
-        await self._client.delete_object(Bucket=self._bucket, Key=tar_filename)
-        await self._client.delete_object(Bucket=self._bucket, Key=metadata_filename)
-
-        # Reset cache after successful deletion
-        self._cache_expiration = time()
-
-    @handle_boto_errors
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        backups = await self._list_backups()
-        return list(backups.values())
-
-    @handle_boto_errors
-    async def async_get_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AgentBackup:
-        """Return a backup."""
-        return await self._find_backup_by_id(backup_id)
-
-    async def _find_backup_by_id(self, backup_id: str) -> AgentBackup:
-        """Find a backup by its backup ID."""
-        backups = await self._list_backups()
-        if backup := backups.get(backup_id):
-            return backup
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    async def _list_backups(self) -> dict[str, AgentBackup]:
-        """List backups, using a cache if possible."""
-        if time() <= self._cache_expiration:
-            return self._backup_cache
-
-        backups = {}
-        response = await self._client.list_objects_v2(Bucket=self._bucket)
-
-        # Filter for metadata files only
-        metadata_files = [
-            obj
-            for obj in response.get("Contents", [])
-            if obj["Key"].endswith(".metadata.json")
-        ]
-
-        for metadata_file in metadata_files:
-            try:
-                # Download and parse metadata file
-                metadata_response = await self._client.get_object(
-                    Bucket=self._bucket, Key=metadata_file["Key"]
-                )
-                metadata_content = await metadata_response["Body"].read()
-                metadata_json = json.loads(metadata_content)
-            except (BotoCoreError, json.JSONDecodeError) as err:
-                _LOGGER.warning(
-                    "Failed to process metadata file %s: %s",
-                    metadata_file["Key"],
-                    err,
-                )
-                continue
-            backup = AgentBackup.from_dict(metadata_json)
-            backups[backup.backup_id] = backup
-
-        self._backup_cache = backups
-        self._cache_expiration = time() + CACHE_TTL
-
-        return self._backup_cache
--- a/homeassistant/components/aws_s3/config_flow.py
+++ b/homeassistant/components/aws_s3/config_flow.py
@@ -1,101 +0,0 @@
-"""Config flow for the AWS S3 integration."""
-
-from __future__ import annotations
-
-from typing import Any
-from urllib.parse import urlparse
-
-from aiobotocore.session import AioSession
-from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
-
-from .const import (
-    AWS_DOMAIN,
-    CONF_ACCESS_KEY_ID,
-    CONF_BUCKET,
-    CONF_ENDPOINT_URL,
-    CONF_SECRET_ACCESS_KEY,
-    DEFAULT_ENDPOINT_URL,
-    DESCRIPTION_AWS_S3_DOCS_URL,
-    DESCRIPTION_BOTO3_DOCS_URL,
-    DOMAIN,
-)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_ACCESS_KEY_ID): cv.string,
-        vol.Required(CONF_SECRET_ACCESS_KEY): TextSelector(
-            config=TextSelectorConfig(type=TextSelectorType.PASSWORD)
-        ),
-        vol.Required(CONF_BUCKET): cv.string,
-        vol.Required(CONF_ENDPOINT_URL, default=DEFAULT_ENDPOINT_URL): TextSelector(
-            config=TextSelectorConfig(type=TextSelectorType.URL)
-        ),
-    }
-)
-
-
-class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initiated by the user."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            self._async_abort_entries_match(
-                {
-                    CONF_BUCKET: user_input[CONF_BUCKET],
-                    CONF_ENDPOINT_URL: user_input[CONF_ENDPOINT_URL],
-                }
-            )
-
-            if not urlparse(user_input[CONF_ENDPOINT_URL]).hostname.endswith(
-                AWS_DOMAIN
-            ):
-                errors[CONF_ENDPOINT_URL] = "invalid_endpoint_url"
-            else:
-                try:
-                    session = AioSession()
-                    async with session.create_client(
-                        "s3",
-                        endpoint_url=user_input.get(CONF_ENDPOINT_URL),
-                        aws_secret_access_key=user_input[CONF_SECRET_ACCESS_KEY],
-                        aws_access_key_id=user_input[CONF_ACCESS_KEY_ID],
-                    ) as client:
-                        await client.head_bucket(Bucket=user_input[CONF_BUCKET])
-                except ClientError:
-                    errors["base"] = "invalid_credentials"
-                except ParamValidationError as err:
-                    if "Invalid bucket name" in str(err):
-                        errors[CONF_BUCKET] = "invalid_bucket_name"
-                except ValueError:
-                    errors[CONF_ENDPOINT_URL] = "invalid_endpoint_url"
-                except ConnectionError:
-                    errors[CONF_ENDPOINT_URL] = "cannot_connect"
-                else:
-                    return self.async_create_entry(
-                        title=user_input[CONF_BUCKET], data=user_input
-                    )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
-            ),
-            errors=errors,
-            description_placeholders={
-                "aws_s3_docs_url": DESCRIPTION_AWS_S3_DOCS_URL,
-                "boto3_docs_url": DESCRIPTION_BOTO3_DOCS_URL,
-            },
-        )
--- a/Show More
+++ b/Show More