Extend WebRTCProvider for HLS support and move view to web.py

Co-authored-by: edenhaus <26537646+edenhaus@users.noreply.github.com>
Add comprehensive tests for go2rtc HLS integration
2026-05-04 03:51:12 +02:00 · 2025-08-20 12:32:14 +00:00 · 2025-08-20 12:05:10 +00:00 · 2025-08-20 12:02:45 +00:00 · 2025-08-20 11:50:12 +00:00 · 2025-08-20 14:08:47 +03:00
1547 changed files with 124332 additions and 16659 deletions
@@ -27,7 +27,7 @@ jobs:
      publish: ${{ steps.version.outputs.publish }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
        with:
          fetch-depth: 0

@@ -90,7 +90,7 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Download nightly wheels of frontend
        if: needs.init.outputs.channel == 'dev'
@@ -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@v5.0.0
        with:
          name: translations

@@ -190,7 +190,7 @@ jobs:
          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -242,7 +242,7 @@ jobs:
          - green
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Set build additional args
        run: |
@@ -256,7 +256,7 @@ jobs:
          fi

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -279,7 +279,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Initialize git
        uses: home-assistant/actions/helpers/git-init@master
@@ -321,7 +321,7 @@ jobs:
        registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Install Cosign
        uses: sigstore/cosign-installer@v3.9.2
@@ -330,14 +330,14 @@ jobs:

      - name: Login to DockerHub
        if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          username: ${{ secrets.DOCKERHUB_USERNAME }}
          password: ${{ secrets.DOCKERHUB_TOKEN }}

      - name: Login to GitHub Container Registry
        if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@v3.4.0
+        uses: docker/login-action@v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -454,7 +454,7 @@ jobs:
    if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@v5.6.0
@@ -462,7 +462,7 @@ jobs:
          python-version: ${{ env.DEFAULT_PYTHON }}

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

@@ -499,10 +499,10 @@ jobs:
      HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
    steps:
      - name: Checkout repository
-        uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
+        uses: actions/checkout@08c6903cd8c0fde910a37f88322edcfb5dd907a8 # v5.0.0

      - name: Login to GitHub Container Registry
-        uses: docker/login-action@74a5d142397b4f367a81961eba4e8cd7edddf772 # v3.4.0
+        uses: docker/login-action@184bdaa0721073962dff0199f1fb9940f07167d1 # v3.5.0
        with:
          registry: ghcr.io
          username: ${{ github.repository_owner }}
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 4
+  CACHE_VERSION: 5
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.8"
+  HA_SHORT_VERSION: "2025.9"
  DEFAULT_PYTHON: "3.13"
  ALL_PYTHON_VERSIONS: "['3.13']"
  # 10.3 is the oldest supported version
@@ -94,7 +94,7 @@ jobs:
    runs-on: ubuntu-24.04
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Generate partial Python venv restore key
        id: generate_python_cache_key
        run: |
@@ -246,7 +246,7 @@ jobs:
      - info
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -255,7 +255,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -271,7 +271,7 @@ jobs:
          uv pip install "$(cat requirements_test.txt | grep pre-commit)"
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          lookup-only: true
@@ -292,7 +292,7 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@v5.6.0
        id: python
@@ -301,7 +301,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -310,7 +310,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -332,7 +332,7 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@v5.6.0
        id: python
@@ -341,7 +341,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -350,7 +350,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -372,7 +372,7 @@ jobs:
      - pre-commit
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@v5.6.0
        id: python
@@ -381,7 +381,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -390,7 +390,7 @@ jobs:
              needs.info.outputs.pre-commit_cache_key }}
      - name: Restore pre-commit environment from cache
        id: cache-precommit
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: ${{ env.PRE_COMMIT_CACHE }}
          fail-on-cache-miss: true
@@ -462,7 +462,7 @@ jobs:
          - script/hassfest/docker/Dockerfile
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Register hadolint problem matcher
        run: |
          echo "::add-matcher::.github/workflows/matchers/hadolint.json"
@@ -481,7 +481,7 @@ jobs:
        python-version: ${{ fromJSON(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -497,7 +497,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: venv
          key: >-
@@ -505,7 +505,7 @@ jobs:
            needs.info.outputs.python_cache_key }}
      - name: Restore uv wheel cache
        if: steps.cache-venv.outputs.cache-hit != 'true'
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: ${{ env.UV_CACHE_DIR }}
          key: >-
@@ -584,7 +584,7 @@ jobs:
          sudo apt-get -y install \
            libturbojpeg
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -593,7 +593,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -617,7 +617,7 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -626,7 +626,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -651,9 +651,9 @@ jobs:
      && github.event_name == 'pull_request'
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Dependency review
-        uses: actions/dependency-review-action@v4.7.1
+        uses: actions/dependency-review-action@v4.7.2
        with:
          license-check: false # We use our own license audit checks

@@ -674,7 +674,7 @@ jobs:
        python-version: ${{ fromJson(needs.info.outputs.python_versions) }}
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -683,7 +683,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -717,7 +717,7 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -726,7 +726,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -764,7 +764,7 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -773,7 +773,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -809,7 +809,7 @@ jobs:
      - base
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -825,7 +825,7 @@ jobs:
            env.HA_SHORT_VERSION }}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -833,7 +833,7 @@ jobs:
            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
            needs.info.outputs.python_cache_key }}
      - name: Restore mypy cache
-        uses: actions/cache@v4.2.3
+        uses: actions/cache@v4.2.4
        with:
          path: .mypy_cache
          key: >-
@@ -886,7 +886,7 @@ jobs:
            libturbojpeg \
            libgammu-dev
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -895,7 +895,7 @@ jobs:
          check-latest: true
      - name: Restore base Python virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -947,7 +947,7 @@ jobs:
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -956,7 +956,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -970,7 +970,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@v5.0.0
        with:
          name: pytest_buckets
      - name: Compile English translations
@@ -1080,7 +1080,7 @@ jobs:
            libmariadb-dev-compat \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -1089,7 +1089,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1222,7 +1222,7 @@ jobs:
          sudo apt-get -y install \
            postgresql-server-dev-14
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -1231,7 +1231,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1334,9 +1334,9 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
@@ -1381,7 +1381,7 @@ jobs:
            libgammu-dev \
            libxml2-utils
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Set up Python ${{ matrix.python-version }}
        id: python
        uses: actions/setup-python@v5.6.0
@@ -1390,7 +1390,7 @@ jobs:
          check-latest: true
      - name: Restore full Python ${{ matrix.python-version }} virtual environment
        id: cache-venv
-        uses: actions/cache/restore@v4.2.3
+        uses: actions/cache/restore@v4.2.4
        with:
          path: venv
          fail-on-cache-miss: true
@@ -1484,9 +1484,9 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: coverage-*
      - name: Upload coverage to Codecov
@@ -1511,7 +1511,7 @@ jobs:
    timeout-minutes: 10
    steps:
      - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v5.0.0
        with:
          pattern: test-results-*
      - name: Upload test results to Codecov
@@ -21,14 +21,14 @@ jobs:

    steps:
      - name: Check out code from GitHub
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

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

      - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.29.5
+        uses: github/codeql-action/analyze@v3.29.9
        with:
          category: "/language:python"
@@ -231,7 +231,7 @@ jobs:
      - name: Detect duplicates using AI
        id: ai_detection
        if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@v1.2.3
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o
          system-prompt: |
@@ -57,7 +57,7 @@ jobs:
      - name: Detect language using AI
        id: ai_language_detection
        if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@v1.2.3
+        uses: actions/ai-inference@v2.0.0
        with:
          model: openai/gpt-4o-mini
          system-prompt: |
@@ -9,7 +9,7 @@ jobs:
  check-authorization:
    runs-on: ubuntu-latest
    # Only run if this is a Task issue type (from the issue form)
-    if: github.event.issue.issue_type == 'Task'
+    if: github.event.issue.type.name == 'Task'
    steps:
      - name: Check if user is authorized
        uses: actions/github-script@v7
@@ -19,7 +19,7 @@ jobs:
    runs-on: ubuntu-latest
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        uses: actions/setup-python@v5.6.0
@@ -32,7 +32,7 @@ jobs:
      architectures: ${{ steps.info.outputs.architectures }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
        id: python
@@ -135,20 +135,20 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

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

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

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

@@ -159,7 +159,7 @@ jobs:
          sed -i "/uv/d" requirements_diff.txt

      - name: Build wheels
-        uses: home-assistant/wheels@2025.03.0
+        uses: home-assistant/wheels@2025.07.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -184,25 +184,25 @@ jobs:
        arch: ${{ fromJson(needs.init.outputs.architectures) }}
    steps:
      - name: Checkout the repository
-        uses: actions/checkout@v4.2.2
+        uses: actions/checkout@v5.0.0

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

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

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

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

@@ -219,7 +219,7 @@ jobs:
          sed -i "/uv/d" requirements_diff.txt

      - name: Build wheels
-        uses: home-assistant/wheels@2025.03.0
+        uses: home-assistant/wheels@2025.07.0
        with:
          abi: ${{ matrix.abi }}
          tag: musllinux_1_2
@@ -18,7 +18,7 @@ repos:
        exclude_types: [csv, json, html]
        exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
  - repo: https://github.com/pre-commit/pre-commit-hooks
-    rev: v5.0.0
+    rev: v6.0.0
    hooks:
      - id: check-executables-have-shebangs
        stages: [manual]
@@ -310,7 +310,6 @@ homeassistant.components.letpot.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
-homeassistant.components.linear_garage_door.*
 homeassistant.components.linkplay.*
 homeassistant.components.litejet.*
 homeassistant.components.litterrobot.*
@@ -467,6 +466,7 @@ homeassistant.components.simplisafe.*
 homeassistant.components.siren.*
 homeassistant.components.skybell.*
 homeassistant.components.slack.*
+homeassistant.components.sleep_as_android.*
 homeassistant.components.sleepiq.*
 homeassistant.components.smhi.*
 homeassistant.components.smlight.*
@@ -156,8 +156,8 @@ build.json @home-assistant/supervisor
 /tests/components/assist_pipeline/ @balloob @synesthesiam
 /homeassistant/components/assist_satellite/ @home-assistant/core @synesthesiam
 /tests/components/assist_satellite/ @home-assistant/core @synesthesiam
-/homeassistant/components/asuswrt/ @kennedyshead @ollo69
-/tests/components/asuswrt/ @kennedyshead @ollo69
+/homeassistant/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
+/tests/components/asuswrt/ @kennedyshead @ollo69 @Vaskivskyi
 /homeassistant/components/atag/ @MatsNL
 /tests/components/atag/ @MatsNL
 /homeassistant/components/aten_pe/ @mtdcr
@@ -422,6 +422,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/emby/ @mezz64
 /homeassistant/components/emoncms/ @borpin @alexandrecuer
 /tests/components/emoncms/ @borpin @alexandrecuer
+/homeassistant/components/emoncms_history/ @alexandrecuer
+/tests/components/emoncms_history/ @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -438,8 +440,8 @@ build.json @home-assistant/supervisor
 /tests/components/enigma2/ @autinerd
 /homeassistant/components/enocean/ @bdurrer
 /tests/components/enocean/ @bdurrer
-/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
-/tests/components/enphase_envoy/ @bdraco @cgarwood @joostlek @catsmanac
+/homeassistant/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
+/tests/components/enphase_envoy/ @bdraco @cgarwood @catsmanac
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
@@ -862,8 +864,6 @@ build.json @home-assistant/supervisor
 /tests/components/lifx/ @Djelibeybi
 /homeassistant/components/light/ @home-assistant/core
 /tests/components/light/ @home-assistant/core
-/homeassistant/components/linear_garage_door/ @IceBotYT
-/tests/components/linear_garage_door/ @IceBotYT
 /homeassistant/components/linkplay/ @Velleman
 /tests/components/linkplay/ @Velleman
 /homeassistant/components/linux_battery/ @fabaff
@@ -1417,6 +1417,8 @@ build.json @home-assistant/supervisor
 /tests/components/skybell/ @tkdrob
 /homeassistant/components/slack/ @tkdrob @fletcherau
 /tests/components/slack/ @tkdrob @fletcherau
+/homeassistant/components/sleep_as_android/ @tr4nt0r
+/tests/components/sleep_as_android/ @tr4nt0r
 /homeassistant/components/sleepiq/ @mfugate1 @kbickar
 /tests/components/sleepiq/ @mfugate1 @kbickar
 /homeassistant/components/slide/ @ualex73
@@ -1599,6 +1601,8 @@ build.json @home-assistant/supervisor
 /tests/components/todo/ @home-assistant/core
 /homeassistant/components/todoist/ @boralyl
 /tests/components/todoist/ @boralyl
+/homeassistant/components/togrill/ @elupus
+/tests/components/togrill/ @elupus
 /homeassistant/components/tolo/ @MatthiasLohr
 /tests/components/tolo/ @MatthiasLohr
 /homeassistant/components/tomorrowio/ @raman325 @lymanepp
@@ -1613,8 +1617,6 @@ build.json @home-assistant/supervisor
 /tests/components/tplink_omada/ @MarkGodwin
 /homeassistant/components/traccar/ @ludeeus
 /tests/components/traccar/ @ludeeus
-/homeassistant/components/traccar_server/ @ludeeus
-/tests/components/traccar_server/ @ludeeus
 /homeassistant/components/trace/ @home-assistant/core
 /tests/components/trace/ @home-assistant/core
 /homeassistant/components/tractive/ @Danielhiversen @zhulik @bieniu
@@ -14,5 +14,8 @@ Still interested? Then you should take a peek at the [developer documentation](h

 ## Feature suggestions

-If you want to suggest a new feature for Home Assistant (e.g., new integrations), please open a thread in our [Community Forum: Feature Requests](https://community.home-assistant.io/c/feature-requests).
-We use [GitHub for tracking issues](https://github.com/home-assistant/core/issues), not for tracking feature requests.
+If you want to suggest a new feature for Home Assistant (e.g. new integrations), please [start a discussion](https://github.com/orgs/home-assistant/discussions) on GitHub.
+
+## Issue Tracker
+
+If you want to report an issue, please [create an issue](https://github.com/home-assistant/core/issues) on GitHub.
@@ -31,7 +31,7 @@ RUN \
    && go2rtc --version

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

 WORKDIR /usr/src

@@ -120,6 +120,9 @@ class AuthStore:

        new_user = models.User(**kwargs)

+        while new_user.id in self._users:
+            new_user = models.User(**kwargs)
+
        self._users[new_user.id] = new_user

        if credentials is None:
@@ -33,7 +33,10 @@ class AuthFlowContext(FlowContext, total=False):
    redirect_uri: str


-AuthFlowResult = FlowResult[AuthFlowContext, tuple[str, str]]
+class AuthFlowResult(FlowResult[AuthFlowContext, tuple[str, str]], total=False):
+    """Typed result dict for auth flow."""
+
+    result: Credentials  # Only present if type is CREATE_ENTRY


@attr.s(slots=True)
@@ -61,7 +61,7 @@
      "display_pm_standard": {
        "name": "Display PM standard",
        "state": {
-          "ugm3": "µg/m³",
+          "ugm3": "μg/m³",
          "us_aqi": "US AQI"
        }
      },
@@ -10,7 +10,10 @@ from homeassistant.helpers.aiohttp_client import async_get_clientsession

 from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator

-_PLATFORMS: list[Platform] = [Platform.SENSOR]
+_PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.SENSOR,
+]


 async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> bool:
@@ -0,0 +1,106 @@
+"""AirOS Binary Sensor component for Home Assistant."""
+
+from __future__ import annotations
+
+from collections.abc import Callable
+from dataclasses import dataclass
+import logging
+
+from homeassistant.components.binary_sensor import (
+    BinarySensorDeviceClass,
+    BinarySensorEntity,
+    BinarySensorEntityDescription,
+)
+from homeassistant.const import EntityCategory
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+
+from .coordinator import AirOSConfigEntry, AirOSData, AirOSDataUpdateCoordinator
+from .entity import AirOSEntity
+
+_LOGGER = logging.getLogger(__name__)
+
+PARALLEL_UPDATES = 0
+
+
+@dataclass(frozen=True, kw_only=True)
+class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
+    """Describe an AirOS binary sensor."""
+
+    value_fn: Callable[[AirOSData], bool]
+
+
+BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
+    AirOSBinarySensorEntityDescription(
+        key="portfw",
+        translation_key="port_forwarding",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.portfw,
+    ),
+    AirOSBinarySensorEntityDescription(
+        key="dhcp_client",
+        translation_key="dhcp_client",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.dhcpc,
+    ),
+    AirOSBinarySensorEntityDescription(
+        key="dhcp_server",
+        translation_key="dhcp_server",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.dhcpd,
+        entity_registry_enabled_default=False,
+    ),
+    AirOSBinarySensorEntityDescription(
+        key="dhcp6_server",
+        translation_key="dhcp6_server",
+        device_class=BinarySensorDeviceClass.RUNNING,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.dhcp6d_stateful,
+        entity_registry_enabled_default=False,
+    ),
+    AirOSBinarySensorEntityDescription(
+        key="pppoe",
+        translation_key="pppoe",
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.pppoe,
+        entity_registry_enabled_default=False,
+    ),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    config_entry: AirOSConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up the AirOS binary sensors from a config entry."""
+    coordinator = config_entry.runtime_data
+
+    async_add_entities(
+        AirOSBinarySensor(coordinator, description) for description in BINARY_SENSORS
+    )
+
+
+class AirOSBinarySensor(AirOSEntity, BinarySensorEntity):
+    """Representation of a binary sensor."""
+
+    entity_description: AirOSBinarySensorEntityDescription
+
+    def __init__(
+        self,
+        coordinator: AirOSDataUpdateCoordinator,
+        description: AirOSBinarySensorEntityDescription,
+    ) -> None:
+        """Initialize the binary sensor."""
+        super().__init__(coordinator)
+
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.data.host.device_id}_{description.key}"
+
+    @property
+    def is_on(self) -> bool:
+        """Return the state of the binary sensor."""
+        return self.entity_description.value_fn(self.coordinator.data)
@@ -6,11 +6,11 @@ import logging
 from typing import Any

 from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
-    KeyDataMissingError,
+    AirOSConnectionAuthenticationError,
+    AirOSConnectionSetupError,
+    AirOSDataMissingError,
+    AirOSDeviceConnectionError,
+    AirOSKeyDataMissingError,
 )
 import voluptuous as vol

@@ -59,13 +59,13 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
                airos_data = await airos_device.status()

            except (
-                ConnectionSetupError,
-                DeviceConnectionError,
+                AirOSConnectionSetupError,
+                AirOSDeviceConnectionError,
            ):
                errors["base"] = "cannot_connect"
-            except (ConnectionAuthenticationError, DataMissingError):
+            except (AirOSConnectionAuthenticationError, AirOSDataMissingError):
                errors["base"] = "invalid_auth"
-            except KeyDataMissingError:
+            except AirOSKeyDataMissingError:
                errors["base"] = "key_data_missing"
            except Exception:
                _LOGGER.exception("Unexpected exception")
@@ -6,10 +6,10 @@ import logging

 from airos.airos8 import AirOS, AirOSData
 from airos.exceptions import (
-    ConnectionAuthenticationError,
-    ConnectionSetupError,
-    DataMissingError,
-    DeviceConnectionError,
+    AirOSConnectionAuthenticationError,
+    AirOSConnectionSetupError,
+    AirOSDataMissingError,
+    AirOSDeviceConnectionError,
 )

 from homeassistant.config_entries import ConfigEntry
@@ -47,18 +47,22 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSData]):
        try:
            await self.airos_device.login()
            return await self.airos_device.status()
-        except (ConnectionAuthenticationError,) as err:
+        except (AirOSConnectionAuthenticationError,) as err:
            _LOGGER.exception("Error authenticating with airOS device")
            raise ConfigEntryError(
                translation_domain=DOMAIN, translation_key="invalid_auth"
            ) from err
-        except (ConnectionSetupError, DeviceConnectionError, TimeoutError) as err:
+        except (
+            AirOSConnectionSetupError,
+            AirOSDeviceConnectionError,
+            TimeoutError,
+        ) as err:
            _LOGGER.error("Error connecting to airOS device: %s", err)
            raise UpdateFailed(
                translation_domain=DOMAIN,
                translation_key="cannot_connect",
            ) from err
-        except (DataMissingError,) as err:
+        except (AirOSDataMissingError,) as err:
            _LOGGER.error("Expected data not returned by airOS device: %s", err)
            raise UpdateFailed(
                translation_domain=DOMAIN,
@@ -0,0 +1,33 @@
+"""Diagnostics support for airOS."""
+
+from __future__ import annotations
+
+from typing import Any
+
+from homeassistant.components.diagnostics import async_redact_data
+from homeassistant.const import CONF_HOST, CONF_PASSWORD
+from homeassistant.core import HomeAssistant
+
+from .coordinator import AirOSConfigEntry
+
+IP_REDACT = ["addr", "ipaddr", "ip6addr", "lastip"]  # IP related
+HW_REDACT = ["apmac", "hwaddr", "mac"]  # MAC address
+TO_REDACT_HA = [CONF_HOST, CONF_PASSWORD]
+TO_REDACT_AIROS = [
+    "hostname",  # Prevent leaking device naming
+    "essid",  # Network SSID
+    "lat",  # GPS latitude to prevent exposing location data.
+    "lon",  # GPS longitude to prevent exposing location data.
+    *HW_REDACT,
+    *IP_REDACT,
+]
+
+
+async def async_get_config_entry_diagnostics(
+    hass: HomeAssistant, entry: AirOSConfigEntry
+) -> dict[str, Any]:
+    """Return diagnostics for a config entry."""
+    return {
+        "entry_data": async_redact_data(entry.data, TO_REDACT_HA),
+        "data": async_redact_data(entry.runtime_data.data.to_dict(), TO_REDACT_AIROS),
+    }
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/airos",
  "iot_class": "local_polling",
  "quality_scale": "bronze",
-  "requirements": ["airos==0.2.1"]
+  "requirements": ["airos==0.3.0"]
 }
@@ -41,7 +41,7 @@ rules:

  # Gold
  devices: done
-  diagnostics: todo
+  diagnostics: done
  discovery-update-info: todo
  discovery: todo
  docs-data-update: done
@@ -54,9 +54,7 @@ rules:
  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
-  entity-disabled-by-default:
-    status: todo
-    comment: prepared binary_sensors will provide this
+  entity-disabled-by-default: done
  entity-translations: done
  exception-translations: done
  icon-translations:
@@ -6,7 +6,7 @@ from collections.abc import Callable
 from dataclasses import dataclass
 import logging

-from airos.data import NetRole, WirelessMode
+from airos.data import DerivedWirelessMode, DerivedWirelessRole, NetRole

 from homeassistant.components.sensor import (
    SensorDeviceClass,
@@ -19,6 +19,8 @@ from homeassistant.const import (
    SIGNAL_STRENGTH_DECIBELS,
    UnitOfDataRate,
    UnitOfFrequency,
+    UnitOfLength,
+    UnitOfTime,
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
@@ -29,8 +31,11 @@ from .entity import AirOSEntity

 _LOGGER = logging.getLogger(__name__)

-WIRELESS_MODE_OPTIONS = [mode.value.replace("-", "_").lower() for mode in WirelessMode]
 NETROLE_OPTIONS = [mode.value for mode in NetRole]
+WIRELESS_MODE_OPTIONS = [mode.value for mode in DerivedWirelessMode]
+WIRELESS_ROLE_OPTIONS = [mode.value for mode in DerivedWirelessRole]
+
+PARALLEL_UPDATES = 0


@dataclass(frozen=True, kw_only=True)
@@ -46,6 +51,7 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        translation_key="host_cpuload",
        native_unit_of_measurement=PERCENTAGE,
        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=1,
        value_fn=lambda data: data.host.cpuload,
        entity_registry_enabled_default=False,
    ),
@@ -69,13 +75,6 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        translation_key="wireless_essid",
        value_fn=lambda data: data.wireless.essid,
    ),
-    AirOSSensorEntityDescription(
-        key="wireless_mode",
-        translation_key="wireless_mode",
-        device_class=SensorDeviceClass.ENUM,
-        value_fn=lambda data: data.wireless.mode.value.replace("-", "_").lower(),
-        options=WIRELESS_MODE_OPTIONS,
-    ),
    AirOSSensorEntityDescription(
        key="wireless_antenna_gain",
        translation_key="wireless_antenna_gain",
@@ -90,6 +89,8 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
        value_fn=lambda data: data.wireless.throughput.tx,
    ),
    AirOSSensorEntityDescription(
@@ -98,6 +99,8 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
        value_fn=lambda data: data.wireless.throughput.rx,
    ),
    AirOSSensorEntityDescription(
@@ -106,6 +109,8 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
        value_fn=lambda data: data.wireless.polling.dl_capacity,
    ),
    AirOSSensorEntityDescription(
@@ -114,8 +119,45 @@ SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
        device_class=SensorDeviceClass.DATA_RATE,
        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
        value_fn=lambda data: data.wireless.polling.ul_capacity,
    ),
+    AirOSSensorEntityDescription(
+        key="host_uptime",
+        translation_key="host_uptime",
+        native_unit_of_measurement=UnitOfTime.SECONDS,
+        device_class=SensorDeviceClass.DURATION,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfTime.DAYS,
+        value_fn=lambda data: data.host.uptime,
+        entity_registry_enabled_default=False,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_distance",
+        translation_key="wireless_distance",
+        native_unit_of_measurement=UnitOfLength.METERS,
+        device_class=SensorDeviceClass.DISTANCE,
+        suggested_display_precision=1,
+        suggested_unit_of_measurement=UnitOfLength.KILOMETERS,
+        value_fn=lambda data: data.wireless.distance,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_mode",
+        translation_key="wireless_mode",
+        device_class=SensorDeviceClass.ENUM,
+        value_fn=lambda data: data.derived.mode.value,
+        options=WIRELESS_MODE_OPTIONS,
+        entity_registry_enabled_default=False,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_role",
+        translation_key="wireless_role",
+        device_class=SensorDeviceClass.ENUM,
+        value_fn=lambda data: data.derived.role.value,
+        options=WIRELESS_ROLE_OPTIONS,
+        entity_registry_enabled_default=False,
+    ),
 )


@@ -26,6 +26,23 @@
    }
  },
  "entity": {
+    "binary_sensor": {
+      "port_forwarding": {
+        "name": "Port forwarding"
+      },
+      "dhcp_client": {
+        "name": "DHCP client"
+      },
+      "dhcp_server": {
+        "name": "DHCP server"
+      },
+      "dhcp6_server": {
+        "name": "DHCPv6 server"
+      },
+      "pppoe": {
+        "name": "PPPoE link"
+      }
+    },
    "sensor": {
      "host_cpuload": {
        "name": "CPU load"
@@ -43,13 +60,6 @@
      "wireless_essid": {
        "name": "Wireless SSID"
      },
-      "wireless_mode": {
-        "name": "Wireless mode",
-        "state": {
-          "ap_ptp": "Access point",
-          "sta_ptp": "Station"
-        }
-      },
      "wireless_antenna_gain": {
        "name": "Antenna gain"
      },
@@ -67,6 +77,26 @@
      },
      "wireless_remote_hostname": {
        "name": "Remote hostname"
+      },
+      "host_uptime": {
+        "name": "Uptime"
+      },
+      "wireless_distance": {
+        "name": "Wireless distance"
+      },
+      "wireless_role": {
+        "name": "Wireless role",
+        "state": {
+          "access_point": "Access point",
+          "station": "Station"
+        }
+      },
+      "wireless_mode": {
+        "name": "Wireless mode",
+        "state": {
+          "point_to_point": "Point-to-point",
+          "point_to_multipoint": "Point-to-multipoint"
+        }
      }
    }
  },
@@ -9,7 +9,7 @@ from homeassistant.core import HomeAssistant
 from .const import CONF_CLIP_NEGATIVE, CONF_RETURN_AVERAGE
 from .coordinator import AirQCoordinator

-PLATFORMS: list[Platform] = [Platform.SENSOR]
+PLATFORMS: list[Platform] = [Platform.NUMBER, Platform.SENSOR]

 AirQConfigEntry = ConfigEntry[AirQCoordinator]

@@ -75,6 +75,7 @@ class AirQCoordinator(DataUpdateCoordinator):
            return_average=self.return_average,
            clip_negative_values=self.clip_negative,
        )
+        data["brightness"] = await self.airq.get_current_brightness()
        if warming_up_sensors := identify_warming_up_sensors(data):
            _LOGGER.debug(
                "Following sensors are still warming up: %s", warming_up_sensors
@@ -0,0 +1,85 @@
+"""Definition of air-Q number platform used to control the LED strips."""
+
+from __future__ import annotations
+
+from collections.abc import Awaitable, Callable
+from dataclasses import dataclass
+import logging
+
+from aioairq.core import AirQ
+
+from homeassistant.components.number import NumberEntity, NumberEntityDescription
+from homeassistant.const import PERCENTAGE
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from . import AirQConfigEntry, AirQCoordinator
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True, kw_only=True)
+class AirQBrightnessDescription(NumberEntityDescription):
+    """Describes AirQ number entity responsible for brightness control."""
+
+    value: Callable[[dict], float]
+    set_value: Callable[[AirQ, float], Awaitable[None]]
+
+
+AIRQ_LED_BRIGHTNESS = AirQBrightnessDescription(
+    key="airq_led_brightness",
+    translation_key="airq_led_brightness",
+    native_min_value=0.0,
+    native_max_value=100.0,
+    native_step=1.0,
+    native_unit_of_measurement=PERCENTAGE,
+    value=lambda data: data["brightness"],
+    set_value=lambda device, value: device.set_current_brightness(value),
+)
+
+
+async def async_setup_entry(
+    hass: HomeAssistant,
+    entry: AirQConfigEntry,
+    async_add_entities: AddConfigEntryEntitiesCallback,
+) -> None:
+    """Set up number entities: a single entity for the LEDs."""
+
+    coordinator = entry.runtime_data
+    entities = [AirQLEDBrightness(coordinator, AIRQ_LED_BRIGHTNESS)]
+
+    async_add_entities(entities)
+
+
+class AirQLEDBrightness(CoordinatorEntity[AirQCoordinator], NumberEntity):
+    """Representation of the LEDs from a single AirQ."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: AirQCoordinator,
+        description: AirQBrightnessDescription,
+    ) -> None:
+        """Initialize a single sensor."""
+        super().__init__(coordinator)
+        self.entity_description: AirQBrightnessDescription = description
+
+        self._attr_device_info = coordinator.device_info
+        self._attr_unique_id = f"{coordinator.device_id}_{description.key}"
+
+    @property
+    def native_value(self) -> float:
+        """Return the brightness of the LEDs in %."""
+        return self.entity_description.value(self.coordinator.data)
+
+    async def async_set_native_value(self, value: float) -> None:
+        """Set the brightness of the LEDs to the value in %."""
+        _LOGGER.debug(
+            "Changing LED brighntess from %.0f%% to %.0f%%",
+            self.coordinator.data["brightness"],
+            value,
+        )
+        await self.entity_description.set_value(self.coordinator.airq, value)
+        await self.coordinator.async_request_refresh()
@@ -35,6 +35,11 @@
    }
  },
  "entity": {
+    "number": {
+      "airq_led_brightness": {
+        "name": "LED brightness"
+      }
+    },
    "sensor": {
      "acetaldehyde": {
        "name": "Acetaldehyde"
@@ -7,21 +7,18 @@ import logging

 from airthings import Airthings

-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 .const import CONF_SECRET
-from .coordinator import AirthingsDataUpdateCoordinator
+from .coordinator import AirthingsConfigEntry, AirthingsDataUpdateCoordinator

 _LOGGER = logging.getLogger(__name__)

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

-type AirthingsConfigEntry = ConfigEntry[AirthingsDataUpdateCoordinator]
-

 async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) -> bool:
    """Set up Airthings from a config entry."""
@@ -31,7 +28,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirthingsConfigEntry) ->
        async_get_clientsession(hass),
    )

-    coordinator = AirthingsDataUpdateCoordinator(hass, airthings)
+    coordinator = AirthingsDataUpdateCoordinator(hass, airthings, entry)

    await coordinator.async_config_entry_first_refresh()

@@ -5,6 +5,7 @@ import logging

 from airthings import Airthings, AirthingsDevice, AirthingsError

+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

@@ -13,15 +14,23 @@ from .const import DOMAIN
 _LOGGER = logging.getLogger(__name__)
 SCAN_INTERVAL = timedelta(minutes=6)

+type AirthingsConfigEntry = ConfigEntry[AirthingsDataUpdateCoordinator]
+

 class AirthingsDataUpdateCoordinator(DataUpdateCoordinator[dict[str, AirthingsDevice]]):
    """Coordinator for Airthings data updates."""

-    def __init__(self, hass: HomeAssistant, airthings: Airthings) -> None:
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        airthings: Airthings,
+        config_entry: AirthingsConfigEntry,
+    ) -> None:
        """Initialize the coordinator."""
        super().__init__(
            hass,
            _LOGGER,
+            config_entry=config_entry,
            name=DOMAIN,
            update_method=self._update_method,
            update_interval=SCAN_INTERVAL,
@@ -16,7 +16,7 @@ from homeassistant.helpers.selector import (
    SelectSelectorMode,
 )

-from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN
+from .const import CONF_SITE_ID, CONF_SITE_NAME, DOMAIN, REQUEST_TIMEOUT

 API_URL = "https://app.amber.com.au/developers"

@@ -64,7 +64,9 @@ class AmberElectricConfigFlow(ConfigFlow, domain=DOMAIN):
        api = amberelectric.AmberApi(api_client)

        try:
-            sites: list[Site] = filter_sites(api.get_sites())
+            sites: list[Site] = filter_sites(
+                api.get_sites(_request_timeout=REQUEST_TIMEOUT)
+            )
        except amberelectric.ApiException as api_exception:
            if api_exception.status == 403:
                self._errors[CONF_API_TOKEN] = "invalid_api_token"
@@ -9,7 +9,6 @@ DOMAIN: Final = "amberelectric"
 CONF_SITE_NAME = "site_name"
 CONF_SITE_ID = "site_id"

-ATTR_CONFIG_ENTRY_ID = "config_entry_id"
 ATTR_CHANNEL_TYPE = "channel_type"

 ATTRIBUTION = "Data provided by Amber Electric"
@@ -22,3 +21,5 @@ SERVICE_GET_FORECASTS = "get_forecasts"
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"
+
+REQUEST_TIMEOUT = 15
@@ -16,7 +16,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

-from .const import LOGGER
+from .const import LOGGER, REQUEST_TIMEOUT
 from .helpers import normalize_descriptor

 type AmberConfigEntry = ConfigEntry[AmberUpdateCoordinator]
@@ -82,7 +82,11 @@ class AmberUpdateCoordinator(DataUpdateCoordinator):
            "grid": {},
        }
        try:
-            data = self._api.get_current_prices(self.site_id, next=288)
+            data = self._api.get_current_prices(
+                self.site_id,
+                next=288,
+                _request_timeout=REQUEST_TIMEOUT,
+            )
            intervals = [interval.actual_instance for interval in data]
        except ApiException as api_exception:
            raise UpdateFailed("Missing price data, skipping update") from api_exception
@@ -4,6 +4,7 @@ from amberelectric.models.channel import ChannelType
 import voluptuous as vol

 from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID
 from homeassistant.core import (
    HomeAssistant,
    ServiceCall,
@@ -16,7 +17,6 @@ from homeassistant.util.json import JsonValueType

 from .const import (
    ATTR_CHANNEL_TYPE,
-    ATTR_CONFIG_ENTRY_ID,
    CONTROLLED_LOAD_CHANNEL,
    DOMAIN,
    FEED_IN_CHANNEL,
@@ -5,7 +5,7 @@ from __future__ import annotations
 from aioambient.util import get_public_device_id

 from homeassistant.core import callback
-from homeassistant.helpers.device_registry import DeviceInfo
+from homeassistant.helpers.device_registry import CONNECTION_NETWORK_MAC, DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity, EntityDescription

@@ -37,6 +37,7 @@ class AmbientWeatherEntity(Entity):
            identifiers={(DOMAIN, mac_address)},
            manufacturer="Ambient Weather",
            name=station_name.capitalize(),
+            connections={(CONNECTION_NETWORK_MAC, mac_address)},
        )

        self._attr_unique_id = f"{mac_address}_{description.key}"
@@ -390,7 +390,6 @@ def _domains_from_yaml_config(yaml_configuration: dict[str, Any]) -> set[str]:

 async def async_devices_payload(hass: HomeAssistant) -> dict:
    """Return the devices payload."""
-    integrations_without_model_id: set[str] = set()
    devices: list[dict[str, Any]] = []
    dev_reg = dr.async_get(hass)
    # Devices that need via device info set
@@ -400,10 +399,6 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
    seen_integrations = set()

    for device in dev_reg.devices.values():
-        # Ignore services
-        if device.entry_type:
-            continue
-
        if not device.primary_config_entry:
            continue

@@ -414,13 +409,6 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:

        seen_integrations.add(config_entry.domain)

-        if not device.model_id:
-            integrations_without_model_id.add(config_entry.domain)
-            continue
-
-        if not device.manufacturer:
-            continue
-
        new_indexes[device.id] = len(devices)
        devices.append(
            {
@@ -430,11 +418,12 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
                "model": device.model,
                "sw_version": device.sw_version,
                "hw_version": device.hw_version,
-                "has_suggested_area": device.suggested_area is not None,
                "has_configuration_url": device.configuration_url is not None,
                "via_device": None,
+                "entry_type": device.entry_type.value if device.entry_type else None,
            }
        )
+
        if device.via_device_id:
            via_devices[device.id] = device.via_device_id

@@ -454,15 +443,11 @@ async def async_devices_payload(hass: HomeAssistant) -> dict:
    for device_info in devices:
        if integration := integrations.get(device_info["integration"]):
            device_info["is_custom_integration"] = not integration.is_built_in
+            # Include version for custom integrations
+            if not integration.is_built_in and integration.version:
+                device_info["custom_integration_version"] = str(integration.version)

    return {
        "version": "home-assistant:1",
-        "no_model_id": sorted(
-            [
-                domain
-                for domain in integrations_without_model_id
-                if domain in integrations and integrations[domain].is_built_in
-            ]
-        ),
        "devices": devices,
    }
@@ -30,10 +30,9 @@ class AndroidIPCamDataUpdateCoordinator(DataUpdateCoordinator[None]):
        cam: PyDroidIPCam,
    ) -> None:
        """Initialize the Android IP Webcam."""
-        self.hass = hass
        self.cam = cam
        super().__init__(
-            self.hass,
+            hass,
            _LOGGER,
            config_entry=config_entry,
            name=f"{DOMAIN} {config_entry.data[CONF_HOST]}",
@@ -81,11 +81,15 @@ async def async_update_options(
 async def async_migrate_integration(hass: HomeAssistant) -> None:
    """Migrate integration entry structure."""

-    entries = hass.config_entries.async_entries(DOMAIN)
+    # Make sure we get enabled config entries first
+    entries = sorted(
+        hass.config_entries.async_entries(DOMAIN),
+        key=lambda e: e.disabled_by is not None,
+    )
    if not any(entry.version == 1 for entry in entries):
        return

-    api_keys_entries: dict[str, ConfigEntry] = {}
+    api_keys_entries: dict[str, tuple[ConfigEntry, bool]] = {}
    entity_registry = er.async_get(hass)
    device_registry = dr.async_get(hass)

@@ -99,30 +103,61 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
        )
        if entry.data[CONF_API_KEY] not in api_keys_entries:
            use_existing = True
-            api_keys_entries[entry.data[CONF_API_KEY]] = entry
+            all_disabled = all(
+                e.disabled_by is not None
+                for e in entries
+                if e.data[CONF_API_KEY] == entry.data[CONF_API_KEY]
+            )
+            api_keys_entries[entry.data[CONF_API_KEY]] = (entry, all_disabled)

-        parent_entry = api_keys_entries[entry.data[CONF_API_KEY]]
+        parent_entry, all_disabled = api_keys_entries[entry.data[CONF_API_KEY]]

        hass.config_entries.async_add_subentry(parent_entry, subentry)
-        conversation_entity = entity_registry.async_get_entity_id(
+        conversation_entity_id = entity_registry.async_get_entity_id(
            "conversation",
            DOMAIN,
            entry.entry_id,
        )
-        if conversation_entity is not None:
-            entity_registry.async_update_entity(
-                conversation_entity,
-                config_entry_id=parent_entry.entry_id,
-                config_subentry_id=subentry.subentry_id,
-                new_unique_id=subentry.subentry_id,
-            )
-
        device = device_registry.async_get_device(
            identifiers={(DOMAIN, entry.entry_id)}
        )
+
+        if conversation_entity_id is not None:
+            conversation_entity_entry = entity_registry.entities[conversation_entity_id]
+            entity_disabled_by = conversation_entity_entry.disabled_by
+            if (
+                entity_disabled_by is er.RegistryEntryDisabler.CONFIG_ENTRY
+                and not all_disabled
+            ):
+                # Device and entity registries don't update the disabled_by flag
+                # when moving a device or entity from one config entry to another,
+                # so we need to do it manually.
+                entity_disabled_by = (
+                    er.RegistryEntryDisabler.DEVICE
+                    if device
+                    else er.RegistryEntryDisabler.USER
+                )
+            entity_registry.async_update_entity(
+                conversation_entity_id,
+                config_entry_id=parent_entry.entry_id,
+                config_subentry_id=subentry.subentry_id,
+                disabled_by=entity_disabled_by,
+                new_unique_id=subentry.subentry_id,
+            )
+
        if device is not None:
+            # Device and entity registries don't update the disabled_by flag when
+            # moving a device or entity from one config entry to another, so we
+            # need to do it manually.
+            device_disabled_by = device.disabled_by
+            if (
+                device.disabled_by is dr.DeviceEntryDisabler.CONFIG_ENTRY
+                and not all_disabled
+            ):
+                device_disabled_by = dr.DeviceEntryDisabler.USER
            device_registry.async_update_device(
                device.id,
+                disabled_by=device_disabled_by,
                new_identifiers={(DOMAIN, subentry.subentry_id)},
                add_config_subentry_id=subentry.subentry_id,
                add_config_entry_id=parent_entry.entry_id,
@@ -147,7 +182,7 @@ async def async_migrate_integration(hass: HomeAssistant) -> None:
                title=DEFAULT_CONVERSATION_NAME,
                options={},
                version=2,
-                minor_version=2,
+                minor_version=3,
            )


@@ -173,6 +208,38 @@ async def async_migrate_entry(hass: HomeAssistant, entry: AnthropicConfigEntry)

        hass.config_entries.async_update_entry(entry, minor_version=2)

+    if entry.version == 2 and entry.minor_version == 2:
+        # Fix migration where the disabled_by flag was not set correctly.
+        # We can currently only correct this for enabled config entries,
+        # because migration does not run for disabled config entries. This
+        # is asserted in tests, and if that behavior is changed, we should
+        # correct also disabled config entries.
+        device_registry = dr.async_get(hass)
+        entity_registry = er.async_get(hass)
+        devices = dr.async_entries_for_config_entry(device_registry, entry.entry_id)
+        entity_entries = er.async_entries_for_config_entry(
+            entity_registry, entry.entry_id
+        )
+        if entry.disabled_by is None:
+            # If the config entry is not disabled, we need to set the disabled_by
+            # flag on devices to USER, and on entities to DEVICE, if they are set
+            # to CONFIG_ENTRY.
+            for device in devices:
+                if device.disabled_by is not dr.DeviceEntryDisabler.CONFIG_ENTRY:
+                    continue
+                device_registry.async_update_device(
+                    device.id,
+                    disabled_by=dr.DeviceEntryDisabler.USER,
+                )
+            for entity in entity_entries:
+                if entity.disabled_by is not er.RegistryEntryDisabler.CONFIG_ENTRY:
+                    continue
+                entity_registry.async_update_entity(
+                    entity.entity_id,
+                    disabled_by=er.RegistryEntryDisabler.DEVICE,
+                )
+        hass.config_entries.async_update_entry(entry, minor_version=3)
+
    LOGGER.debug(
        "Migration to version %s:%s successful", entry.version, entry.minor_version
    )
@@ -75,7 +75,7 @@ class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
    """Handle a config flow for Anthropic."""

    VERSION = 2
-    MINOR_VERSION = 2
+    MINOR_VERSION = 3

    async def async_step_user(
        self, user_input: dict[str, Any] | None = None
@@ -20,10 +20,8 @@ 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-3-7-sonnet",
    "claude-sonnet-4-0",
+    "claude-opus-4-0",
+    "claude-opus-4-1",
 ]
@@ -2,11 +2,10 @@

 from collections.abc import AsyncGenerator, Callable, Iterable
 import json
-from typing import Any, cast
+from typing import Any

 import anthropic
 from anthropic import AsyncStream
-from anthropic._types import NOT_GIVEN
 from anthropic.types import (
    InputJSONDelta,
    MessageDeltaUsage,
@@ -17,7 +16,6 @@ from anthropic.types import (
    RawContentBlockStopEvent,
    RawMessageDeltaEvent,
    RawMessageStartEvent,
-    RawMessageStopEvent,
    RedactedThinkingBlock,
    RedactedThinkingBlockParam,
    SignatureDelta,
@@ -35,6 +33,7 @@ from anthropic.types import (
    ToolUseBlockParam,
    Usage,
 )
+from anthropic.types.message_create_params import MessageCreateParamsStreaming
 from voluptuous_openapi import convert

 from homeassistant.components import conversation
@@ -129,6 +128,28 @@ def _convert_content(
                    )
                )

+            if isinstance(content.native, ThinkingBlock):
+                messages[-1]["content"].append(  # type: ignore[union-attr]
+                    ThinkingBlockParam(
+                        type="thinking",
+                        thinking=content.thinking_content or "",
+                        signature=content.native.signature,
+                    )
+                )
+            elif isinstance(content.native, RedactedThinkingBlock):
+                redacted_thinking_block = RedactedThinkingBlockParam(
+                    type="redacted_thinking",
+                    data=content.native.data,
+                )
+                if isinstance(messages[-1]["content"], str):
+                    messages[-1]["content"] = [
+                        TextBlockParam(type="text", text=messages[-1]["content"]),
+                        redacted_thinking_block,
+                    ]
+                else:
+                    messages[-1]["content"].append(  # type: ignore[attr-defined]
+                        redacted_thinking_block
+                    )
            if content.content:
                messages[-1]["content"].append(  # type: ignore[union-attr]
                    TextBlockParam(type="text", text=content.content)
@@ -152,10 +173,9 @@ def _convert_content(
    return messages


-async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
+async def _transform_stream(
    chat_log: conversation.ChatLog,
-    result: AsyncStream[MessageStreamEvent],
-    messages: list[MessageParam],
+    stream: AsyncStream[MessageStreamEvent],
 ) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
    """Transform the response stream into HA format.

@@ -186,31 +206,25 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have

    Each message could contain multiple blocks of the same type.
    """
-    if result is None:
+    if stream is None:
        raise TypeError("Expected a stream of messages")

-    current_message: MessageParam | None = None
-    current_block: (
-        TextBlockParam
-        | ToolUseBlockParam
-        | ThinkingBlockParam
-        | RedactedThinkingBlockParam
-        | None
-    ) = None
+    current_tool_block: ToolUseBlockParam | None = None
    current_tool_args: str
    input_usage: Usage | None = None
+    has_content = False
+    has_native = False

-    async for response in result:
+    async for response in stream:
        LOGGER.debug("Received response: %s", response)

        if isinstance(response, RawMessageStartEvent):
            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(
+                current_tool_block = ToolUseBlockParam(
                    type="tool_use",
                    id=response.content_block.id,
                    name=response.content_block.name,
@@ -218,75 +232,64 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                )
                current_tool_args = ""
            elif isinstance(response.content_block, TextBlock):
-                current_block = TextBlockParam(
-                    type="text", text=response.content_block.text
-                )
-                yield {"role": "assistant"}
+                if has_content:
+                    yield {"role": "assistant"}
+                    has_native = False
+                has_content = True
                if response.content_block.text:
                    yield {"content": response.content_block.text}
            elif isinstance(response.content_block, ThinkingBlock):
-                current_block = ThinkingBlockParam(
-                    type="thinking",
-                    thinking=response.content_block.thinking,
-                    signature=response.content_block.signature,
-                )
+                if has_native:
+                    yield {"role": "assistant"}
+                    has_native = False
+                    has_content = False
            elif isinstance(response.content_block, RedactedThinkingBlock):
-                current_block = RedactedThinkingBlockParam(
-                    type="redacted_thinking", data=response.content_block.data
-                )
                LOGGER.debug(
                    "Some of Claude’s internal reasoning has been automatically "
                    "encrypted for safety reasons. This doesn’t affect the quality of "
                    "responses"
                )
+                if has_native:
+                    yield {"role": "assistant"}
+                    has_native = False
+                    has_content = False
+                yield {"native": response.content_block}
+                has_native = True
        elif isinstance(response, RawContentBlockDeltaEvent):
-            if current_block is None:
-                raise ValueError("Unexpected delta without a block")
            if isinstance(response.delta, InputJSONDelta):
                current_tool_args += response.delta.partial_json
            elif isinstance(response.delta, TextDelta):
-                text_block = cast(TextBlockParam, current_block)
-                text_block["text"] += response.delta.text
                yield {"content": response.delta.text}
            elif isinstance(response.delta, ThinkingDelta):
-                thinking_block = cast(ThinkingBlockParam, current_block)
-                thinking_block["thinking"] += response.delta.thinking
+                yield {"thinking_content": response.delta.thinking}
            elif isinstance(response.delta, SignatureDelta):
-                thinking_block = cast(ThinkingBlockParam, current_block)
-                thinking_block["signature"] += response.delta.signature
+                yield {
+                    "native": ThinkingBlock(
+                        type="thinking",
+                        thinking="",
+                        signature=response.delta.signature,
+                    )
+                }
+                has_native = True
        elif isinstance(response, RawContentBlockStopEvent):
-            if current_block is None:
-                raise ValueError("Unexpected stop event without a current block")
-            if current_block["type"] == "tool_use":
-                # tool block
+            if current_tool_block is not None:
                tool_args = json.loads(current_tool_args) if current_tool_args else {}
-                current_block["input"] = tool_args
+                current_tool_block["input"] = tool_args
                yield {
                    "tool_calls": [
                        llm.ToolInput(
-                            id=current_block["id"],
-                            tool_name=current_block["name"],
+                            id=current_tool_block["id"],
+                            tool_name=current_tool_block["name"],
                            tool_args=tool_args,
                        )
                    ]
                }
-            elif current_block["type"] == "thinking":
-                # thinking block
-                LOGGER.debug("Thinking: %s", current_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
+                current_tool_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(
@@ -351,45 +354,48 @@ class AnthropicBaseLLMEntity(Entity):
        thinking_budget = options.get(CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET)
        model = options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)

+        model_args = MessageCreateParamsStreaming(
+            model=model,
+            messages=messages,
+            max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
+            system=system.content,
+            stream=True,
+        )
+        if tools:
+            model_args["tools"] = tools
+        if (
+            model.startswith(tuple(THINKING_MODELS))
+            and thinking_budget >= MIN_THINKING_BUDGET
+        ):
+            model_args["thinking"] = ThinkingConfigEnabledParam(
+                type="enabled", budget_tokens=thinking_budget
+            )
+        else:
+            model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
+            model_args["temperature"] = options.get(
+                CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
+            )
+
        # To prevent infinite loops, we limit the number of iterations
        for _iteration in range(MAX_TOOL_ITERATIONS):
-            model_args = {
-                "model": model,
-                "messages": messages,
-                "tools": tools or NOT_GIVEN,
-                "max_tokens": options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
-                "system": system.content,
-                "stream": True,
-            }
-            if model in THINKING_MODELS and thinking_budget >= MIN_THINKING_BUDGET:
-                model_args["thinking"] = ThinkingConfigEnabledParam(
-                    type="enabled", budget_tokens=thinking_budget
-                )
-            else:
-                model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
-                model_args["temperature"] = options.get(
-                    CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
-                )
-
            try:
                stream = await client.messages.create(**model_args)
+
+                messages.extend(
+                    _convert_content(
+                        [
+                            content
+                            async for content in chat_log.async_add_delta_content_stream(
+                                self.entity_id,
+                                _transform_stream(chat_log, stream),
+                            )
+                        ]
+                    )
+                )
            except anthropic.AnthropicError as err:
                raise HomeAssistantError(
                    f"Sorry, I had a problem talking to Anthropic: {err}"
                ) from err

-            messages.extend(
-                _convert_content(
-                    [
-                        content
-                        async for content in chat_log.async_add_delta_content_stream(
-                            self.entity_id,
-                            _transform_stream(chat_log, stream, messages),
-                        )
-                        if not isinstance(content, conversation.AssistantContent)
-                    ]
-                )
-            )
-
            if not chat_log.unresponded_tool_results:
                break
@@ -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.62.0"]
 }
@@ -10,9 +10,9 @@ from homeassistant.components.binary_sensor import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
+from .entity import APCUPSdEntity

 PARALLEL_UPDATES = 0

@@ -40,22 +40,16 @@ async def async_setup_entry(
    async_add_entities([OnlineStatus(coordinator, _DESCRIPTION)])


-class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
+class OnlineStatus(APCUPSdEntity, BinarySensorEntity):
    """Representation of a UPS online status."""

-    _attr_has_entity_name = True
-
    def __init__(
        self,
        coordinator: APCUPSdCoordinator,
        description: BinarySensorEntityDescription,
    ) -> None:
        """Initialize the APCUPSd binary device."""
-        super().__init__(coordinator, context=description.key.upper())
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
-        self._attr_device_info = coordinator.device_info
+        super().__init__(coordinator, description)

    @property
    def is_on(self) -> bool | None:
@@ -0,0 +1,26 @@
+"""Base entity for APCUPSd integration."""
+
+from __future__ import annotations
+
+from homeassistant.helpers.entity import EntityDescription
+from homeassistant.helpers.update_coordinator import CoordinatorEntity
+
+from .coordinator import APCUPSdCoordinator
+
+
+class APCUPSdEntity(CoordinatorEntity[APCUPSdCoordinator]):
+    """Base entity for APCUPSd integration."""
+
+    _attr_has_entity_name = True
+
+    def __init__(
+        self,
+        coordinator: APCUPSdCoordinator,
+        description: EntityDescription,
+    ) -> None:
+        """Initialize the APCUPSd entity."""
+        super().__init__(coordinator, context=description.key.upper())
+
+        self.entity_description = description
+        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
+        self._attr_device_info = coordinator.device_info
@@ -6,5 +6,6 @@
  "documentation": "https://www.home-assistant.io/integrations/apcupsd",
  "iot_class": "local_polling",
  "loggers": ["apcaccess"],
+  "quality_scale": "bronze",
  "requirements": ["aioapcaccess==0.4.2"]
 }
@@ -0,0 +1,90 @@
+rules:
+  # Bronze
+  action-setup: done
+  appropriate-polling: done
+  brands: done
+  common-modules: done
+  config-flow-test-coverage: done
+  config-flow: done
+  dependency-transparency: done
+  docs-actions:
+    status: exempt
+    comment: |
+      The integration does not provide any actions.
+  docs-high-level-description: done
+  docs-installation-instructions: done
+  docs-removal-instructions: done
+  entity-event-setup:
+    status: exempt
+    comment: |
+      Entities of this integration does 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:
+    status: exempt
+    comment: |
+      The integration does not provide any actions.
+  config-entry-unloading: done
+  docs-configuration-parameters:
+    status: exempt
+    comment: |
+      The integration does not provide any additional options.
+  docs-installation-parameters: done
+  entity-unavailable: done
+  integration-owner: done
+  log-when-unavailable: done
+  parallel-updates: done
+  reauthentication-flow:
+    status: exempt
+    comment: |
+      The integration does not require authentication.
+  test-coverage:
+    status: todo
+    comment: |
+      Patch `aioapcaccess.request_status` where we use it.
+  # Gold
+  devices: done
+  diagnostics: done
+  discovery-update-info:
+    status: exempt
+    comment: |
+      This integration cannot be discovered.
+  discovery:
+    status: exempt
+    comment: |
+      This integration cannot be discovered.
+  docs-data-update: done
+  docs-examples: done
+  docs-known-limitations: done
+  docs-supported-devices: done
+  docs-supported-functions: done
+  docs-troubleshooting: done
+  docs-use-cases: done
+  dynamic-devices:
+    status: exempt
+    comment: |
+      The integration connects to a single service per configuration entry.
+  entity-category: done
+  entity-device-class: done
+  entity-disabled-by-default: done
+  entity-translations: done
+  exception-translations: done
+  icon-translations: done
+  reconfiguration-flow: done
+  repair-issues: done
+  stale-devices:
+    status: exempt
+    comment: |
+      This integration connect to a single service per configuration entry.
+  # Platinum
+  async-dependency: done
+  inject-websession:
+    status: exempt
+    comment: |
+      The integration does not connect via HTTP.
+  strict-typing: done
@@ -23,10 +23,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .const import LAST_S_TEST
 from .coordinator import APCUPSdConfigEntry, APCUPSdCoordinator
+from .entity import APCUPSdEntity

 PARALLEL_UPDATES = 0

@@ -490,22 +490,16 @@ def infer_unit(value: str) -> tuple[str, str | None]:
    return value, None


-class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
+class APCUPSdSensor(APCUPSdEntity, SensorEntity):
    """Representation of a sensor entity for APCUPSd status values."""

-    _attr_has_entity_name = True
-
    def __init__(
        self,
        coordinator: APCUPSdCoordinator,
        description: SensorEntityDescription,
    ) -> None:
        """Initialize the sensor."""
-        super().__init__(coordinator=coordinator, context=description.key.upper())
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
-        self._attr_device_info = coordinator.device_info
+        super().__init__(coordinator, description)

        # Initial update of attributes.
        self._update_attrs()
@@ -14,7 +14,22 @@
          "host": "[%key:common::config_flow::data::host%]",
          "port": "[%key:common::config_flow::data::port%]"
        },
+        "data_description": {
+          "host": "The hostname or IP address of the APC UPS Daemon",
+          "port": "The port the APC UPS Daemon is listening on"
+        },
        "description": "Enter the host and port on which the apcupsd NIS is being served."
+      },
+      "reconfigure": {
+        "data": {
+          "host": "[%key:common::config_flow::data::host%]",
+          "port": "[%key:common::config_flow::data::port%]"
+        },
+        "data_description": {
+          "host": "[%key:component::apcupsd::config::step::user::data_description::host%]",
+          "port": "[%key:component::apcupsd::config::step::user::data_description::port%]"
+        },
+        "description": "[%key:component::apcupsd::config::step::user::description%]"
      }
    }
  },
@@ -11,7 +11,7 @@ import time
 from typing import Any, Literal, final

 from hassil import Intents, recognize
-from hassil.expression import Expression, ListReference, Sequence
+from hassil.expression import Expression, Group, ListReference
 from hassil.intents import WildcardSlotList

 from homeassistant.components import conversation, media_source, stt, tts
@@ -413,7 +413,7 @@ class AssistSatelliteEntity(entity.Entity):
        for intent in intents.intents.values():
            for intent_data in intent.data:
                for sentence in intent_data.sentences:
-                    _collect_list_references(sentence, wildcard_names)
+                    _collect_list_references(sentence.expression, wildcard_names)

        for wildcard_name in wildcard_names:
            intents.slot_lists[wildcard_name] = WildcardSlotList(wildcard_name)
@@ -727,9 +727,9 @@ class AssistSatelliteEntity(entity.Entity):

 def _collect_list_references(expression: Expression, list_names: set[str]) -> None:
    """Collect list reference names recursively."""
-    if isinstance(expression, Sequence):
-        seq: Sequence = expression
-        for item in seq.items:
+    if isinstance(expression, Group):
+        grp: Group = expression
+        for item in grp.items:
            _collect_list_references(item, list_names)
    elif isinstance(expression, ListReference):
        # {list}
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
  "integration_type": "entity",
  "quality_scale": "internal",
-  "requirements": ["hassil==2.2.3"]
+  "requirements": ["hassil==3.1.0"]
 }
@@ -5,15 +5,16 @@ from __future__ import annotations
 from abc import ABC, abstractmethod
 from collections import namedtuple
 from collections.abc import Awaitable, Callable, Coroutine
-from datetime import datetime
 import functools
 import logging
 from typing import Any, cast

 from aioasuswrt.asuswrt import AsusWrt as AsusWrtLegacy
 from aiohttp import ClientSession
-from pyasuswrt import AsusWrtError, AsusWrtHttp
-from pyasuswrt.exceptions import AsusWrtNotAvailableInfoError
+from asusrouter import AsusRouter, AsusRouterError
+from asusrouter.modules.client import AsusClient
+from asusrouter.modules.data import AsusData
+from asusrouter.modules.homeassistant import convert_to_ha_data, convert_to_ha_sensors

 from homeassistant.const import (
    CONF_HOST,
@@ -41,14 +42,13 @@ from .const import (
    PROTOCOL_HTTPS,
    PROTOCOL_TELNET,
    SENSORS_BYTES,
-    SENSORS_CPU,
    SENSORS_LOAD_AVG,
    SENSORS_MEMORY,
    SENSORS_RATES,
-    SENSORS_TEMPERATURES,
    SENSORS_TEMPERATURES_LEGACY,
    SENSORS_UPTIME,
 )
+from .helpers import clean_dict, translate_to_legacy

 SENSORS_TYPE_BYTES = "sensors_bytes"
 SENSORS_TYPE_COUNT = "sensors_count"
@@ -310,16 +310,16 @@ class AsusWrtHttpBridge(AsusWrtBridge):
    def __init__(self, conf: dict[str, Any], session: ClientSession) -> None:
        """Initialize Bridge that use HTTP library."""
        super().__init__(conf[CONF_HOST])
-        self._api: AsusWrtHttp = self._get_api(conf, session)
+        self._api = self._get_api(conf, session)

    @staticmethod
-    def _get_api(conf: dict[str, Any], session: ClientSession) -> AsusWrtHttp:
-        """Get the AsusWrtHttp API."""
-        return AsusWrtHttp(
-            conf[CONF_HOST],
-            conf[CONF_USERNAME],
-            conf.get(CONF_PASSWORD, ""),
-            use_https=conf[CONF_PROTOCOL] == PROTOCOL_HTTPS,
+    def _get_api(conf: dict[str, Any], session: ClientSession) -> AsusRouter:
+        """Get the AsusRouter API."""
+        return AsusRouter(
+            hostname=conf[CONF_HOST],
+            username=conf[CONF_USERNAME],
+            password=conf.get(CONF_PASSWORD, ""),
+            use_ssl=conf[CONF_PROTOCOL] == PROTOCOL_HTTPS,
            port=conf.get(CONF_PORT),
            session=session,
        )
@@ -327,46 +327,90 @@ class AsusWrtHttpBridge(AsusWrtBridge):
    @property
    def is_connected(self) -> bool:
        """Get connected status."""
-        return cast(bool, self._api.is_connected)
+        return self._api.connected

    async def async_connect(self) -> None:
        """Connect to the device."""
        await self._api.async_connect()

+        # Collect the identity
+        _identity = await self._api.async_get_identity()
+
        # get main router properties
-        if mac := self._api.mac:
+        if mac := _identity.mac:
            self._label_mac = format_mac(mac)
-        self._firmware = self._api.firmware
-        self._model = self._api.model
+        self._firmware = str(_identity.firmware)
+        self._model = _identity.model

    async def async_disconnect(self) -> None:
        """Disconnect to the device."""
        await self._api.async_disconnect()

+    async def _get_data(
+        self,
+        datatype: AsusData,
+        force: bool = False,
+    ) -> dict[str, Any]:
+        """Get data from the device.
+
+        This is a generic method which automatically converts to
+        the Home Assistant-compatible format.
+        """
+        try:
+            raw = await self._api.async_get_data(datatype, force=force)
+            return translate_to_legacy(clean_dict(convert_to_ha_data(raw)))
+        except AsusRouterError as ex:
+            raise UpdateFailed(ex) from ex
+
+    async def _get_sensors(self, datatype: AsusData) -> list[str]:
+        """Get the available sensors.
+
+        This is a generic method which automatically converts to
+        the Home Assistant-compatible format.
+        """
+        sensors = []
+        try:
+            data = await self._api.async_get_data(datatype)
+            # Get the list of sensors from the raw data
+            # and translate in to the legacy format
+            sensors = translate_to_legacy(convert_to_ha_sensors(data, datatype))
+            _LOGGER.debug("Available `%s` sensors: %s", datatype.value, sensors)
+        except AsusRouterError as ex:
+            _LOGGER.warning(
+                "Cannot get available `%s` sensors with exception: %s",
+                datatype.value,
+                ex,
+            )
+        return sensors
+
    async def async_get_connected_devices(self) -> dict[str, WrtDevice]:
        """Get list of connected devices."""
-        api_devices = await self._api.async_get_connected_devices()
+        api_devices: dict[str, AsusClient] = await self._api.async_get_data(
+            AsusData.CLIENTS, force=True
+        )
        return {
-            format_mac(mac): WrtDevice(dev.ip, dev.name, dev.node)
+            format_mac(mac): WrtDevice(
+                dev.connection.ip_address, dev.description.name, dev.connection.node
+            )
            for mac, dev in api_devices.items()
+            if dev.connection is not None
+            and dev.description is not None
+            and dev.connection.ip_address is not None
        }

    async def async_get_available_sensors(self) -> dict[str, dict[str, Any]]:
        """Return a dictionary of available sensors for this bridge."""
-        sensors_cpu = await self._get_available_cpu_sensors()
-        sensors_temperatures = await self._get_available_temperature_sensors()
-        sensors_loadavg = await self._get_loadavg_sensors_availability()
        return {
            SENSORS_TYPE_BYTES: {
                KEY_SENSORS: SENSORS_BYTES,
                KEY_METHOD: self._get_bytes,
            },
            SENSORS_TYPE_CPU: {
-                KEY_SENSORS: sensors_cpu,
+                KEY_SENSORS: await self._get_sensors(AsusData.CPU),
                KEY_METHOD: self._get_cpu_usage,
            },
            SENSORS_TYPE_LOAD_AVG: {
-                KEY_SENSORS: sensors_loadavg,
+                KEY_SENSORS: await self._get_sensors(AsusData.SYSINFO),
                KEY_METHOD: self._get_load_avg,
            },
            SENSORS_TYPE_MEMORY: {
@@ -382,95 +426,44 @@ class AsusWrtHttpBridge(AsusWrtBridge):
                KEY_METHOD: self._get_uptime,
            },
            SENSORS_TYPE_TEMPERATURES: {
-                KEY_SENSORS: sensors_temperatures,
+                KEY_SENSORS: await self._get_sensors(AsusData.TEMPERATURE),
                KEY_METHOD: self._get_temperatures,
            },
        }

-    async def _get_available_cpu_sensors(self) -> list[str]:
-        """Check which cpu information is available on the router."""
-        try:
-            available_cpu = await self._api.async_get_cpu_usage()
-            available_sensors = [t for t in SENSORS_CPU if t in available_cpu]
-        except AsusWrtError as exc:
-            _LOGGER.warning(
-                (
-                    "Failed checking cpu sensor availability for ASUS router"
-                    " %s. Exception: %s"
-                ),
-                self.host,
-                exc,
-            )
-            return []
-        return available_sensors
-
-    async def _get_available_temperature_sensors(self) -> list[str]:
-        """Check which temperature information is available on the router."""
-        try:
-            available_temps = await self._api.async_get_temperatures()
-            available_sensors = [
-                t for t in SENSORS_TEMPERATURES if t in available_temps
-            ]
-        except AsusWrtError as exc:
-            _LOGGER.warning(
-                (
-                    "Failed checking temperature sensor availability for ASUS router"
-                    " %s. Exception: %s"
-                ),
-                self.host,
-                exc,
-            )
-            return []
-        return available_sensors
-
-    async def _get_loadavg_sensors_availability(self) -> list[str]:
-        """Check if load avg is available on the router."""
-        try:
-            await self._api.async_get_loadavg()
-        except AsusWrtNotAvailableInfoError:
-            return []
-        except AsusWrtError:
-            pass
-        return SENSORS_LOAD_AVG
-
-    @handle_errors_and_zip(AsusWrtError, SENSORS_BYTES)
    async def _get_bytes(self) -> Any:
        """Fetch byte information from the router."""
-        return await self._api.async_get_traffic_bytes()
+        return await self._get_data(AsusData.NETWORK)

-    @handle_errors_and_zip(AsusWrtError, SENSORS_RATES)
    async def _get_rates(self) -> Any:
        """Fetch rates information from the router."""
-        return await self._api.async_get_traffic_rates()
+        data = await self._get_data(AsusData.NETWORK)
+        # Convert from bits/s to Bytes/s for compatibility with legacy sensors
+        return {
+            key: (
+                value / 8
+                if key in SENSORS_RATES and isinstance(value, (int, float))
+                else value
+            )
+            for key, value in data.items()
+        }

-    @handle_errors_and_zip(AsusWrtError, SENSORS_LOAD_AVG)
    async def _get_load_avg(self) -> Any:
        """Fetch cpu load avg information from the router."""
-        return await self._api.async_get_loadavg()
+        return await self._get_data(AsusData.SYSINFO)

-    @handle_errors_and_zip(AsusWrtError, None)
    async def _get_temperatures(self) -> Any:
        """Fetch temperatures information from the router."""
-        return await self._api.async_get_temperatures()
+        return await self._get_data(AsusData.TEMPERATURE)

-    @handle_errors_and_zip(AsusWrtError, None)
    async def _get_cpu_usage(self) -> Any:
        """Fetch cpu information from the router."""
-        return await self._api.async_get_cpu_usage()
+        return await self._get_data(AsusData.CPU)

-    @handle_errors_and_zip(AsusWrtError, None)
    async def _get_memory_usage(self) -> Any:
        """Fetch memory information from the router."""
-        return await self._api.async_get_memory_usage()
+        return await self._get_data(AsusData.RAM)

    async def _get_uptime(self) -> dict[str, Any]:
        """Fetch uptime from the router."""
-        try:
-            uptimes = await self._api.async_get_uptime()
-        except AsusWrtError as exc:
-            raise UpdateFailed(exc) from exc
-
-        last_boot = datetime.fromisoformat(uptimes["last_boot"])
-        uptime = uptimes["uptime"]
-
-        return dict(zip(SENSORS_UPTIME, [last_boot, uptime], strict=False))
+        return await self._get_data(AsusData.BOOTTIME)
@@ -7,7 +7,7 @@ import os
 import socket
 from typing import Any, cast

-from pyasuswrt import AsusWrtError
+from asusrouter import AsusRouterError
 import voluptuous as vol

 from homeassistant.components.device_tracker import (
@@ -189,7 +189,7 @@ class AsusWrtFlowHandler(ConfigFlow, domain=DOMAIN):
        try:
            await api.async_connect()

-        except (AsusWrtError, OSError):
+        except (AsusRouterError, OSError):
            _LOGGER.error(
                "Error connecting to the AsusWrt router at %s using protocol %s",
                host,
@@ -0,0 +1,56 @@
+"""Helpers for AsusWRT integration."""
+
+from __future__ import annotations
+
+from typing import Any, TypeVar
+
+T = TypeVar("T", dict[str, Any], list[Any], None)
+
+TRANSLATION_MAP = {
+    "wan_rx": "sensor_rx_bytes",
+    "wan_tx": "sensor_tx_bytes",
+    "total_usage": "cpu_total_usage",
+    "usage": "mem_usage_perc",
+    "free": "mem_free",
+    "used": "mem_used",
+    "wan_rx_speed": "sensor_rx_rates",
+    "wan_tx_speed": "sensor_tx_rates",
+    "2ghz": "2.4GHz",
+    "5ghz": "5.0GHz",
+    "5ghz2": "5.0GHz_2",
+    "6ghz": "6.0GHz",
+    "cpu": "CPU",
+    "datetime": "sensor_last_boot",
+    "uptime": "sensor_uptime",
+    **{f"{num}_usage": f"cpu{num}_usage" for num in range(1, 9)},
+    **{f"load_avg_{load}": f"sensor_load_avg{load}" for load in ("1", "5", "15")},
+}
+
+
+def clean_dict(raw: dict[str, Any]) -> dict[str, Any]:
+    """Cleans dictionary from None values.
+
+    The `state` key is always preserved regardless of its value.
+    """
+
+    return {k: v for k, v in raw.items() if v is not None or k.endswith("state")}
+
+
+def translate_to_legacy(raw: T) -> T:
+    """Translate raw data to legacy format for dicts and lists."""
+
+    if raw is None:
+        return None
+
+    if isinstance(raw, dict):
+        return {TRANSLATION_MAP.get(k, k): v for k, v in raw.items()}
+
+    if isinstance(raw, list):
+        return [
+            TRANSLATION_MAP[item]
+            if isinstance(item, str) and item in TRANSLATION_MAP
+            else item
+            for item in raw
+        ]
+
+    return raw
@@ -1,11 +1,11 @@
 {
  "domain": "asuswrt",
  "name": "ASUSWRT",
-  "codeowners": ["@kennedyshead", "@ollo69"],
+  "codeowners": ["@kennedyshead", "@ollo69", "@Vaskivskyi"],
  "config_flow": true,
  "documentation": "https://www.home-assistant.io/integrations/asuswrt",
  "integration_type": "hub",
  "iot_class": "local_polling",
-  "loggers": ["aioasuswrt", "asyncssh"],
-  "requirements": ["aioasuswrt==1.4.0", "pyasuswrt==0.1.21"]
+  "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
+  "requirements": ["aioasuswrt==1.4.0", "asusrouter==1.19.0"]
 }
@@ -5,9 +5,9 @@ from __future__ import annotations
 from collections.abc import Callable, Mapping
 from datetime import datetime, timedelta
 import logging
-from typing import Any
+from typing import TYPE_CHECKING, Any

-from pyasuswrt import AsusWrtError
+from asusrouter import AsusRouterError

 from homeassistant.components.device_tracker import (
    CONF_CONSIDER_HOME,
@@ -40,6 +40,9 @@ from .const import (
    SENSORS_CONNECTED_DEVICE,
 )

+if TYPE_CHECKING:
+    from . import AsusWrtConfigEntry
+
 CONF_REQ_RELOAD = [CONF_DNSMASQ, CONF_INTERFACE, CONF_REQUIRE_IP]

 SCAN_INTERVAL = timedelta(seconds=30)
@@ -52,10 +55,13 @@ _LOGGER = logging.getLogger(__name__)
 class AsusWrtSensorDataHandler:
    """Data handler for AsusWrt sensor."""

-    def __init__(self, hass: HomeAssistant, api: AsusWrtBridge) -> None:
+    def __init__(
+        self, hass: HomeAssistant, api: AsusWrtBridge, entry: AsusWrtConfigEntry
+    ) -> None:
        """Initialize a AsusWrt sensor data handler."""
        self._hass = hass
        self._api = api
+        self._entry = entry
        self._connected_devices = 0

    async def _get_connected_devices(self) -> dict[str, int]:
@@ -91,6 +97,7 @@ class AsusWrtSensorDataHandler:
            update_method=method,
            # Polling interval. Will only be polled if there are subscribers.
            update_interval=SCAN_INTERVAL if should_poll else None,
+            config_entry=self._entry,
        )
        await coordinator.async_refresh()

@@ -222,7 +229,7 @@ class AsusWrtRouter:
        """Set up a AsusWrt router."""
        try:
            await self._api.async_connect()
-        except (AsusWrtError, OSError) as exc:
+        except (AsusRouterError, OSError) as exc:
            raise ConfigEntryNotReady from exc
        if not self._api.is_connected:
            raise ConfigEntryNotReady
@@ -277,7 +284,7 @@ class AsusWrtRouter:
        _LOGGER.debug("Checking devices for ASUS router %s", self.host)
        try:
            wrt_devices = await self._api.async_get_connected_devices()
-        except (OSError, AsusWrtError) as exc:
+        except (OSError, AsusRouterError) as exc:
            if not self._connect_error:
                self._connect_error = True
                _LOGGER.error(
@@ -321,7 +328,9 @@ class AsusWrtRouter:
        if self._sensors_data_handler:
            return

-        self._sensors_data_handler = AsusWrtSensorDataHandler(self.hass, self._api)
+        self._sensors_data_handler = AsusWrtSensorDataHandler(
+            self.hass, self._api, self._entry
+        )
        self._sensors_data_handler.update_device_count(self._connected_devices)

        sensors_types = await self._api.async_get_available_sensors()
@@ -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==3.1.0"]
+  "requirements": ["yalexs==8.11.1", "yalexs-ble==3.1.2"]
 }
@@ -199,23 +199,19 @@ class AuthProvidersView(HomeAssistantView):
        )


-def _prepare_result_json(
-    result: AuthFlowResult,
-) -> AuthFlowResult:
-    """Convert result to JSON."""
+def _prepare_result_json(result: AuthFlowResult) -> dict[str, Any]:
+    """Convert result to JSON serializable dict."""
    if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
-        data = result.copy()
-        data.pop("result")
-        data.pop("data")
-        return data
+        return {
+            key: val for key, val in result.items() if key not in ("result", "data")
+        }

    if result["type"] != data_entry_flow.FlowResultType.FORM:
-        return result
+        return result  # type: ignore[return-value]

-    data = result.copy()
-
-    if (schema := data["data_schema"]) is None:
-        data["data_schema"] = []  # type: ignore[typeddict-item]  # json result type
+    data = dict(result)
+    if (schema := result["data_schema"]) is None:
+        data["data_schema"] = []
    else:
        data["data_schema"] = voluptuous_serialize.convert(schema)

@@ -268,7 +264,7 @@ class LoginFlowBaseView(HomeAssistantView):
        result.pop("data")
        result.pop("context")

-        result_obj: Credentials = result.pop("result")
+        result_obj = result.pop("result")

        # Result can be None if credential was never linked to a user before.
        user = await hass.auth.async_get_user_by_credentials(result_obj)
@@ -281,7 +277,8 @@ class LoginFlowBaseView(HomeAssistantView):
            )

        process_success_login(request)
-        result["result"] = self._store_result(client_id, result_obj)
+        # We overwrite the Credentials object with the string code to retrieve it.
+        result["result"] = self._store_result(client_id, result_obj)  # type: ignore[typeddict-item]

        return self.json(result)

@@ -149,20 +149,16 @@ def websocket_depose_mfa(
    hass.async_create_task(async_depose(msg))


-def _prepare_result_json(
-    result: data_entry_flow.FlowResult,
-) -> data_entry_flow.FlowResult:
-    """Convert result to JSON."""
+def _prepare_result_json(result: data_entry_flow.FlowResult) -> dict[str, Any]:
+    """Convert result to JSON serializable dict."""
    if result["type"] == data_entry_flow.FlowResultType.CREATE_ENTRY:
-        return result.copy()
-
+        return dict(result)
    if result["type"] != data_entry_flow.FlowResultType.FORM:
-        return result
+        return result  # type: ignore[return-value]

-    data = result.copy()
-
-    if (schema := data["data_schema"]) is None:
-        data["data_schema"] = []  # type: ignore[typeddict-item]  # json result type
+    data = dict(result)
+    if (schema := result["data_schema"]) is None:
+        data["data_schema"] = []
    else:
        data["data_schema"] = voluptuous_serialize.convert(schema)

@@ -5,6 +5,7 @@ from __future__ import annotations
 from datetime import timedelta
 import logging

+API_ABS_HUMID = "abs_humid"
 API_CO2 = "carbon_dioxide"
 API_DEW_POINT = "dew_point"
 API_DUST = "dust"
@@ -18,6 +18,7 @@ from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
    ATTR_CONNECTIONS,
    ATTR_SW_VERSION,
+    CONCENTRATION_GRAMS_PER_CUBIC_METER,
    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
    CONCENTRATION_PARTS_PER_BILLION,
    CONCENTRATION_PARTS_PER_MILLION,
@@ -33,6 +34,7 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity

 from .const import (
+    API_ABS_HUMID,
    API_CO2,
    API_DEW_POINT,
    API_DUST,
@@ -120,6 +122,14 @@ SENSOR_TYPES: tuple[AwairSensorEntityDescription, ...] = (
        state_class=SensorStateClass.MEASUREMENT,
        entity_registry_enabled_default=False,
    ),
+    AwairSensorEntityDescription(
+        key=API_ABS_HUMID,
+        device_class=SensorDeviceClass.ABSOLUTE_HUMIDITY,
+        native_unit_of_measurement=CONCENTRATION_GRAMS_PER_CUBIC_METER,
+        unique_id_tag="absolute_humidity",
+        state_class=SensorStateClass.MEASUREMENT,
+        entity_registry_enabled_default=False,
+    ),
 )

 SENSOR_TYPES_DUST: tuple[AwairSensorEntityDescription, ...] = (
@@ -29,7 +29,7 @@
  "integration_type": "device",
  "iot_class": "local_push",
  "loggers": ["axis"],
-  "requirements": ["axis==64"],
+  "requirements": ["axis==65"],
  "ssdp": [
    {
      "manufacturer": "AXIS"
@@ -127,7 +127,6 @@ class BackupConfigData:
            schedule=BackupSchedule(
                days=days,
                recurrence=ScheduleRecurrence(data["schedule"]["recurrence"]),
-                state=ScheduleState(data["schedule"].get("state", ScheduleState.NEVER)),
                time=time,
            ),
        )
@@ -453,7 +452,6 @@ class StoredBackupSchedule(TypedDict):

    days: list[Day]
    recurrence: ScheduleRecurrence
-    state: ScheduleState
    time: str | None


@@ -462,7 +460,6 @@ class ScheduleParametersDict(TypedDict, total=False):

    days: list[Day]
    recurrence: ScheduleRecurrence
-    state: ScheduleState
    time: dt.time | None


@@ -486,32 +483,12 @@ class ScheduleRecurrence(StrEnum):
    CUSTOM_DAYS = "custom_days"


-class ScheduleState(StrEnum):
-    """Represent the schedule recurrence.
-
-    This is deprecated and can be remove in HA Core 2025.8.
-    """
-
-    NEVER = "never"
-    DAILY = "daily"
-    MONDAY = "mon"
-    TUESDAY = "tue"
-    WEDNESDAY = "wed"
-    THURSDAY = "thu"
-    FRIDAY = "fri"
-    SATURDAY = "sat"
-    SUNDAY = "sun"
-
-
@dataclass(kw_only=True)
 class BackupSchedule:
    """Represent the backup schedule."""

    days: list[Day] = field(default_factory=list)
    recurrence: ScheduleRecurrence = ScheduleRecurrence.NEVER
-    # Although no longer used, state is kept for backwards compatibility.
-    # It can be removed in HA Core 2025.8.
-    state: ScheduleState = ScheduleState.NEVER
    time: dt.time | None = None
    cron_event: CronSim | None = field(init=False, default=None)
    next_automatic_backup: datetime | None = field(init=False, default=None)
@@ -610,7 +587,6 @@ class BackupSchedule:
        return StoredBackupSchedule(
            days=self.days,
            recurrence=self.recurrence,
-            state=self.state,
            time=self.time.isoformat() if self.time else None,
        )

@@ -1119,7 +1119,7 @@ class BackupManager:
            )
        if unavailable_agents:
            LOGGER.warning(
-                "Backup agents %s are not available, will backupp to %s",
+                "Backup agents %s are not available, will backup to %s",
                unavailable_agents,
                available_agents,
            )
@@ -331,9 +331,6 @@ async def handle_config_info(
    """Send the stored backup config."""
    manager = hass.data[DATA_MANAGER]
    config = manager.config.data.to_dict()
-    # Remove state from schedule, it's not needed in the frontend
-    # mypy doesn't like deleting from TypedDict, ignore it
-    del config["schedule"]["state"]  # type: ignore[misc]
    connection.send_result(
        msg["id"],
        {
@@ -25,7 +25,6 @@ SERVICE_TRIGGER = "trigger_camera"
 SERVICE_SAVE_VIDEO = "save_video"
 SERVICE_SAVE_RECENT_CLIPS = "save_recent_clips"
 SERVICE_SEND_PIN = "send_pin"
-ATTR_CONFIG_ENTRY_ID = "config_entry_id"

 PLATFORMS = [
    Platform.ALARM_CONTROL_PANEL,
@@ -5,12 +5,12 @@ from __future__ import annotations
 import voluptuous as vol

 from homeassistant.config_entries import ConfigEntryState
-from homeassistant.const import CONF_PIN
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID, CONF_PIN
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv

-from .const import ATTR_CONFIG_ENTRY_ID, DOMAIN, SERVICE_SEND_PIN
+from .const import DOMAIN, SERVICE_SEND_PIN
 from .coordinator import BlinkConfigEntry

 SERVICE_SEND_PIN_SCHEMA = vol.Schema(
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/blue_current",
  "iot_class": "cloud_push",
  "loggers": ["bluecurrent_api"],
-  "requirements": ["bluecurrent-api==1.2.4"]
+  "requirements": ["bluecurrent-api==1.3.1"]
 }
@@ -388,12 +388,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
    mode = BluetoothScanningMode.PASSIVE if passive else BluetoothScanningMode.ACTIVE
    scanner = HaScanner(mode, adapter, address)
    scanner.async_setup()
-    try:
-        await scanner.async_start()
-    except (RuntimeError, ScannerStartError) as err:
-        raise ConfigEntryNotReady(
-            f"{adapter_human_name(adapter, address)}: {err}"
-        ) from err
    adapters = await manager.async_get_bluetooth_adapters()
    details = adapters[adapter]
    if entry.title == address:
@@ -401,8 +395,16 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
            entry, title=adapter_title(adapter, details)
        )
    slots: int = details.get(ADAPTER_CONNECTION_SLOTS) or DEFAULT_CONNECTION_SLOTS
+    # Register the scanner before starting so
+    # any raw advertisement data can be processed
    entry.async_on_unload(async_register_scanner(hass, scanner, connection_slots=slots))
    await async_update_device(hass, entry, adapter, details)
+    try:
+        await scanner.async_start()
+    except (RuntimeError, ScannerStartError) as err:
+        raise ConfigEntryNotReady(
+            f"{adapter_human_name(adapter, address)}: {err}"
+        ) from err
    entry.async_on_unload(entry.add_update_listener(async_update_listener))
    entry.async_on_unload(scanner.async_stop)
    return True
@@ -235,10 +235,9 @@ class HomeAssistantBluetoothManager(BluetoothManager):

    def _async_save_scanner_history(self, scanner: BaseHaScanner) -> None:
        """Save the scanner history."""
-        if isinstance(scanner, BaseHaRemoteScanner):
-            self.storage.async_set_advertisement_history(
-                scanner.source, scanner.serialize_discovered_devices()
-            )
+        self.storage.async_set_advertisement_history(
+            scanner.source, scanner.serialize_discovered_devices()
+        )

    def _async_unregister_scanner(
        self, scanner: BaseHaScanner, unregister: CALLBACK_TYPE
@@ -285,9 +284,8 @@ class HomeAssistantBluetoothManager(BluetoothManager):
        connection_slots: int | None = None,
    ) -> CALLBACK_TYPE:
        """Register a scanner."""
-        if isinstance(scanner, BaseHaRemoteScanner):
-            if history := self.storage.async_get_advertisement_history(scanner.source):
-                scanner.restore_discovered_devices(history)
+        if history := self.storage.async_get_advertisement_history(scanner.source):
+            scanner.restore_discovered_devices(history)

        unregister = super().async_register_scanner(scanner, connection_slots)
        return partial(self._async_unregister_scanner, scanner, unregister)
@@ -16,11 +16,11 @@
  "quality_scale": "internal",
  "requirements": [
    "bleak==1.0.1",
-    "bleak-retry-connector==4.0.0",
+    "bleak-retry-connector==4.0.2",
    "bluetooth-adapters==2.0.0",
    "bluetooth-auto-recovery==1.5.2",
    "bluetooth-data-tools==1.28.2",
-    "dbus-fast==2.44.2",
-    "habluetooth==4.0.1"
+    "dbus-fast==2.44.3",
+    "habluetooth==5.0.1"
  ]
 }
@@ -39,7 +39,13 @@ def async_setup(hass: HomeAssistant) -> None:
 def serialize_service_info(
    service_info: BluetoothServiceInfoBleak, time_diff: float
 ) -> dict[str, Any]:
-    """Serialize a BluetoothServiceInfoBleak object."""
+    """Serialize a BluetoothServiceInfoBleak object.
+
+    The raw field is included for:
+    1. Debugging - to see the actual advertisement packet
+    2. Data freshness - manufacturer_data and service_data are aggregated
+       across multiple advertisements, raw shows the latest packet only
+    """
    return {
        "name": service_info.name,
        "address": service_info.address,
@@ -57,6 +63,7 @@ def serialize_service_info(
        "connectable": service_info.connectable,
        "time": service_info.time + time_diff,
        "tx_power": service_info.tx_power,
+        "raw": service_info.raw.hex() if service_info.raw else None,
    }


@@ -6,4 +6,3 @@ CONF_INSTALLER_CODE = "installer_code"
 CONF_USER_CODE = "user_code"
 ATTR_DATETIME = "datetime"
 SERVICE_SET_DATE_TIME = "set_date_time"
-ATTR_CONFIG_ENTRY_ID = "config_entry_id"
@@ -9,12 +9,13 @@ from typing import Any
 import voluptuous as vol

 from homeassistant.config_entries import ConfigEntryState
+from homeassistant.const import ATTR_CONFIG_ENTRY_ID
 from homeassistant.core import HomeAssistant, ServiceCall, callback
 from homeassistant.exceptions import HomeAssistantError, ServiceValidationError
 from homeassistant.helpers import config_validation as cv
 from homeassistant.util import dt as dt_util

-from .const import ATTR_CONFIG_ENTRY_ID, ATTR_DATETIME, DOMAIN, SERVICE_SET_DATE_TIME
+from .const import ATTR_DATETIME, DOMAIN, SERVICE_SET_DATE_TIME
 from .types import BoschAlarmConfigEntry


@@ -95,7 +95,7 @@
        "name": "Battery missing"
      },
      "panel_fault_ac_fail": {
-        "name": "AC Failure"
+        "name": "AC failure"
      },
      "panel_fault_parameter_crc_fail_in_pif": {
        "name": "CRC failure in panel configuration"
@@ -69,12 +69,7 @@ class SHCEntity(SHCBaseEntity):
            manufacturer=device.manufacturer,
            model=device.device_model,
            name=device.name,
-            via_device=(
-                DOMAIN,
-                device.parent_device_id
-                if device.parent_device_id is not None
-                else parent_id,
-            ),
+            via_device=(DOMAIN, device.root_device_id),
        )
        super().__init__(device=device, parent_id=parent_id, entry_id=entry_id)

@@ -7,7 +7,7 @@
  "documentation": "https://www.home-assistant.io/integrations/bosch_shc",
  "iot_class": "local_push",
  "loggers": ["boschshcpy"],
-  "requirements": ["boschshcpy==0.2.91"],
+  "requirements": ["boschshcpy==0.2.107"],
  "zeroconf": [
    {
      "type": "_http._tcp.local.",
@@ -53,8 +53,7 @@ async def async_setup_entry(
    assert unique_id is not None

    async_add_entities(
-        BraviaTVButton(coordinator, unique_id, config_entry.title, description)
-        for description in BUTTONS
+        BraviaTVButton(coordinator, unique_id, description) for description in BUTTONS
    )


@@ -67,11 +66,10 @@ class BraviaTVButton(BraviaTVEntity, ButtonEntity):
        self,
        coordinator: BraviaTVCoordinator,
        unique_id: str,
-        model: str,
        description: BraviaTVButtonDescription,
    ) -> None:
        """Initialize the button."""
-        super().__init__(coordinator, unique_id, model)
+        super().__init__(coordinator, unique_id)
        self._attr_unique_id = f"{unique_id}_{description.key}"
        self.entity_description = description

@@ -79,14 +79,16 @@ class BraviaTVConfigFlow(ConfigFlow, domain=DOMAIN):

        system_info = await self.client.get_system_info()
        cid = system_info[ATTR_CID].lower()
-        title = system_info[ATTR_MODEL]

        self.device_config[CONF_MAC] = system_info[ATTR_MAC]

        await self.async_set_unique_id(cid)
        self._abort_if_unique_id_configured()

-        return self.async_create_entry(title=title, data=self.device_config)
+        return self.async_create_entry(
+            title=f"{system_info['name']} {system_info[ATTR_MODEL]}",
+            data=self.device_config,
+        )

    async def async_reauth_device(self) -> ConfigFlowResult:
        """Reauthorize Bravia TV device from config."""
@@ -81,6 +81,7 @@ class BraviaTVCoordinator(DataUpdateCoordinator[None]):
        self.use_psk = config_entry.data.get(CONF_USE_PSK, False)
        self.client_id = config_entry.data.get(CONF_CLIENT_ID, LEGACY_CLIENT_ID)
        self.nickname = config_entry.data.get(CONF_NICKNAME, NICKNAME_PREFIX)
+        self.system_info: dict[str, str] = {}
        self.source: str | None = None
        self.source_list: list[str] = []
        self.source_map: dict[str, dict] = {}
@@ -150,6 +151,9 @@ class BraviaTVCoordinator(DataUpdateCoordinator[None]):
            self.is_on = power_status == "active"
            self.skipped_updates = 0

+            if not self.system_info:
+                self.system_info = await self.client.get_system_info()
+
            if self.is_on is False:
                return

@@ -12,23 +12,16 @@ class BraviaTVEntity(CoordinatorEntity[BraviaTVCoordinator]):

    _attr_has_entity_name = True

-    def __init__(
-        self,
-        coordinator: BraviaTVCoordinator,
-        unique_id: str,
-        model: str,
-    ) -> None:
+    def __init__(self, coordinator: BraviaTVCoordinator, unique_id: str) -> None:
        """Initialize the entity."""
        super().__init__(coordinator)

        self._attr_unique_id = unique_id
        self._attr_device_info = DeviceInfo(
            identifiers={(DOMAIN, unique_id)},
+            connections={(CONNECTION_NETWORK_MAC, coordinator.system_info["macAddr"])},
            manufacturer=ATTR_MANUFACTURER,
-            model=model,
-            name=f"{ATTR_MANUFACTURER} {model}",
+            model_id=coordinator.system_info["model"],
+            hw_version=coordinator.system_info["generation"],
+            serial_number=coordinator.system_info["serial"],
        )
-        if coordinator.client.mac is not None:
-            self._attr_device_info["connections"] = {
-                (CONNECTION_NETWORK_MAC, coordinator.client.mac)
-            }
@@ -34,9 +34,7 @@ async def async_setup_entry(
    unique_id = config_entry.unique_id
    assert unique_id is not None

-    async_add_entities(
-        [BraviaTVMediaPlayer(coordinator, unique_id, config_entry.title)]
-    )
+    async_add_entities([BraviaTVMediaPlayer(coordinator, unique_id)])


 class BraviaTVMediaPlayer(BraviaTVEntity, MediaPlayerEntity):
@@ -24,7 +24,7 @@ async def async_setup_entry(
    unique_id = config_entry.unique_id
    assert unique_id is not None

-    async_add_entities([BraviaTVRemote(coordinator, unique_id, config_entry.title)])
+    async_add_entities([BraviaTVRemote(coordinator, unique_id)])


 class BraviaTVRemote(BraviaTVEntity, RemoteEntity):
@@ -64,6 +64,7 @@ class BroadlinkUpdateManager(ABC, Generic[_ApiT]):
            device.hass,
            _LOGGER,
            name=f"{device.name} ({device.api.model} at {device.api.host[0]})",
+            config_entry=device.config,
            update_method=self.async_update,
            update_interval=self.SCAN_INTERVAL,
        )
@@ -8,7 +8,7 @@
  "integration_type": "device",
  "iot_class": "local_polling",
  "loggers": ["brother", "pyasn1", "pysmi", "pysnmp"],
-  "requirements": ["brother==5.0.0"],
+  "requirements": ["brother==5.0.1"],
  "zeroconf": [
    {
      "type": "_printer._tcp.local.",
@@ -2,7 +2,16 @@

 import dataclasses

-from bsblan import BSBLAN, BSBLANConfig, Device, Info, StaticState
+from bsblan import (
+    BSBLAN,
+    BSBLANAuthError,
+    BSBLANConfig,
+    BSBLANConnectionError,
+    BSBLANError,
+    Device,
+    Info,
+    StaticState,
+)

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
@@ -13,9 +22,14 @@ from homeassistant.const import (
    Platform,
 )
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import (
+    ConfigEntryAuthFailed,
+    ConfigEntryError,
+    ConfigEntryNotReady,
+)
 from homeassistant.helpers.aiohttp_client import async_get_clientsession

-from .const import CONF_PASSKEY
+from .const import CONF_PASSKEY, DOMAIN
 from .coordinator import BSBLanUpdateCoordinator

 PLATFORMS = [Platform.CLIMATE, Platform.SENSOR, Platform.WATER_HEATER]
@@ -54,10 +68,27 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
    coordinator = BSBLanUpdateCoordinator(hass, entry, bsblan)
    await coordinator.async_config_entry_first_refresh()

-    # Fetch all required data concurrently
-    device = await bsblan.device()
-    info = await bsblan.info()
-    static = await bsblan.static_values()
+    try:
+        # Fetch all required data sequentially
+        device = await bsblan.device()
+        info = await bsblan.info()
+        static = await bsblan.static_values()
+    except BSBLANConnectionError as err:
+        raise ConfigEntryNotReady(
+            translation_domain=DOMAIN,
+            translation_key="setup_connection_error",
+            translation_placeholders={"host": entry.data[CONF_HOST]},
+        ) from err
+    except BSBLANAuthError as err:
+        raise ConfigEntryAuthFailed(
+            translation_domain=DOMAIN,
+            translation_key="setup_auth_error",
+        ) from err
+    except BSBLANError as err:
+        raise ConfigEntryError(
+            translation_domain=DOMAIN,
+            translation_key="setup_general_error",
+        ) from err

    entry.runtime_data = BSBLanData(
        client=bsblan,
@@ -2,9 +2,10 @@

 from __future__ import annotations

+from collections.abc import Mapping
 from typing import Any

-from bsblan import BSBLAN, BSBLANConfig, BSBLANError
+from bsblan import BSBLAN, BSBLANAuthError, BSBLANConfig, BSBLANError
 import voluptuous as vol

 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
@@ -45,7 +46,7 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
        self.username = user_input.get(CONF_USERNAME)
        self.password = user_input.get(CONF_PASSWORD)

-        return await self._validate_and_create()
+        return await self._validate_and_create(user_input)

    async def async_step_zeroconf(
        self, discovery_info: ZeroconfServiceInfo
@@ -128,14 +129,29 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
        self.username = user_input.get(CONF_USERNAME)
        self.password = user_input.get(CONF_PASSWORD)

-        return await self._validate_and_create(is_discovery=True)
+        return await self._validate_and_create(user_input, is_discovery=True)

    async def _validate_and_create(
-        self, is_discovery: bool = False
+        self, user_input: dict[str, Any], is_discovery: bool = False
    ) -> ConfigFlowResult:
        """Validate device connection and create entry."""
        try:
-            await self._get_bsblan_info(is_discovery=is_discovery)
+            await self._get_bsblan_info()
+        except BSBLANAuthError:
+            if is_discovery:
+                return self.async_show_form(
+                    step_id="discovery_confirm",
+                    data_schema=vol.Schema(
+                        {
+                            vol.Optional(CONF_PASSKEY): str,
+                            vol.Optional(CONF_USERNAME): str,
+                            vol.Optional(CONF_PASSWORD): str,
+                        }
+                    ),
+                    errors={"base": "invalid_auth"},
+                    description_placeholders={"host": str(self.host)},
+                )
+            return self._show_setup_form({"base": "invalid_auth"}, user_input)
        except BSBLANError:
            if is_discovery:
                return self.async_show_form(
@@ -154,18 +170,137 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):

        return self._async_create_entry()

+    async def async_step_reauth(
+        self, entry_data: Mapping[str, Any]
+    ) -> ConfigFlowResult:
+        """Handle reauth flow."""
+        return await self.async_step_reauth_confirm()
+
+    async def async_step_reauth_confirm(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
+        """Handle reauth confirmation flow."""
+        existing_entry = self.hass.config_entries.async_get_entry(
+            self.context["entry_id"]
+        )
+        assert existing_entry
+
+        if user_input is None:
+            # Preserve existing values as defaults
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=existing_entry.data.get(
+                                CONF_PASSKEY, vol.UNDEFINED
+                            ),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=existing_entry.data.get(
+                                CONF_USERNAME, vol.UNDEFINED
+                            ),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
+            )
+
+        # Combine existing data with the user's new input for validation.
+        # This correctly handles adding, changing, and clearing credentials.
+        config_data = existing_entry.data.copy()
+        config_data.update(user_input)
+
+        self.host = config_data[CONF_HOST]
+        self.port = config_data[CONF_PORT]
+        self.passkey = config_data.get(CONF_PASSKEY)
+        self.username = config_data.get(CONF_USERNAME)
+        self.password = config_data.get(CONF_PASSWORD)
+
+        try:
+            await self._get_bsblan_info(raise_on_progress=False, is_reauth=True)
+        except BSBLANAuthError:
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=user_input.get(CONF_PASSKEY, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=user_input.get(CONF_USERNAME, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
+                errors={"base": "invalid_auth"},
+            )
+        except BSBLANError:
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=user_input.get(CONF_PASSKEY, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=user_input.get(CONF_USERNAME, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
+                errors={"base": "cannot_connect"},
+            )
+
+        # Update only the fields that were provided by the user
+        return self.async_update_reload_and_abort(
+            existing_entry, data_updates=user_input, reason="reauth_successful"
+        )
+
    @callback
-    def _show_setup_form(self, errors: dict | None = None) -> ConfigFlowResult:
+    def _show_setup_form(
+        self, errors: dict | None = None, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
        """Show the setup form to the user."""
+        # Preserve user input if provided, otherwise use defaults
+        defaults = user_input or {}
+
        return self.async_show_form(
            step_id="user",
            data_schema=vol.Schema(
                {
-                    vol.Required(CONF_HOST): str,
-                    vol.Optional(CONF_PORT, default=DEFAULT_PORT): int,
-                    vol.Optional(CONF_PASSKEY): str,
-                    vol.Optional(CONF_USERNAME): str,
-                    vol.Optional(CONF_PASSWORD): str,
+                    vol.Required(
+                        CONF_HOST, default=defaults.get(CONF_HOST, vol.UNDEFINED)
+                    ): str,
+                    vol.Optional(
+                        CONF_PORT, default=defaults.get(CONF_PORT, DEFAULT_PORT)
+                    ): int,
+                    vol.Optional(
+                        CONF_PASSKEY, default=defaults.get(CONF_PASSKEY, vol.UNDEFINED)
+                    ): str,
+                    vol.Optional(
+                        CONF_USERNAME,
+                        default=defaults.get(CONF_USERNAME, vol.UNDEFINED),
+                    ): str,
+                    vol.Optional(
+                        CONF_PASSWORD,
+                        default=defaults.get(CONF_PASSWORD, vol.UNDEFINED),
+                    ): str,
                }
            ),
            errors=errors or {},
@@ -186,7 +321,9 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
        )

    async def _get_bsblan_info(
-        self, raise_on_progress: bool = True, is_discovery: bool = False
+        self,
+        raise_on_progress: bool = True,
+        is_reauth: bool = False,
    ) -> None:
        """Get device information from a BSBLAN device."""
        config = BSBLANConfig(
@@ -209,11 +346,13 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
                format_mac(self.mac), raise_on_progress=raise_on_progress
            )

-        # Always allow updating host/port for both user and discovery flows
-        # This ensures connectivity is maintained when devices change IP addresses
-        self._abort_if_unique_id_configured(
-            updates={
-                CONF_HOST: self.host,
-                CONF_PORT: self.port,
-            }
-        )
+        # Skip unique_id configuration check during reauth to prevent "already_configured" abort
+        if not is_reauth:
+            # Always allow updating host/port for both user and discovery flows
+            # This ensures connectivity is maintained when devices change IP addresses
+            self._abort_if_unique_id_configured(
+                updates={
+                    CONF_HOST: self.host,
+                    CONF_PORT: self.port,
+                }
+            )
@@ -4,11 +4,19 @@ from dataclasses import dataclass
 from datetime import timedelta
 from random import randint

-from bsblan import BSBLAN, BSBLANConnectionError, HotWaterState, Sensor, State
+from bsblan import (
+    BSBLAN,
+    BSBLANAuthError,
+    BSBLANConnectionError,
+    HotWaterState,
+    Sensor,
+    State,
+)

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST
 from homeassistant.core import HomeAssistant
+from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed

 from .const import DOMAIN, LOGGER, SCAN_INTERVAL
@@ -62,6 +70,10 @@ class BSBLanUpdateCoordinator(DataUpdateCoordinator[BSBLanCoordinatorData]):
            state = await self.client.state()
            sensor = await self.client.sensor()
            dhw = await self.client.hot_water_state()
+        except BSBLANAuthError as err:
+            raise ConfigEntryAuthFailed(
+                "Authentication failed for BSB-Lan device"
+            ) from err
        except BSBLANConnectionError as err:
            host = self.config_entry.data[CONF_HOST] if self.config_entry else "unknown"
            raise UpdateFailed(
@@ -33,14 +33,30 @@
          "username": "[%key:component::bsblan::config::step::user::data_description::username%]",
          "password": "[%key:component::bsblan::config::step::user::data_description::password%]"
        }
+      },
+      "reauth_confirm": {
+        "title": "[%key:common::config_flow::title::reauth%]",
+        "description": "The BSB-Lan integration needs to re-authenticate with {name}",
+        "data": {
+          "passkey": "[%key:component::bsblan::config::step::user::data::passkey%]",
+          "username": "[%key:common::config_flow::data::username%]",
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "passkey": "[%key:component::bsblan::config::step::user::data_description::passkey%]",
+          "username": "[%key:component::bsblan::config::step::user::data_description::username%]",
+          "password": "[%key:component::bsblan::config::step::user::data_description::password%]"
+        }
      }
    },
    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]"
    },
    "abort": {
      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]"
+      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
    }
  },
  "exceptions": {
@@ -55,6 +71,15 @@
    },
    "set_operation_mode_error": {
      "message": "An error occurred while setting the operation mode"
+    },
+    "setup_connection_error": {
+      "message": "Failed to retrieve static device data from BSB-Lan device at {host}"
+    },
+    "setup_auth_error": {
+      "message": "Authentication failed while retrieving static device data"
+    },
+    "setup_general_error": {
+      "message": "An unknown error occurred while retrieving static device data"
    }
  },
  "entity": {
@@ -72,7 +72,7 @@ SENSOR_DESCRIPTIONS = {
        key=str(BTHomeExtendedSensorDeviceClass.CHANNEL),
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    # Conductivity (µS/cm)
+    # Conductivity (μS/cm)
    (
        BTHomeSensorDeviceClass.CONDUCTIVITY,
        Units.CONDUCTIVITY,
@@ -215,7 +215,7 @@ SENSOR_DESCRIPTIONS = {
        entity_category=EntityCategory.DIAGNOSTIC,
        entity_registry_enabled_default=False,
    ),
-    # PM10 (µg/m3)
+    # PM10 (μg/m3)
    (
        BTHomeSensorDeviceClass.PM10,
        Units.CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -225,7 +225,7 @@ SENSOR_DESCRIPTIONS = {
        native_unit_of_measurement=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    # PM2.5 (µg/m3)
+    # PM2.5 (μg/m3)
    (
        BTHomeSensorDeviceClass.PM25,
        Units.CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -318,7 +318,7 @@ SENSOR_DESCRIPTIONS = {
        key=str(BTHomeSensorDeviceClass.UV_INDEX),
        state_class=SensorStateClass.MEASUREMENT,
    ),
-    # Volatile organic Compounds (VOC) (µg/m3)
+    # Volatile organic Compounds (VOC) (μg/m3)
    (
        BTHomeSensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS,
        Units.CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
@@ -25,7 +25,7 @@
  "services": {
    "press": {
      "name": "Press",
-      "description": "Press the button entity."
+      "description": "Presses a button entity."
    }
  }
 }
@@ -6,5 +6,5 @@
  "documentation": "https://www.home-assistant.io/integrations/caldav",
  "iot_class": "cloud_polling",
  "loggers": ["caldav", "vobject"],
-  "requirements": ["caldav==1.6.0", "icalendar==6.1.0"]
+  "requirements": ["caldav==1.6.0", "icalendar==6.3.1"]
 }
@@ -1085,6 +1085,23 @@ async def async_handle_play_stream_service(
 async def _async_stream_endpoint_url(
    hass: HomeAssistant, camera: Camera, fmt: str
 ) -> str:
+    # Check if go2rtc HLS provider is available and supports this camera
+    if fmt == "hls":
+        try:
+            from homeassistant.components.go2rtc.const import DOMAIN as GO2RTC_DOMAIN
+            if (
+                GO2RTC_DOMAIN in hass.data
+                and "hls_provider" in hass.data[GO2RTC_DOMAIN]
+            ):
+                hls_provider = hass.data[GO2RTC_DOMAIN]["hls_provider"]
+                # Check if camera stream source is compatible with go2rtc
+                if await camera.stream_source():
+                    if hls_provider.async_is_supported(await camera.stream_source()):
+                        return await hls_provider.async_get_stream_url(camera)
+        except Exception:
+            # If go2rtc HLS fails, fall back to stream integration
+            pass
+    
    stream = await camera.async_create_stream()
    if not stream:
        raise HomeAssistantError(
@@ -255,7 +255,7 @@ class ClimateEntity(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
    )

    entity_description: ClimateEntityDescription
-    _attr_current_humidity: int | None = None
+    _attr_current_humidity: float | None = None
    _attr_current_temperature: float | None = None
    _attr_fan_mode: str | None
    _attr_fan_modes: list[str] | None
@@ -100,16 +100,10 @@ set_hvac_mode:
  fields:
    hvac_mode:
      selector:
-        select:
-          options:
-            - "off"
-            - "auto"
-            - "cool"
-            - "dry"
-            - "fan_only"
-            - "heat_cool"
-            - "heat"
-          translation_key: hvac_mode
+        state:
+          hide_states:
+            - unavailable
+            - unknown
 set_swing_mode:
  target:
    entity:
@@ -6,12 +6,16 @@ import asyncio
 from collections.abc import Callable
 from contextlib import suppress
 from datetime import datetime, timedelta
-from http import HTTPStatus
 import logging
 from typing import TYPE_CHECKING, Any

 import aiohttp
-from hass_nabucasa import Cloud, cloud_api
+from hass_nabucasa import AlexaApiError, Cloud
+from hass_nabucasa.alexa_api import (
+    AlexaAccessTokenDetails,
+    AlexaApiNeedsRelinkError,
+    AlexaApiNoTokenError,
+)
 from yarl import URL

 from homeassistant.components import persistent_notification
@@ -146,7 +150,7 @@ class CloudAlexaConfig(alexa_config.AbstractConfig):
        self._cloud_user = cloud_user
        self._prefs = prefs
        self._cloud = cloud
-        self._token = None
+        self._token: str | None = None
        self._token_valid: datetime | None = None
        self._cur_entity_prefs = async_get_assistant_settings(hass, CLOUD_ALEXA)
        self._alexa_sync_unsub: Callable[[], None] | None = None
@@ -318,32 +322,31 @@ class CloudAlexaConfig(alexa_config.AbstractConfig):

    async def async_get_access_token(self) -> str | None:
        """Get an access token."""
+        details: AlexaAccessTokenDetails | None
        if self._token_valid is not None and self._token_valid > utcnow():
            return self._token

-        resp = await cloud_api.async_alexa_access_token(self._cloud)
-        body = await resp.json()
+        try:
+            details = await self._cloud.alexa_api.access_token()
+        except AlexaApiNeedsRelinkError as exception:
+            if self.should_report_state:
+                persistent_notification.async_create(
+                    self.hass,
+                    (
+                        "There was an error reporting state to Alexa"
+                        f" ({exception.reason}). Please re-link your Alexa skill via"
+                        " the Alexa app to continue using it."
+                    ),
+                    "Alexa state reporting disabled",
+                    "cloud_alexa_report",
+                )
+            raise alexa_errors.RequireRelink from exception
+        except (AlexaApiNoTokenError, AlexaApiError) as exception:
+            raise alexa_errors.NoTokenAvailable from exception

-        if resp.status == HTTPStatus.BAD_REQUEST:
-            if body["reason"] in ("RefreshTokenNotFound", "UnknownRegion"):
-                if self.should_report_state:
-                    persistent_notification.async_create(
-                        self.hass,
-                        (
-                            "There was an error reporting state to Alexa"
-                            f" ({body['reason']}). Please re-link your Alexa skill via"
-                            " the Alexa app to continue using it."
-                        ),
-                        "Alexa state reporting disabled",
-                        "cloud_alexa_report",
-                    )
-                raise alexa_errors.RequireRelink
-
-            raise alexa_errors.NoTokenAvailable
-
-        self._token = body["access_token"]
-        self._endpoint = body["event_endpoint"]
-        self._token_valid = utcnow() + timedelta(seconds=body["expires_in"])
+        self._token = details["access_token"]
+        self._endpoint = details["event_endpoint"]
+        self._token_valid = utcnow() + timedelta(seconds=details["expires_in"])
        return self._token

    async def _async_prefs_updated(self, prefs: CloudPreferences) -> None:
@@ -7,7 +7,7 @@ from http import HTTPStatus
 import logging
 from typing import TYPE_CHECKING, Any

-from hass_nabucasa import Cloud, cloud_api
+from hass_nabucasa import Cloud
 from hass_nabucasa.google_report_state import ErrorResponse

 from homeassistant.components.binary_sensor import BinarySensorDeviceClass
@@ -377,7 +377,7 @@ class CloudGoogleConfig(AbstractConfig):
            return HTTPStatus.OK

        async with self._sync_entities_lock:
-            resp = await cloud_api.async_google_actions_request_sync(self._cloud)
+            resp = await self._cloud.google_report_state.request_sync()
            return resp.status

    async def async_connect_agent_user(self, agent_user_id: str) -> None:
@@ -13,6 +13,6 @@
  "integration_type": "system",
  "iot_class": "cloud_push",
  "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==0.110.0"],
+  "requirements": ["hass-nabucasa==1.0.0"],
  "single_config_entry": true
 }
@@ -4,11 +4,13 @@ from __future__ import annotations

 import asyncio
 import logging
-from typing import Any

-from aiohttp.client_exceptions import ClientError
-from hass_nabucasa import Cloud, cloud_api
-from hass_nabucasa.payments_api import PaymentsApiError, SubscriptionInfo
+from hass_nabucasa import (
+    Cloud,
+    MigratePaypalAgreementInfo,
+    PaymentsApiError,
+    SubscriptionInfo,
+)

 from .client import CloudClient
 from .const import REQUEST_TIMEOUT
@@ -29,17 +31,17 @@ async def async_subscription_info(cloud: Cloud[CloudClient]) -> SubscriptionInfo

 async def async_migrate_paypal_agreement(
    cloud: Cloud[CloudClient],
-) -> dict[str, Any] | None:
+) -> MigratePaypalAgreementInfo | None:
    """Migrate a paypal agreement from legacy."""
    try:
        async with asyncio.timeout(REQUEST_TIMEOUT):
-            return await cloud_api.async_migrate_paypal_agreement(cloud)
+            return await cloud.payments.migrate_paypal_agreement()
    except TimeoutError:
        _LOGGER.error(
            "A timeout of %s was reached while trying to start agreement migration",
            REQUEST_TIMEOUT,
        )
-    except ClientError as exception:
+    except PaymentsApiError as exception:
        _LOGGER.error("Failed to start agreement migration - %s", exception)

    return None
@@ -7,22 +7,18 @@ import logging

 from coinbase.rest import RESTClient
 from coinbase.rest.rest_base import HTTPError
-from coinbase.wallet.client import Client as LegacyClient
-from coinbase.wallet.error import AuthenticationError

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_API_KEY, CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import entity_registry as er
+from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.util import Throttle

 from .const import (
    ACCOUNT_IS_VAULT,
    API_ACCOUNT_AMOUNT,
    API_ACCOUNT_AVALIABLE,
-    API_ACCOUNT_BALANCE,
    API_ACCOUNT_CURRENCY,
-    API_ACCOUNT_CURRENCY_CODE,
    API_ACCOUNT_HOLD,
    API_ACCOUNT_ID,
    API_ACCOUNT_NAME,
@@ -31,12 +27,9 @@ from .const import (
    API_DATA,
    API_RATES_CURRENCY,
    API_RESOURCE_TYPE,
-    API_TYPE_VAULT,
    API_V3_ACCOUNT_ID,
    API_V3_TYPE_VAULT,
-    CONF_CURRENCIES,
    CONF_EXCHANGE_BASE,
-    CONF_EXCHANGE_RATES,
 )

 _LOGGER = logging.getLogger(__name__)
@@ -51,9 +44,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: CoinbaseConfigEntry) ->
    """Set up Coinbase from a config entry."""

    instance = await hass.async_add_executor_job(create_and_update_instance, entry)
-
-    entry.async_on_unload(entry.add_update_listener(update_listener))
-
    entry.runtime_data = instance

    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
@@ -68,68 +58,28 @@ async def async_unload_entry(hass: HomeAssistant, entry: CoinbaseConfigEntry) ->

 def create_and_update_instance(entry: CoinbaseConfigEntry) -> CoinbaseData:
    """Create and update a Coinbase Data instance."""
+
+    # Check if user is using deprecated v2 API credentials
    if "organizations" not in entry.data[CONF_API_KEY]:
-        client = LegacyClient(entry.data[CONF_API_KEY], entry.data[CONF_API_TOKEN])
-        version = "v2"
-    else:
-        client = RESTClient(
-            api_key=entry.data[CONF_API_KEY], api_secret=entry.data[CONF_API_TOKEN]
+        # Trigger reauthentication to ask user for v3 credentials
+        raise ConfigEntryAuthFailed(
+            "Your Coinbase API key appears to be for the deprecated v2 API. "
+            "Please reconfigure with a new API key created for the v3 API. "
+            "Visit https://www.coinbase.com/developer-platform to create new credentials."
        )
-        version = "v3"
+
+    client = RESTClient(
+        api_key=entry.data[CONF_API_KEY], api_secret=entry.data[CONF_API_TOKEN]
+    )
    base_rate = entry.options.get(CONF_EXCHANGE_BASE, "USD")
-    instance = CoinbaseData(client, base_rate, version)
+    instance = CoinbaseData(client, base_rate)
    instance.update()
    return instance


-async def update_listener(
-    hass: HomeAssistant, config_entry: CoinbaseConfigEntry
-) -> None:
-    """Handle options update."""
-
-    await hass.config_entries.async_reload(config_entry.entry_id)
-
-    registry = er.async_get(hass)
-    entities = er.async_entries_for_config_entry(registry, config_entry.entry_id)
-
-    # Remove orphaned entities
-    for entity in entities:
-        currency = entity.unique_id.split("-")[-1]
-        if (
-            "xe" in entity.unique_id
-            and currency not in config_entry.options.get(CONF_EXCHANGE_RATES, [])
-        ) or (
-            "wallet" in entity.unique_id
-            and currency not in config_entry.options.get(CONF_CURRENCIES, [])
-        ):
-            registry.async_remove(entity.entity_id)
-
-
-def get_accounts(client, version):
+def get_accounts(client):
    """Handle paginated accounts."""
    response = client.get_accounts()
-    if version == "v2":
-        accounts = response[API_DATA]
-        next_starting_after = response.pagination.next_starting_after
-
-        while next_starting_after:
-            response = client.get_accounts(starting_after=next_starting_after)
-            accounts += response[API_DATA]
-            next_starting_after = response.pagination.next_starting_after
-
-        return [
-            {
-                API_ACCOUNT_ID: account[API_ACCOUNT_ID],
-                API_ACCOUNT_NAME: account[API_ACCOUNT_NAME],
-                API_ACCOUNT_CURRENCY: account[API_ACCOUNT_CURRENCY][
-                    API_ACCOUNT_CURRENCY_CODE
-                ],
-                API_ACCOUNT_AMOUNT: account[API_ACCOUNT_BALANCE][API_ACCOUNT_AMOUNT],
-                ACCOUNT_IS_VAULT: account[API_RESOURCE_TYPE] == API_TYPE_VAULT,
-            }
-            for account in accounts
-        ]
-
    accounts = response[API_ACCOUNTS]
    while response["has_next"]:
        response = client.get_accounts(cursor=response["cursor"])
@@ -153,37 +103,28 @@ def get_accounts(client, version):
 class CoinbaseData:
    """Get the latest data and update the states."""

-    def __init__(self, client, exchange_base, version):
+    def __init__(self, client, exchange_base):
        """Init the coinbase data object."""

        self.client = client
        self.accounts = None
        self.exchange_base = exchange_base
        self.exchange_rates = None
-        if version == "v2":
-            self.user_id = self.client.get_current_user()[API_ACCOUNT_ID]
-        else:
-            self.user_id = (
-                "v3_" + client.get_portfolios()["portfolios"][0][API_V3_ACCOUNT_ID]
-            )
-        self.api_version = version
+        self.user_id = (
+            "v3_" + client.get_portfolios()["portfolios"][0][API_V3_ACCOUNT_ID]
+        )

    @Throttle(MIN_TIME_BETWEEN_UPDATES)
    def update(self):
        """Get the latest data from coinbase."""

        try:
-            self.accounts = get_accounts(self.client, self.api_version)
-            if self.api_version == "v2":
-                self.exchange_rates = self.client.get_exchange_rates(
-                    currency=self.exchange_base
-                )
-            else:
-                self.exchange_rates = self.client.get(
-                    "/v2/exchange-rates",
-                    params={API_RATES_CURRENCY: self.exchange_base},
-                )[API_DATA]
-        except (AuthenticationError, HTTPError) as coinbase_error:
+            self.accounts = get_accounts(self.client)
+            self.exchange_rates = self.client.get(
+                "/v2/exchange-rates",
+                params={API_RATES_CURRENCY: self.exchange_base},
+            )[API_DATA]
+        except HTTPError as coinbase_error:
            _LOGGER.error(
                "Authentication error connecting to coinbase: %s", coinbase_error
            )
--- a/Show More
+++ b/Show More