dry it up

changelog: https://github.com/home-assistant-libs/aioshelly/compare/13.20.0...13.21.0

.github/workflows/builder.yml

@@ -14,9 +14,6 @@ env:
   PIP_TIMEOUT: 60
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
-  # Base image version from https://github.com/home-assistant/docker
-  BASE_IMAGE_VERSION: "2025.11.3"
-  ARCHITECTURES: '["amd64", "aarch64"]'
 
 jobs:
   init:
@@ -24,16 +21,18 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
     outputs:
+      architectures: ${{ steps.info.outputs.architectures }}
       version: ${{ steps.version.outputs.version }}
       channel: ${{ steps.version.outputs.channel }}
       publish: ${{ steps.version.outputs.publish }}
-      architectures: ${{ env.ARCHITECTURES }}
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+        with:
+          fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -80,7 +79,7 @@ jobs:
     name: Build ${{ matrix.arch }} base core image
     if: github.repository_owner == 'home-assistant'
     needs: init
-    runs-on: ${{ matrix.os }}
+    runs-on: ubuntu-latest
     permissions:
       contents: read
       packages: write
@@ -89,14 +88,9 @@ jobs:
       fail-fast: false
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
-        include:
-          - arch: amd64
-            os: ubuntu-latest
-          - arch: aarch64
-            os: ubuntu-24.04-arm
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
@@ -122,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -190,60 +184,16 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - &install_cosign
-        name: Install Cosign
-        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
-        with:
-          cosign-release: "v2.5.3"
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.11.1
-
-      - name: Build variables
-        id: vars
-        shell: bash
-        run: |
-          echo "base_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ env.BASE_IMAGE_VERSION }}" >> "$GITHUB_OUTPUT"
-          echo "cache_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:latest" >> "$GITHUB_OUTPUT"
-          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
-
-      - name: Verify base image signature
-        run: |
-          cosign verify \
-            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
-            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
-            "${{ steps.vars.outputs.base_image }}"
-
-      - name: Verify cache image signature
-        id: cache
-        continue-on-error: true
-        run: |
-          cosign verify \
-            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
-            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
-            "${{ steps.vars.outputs.cache_image }}"
-
+      # home-assistant/builder doesn't support sha pinning
       - name: Build base image
-        id: build
-        uses: docker/build-push-action@263435318d21b8e681c14492fe198d362a7d2c83 # v6.18.0
+        uses: home-assistant/builder@2025.09.0
         with:
-          context: .
-          file: ./Dockerfile
-          platforms: ${{ steps.vars.outputs.platform }}
-          push: true
-          cache-from: ${{ steps.cache.outcome == 'success' && steps.vars.outputs.cache_image || '' }}
-          build-args: |
-            BUILD_FROM=${{ steps.vars.outputs.base_image }}
-          tags: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          labels: |
-            io.hass.arch=${{ matrix.arch }}
-            io.hass.version=${{ needs.init.outputs.version }}
-            org.opencontainers.image.created=${{ steps.vars.outputs.created }}
-            org.opencontainers.image.version=${{ needs.init.outputs.version }}
-
-      - name: Sign image
-        run: |
-          cosign sign --yes "ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}@${{ steps.build.outputs.digest }}"
+          args: |
+            $BUILD_ARGS \
+            --${{ matrix.arch }} \
+            --cosign \
+            --target /data \
+            --generic ${{ needs.init.outputs.version }}
 
   build_machine:
     name: Build ${{ matrix.machine }} machine core image
@@ -273,7 +223,7 @@ jobs:
           - green
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set build additional args
         run: |
@@ -295,7 +245,7 @@ jobs:
 
       # home-assistant/builder doesn't support sha pinning
       - name: Build base image
-        uses: home-assistant/builder@2025.11.0
+        uses: home-assistant/builder@2025.09.0
         with:
           args: |
             $BUILD_ARGS \
@@ -311,7 +261,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize git
         uses: home-assistant/actions/helpers/git-init@master
@@ -354,7 +304,13 @@ jobs:
       matrix:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
-      - *install_cosign
+      - name: Checkout the repository
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        with:
+          cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
@@ -364,94 +320,88 @@ jobs:
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
+        if: matrix.registry == 'ghcr.io/home-assistant'
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
-      - name: Verify architecture image signatures
+      - name: Build Meta Image
         shell: bash
         run: |
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
-          for arch in $ARCHS; do
-            echo "Verifying ${arch} image signature..."
-            cosign verify \
-              --certificate-oidc-issuer https://token.actions.githubusercontent.com \
-              --certificate-identity-regexp https://github.com/home-assistant/core/.* \
-              "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
-          done
-          echo "✓ All images verified successfully"
+          export DOCKER_CLI_EXPERIMENTAL=enabled
 
-      # Generate all Docker tags based on version string
-      # Version format: YYYY.MM.PATCH, YYYY.MM.PATCHbN (beta), or YYYY.MM.PATCH.devYYYYMMDDHHMM (dev)
-      # Examples:
-      #   2025.12.1     (stable)    -> tags: 2025.12.1, 2025.12, stable, latest, beta, rc
-      #   2025.12.0b3   (beta)      -> tags: 2025.12.0b3, beta, rc
-      #   2025.12.0.dev202511250240 -> tags: 2025.12.0.dev202511250240, dev
-      - name: Generate Docker metadata
-        id: meta
-        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
-        with:
-          images: ${{ matrix.registry }}/home-assistant
-          sep-tags: ","
-          tags: |
-            type=raw,value=${{ needs.init.outputs.version }},priority=9999
-            type=raw,value=dev,enable=${{ contains(needs.init.outputs.version, 'd') }}
-            type=raw,value=beta,enable=${{ !contains(needs.init.outputs.version, 'd') }}
-            type=raw,value=rc,enable=${{ !contains(needs.init.outputs.version, 'd') }}
-            type=raw,value=stable,enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}
-            type=raw,value=latest,enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}
-            type=semver,pattern={{major}}.{{minor}},value=${{ needs.init.outputs.version }},enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}
+          function create_manifest() {
+            local tag_l=${1}
+            local tag_r=${2}
+            local registry=${{ matrix.registry }}
 
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@e468171a9de216ec08956ac3ada2f0791b6bd435 # v3.7.1
+            docker manifest create "${registry}/home-assistant:${tag_l}" \
+              "${registry}/amd64-homeassistant:${tag_r}" \
+              "${registry}/aarch64-homeassistant:${tag_r}"
 
-      - name: Copy architecture images to DockerHub
-        if: matrix.registry == 'docker.io/homeassistant'
-        shell: bash
-        run: |
-          # Use imagetools to copy image blobs directly between registries
-          # This preserves provenance/attestations and seems to be much faster than pull/push
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
-          for arch in $ARCHS; do
-            echo "Copying ${arch} image to DockerHub..."
-            docker buildx imagetools create \
-              --tag "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}" \
-              "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
-            cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
-          done
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/amd64-homeassistant:${tag_r}" \
+              --os linux --arch amd64
 
-      - name: Create and push multi-arch manifests
-        shell: bash
-        run: |
-          # Build list of architecture images dynamically
-          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
-          ARCH_IMAGES=()
-          for arch in $ARCHS; do
-            ARCH_IMAGES+=("${{ matrix.registry }}/${arch}-homeassistant:${{ needs.init.outputs.version }}")
-          done
+            docker manifest annotate "${registry}/home-assistant:${tag_l}" \
+              "${registry}/aarch64-homeassistant:${tag_r}" \
+              --os linux --arch arm64 --variant=v8
 
-          # Build list of all tags for single manifest creation
-          # Note: Using sep-tags=',' in metadata-action for easier parsing
-          TAG_ARGS=()
-          IFS=',' read -ra TAGS <<< "${{ steps.meta.outputs.tags }}"
-          for tag in "${TAGS[@]}"; do
-            TAG_ARGS+=("--tag" "${tag}")
-          done
+            docker manifest push --purge "${registry}/home-assistant:${tag_l}"
+            cosign sign --yes "${registry}/home-assistant:${tag_l}"
+          }
 
-          # Create manifest with ALL tags in a single operation (much faster!)
-          echo "Creating multi-arch manifest with tags: ${TAGS[*]}"
-          docker buildx imagetools create "${TAG_ARGS[@]}" "${ARCH_IMAGES[@]}"
+          function validate_image() {
+            local image=${1}
+            if ! cosign verify --certificate-oidc-issuer https://token.actions.githubusercontent.com --certificate-identity-regexp https://github.com/home-assistant/core/.* "${image}"; then
+              echo "Invalid signature!"
+              exit 1
+            fi
+          }
 
-          # Sign each tag separately (signing requires individual tag names)
-          echo "Signing all tags..."
-          for tag in "${TAGS[@]}"; do
-            echo "Signing ${tag}"
-            cosign sign --yes "${tag}"
-          done
+          function push_dockerhub() {
+            local image=${1}
+            local tag=${2}
 
-          echo "All manifests created and signed successfully"
+            docker tag "ghcr.io/home-assistant/${image}:${tag}" "docker.io/homeassistant/${image}:${tag}"
+            docker push "docker.io/homeassistant/${image}:${tag}"
+            cosign sign --yes "docker.io/homeassistant/${image}:${tag}"
+          }
+
+          # Pull images from github container registry and verify signature
+          docker pull "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          docker pull "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          validate_image "ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}"
+          validate_image "ghcr.io/home-assistant/aarch64-homeassistant:${{ needs.init.outputs.version }}"
+
+          if [[ "${{ matrix.registry }}" ==  "docker.io/homeassistant" ]]; then
+            # Upload images to dockerhub
+            push_dockerhub "amd64-homeassistant" "${{ needs.init.outputs.version }}"
+            push_dockerhub "aarch64-homeassistant" "${{ needs.init.outputs.version }}"
+          fi
+
+          # Create version tag
+          create_manifest "${{ needs.init.outputs.version }}" "${{ needs.init.outputs.version }}"
+
+          # Create general tags
+          if [[ "${{ needs.init.outputs.version }}" =~ d ]]; then
+            create_manifest "dev" "${{ needs.init.outputs.version }}"
+          elif [[ "${{ needs.init.outputs.version }}" =~ b ]]; then
+            create_manifest "beta" "${{ needs.init.outputs.version }}"
+            create_manifest "rc" "${{ needs.init.outputs.version }}"
+          else
+            create_manifest "stable" "${{ needs.init.outputs.version }}"
+            create_manifest "latest" "${{ needs.init.outputs.version }}"
+            create_manifest "beta" "${{ needs.init.outputs.version }}"
+            create_manifest "rc" "${{ needs.init.outputs.version }}"
+
+            # Create series version tag (e.g. 2021.6)
+            v="${{ needs.init.outputs.version }}"
+            create_manifest "${v%.*}" "${{ needs.init.outputs.version }}"
+          fi
 
   build_python:
     name: Build PyPi package
@@ -464,10 +414,10 @@ jobs:
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -509,7 +459,7 @@ jobs:
       HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
     steps:
       - name: Checkout repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Login to GitHub Container Registry
         uses: docker/login-action@5e57cd118135c172c3672efd75eb46360885c0ef # v3.6.0

.github/workflows/ci.yaml

@@ -40,9 +40,9 @@ env:
   CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.1"
-  DEFAULT_PYTHON: "3.13.9"
-  ALL_PYTHON_VERSIONS: "['3.13.9', '3.14.0']"
+  HA_SHORT_VERSION: "2025.12"
+  DEFAULT_PYTHON: "3.13"
+  ALL_PYTHON_VERSIONS: "['3.13', '3.14']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -99,7 +99,7 @@ jobs:
     steps:
       - &checkout
         name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
       - name: Generate partial Python venv restore key
         id: generate_python_cache_key
         run: |
@@ -257,7 +257,7 @@ jobs:
       - &setup-python-default
         name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: &actions-setup-python actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: &actions-setup-python actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true

.github/workflows/codeql.yml

@@ -21,14 +21,14 @@ jobs:
 
     steps:
       - name: Check out code from GitHub
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
+        uses: github/codeql-action/init@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@fe4161a26a8629af62121b670040955b330f9af2 # v4.31.6
+        uses: github/codeql-action/analyze@e12f0178983d466f2f6028f5cc7a6d786fd97f4b # v4.31.4
         with:
           category: "/language:python"

.github/workflows/detect-duplicate-issues.yml

@@ -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@334892bb203895caaed82ec52d23c1ed9385151e # v2.0.4
+        uses: actions/ai-inference@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
         with:
           model: openai/gpt-4o
           system-prompt: |

.github/workflows/detect-non-english-issues.yml

@@ -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@334892bb203895caaed82ec52d23c1ed9385151e # v2.0.4
+        uses: actions/ai-inference@a1c11829223a786afe3b5663db904a3aa1eac3a2 # v2.0.1
         with:
           model: openai/gpt-4o-mini
           system-prompt: |

.github/workflows/stale.yml

@@ -17,7 +17,7 @@ jobs:
       # - No PRs marked as no-stale
       # - No issues (-1)
       - name: 60 days stale PRs policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ secrets.GITHUB_TOKEN }}
           days-before-stale: 60
@@ -57,7 +57,7 @@ jobs:
       # - No issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: 90 days stale issues
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           days-before-stale: 90
@@ -87,7 +87,7 @@ jobs:
       # - No Issues marked as no-stale or help-wanted
       # - No PRs (-1)
       - name: Needs more information stale issues policy
-        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
+        uses: actions/stale@5f858e3efba33a5ca4407a664cc011ad407f2008 # v10.1.0
         with:
           repo-token: ${{ steps.token.outputs.token }}
           only-labels: "needs-more-information"

.github/workflows/translations.yml

@@ -19,10 +19,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -28,14 +28,16 @@ jobs:
     name: Initialize wheels builder
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
+    outputs:
+      architectures: ${{ steps.info.outputs.architectures }}
     steps:
       - &checkout
         name: Checkout the repository
-        uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
+        uses: actions/checkout@1af3b93b6815bc44a9784bd300feb67ff0d1eeb3 # v6.0.0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@83679a892e2d95755f2dac6acb0bfd1e9ac5d548 # v6.1.0
+        uses: actions/setup-python@e797f83bcb11b83ae66e0230d6156d7c80228e7c # v6.0.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -48,6 +50,10 @@ jobs:
           pip install "$(grep '^uv' < requirements.txt)"
           uv pip install -r requirements.txt
 
+      - name: Get information
+        id: info
+        uses: home-assistant/actions/helpers/info@master
+
       - name: Create requirements_diff file
         run: |
           if [[ ${{ github.event_name }} =~ (schedule|workflow_dispatch) ]]; then
@@ -108,10 +114,9 @@ jobs:
       fail-fast: false
       matrix: &matrix-build
         abi: ["cp313", "cp314"]
-        arch: ["amd64", "aarch64"]
+        arch: ${{ fromJson(needs.init.outputs.architectures) }}
         include:
-          - arch: amd64
-            os: ubuntu-latest
+          - os: ubuntu-latest
           - arch: aarch64
             os: ubuntu-24.04-arm
     steps:
@@ -135,8 +140,9 @@ jobs:
           sed -i "/uv/d" requirements.txt
           sed -i "/uv/d" requirements_diff.txt
 
+      # home-assistant/wheels doesn't support sha pinning
       - name: Build wheels
-        uses: &home-assistant-wheels home-assistant/wheels@e5742a69d69f0e274e2689c998900c7d19652c21 # 2025.12.0
+        uses: &home-assistant-wheels home-assistant/wheels@2025.10.0
         with:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
@@ -177,6 +183,7 @@ jobs:
           sed -i "/uv/d" requirements.txt
           sed -i "/uv/d" requirements_diff.txt
 
+      # home-assistant/wheels doesn't support sha pinning
       - name: Build wheels
         uses: *home-assistant-wheels
         with:

.pre-commit-config.yaml

@@ -94,7 +94,7 @@ repos:
         pass_filenames: false
         language: script
         types: [text]
-        files: ^(script/hassfest/(metadata|docker)\.py|homeassistant/const\.py$|pyproject\.toml)$
+        files: ^(script/hassfest/metadata\.py|homeassistant/const\.py$|pyproject\.toml|homeassistant/components/go2rtc/const\.py)$
       - id: hassfest-mypy-config
         name: hassfest-mypy-config
         entry: script/run-in-env.sh python3 -m script.hassfest -p mypy_config

.strict-typing

@@ -120,6 +120,7 @@ homeassistant.components.blueprint.*
 homeassistant.components.bluesound.*
 homeassistant.components.bluetooth.*
 homeassistant.components.bluetooth_adapters.*
+homeassistant.components.bluetooth_tracker.*
 homeassistant.components.bmw_connected_drive.*
 homeassistant.components.bond.*
 homeassistant.components.bosch_alarm.*
@@ -187,7 +188,6 @@ homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
 homeassistant.components.energenie_power_sockets.*
 homeassistant.components.energy.*
-homeassistant.components.energyid.*
 homeassistant.components.energyzero.*
 homeassistant.components.enigma2.*
 homeassistant.components.enphase_envoy.*

CODEOWNERS

@@ -121,8 +121,6 @@ build.json @home-assistant/supervisor
 /tests/components/androidtv/ @JeffLIrion @ollo69
 /homeassistant/components/androidtv_remote/ @tronikos @Drafteed
 /tests/components/androidtv_remote/ @tronikos @Drafteed
-/homeassistant/components/anglian_water/ @pantherale0
-/tests/components/anglian_water/ @pantherale0
 /homeassistant/components/anova/ @Lash-L
 /tests/components/anova/ @Lash-L
 /homeassistant/components/anthemav/ @hyralex
@@ -185,8 +183,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/automation/ @home-assistant/core
 /tests/components/automation/ @home-assistant/core
 /homeassistant/components/avea/ @pattyland
-/homeassistant/components/awair/ @ahayworth @ricohageman
-/tests/components/awair/ @ahayworth @ricohageman
+/homeassistant/components/awair/ @ahayworth @danielsjf
+/tests/components/awair/ @ahayworth @danielsjf
 /homeassistant/components/aws_s3/ @tomasbedrich
 /tests/components/aws_s3/ @tomasbedrich
 /homeassistant/components/axis/ @Kane610
@@ -452,8 +450,6 @@ build.json @home-assistant/supervisor
 /tests/components/energenie_power_sockets/ @gnumpi
 /homeassistant/components/energy/ @home-assistant/core
 /tests/components/energy/ @home-assistant/core
-/homeassistant/components/energyid/ @JrtPec @Molier
-/tests/components/energyid/ @JrtPec @Molier
 /homeassistant/components/energyzero/ @klaasnicolaas
 /tests/components/energyzero/ @klaasnicolaas
 /homeassistant/components/enigma2/ @autinerd
@@ -476,8 +472,6 @@ build.json @home-assistant/supervisor
 /tests/components/escea/ @lazdavila
 /homeassistant/components/esphome/ @jesserockz @kbx81 @bdraco
 /tests/components/esphome/ @jesserockz @kbx81 @bdraco
-/homeassistant/components/essent/ @jaapp
-/tests/components/essent/ @jaapp
 /homeassistant/components/eufylife_ble/ @bdr99
 /tests/components/eufylife_ble/ @bdr99
 /homeassistant/components/event/ @home-assistant/core
@@ -539,8 +533,6 @@ build.json @home-assistant/supervisor
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
-/homeassistant/components/fressnapf_tracker/ @eifinger
-/tests/components/fressnapf_tracker/ @eifinger
 /homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
@@ -599,8 +591,6 @@ build.json @home-assistant/supervisor
 /tests/components/goodwe/ @mletenay @starkillerOG
 /homeassistant/components/google/ @allenporter
 /tests/components/google/ @allenporter
-/homeassistant/components/google_air_quality/ @Thomas55555
-/tests/components/google_air_quality/ @Thomas55555
 /homeassistant/components/google_assistant/ @home-assistant/cloud
 /tests/components/google_assistant/ @home-assistant/cloud
 /homeassistant/components/google_assistant_sdk/ @tronikos
@@ -710,8 +700,6 @@ build.json @home-assistant/supervisor
 /tests/components/huawei_lte/ @scop @fphammerle
 /homeassistant/components/hue/ @marcelveldt
 /tests/components/hue/ @marcelveldt
-/homeassistant/components/hue_ble/ @flip-dots
-/tests/components/hue_ble/ @flip-dots
 /homeassistant/components/huisbaasje/ @dennisschroer
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
@@ -1763,7 +1751,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/vilfo/ @ManneW
 /tests/components/vilfo/ @ManneW
 /homeassistant/components/vivotek/ @HarlemSquirrel
-/tests/components/vivotek/ @HarlemSquirrel
 /homeassistant/components/vizio/ @raman325
 /tests/components/vizio/ @raman325
 /homeassistant/components/vlc_telnet/ @rodripf @MartinHjelmare

Dockerfile

@@ -4,33 +4,32 @@
 ARG BUILD_FROM
 FROM ${BUILD_FROM}
 
-LABEL \
-    io.hass.type="core" \
-    org.opencontainers.image.authors="The Home Assistant Authors" \
-    org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
-    org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
-    org.opencontainers.image.licenses="Apache-2.0" \
-    org.opencontainers.image.source="https://github.com/home-assistant/core" \
-    org.opencontainers.image.title="Home Assistant" \
-    org.opencontainers.image.url="https://www.home-assistant.io/"
-
 # Synchronize with homeassistant/core.py:async_stop
 ENV \
     S6_SERVICES_GRACETIME=240000 \
     UV_SYSTEM_PYTHON=true \
     UV_NO_CACHE=true
 
+ARG QEMU_CPU
+
 # Home Assistant S6-Overlay
 COPY rootfs /
 
-# Add go2rtc binary
-COPY --from=ghcr.io/alexxit/go2rtc@sha256:baef0aa19d759fcfd31607b34ce8eaf039d496282bba57731e6ae326896d7640 /usr/local/bin/go2rtc /bin/go2rtc
-
+# Needs to be redefined inside the FROM statement to be set for RUN commands
+ARG BUILD_ARCH
+# Get go2rtc binary
 RUN \
+    case "${BUILD_ARCH}" in \
+        "aarch64") go2rtc_suffix='arm64' ;; \
+        *) go2rtc_suffix=${BUILD_ARCH} ;; \
+    esac \
+    && curl -L https://github.com/AlexxIT/go2rtc/releases/download/v1.9.12/go2rtc_linux_${go2rtc_suffix} --output /bin/go2rtc \
+    && chmod +x /bin/go2rtc \
     # Verify go2rtc can be executed
-    go2rtc --version \
-    # Install uv
-    && pip3 install uv==0.9.6
+    && go2rtc --version
+
+# Install uv
+RUN pip3 install uv==0.9.6
 
 WORKDIR /usr/src
 

Dockerfile.dev

@@ -35,22 +35,25 @@ COPY --from=ghcr.io/astral-sh/uv:latest /uv /usr/local/bin/uv
 
 USER vscode
 
+COPY .python-version ./
+RUN uv python install
+
 ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"
-RUN --mount=type=bind,source=.python-version,target=.python-version \
-    uv python install \
-    && uv venv $VIRTUAL_ENV
+RUN uv venv $VIRTUAL_ENV
 ENV PATH="$VIRTUAL_ENV/bin:$PATH"
 
+WORKDIR /tmp
+
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release ~/hass-release \
     && uv pip install -e ~/hass-release/
 
 # Install Python dependencies from requirements
-RUN --mount=type=bind,source=requirements.txt,target=requirements.txt \
-    --mount=type=bind,source=homeassistant/package_constraints.txt,target=homeassistant/package_constraints.txt \
-    --mount=type=bind,source=requirements_test.txt,target=requirements_test.txt \
-    --mount=type=bind,source=requirements_test_pre_commit.txt,target=requirements_test_pre_commit.txt \
-    uv pip install -r requirements.txt -r requirements_test.txt
+COPY requirements.txt ./
+COPY homeassistant/package_constraints.txt homeassistant/package_constraints.txt
+RUN uv pip install -r requirements.txt
+COPY requirements_test.txt requirements_test_pre_commit.txt ./
+RUN uv pip install -r requirements_test.txt
 
 WORKDIR /workspaces
 

build.yaml

@@ -0,0 +1,16 @@
+image: ghcr.io/home-assistant/{arch}-homeassistant
+build_from:
+  aarch64: ghcr.io/home-assistant/aarch64-homeassistant-base:2025.11.0
+  amd64: ghcr.io/home-assistant/amd64-homeassistant-base:2025.11.0
+cosign:
+  base_identity: https://github.com/home-assistant/docker/.*
+  identity: https://github.com/home-assistant/core/.*
+labels:
+  io.hass.type: core
+  org.opencontainers.image.title: Home Assistant
+  org.opencontainers.image.description: Open-source home automation platform running on Python 3
+  org.opencontainers.image.source: https://github.com/home-assistant/core
+  org.opencontainers.image.authors: The Home Assistant Authors
+  org.opencontainers.image.url: https://www.home-assistant.io/
+  org.opencontainers.image.documentation: https://www.home-assistant.io/docs/
+  org.opencontainers.image.licenses: Apache-2.0

homeassistant/auth/permissions/events.py

@@ -7,7 +7,6 @@ from typing import Any, Final
 from homeassistant.const import (
     EVENT_COMPONENT_LOADED,
     EVENT_CORE_CONFIG_UPDATE,
-    EVENT_LABS_UPDATED,
     EVENT_LOVELACE_UPDATED,
     EVENT_PANELS_UPDATED,
     EVENT_RECORDER_5MIN_STATISTICS_GENERATED,
@@ -46,7 +45,6 @@ SUBSCRIBE_ALLOWLIST: Final[set[EventType[Any] | str]] = {
     EVENT_STATE_CHANGED,
     EVENT_THEMES_UPDATED,
     EVENT_LABEL_REGISTRY_UPDATED,
-    EVENT_LABS_UPDATED,
     EVENT_CATEGORY_REGISTRY_UPDATED,
     EVENT_FLOOR_REGISTRY_UPDATED,
 }

homeassistant/bootstrap.py

@@ -1000,7 +1000,7 @@ class _WatchPendingSetups:
             # We log every LOG_SLOW_STARTUP_INTERVAL until all integrations are done
             # once we take over LOG_SLOW_STARTUP_INTERVAL (60s) to start up
             _LOGGER.warning(
-                "Waiting for integrations to complete setup: %s",
+                "Waiting on integrations to complete setup: %s",
                 self._setup_started,
             )
 

homeassistant/brands/google.json

@@ -2,7 +2,6 @@
   "domain": "google",
   "name": "Google",
   "integrations": [
-    "google_air_quality",
     "google_assistant",
     "google_assistant_sdk",
     "google_cloud",

homeassistant/brands/philips.json

@@ -1,5 +1,5 @@
 {
   "domain": "philips",
   "name": "Philips",
-  "integrations": ["dynalite", "hue", "hue_ble", "philips_js"]
+  "integrations": ["dynalite", "hue", "philips_js"]
 }

homeassistant/brands/raspberry_pi.json

@@ -1,5 +1,5 @@
 {
   "domain": "raspberry_pi",
   "name": "Raspberry Pi",
-  "integrations": ["raspberry_pi", "rpi_power", "remote_rpi_gpio"]
+  "integrations": ["raspberry_pi", "rpi_camera", "rpi_power", "remote_rpi_gpio"]
 }

homeassistant/components/airobot/climate.py

@@ -75,19 +75,9 @@ class AirobotClimate(AirobotEntity, ClimateEntity):
 
     @property
     def current_temperature(self) -> float | None:
-        """Return the current temperature.
-
-        If floor temperature is available, thermostat is set up for floor heating.
-        """
-        if self._status.temp_floor is not None:
-            return self._status.temp_floor
+        """Return the current temperature."""
         return self._status.temp_air
 
-    @property
-    def current_humidity(self) -> float | None:
-        """Return the current humidity."""
-        return self._status.hum_air
-
     @property
     def target_temperature(self) -> float | None:
         """Return the target temperature."""
@@ -136,13 +126,6 @@ class AirobotClimate(AirobotEntity, ClimateEntity):
 
         await self.coordinator.async_request_refresh()
 
-    async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
-        """Set HVAC mode.
-
-        This thermostat only supports HEAT mode. The climate platform validates
-        that only supported modes are passed, so this method is a no-op.
-        """
-
     async def async_set_preset_mode(self, preset_mode: str) -> None:
         """Set new preset mode."""
         try:

homeassistant/components/airobot/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 from dataclasses import dataclass
 import logging
 from typing import Any
@@ -175,56 +174,6 @@ class AirobotConfigFlow(BaseConfigFlow, domain=DOMAIN):
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle reauthentication upon an API authentication error."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm reauthentication dialog."""
-        errors: dict[str, str] = {}
-        reauth_entry = self._get_reauth_entry()
-
-        if user_input is not None:
-            # Combine existing data with new password
-            data = {
-                CONF_HOST: reauth_entry.data[CONF_HOST],
-                CONF_USERNAME: reauth_entry.data[CONF_USERNAME],
-                CONF_PASSWORD: user_input[CONF_PASSWORD],
-            }
-
-            try:
-                await validate_input(self.hass, data)
-            except CannotConnect:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_update_reload_and_abort(
-                    reauth_entry,
-                    data_updates={CONF_PASSWORD: user_input[CONF_PASSWORD]},
-                )
-
-        return self.async_show_form(
-            step_id="reauth_confirm",
-            data_schema=vol.Schema(
-                {
-                    vol.Required(CONF_PASSWORD): str,
-                }
-            ),
-            description_placeholders={
-                "username": reauth_entry.data[CONF_USERNAME],
-                "host": reauth_entry.data[CONF_HOST],
-            },
-            errors=errors,
-        )
-
 
 class CannotConnect(HomeAssistantError):
     """Error to indicate we cannot connect."""

homeassistant/components/airobot/coordinator.py

@@ -11,7 +11,6 @@ from pyairobotrest.exceptions import AirobotAuthError, AirobotConnectionError
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_USERNAME
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
@@ -54,15 +53,7 @@ class AirobotDataUpdateCoordinator(DataUpdateCoordinator[AirobotData]):
         try:
             status = await self.client.get_statuses()
             settings = await self.client.get_settings()
-        except AirobotAuthError as err:
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="authentication_failed",
-            ) from err
-        except AirobotConnectionError as err:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="connection_failed",
-            ) from err
+        except (AirobotAuthError, AirobotConnectionError) as err:
+            raise UpdateFailed(f"Failed to communicate with device: {err}") from err
 
         return AirobotData(status=status, settings=settings)

homeassistant/components/airobot/manifest.json

@@ -12,6 +12,6 @@
   "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pyairobotrest"],
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["pyairobotrest==0.1.0"]
 }

homeassistant/components/airobot/quality_scale.yaml

@@ -34,7 +34,7 @@ rules:
   integration-owner: done
   log-when-unavailable: done
   parallel-updates: done
-  reauthentication-flow: done
+  reauthentication-flow: todo
   test-coverage: done
 
   # Gold
@@ -59,9 +59,7 @@ rules:
   exception-translations: done
   icon-translations: todo
   reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: This integration doesn't have any cases where raising an issue is needed.
+  repair-issues: todo
   stale-devices:
     status: exempt
     comment: Single device integration, no stale device handling needed.

homeassistant/components/airobot/strings.json

@@ -1,8 +1,7 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -15,24 +14,15 @@
           "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "password": "[%key:component::airobot::config::step::user::data_description::password%]"
+          "password": "The thermostat password."
         },
         "description": "Airobot thermostat {device_id} discovered at {host}. Enter the password to complete setup. Find the password in the thermostat settings menu under Connectivity → Mobile app."
       },
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airobot::config::step::user::data_description::password%]"
-        },
-        "description": "The authentication for Airobot thermostat at {host} (Device ID: {username}) has expired. Please enter the password to reauthenticate. Find the password in the thermostat settings menu under Connectivity → Mobile app."
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]",
-          "username": "Device ID"
+          "username": "[%key:common::config_flow::data::username%]"
         },
         "data_description": {
           "host": "The hostname or IP address of your Airobot thermostat.",
@@ -44,12 +34,6 @@
     }
   },
   "exceptions": {
-    "authentication_failed": {
-      "message": "Authentication failed, please reauthenticate."
-    },
-    "connection_failed": {
-      "message": "Failed to communicate with device."
-    },
     "set_preset_mode_failed": {
       "message": "Failed to set preset mode to {preset_mode}."
     },

homeassistant/components/alarm_control_panel/icons.json

@@ -36,28 +36,5 @@
     "alarm_trigger": {
       "service": "mdi:bell-ring"
     }
-  },
-  "triggers": {
-    "armed": {
-      "trigger": "mdi:shield"
-    },
-    "armed_away": {
-      "trigger": "mdi:shield-lock"
-    },
-    "armed_home": {
-      "trigger": "mdi:shield-home"
-    },
-    "armed_night": {
-      "trigger": "mdi:shield-moon"
-    },
-    "armed_vacation": {
-      "trigger": "mdi:shield-airplane"
-    },
-    "disarmed": {
-      "trigger": "mdi:shield-off"
-    },
-    "triggered": {
-      "trigger": "mdi:bell-ring"
-    }
   }
 }

homeassistant/components/alarm_control_panel/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted alarms to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "device_automation": {
     "action_type": {
       "arm_away": "Arm {entity_name} away",
@@ -75,15 +71,6 @@
       "message": "Arming requires a code but none was given for {entity_id}."
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "alarm_arm_away": {
       "description": "Arms the alarm in the away mode.",
@@ -156,77 +143,5 @@
       "name": "Trigger"
     }
   },
-  "title": "Alarm control panel",
-  "triggers": {
-    "armed": {
-      "description": "Triggers after one or more alarms become armed, regardless of the mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm armed"
-    },
-    "armed_away": {
-      "description": "Triggers after one or more alarms become armed in away mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm armed away"
-    },
-    "armed_home": {
-      "description": "Triggers after one or more alarms become armed in home mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm armed home"
-    },
-    "armed_night": {
-      "description": "Triggers after one or more alarms become armed in night mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm armed night"
-    },
-    "armed_vacation": {
-      "description": "Triggers after one or more alarms become armed in vacation mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm armed vacation"
-    },
-    "disarmed": {
-      "description": "Triggers after one or more alarms become disarmed.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm disarmed"
-    },
-    "triggered": {
-      "description": "Triggers after one or more alarms become triggered.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::alarm_control_panel::common::trigger_behavior_description%]",
-          "name": "[%key:component::alarm_control_panel::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Alarm triggered"
-    }
-  }
+  "title": "Alarm control panel"
 }

homeassistant/components/alarm_control_panel/trigger.py

@@ -1,99 +0,0 @@
-"""Provides triggers for alarm control panels."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import get_supported_features
-from homeassistant.helpers.trigger import (
-    EntityStateTriggerBase,
-    Trigger,
-    make_conditional_entity_state_trigger,
-    make_entity_state_trigger,
-)
-
-from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelState
-
-
-def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool:
-    """Get the device class of an entity or UNDEFINED if not found."""
-    try:
-        return bool(get_supported_features(hass, entity_id) & features)
-    except HomeAssistantError:
-        return False
-
-
-class EntityStateTriggerRequiredFeatures(EntityStateTriggerBase):
-    """Trigger for entity state changes."""
-
-    _required_features: int
-
-    def entity_filter(self, entities: set[str]) -> set[str]:
-        """Filter entities of this domain."""
-        entities = super().entity_filter(entities)
-        return {
-            entity_id
-            for entity_id in entities
-            if supports_feature(self._hass, entity_id, self._required_features)
-        }
-
-
-def make_entity_state_trigger_required_features(
-    domain: str, to_state: str, required_features: int
-) -> type[EntityStateTriggerBase]:
-    """Create an entity state trigger class."""
-
-    class CustomTrigger(EntityStateTriggerRequiredFeatures):
-        """Trigger for entity state changes."""
-
-        _domain = domain
-        _to_state = to_state
-        _required_features = required_features
-
-    return CustomTrigger
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "armed": make_conditional_entity_state_trigger(
-        DOMAIN,
-        from_states={
-            AlarmControlPanelState.ARMING,
-            AlarmControlPanelState.DISARMED,
-            AlarmControlPanelState.DISARMING,
-            AlarmControlPanelState.PENDING,
-            AlarmControlPanelState.TRIGGERED,
-        },
-        to_states={
-            AlarmControlPanelState.ARMED_AWAY,
-            AlarmControlPanelState.ARMED_CUSTOM_BYPASS,
-            AlarmControlPanelState.ARMED_HOME,
-            AlarmControlPanelState.ARMED_NIGHT,
-            AlarmControlPanelState.ARMED_VACATION,
-        },
-    ),
-    "armed_away": make_entity_state_trigger_required_features(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_AWAY,
-        AlarmControlPanelEntityFeature.ARM_AWAY,
-    ),
-    "armed_home": make_entity_state_trigger_required_features(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_HOME,
-        AlarmControlPanelEntityFeature.ARM_HOME,
-    ),
-    "armed_night": make_entity_state_trigger_required_features(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_NIGHT,
-        AlarmControlPanelEntityFeature.ARM_NIGHT,
-    ),
-    "armed_vacation": make_entity_state_trigger_required_features(
-        DOMAIN,
-        AlarmControlPanelState.ARMED_VACATION,
-        AlarmControlPanelEntityFeature.ARM_VACATION,
-    ),
-    "disarmed": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.DISARMED),
-    "triggered": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.TRIGGERED),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for alarm control panels."""
-    return TRIGGERS

homeassistant/components/alarm_control_panel/triggers.yaml

@@ -1,53 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: alarm_control_panel
-  fields: &trigger_common_fields
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-armed: *trigger_common
-
-armed_away:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_AWAY
-
-armed_home:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_HOME
-
-armed_night:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_NIGHT
-
-armed_vacation:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: alarm_control_panel
-      supported_features:
-        - alarm_control_panel.AlarmControlPanelEntityFeature.ARM_VACATION
-
-disarmed: *trigger_common
-
-triggered: *trigger_common

homeassistant/components/alexa_devices/coordinator.py

@@ -21,7 +21,7 @@ from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, Upda
 
 from .const import _LOGGER, CONF_LOGIN_DATA, DOMAIN
 
-SCAN_INTERVAL = 300
+SCAN_INTERVAL = 30
 
 type AmazonConfigEntry = ConfigEntry[AmazonDevicesCoordinator]
 
@@ -45,7 +45,7 @@ class AmazonDevicesCoordinator(DataUpdateCoordinator[dict[str, AmazonDevice]]):
             config_entry=entry,
             update_interval=timedelta(seconds=SCAN_INTERVAL),
             request_refresh_debouncer=Debouncer(
-                hass, _LOGGER, cooldown=SCAN_INTERVAL, immediate=False
+                hass, _LOGGER, cooldown=30, immediate=False
             ),
         )
         self.api = AmazonEchoApi(

homeassistant/components/alexa_devices/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["aioamazondevices"],
   "quality_scale": "platinum",
-  "requirements": ["aioamazondevices==10.0.0"]
+  "requirements": ["aioamazondevices==9.0.2"]
 }

homeassistant/components/anglian_water/__init__.py

@@ -1,74 +0,0 @@
-"""The Anglian Water integration."""
-
-from __future__ import annotations
-
-from aiohttp import CookieJar
-from pyanglianwater import AnglianWater
-from pyanglianwater.auth import MSOB2CAuth
-from pyanglianwater.exceptions import (
-    ExpiredAccessTokenError,
-    SelfAssertedError,
-    SmartMeterUnavailableError,
-)
-
-from homeassistant.const import (
-    CONF_ACCESS_TOKEN,
-    CONF_PASSWORD,
-    CONF_USERNAME,
-    Platform,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryError
-from homeassistant.helpers.aiohttp_client import async_create_clientsession
-
-from .const import CONF_ACCOUNT_NUMBER, DOMAIN
-from .coordinator import AnglianWaterConfigEntry, AnglianWaterUpdateCoordinator
-
-_PLATFORMS: list[Platform] = [Platform.SENSOR]
-
-
-async def async_setup_entry(
-    hass: HomeAssistant, entry: AnglianWaterConfigEntry
-) -> bool:
-    """Set up Anglian Water from a config entry."""
-    auth = MSOB2CAuth(
-        username=entry.data[CONF_USERNAME],
-        password=entry.data[CONF_PASSWORD],
-        session=async_create_clientsession(
-            hass,
-            cookie_jar=CookieJar(quote_cookie=False),
-        ),
-        refresh_token=entry.data[CONF_ACCESS_TOKEN],
-        account_number=entry.data[CONF_ACCOUNT_NUMBER],
-    )
-    try:
-        await auth.send_refresh_request()
-    except (ExpiredAccessTokenError, SelfAssertedError) as err:
-        raise ConfigEntryAuthFailed from err
-
-    _aw = AnglianWater(authenticator=auth)
-
-    try:
-        await _aw.validate_smart_meter()
-    except SmartMeterUnavailableError as err:
-        raise ConfigEntryError(
-            translation_domain=DOMAIN, translation_key="smart_meter_unavailable"
-        ) from err
-
-    hass.config_entries.async_update_entry(
-        entry, data={**entry.data, CONF_ACCESS_TOKEN: auth.refresh_token}
-    )
-    entry.runtime_data = coordinator = AnglianWaterUpdateCoordinator(
-        hass=hass, api=_aw, config_entry=entry
-    )
-
-    await coordinator.async_config_entry_first_refresh()
-    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
-    return True
-
-
-async def async_unload_entry(
-    hass: HomeAssistant, entry: AnglianWaterConfigEntry
-) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)

homeassistant/components/anglian_water/config_flow.py

@@ -1,103 +0,0 @@
-"""Config flow for the Anglian Water integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from aiohttp import CookieJar
-from pyanglianwater import AnglianWater
-from pyanglianwater.auth import BaseAuth, MSOB2CAuth
-from pyanglianwater.exceptions import (
-    InvalidAccountIdError,
-    SelfAssertedError,
-    SmartMeterUnavailableError,
-)
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ACCESS_TOKEN, CONF_PASSWORD, CONF_USERNAME
-from homeassistant.helpers import selector
-from homeassistant.helpers.aiohttp_client import async_create_clientsession
-
-from .const import CONF_ACCOUNT_NUMBER, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): selector.TextSelector(),
-        vol.Required(CONF_PASSWORD): selector.TextSelector(
-            selector.TextSelectorConfig(type=selector.TextSelectorType.PASSWORD)
-        ),
-    }
-)
-
-
-async def validate_credentials(auth: MSOB2CAuth) -> str | MSOB2CAuth:
-    """Validate the provided credentials."""
-    try:
-        await auth.send_login_request()
-    except SelfAssertedError:
-        return "invalid_auth"
-    except Exception:
-        _LOGGER.exception("Unexpected exception")
-        return "unknown"
-    _aw = AnglianWater(authenticator=auth)
-    try:
-        await _aw.validate_smart_meter()
-    except (InvalidAccountIdError, SmartMeterUnavailableError):
-        return "smart_meter_unavailable"
-    return auth
-
-
-class AnglianWaterConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Anglian Water."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors: dict[str, str] = {}
-        if user_input is not None:
-            validation_response = await validate_credentials(
-                MSOB2CAuth(
-                    username=user_input[CONF_USERNAME],
-                    password=user_input[CONF_PASSWORD],
-                    session=async_create_clientsession(
-                        self.hass,
-                        cookie_jar=CookieJar(quote_cookie=False),
-                    ),
-                    account_number=user_input.get(CONF_ACCOUNT_NUMBER),
-                )
-            )
-            if isinstance(validation_response, BaseAuth):
-                account_number = (
-                    user_input.get(CONF_ACCOUNT_NUMBER)
-                    or validation_response.account_number
-                )
-                await self.async_set_unique_id(account_number)
-                self._abort_if_unique_id_configured()
-                return self.async_create_entry(
-                    title=account_number,
-                    data={
-                        **user_input,
-                        CONF_ACCESS_TOKEN: validation_response.refresh_token,
-                        CONF_ACCOUNT_NUMBER: account_number,
-                    },
-                )
-            if validation_response == "smart_meter_unavailable":
-                return self.async_show_form(
-                    step_id="user",
-                    data_schema=STEP_USER_DATA_SCHEMA.extend(
-                        {
-                            vol.Required(CONF_ACCOUNT_NUMBER): selector.TextSelector(),
-                        }
-                    ),
-                    errors={"base": validation_response},
-                )
-            errors["base"] = validation_response
-
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
-        )

homeassistant/components/anglian_water/const.py

@@ -1,4 +0,0 @@
-"""Constants for the Anglian Water integration."""
-
-DOMAIN = "anglian_water"
-CONF_ACCOUNT_NUMBER = "account_number"

homeassistant/components/anglian_water/coordinator.py

@@ -1,49 +0,0 @@
-"""Anglian Water data coordinator."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-
-from pyanglianwater import AnglianWater
-from pyanglianwater.exceptions import ExpiredAccessTokenError, UnknownEndpointError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-type AnglianWaterConfigEntry = ConfigEntry[AnglianWaterUpdateCoordinator]
-
-_LOGGER = logging.getLogger(__name__)
-UPDATE_INTERVAL = timedelta(minutes=60)
-
-
-class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
-    """Anglian Water data update coordinator."""
-
-    config_entry: AnglianWaterConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        api: AnglianWater,
-        config_entry: AnglianWaterConfigEntry,
-    ) -> None:
-        """Initialize update coordinator."""
-        super().__init__(
-            hass=hass,
-            logger=_LOGGER,
-            name=DOMAIN,
-            update_interval=UPDATE_INTERVAL,
-            config_entry=config_entry,
-        )
-        self.api = api
-
-    async def _async_update_data(self) -> None:
-        """Update data from Anglian Water's API."""
-        try:
-            return await self.api.update()
-        except (ExpiredAccessTokenError, UnknownEndpointError) as err:
-            raise UpdateFailed from err

homeassistant/components/anglian_water/entity.py

@@ -1,48 +0,0 @@
-"""Anglian Water entity."""
-
-from __future__ import annotations
-
-import logging
-
-from pyanglianwater.meter import SmartMeter
-
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import AnglianWaterUpdateCoordinator
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class AnglianWaterEntity(CoordinatorEntity[AnglianWaterUpdateCoordinator]):
-    """Defines a Anglian Water entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self,
-        coordinator: AnglianWaterUpdateCoordinator,
-        smart_meter: SmartMeter,
-        key: str,
-    ) -> None:
-        """Initialize Anglian Water entity."""
-        super().__init__(coordinator)
-        self.smart_meter = smart_meter
-        self._attr_unique_id = f"{smart_meter.serial_number}_{key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, smart_meter.serial_number)},
-            name=smart_meter.serial_number,
-            manufacturer="Anglian Water",
-            serial_number=smart_meter.serial_number,
-        )
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is loaded."""
-        self.coordinator.api.updated_data_callbacks.append(self.async_write_ha_state)
-        await super().async_added_to_hass()
-
-    async def async_will_remove_from_hass(self) -> None:
-        """When will be removed from HASS."""
-        self.coordinator.api.updated_data_callbacks.remove(self.async_write_ha_state)
-        await super().async_will_remove_from_hass()

homeassistant/components/anglian_water/manifest.json

@@ -1,10 +0,0 @@
-{
-  "domain": "anglian_water",
-  "name": "Anglian Water",
-  "codeowners": ["@pantherale0"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/anglian_water",
-  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==2.1.0"]
-}

homeassistant/components/anglian_water/quality_scale.yaml

@@ -1,83 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: |
-      No custom actions are defined.
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: |
-      No custom actions are defined.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup: done
-  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: |
-      No custom actions are defined.
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: done
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
-  reauthentication-flow: todo
-  test-coverage: todo
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: |
-      Unable to discover meters.
-  discovery:
-    status: exempt
-    comment: |
-      Unable to discover meters.
-  docs-data-update: done
-  docs-examples: todo
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default:
-    status: exempt
-    comment: |
-      No entities are disabled by default.
-  entity-translations: done
-  exception-translations: done
-  icon-translations:
-    status: exempt
-    comment: |
-      Entities do not require different icons.
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: |
-      Read-only integration and no repairs are possible.
-  stale-devices: todo
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: todo

homeassistant/components/anglian_water/sensor.py

@@ -1,117 +0,0 @@
-"""Anglian Water sensor platform."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-from enum import StrEnum
-
-from pyanglianwater.meter import SmartMeter
-
-from homeassistant.components.sensor import (
-    EntityCategory,
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import UnitOfVolume
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import AnglianWaterConfigEntry, AnglianWaterUpdateCoordinator
-from .entity import AnglianWaterEntity
-
-PARALLEL_UPDATES = 0
-
-
-class AnglianWaterSensor(StrEnum):
-    """Store keys for Anglian Water sensors."""
-
-    YESTERDAY_CONSUMPTION = "yesterday_consumption"
-    YESTERDAY_WATER_COST = "yesterday_water_cost"
-    YESTERDAY_SEWERAGE_COST = "yesterday_sewerage_cost"
-    LATEST_READING = "latest_reading"
-
-
-@dataclass(frozen=True, kw_only=True)
-class AnglianWaterSensorEntityDescription(SensorEntityDescription):
-    """Describes AnglianWater sensor entity."""
-
-    value_fn: Callable[[SmartMeter], float]
-
-
-ENTITY_DESCRIPTIONS: tuple[AnglianWaterSensorEntityDescription, ...] = (
-    AnglianWaterSensorEntityDescription(
-        key=AnglianWaterSensor.YESTERDAY_CONSUMPTION,
-        native_unit_of_measurement=UnitOfVolume.LITERS,
-        device_class=SensorDeviceClass.WATER,
-        value_fn=lambda entity: entity.get_yesterday_consumption,
-        state_class=SensorStateClass.TOTAL,
-        translation_key=AnglianWaterSensor.YESTERDAY_CONSUMPTION,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    AnglianWaterSensorEntityDescription(
-        key=AnglianWaterSensor.LATEST_READING,
-        native_unit_of_measurement=UnitOfVolume.CUBIC_METERS,
-        device_class=SensorDeviceClass.WATER,
-        value_fn=lambda entity: entity.latest_read,
-        state_class=SensorStateClass.TOTAL_INCREASING,
-        translation_key=AnglianWaterSensor.LATEST_READING,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    AnglianWaterSensorEntityDescription(
-        key=AnglianWaterSensor.YESTERDAY_WATER_COST,
-        native_unit_of_measurement="GBP",
-        device_class=SensorDeviceClass.MONETARY,
-        value_fn=lambda entity: entity.yesterday_water_cost,
-        translation_key=AnglianWaterSensor.YESTERDAY_WATER_COST,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-    AnglianWaterSensorEntityDescription(
-        key=AnglianWaterSensor.YESTERDAY_SEWERAGE_COST,
-        native_unit_of_measurement="GBP",
-        device_class=SensorDeviceClass.MONETARY,
-        value_fn=lambda entity: entity.yesterday_sewerage_cost,
-        translation_key=AnglianWaterSensor.YESTERDAY_SEWERAGE_COST,
-        entity_category=EntityCategory.DIAGNOSTIC,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: AnglianWaterConfigEntry,
-    async_add_devices: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the sensor platform."""
-    async_add_devices(
-        AnglianWaterSensorEntity(
-            coordinator=entry.runtime_data,
-            description=entity_description,
-            smart_meter=smart_meter,
-        )
-        for entity_description in ENTITY_DESCRIPTIONS
-        for smart_meter in entry.runtime_data.api.meters.values()
-    )
-
-
-class AnglianWaterSensorEntity(AnglianWaterEntity, SensorEntity):
-    """Defines a Anglian Water sensor."""
-
-    entity_description: AnglianWaterSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AnglianWaterUpdateCoordinator,
-        smart_meter: SmartMeter,
-        description: AnglianWaterSensorEntityDescription,
-    ) -> None:
-        """Initialize Anglian Water sensor."""
-        super().__init__(coordinator, smart_meter, description.key)
-        self.entity_description = description
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.smart_meter)

homeassistant/components/anglian_water/strings.json

@@ -1,55 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
-      "smart_meter_unavailable": "This account does not have any smart meters associated with it. If this is unexpected, enter your Billing Account Number found at the top of your latest bill.",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "step": {
-      "user": {
-        "data": {
-          "account_number": "Billing Account Number",
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "data_description": {
-          "account_number": "Your account number found on your latest bill.",
-          "password": "Your password",
-          "username": "Username or email used to log in to the Anglian Water website."
-        },
-        "description": "Enter your Anglian Water account credentials to connect to Home Assistant."
-      }
-    }
-  },
-  "entity": {
-    "sensor": {
-      "latest_reading": {
-        "name": "Latest reading"
-      },
-      "yesterday_consumption": {
-        "name": "Yesterday's usage"
-      },
-      "yesterday_sewerage_cost": {
-        "name": "Yesterday's sewerage cost"
-      },
-      "yesterday_water_cost": {
-        "name": "Yesterday's water cost"
-      }
-    }
-  },
-  "exceptions": {
-    "auth_expired": {
-      "message": "Authentication token expired"
-    },
-    "service_unavailable": {
-      "message": "Anglian Water services are currently unavailable for maintenance."
-    },
-    "smart_meter_unavailable": {
-      "message": "This account no longer has a smart meter associated with it."
-    }
-  }
-}

homeassistant/components/anthropic/__init__.py

@@ -17,7 +17,13 @@ from homeassistant.helpers import (
 )
 from homeassistant.helpers.typing import ConfigType
 
-from .const import DEFAULT_CONVERSATION_NAME, DOMAIN, LOGGER
+from .const import (
+    CONF_CHAT_MODEL,
+    DEFAULT_CONVERSATION_NAME,
+    DOMAIN,
+    LOGGER,
+    RECOMMENDED_CHAT_MODEL,
+)
 
 PLATFORMS = (Platform.AI_TASK, Platform.CONVERSATION)
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
@@ -37,7 +43,14 @@ async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) ->
         partial(anthropic.AsyncAnthropic, api_key=entry.data[CONF_API_KEY])
     )
     try:
-        await client.models.list(timeout=10.0)
+        # Use model from first conversation subentry for validation
+        subentries = list(entry.subentries.values())
+        if subentries:
+            model_id = subentries[0].data.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
+        else:
+            model_id = RECOMMENDED_CHAT_MODEL
+        model = await client.models.retrieve(model_id=model_id, timeout=10.0)
+        LOGGER.debug("Anthropic model: %s", model.display_name)
     except anthropic.AuthenticationError as err:
         LOGGER.error("Invalid API key: %s", err)
         return False

homeassistant/components/anthropic/config_flow.py

@@ -6,7 +6,7 @@ from functools import partial
 import json
 import logging
 import re
-from typing import Any, cast
+from typing import Any
 
 import anthropic
 import voluptuous as vol
@@ -54,11 +54,17 @@ from .const import (
     CONF_WEB_SEARCH_REGION,
     CONF_WEB_SEARCH_TIMEZONE,
     CONF_WEB_SEARCH_USER_LOCATION,
-    DEFAULT,
     DEFAULT_AI_TASK_NAME,
     DEFAULT_CONVERSATION_NAME,
     DOMAIN,
     NON_THINKING_MODELS,
+    RECOMMENDED_CHAT_MODEL,
+    RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_TEMPERATURE,
+    RECOMMENDED_THINKING_BUDGET,
+    RECOMMENDED_WEB_SEARCH,
+    RECOMMENDED_WEB_SEARCH_MAX_USES,
+    RECOMMENDED_WEB_SEARCH_USER_LOCATION,
     WEB_SEARCH_UNSUPPORTED_MODELS,
 )
 
@@ -70,13 +76,13 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
     }
 )
 
-DEFAULT_CONVERSATION_OPTIONS = {
+RECOMMENDED_CONVERSATION_OPTIONS = {
     CONF_RECOMMENDED: True,
     CONF_LLM_HASS_API: [llm.LLM_API_ASSIST],
     CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
 }
 
-DEFAULT_AI_TASK_OPTIONS = {
+RECOMMENDED_AI_TASK_OPTIONS = {
     CONF_RECOMMENDED: True,
 }
 
@@ -130,13 +136,13 @@ class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
                     subentries=[
                         {
                             "subentry_type": "conversation",
-                            "data": DEFAULT_CONVERSATION_OPTIONS,
+                            "data": RECOMMENDED_CONVERSATION_OPTIONS,
                             "title": DEFAULT_CONVERSATION_NAME,
                             "unique_id": None,
                         },
                         {
                             "subentry_type": "ai_task_data",
-                            "data": DEFAULT_AI_TASK_OPTIONS,
+                            "data": RECOMMENDED_AI_TASK_OPTIONS,
                             "title": DEFAULT_AI_TASK_NAME,
                             "unique_id": None,
                         },
@@ -174,9 +180,9 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
     ) -> SubentryFlowResult:
         """Add a subentry."""
         if self._subentry_type == "ai_task_data":
-            self.options = DEFAULT_AI_TASK_OPTIONS.copy()
+            self.options = RECOMMENDED_AI_TASK_OPTIONS.copy()
         else:
-            self.options = DEFAULT_CONVERSATION_OPTIONS.copy()
+            self.options = RECOMMENDED_CONVERSATION_OPTIONS.copy()
         return await self.async_step_init()
 
     async def async_step_reconfigure(
@@ -277,7 +283,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
         step_schema: VolDictType = {
             vol.Optional(
                 CONF_CHAT_MODEL,
-                default=DEFAULT[CONF_CHAT_MODEL],
+                default=RECOMMENDED_CHAT_MODEL,
             ): SelectSelector(
                 SelectSelectorConfig(
                     options=await self._get_model_list(), custom_value=True
@@ -285,11 +291,11 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             ),
             vol.Optional(
                 CONF_MAX_TOKENS,
-                default=DEFAULT[CONF_MAX_TOKENS],
+                default=RECOMMENDED_MAX_TOKENS,
             ): int,
             vol.Optional(
                 CONF_TEMPERATURE,
-                default=DEFAULT[CONF_TEMPERATURE],
+                default=RECOMMENDED_TEMPERATURE,
             ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
         }
 
@@ -319,14 +325,12 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
 
         if not model.startswith(tuple(NON_THINKING_MODELS)):
             step_schema[
-                vol.Optional(
-                    CONF_THINKING_BUDGET, default=DEFAULT[CONF_THINKING_BUDGET]
-                )
+                vol.Optional(CONF_THINKING_BUDGET, default=RECOMMENDED_THINKING_BUDGET)
             ] = vol.All(
                 NumberSelector(
                     NumberSelectorConfig(
                         min=0,
-                        max=self.options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
+                        max=self.options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
                     )
                 ),
                 vol.Coerce(int),
@@ -339,15 +343,15 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                 {
                     vol.Optional(
                         CONF_WEB_SEARCH,
-                        default=DEFAULT[CONF_WEB_SEARCH],
+                        default=RECOMMENDED_WEB_SEARCH,
                     ): bool,
                     vol.Optional(
                         CONF_WEB_SEARCH_MAX_USES,
-                        default=DEFAULT[CONF_WEB_SEARCH_MAX_USES],
+                        default=RECOMMENDED_WEB_SEARCH_MAX_USES,
                     ): int,
                     vol.Optional(
                         CONF_WEB_SEARCH_USER_LOCATION,
-                        default=DEFAULT[CONF_WEB_SEARCH_USER_LOCATION],
+                        default=RECOMMENDED_WEB_SEARCH_USER_LOCATION,
                     ): bool,
                 }
             )
@@ -365,10 +369,9 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             user_input = {}
 
         if user_input is not None:
-            if user_input.get(CONF_WEB_SEARCH, DEFAULT[CONF_WEB_SEARCH]) and not errors:
+            if user_input.get(CONF_WEB_SEARCH, RECOMMENDED_WEB_SEARCH) and not errors:
                 if user_input.get(
-                    CONF_WEB_SEARCH_USER_LOCATION,
-                    DEFAULT[CONF_WEB_SEARCH_USER_LOCATION],
+                    CONF_WEB_SEARCH_USER_LOCATION, RECOMMENDED_WEB_SEARCH_USER_LOCATION
                 ):
                     user_input.update(await self._get_location_data())
 
@@ -421,8 +424,6 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
             )
             if short_form.search(model_alias):
                 model_alias += "-0"
-            if model_alias.endswith(("haiku", "opus", "sonnet")):
-                model_alias += "-latest"
             model_options.append(
                 SelectOptionDict(
                     label=model_info.display_name,
@@ -455,7 +456,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                 }
             )
             response = await client.messages.create(
-                model=cast(str, DEFAULT[CONF_CHAT_MODEL]),
+                model=RECOMMENDED_CHAT_MODEL,
                 messages=[
                     {
                         "role": "user",
@@ -470,7 +471,7 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
                         "content": "{",  # hints the model to skip any preamble
                     },
                 ],
-                max_tokens=cast(int, DEFAULT[CONF_MAX_TOKENS]),
+                max_tokens=RECOMMENDED_MAX_TOKENS,
             )
             _LOGGER.debug("Model response: %s", response.content)
             location_data = location_schema(

homeassistant/components/anthropic/const.py

@@ -11,29 +11,25 @@ DEFAULT_AI_TASK_NAME = "Claude AI Task"
 CONF_RECOMMENDED = "recommended"
 CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
+RECOMMENDED_CHAT_MODEL = "claude-3-5-haiku-latest"
 CONF_MAX_TOKENS = "max_tokens"
+RECOMMENDED_MAX_TOKENS = 3000
 CONF_TEMPERATURE = "temperature"
+RECOMMENDED_TEMPERATURE = 1.0
 CONF_THINKING_BUDGET = "thinking_budget"
+RECOMMENDED_THINKING_BUDGET = 0
+MIN_THINKING_BUDGET = 1024
 CONF_WEB_SEARCH = "web_search"
+RECOMMENDED_WEB_SEARCH = False
 CONF_WEB_SEARCH_USER_LOCATION = "user_location"
+RECOMMENDED_WEB_SEARCH_USER_LOCATION = False
 CONF_WEB_SEARCH_MAX_USES = "web_search_max_uses"
+RECOMMENDED_WEB_SEARCH_MAX_USES = 5
 CONF_WEB_SEARCH_CITY = "city"
 CONF_WEB_SEARCH_REGION = "region"
 CONF_WEB_SEARCH_COUNTRY = "country"
 CONF_WEB_SEARCH_TIMEZONE = "timezone"
 
-DEFAULT = {
-    CONF_CHAT_MODEL: "claude-3-5-haiku-latest",
-    CONF_MAX_TOKENS: 3000,
-    CONF_TEMPERATURE: 1.0,
-    CONF_THINKING_BUDGET: 0,
-    CONF_WEB_SEARCH: False,
-    CONF_WEB_SEARCH_USER_LOCATION: False,
-    CONF_WEB_SEARCH_MAX_USES: 5,
-}
-
-MIN_THINKING_BUDGET = 1024
-
 NON_THINKING_MODELS = [
     "claude-3-5",  # Both sonnet and haiku
     "claude-3-opus",

homeassistant/components/anthropic/entity.py

@@ -84,11 +84,14 @@ from .const import (
     CONF_WEB_SEARCH_REGION,
     CONF_WEB_SEARCH_TIMEZONE,
     CONF_WEB_SEARCH_USER_LOCATION,
-    DEFAULT,
     DOMAIN,
     LOGGER,
     MIN_THINKING_BUDGET,
     NON_THINKING_MODELS,
+    RECOMMENDED_CHAT_MODEL,
+    RECOMMENDED_MAX_TOKENS,
+    RECOMMENDED_TEMPERATURE,
+    RECOMMENDED_THINKING_BUDGET,
 )
 
 # Max number of back and forth with the LLM to generate a response
@@ -583,7 +586,7 @@ class AnthropicBaseLLMEntity(Entity):
             identifiers={(DOMAIN, subentry.subentry_id)},
             name=subentry.title,
             manufacturer="Anthropic",
-            model=subentry.data.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL]),
+            model="Claude",
             entry_type=dr.DeviceEntryType.SERVICE,
         )
 
@@ -601,19 +604,17 @@ class AnthropicBaseLLMEntity(Entity):
             raise TypeError("First message must be a system message")
         messages = _convert_content(chat_log.content[1:])
 
-        model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])
+        model = options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL)
 
         model_args = MessageCreateParamsStreaming(
             model=model,
             messages=messages,
-            max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
+            max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
             system=system.content,
             stream=True,
         )
 
-        thinking_budget = options.get(
-            CONF_THINKING_BUDGET, DEFAULT[CONF_THINKING_BUDGET]
-        )
+        thinking_budget = options.get(CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET)
         if (
             not model.startswith(tuple(NON_THINKING_MODELS))
             and thinking_budget >= MIN_THINKING_BUDGET
@@ -624,7 +625,7 @@ class AnthropicBaseLLMEntity(Entity):
         else:
             model_args["thinking"] = ThinkingConfigDisabledParam(type="disabled")
             model_args["temperature"] = options.get(
-                CONF_TEMPERATURE, DEFAULT[CONF_TEMPERATURE]
+                CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE
             )
 
         tools: list[ToolUnionParam] = []

homeassistant/components/anthropic/manifest.json

@@ -8,5 +8,5 @@
   "documentation": "https://www.home-assistant.io/integrations/anthropic",
   "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.75.0"]
+  "requirements": ["anthropic==0.73.0"]
 }

homeassistant/components/apple_tv/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["zeroconf"],
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
   "requirements": ["pyatv==0.16.1;python_version<'3.14'"],

homeassistant/components/assist_pipeline/pipeline.py

@@ -1123,6 +1123,63 @@ class PipelineRun:
         )
 
         try:
+            user_input = conversation.ConversationInput(
+                text=intent_input,
+                context=self.context,
+                conversation_id=conversation_id,
+                device_id=self._device_id,
+                satellite_id=self._satellite_id,
+                language=input_language,
+                agent_id=self.intent_agent.id,
+                extra_system_prompt=conversation_extra_system_prompt,
+            )
+
+            agent_id = self.intent_agent.id
+            processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
+            all_targets_in_satellite_area = False
+            intent_response: intent.IntentResponse | None = None
+            if not processed_locally and not self._intent_agent_only:
+                # Sentence triggers override conversation agent
+                if (
+                    trigger_response_text
+                    := await conversation.async_handle_sentence_triggers(
+                        self.hass, user_input
+                    )
+                ) is not None:
+                    # Sentence trigger matched
+                    agent_id = "sentence_trigger"
+                    processed_locally = True
+                    intent_response = intent.IntentResponse(
+                        self.pipeline.conversation_language
+                    )
+                    intent_response.async_set_speech(trigger_response_text)
+
+                intent_filter: Callable[[RecognizeResult], bool] | None = None
+                # If the LLM has API access, we filter out some sentences that are
+                # interfering with LLM operation.
+                if (
+                    intent_agent_state := self.hass.states.get(self.intent_agent.id)
+                ) and intent_agent_state.attributes.get(
+                    ATTR_SUPPORTED_FEATURES, 0
+                ) & conversation.ConversationEntityFeature.CONTROL:
+                    intent_filter = _async_local_fallback_intent_filter
+
+                # Try local intents
+                if (
+                    intent_response is None
+                    and self.pipeline.prefer_local_intents
+                    and (
+                        intent_response := await conversation.async_handle_intents(
+                            self.hass,
+                            user_input,
+                            intent_filter=intent_filter,
+                        )
+                    )
+                ):
+                    # Local intent matched
+                    agent_id = conversation.HOME_ASSISTANT_AGENT
+                    processed_locally = True
+
             if self.tts_stream and self.tts_stream.supports_streaming_input:
                 tts_input_stream: asyncio.Queue[str | None] | None = asyncio.Queue()
             else:
@@ -1208,17 +1265,6 @@ class PipelineRun:
                 assert self.tts_stream is not None
                 self.tts_stream.async_set_message_stream(tts_input_stream_generator())
 
-            user_input = conversation.ConversationInput(
-                text=intent_input,
-                context=self.context,
-                conversation_id=conversation_id,
-                device_id=self._device_id,
-                satellite_id=self._satellite_id,
-                language=input_language,
-                agent_id=self.intent_agent.id,
-                extra_system_prompt=conversation_extra_system_prompt,
-            )
-
             with (
                 chat_session.async_get_chat_session(
                     self.hass, user_input.conversation_id
@@ -1230,53 +1276,6 @@ class PipelineRun:
                     chat_log_delta_listener=chat_log_delta_listener,
                 ) as chat_log,
             ):
-                agent_id = self.intent_agent.id
-                processed_locally = agent_id == conversation.HOME_ASSISTANT_AGENT
-                all_targets_in_satellite_area = False
-                intent_response: intent.IntentResponse | None = None
-                if not processed_locally and not self._intent_agent_only:
-                    # Sentence triggers override conversation agent
-                    if (
-                        trigger_response_text
-                        := await conversation.async_handle_sentence_triggers(
-                            self.hass, user_input, chat_log
-                        )
-                    ) is not None:
-                        # Sentence trigger matched
-                        agent_id = "sentence_trigger"
-                        processed_locally = True
-                        intent_response = intent.IntentResponse(
-                            self.pipeline.conversation_language
-                        )
-                        intent_response.async_set_speech(trigger_response_text)
-
-                    intent_filter: Callable[[RecognizeResult], bool] | None = None
-                    # If the LLM has API access, we filter out some sentences that are
-                    # interfering with LLM operation.
-                    if (
-                        intent_agent_state := self.hass.states.get(self.intent_agent.id)
-                    ) and intent_agent_state.attributes.get(
-                        ATTR_SUPPORTED_FEATURES, 0
-                    ) & conversation.ConversationEntityFeature.CONTROL:
-                        intent_filter = _async_local_fallback_intent_filter
-
-                    # Try local intents
-                    if (
-                        intent_response is None
-                        and self.pipeline.prefer_local_intents
-                        and (
-                            intent_response := await conversation.async_handle_intents(
-                                self.hass,
-                                user_input,
-                                chat_log,
-                                intent_filter=intent_filter,
-                            )
-                        )
-                    ):
-                        # Local intent matched
-                        agent_id = conversation.HOME_ASSISTANT_AGENT
-                        processed_locally = True
-
                 # It was already handled, create response and add to chat history
                 if intent_response is not None:
                     speech: str = intent_response.speech.get("plain", {}).get(

homeassistant/components/assist_satellite/icons.json

@@ -14,19 +14,5 @@
     "start_conversation": {
       "service": "mdi:forum"
     }
-  },
-  "triggers": {
-    "idle": {
-      "trigger": "mdi:chat-sleep"
-    },
-    "listening": {
-      "trigger": "mdi:chat-question"
-    },
-    "processing": {
-      "trigger": "mdi:chat-processing"
-    },
-    "responding": {
-      "trigger": "mdi:chat-alert"
-    }
   }
 }

homeassistant/components/assist_satellite/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/assist_satellite",
   "integration_type": "entity",
   "quality_scale": "internal",
-  "requirements": ["hassil==3.5.0"]
+  "requirements": ["hassil==3.4.0"]
 }

homeassistant/components/assist_satellite/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted Assist satellites to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "Assist satellite",
@@ -20,13 +16,6 @@
         "id": "Answer ID",
         "sentences": "Sentences"
       }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
     }
   },
   "services": {
@@ -109,47 +98,5 @@
       "name": "Start conversation"
     }
   },
-  "title": "Assist satellite",
-  "triggers": {
-    "idle": {
-      "description": "Triggers after one or more voice assistant satellites become idle after having processed a command.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
-          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Satellite became idle"
-    },
-    "listening": {
-      "description": "Triggers after one or more voice assistant satellites start listening for a command from someone.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
-          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Satellite started listening"
-    },
-    "processing": {
-      "description": "Triggers after one or more voice assistant satellites start processing a command after having heard it.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
-          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Satellite started processing"
-    },
-    "responding": {
-      "description": "Triggers after one or more voice assistant satellites start responding to a command after having processed it, or start announcing something.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::assist_satellite::common::trigger_behavior_description%]",
-          "name": "[%key:component::assist_satellite::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Satellite started responding"
-    }
-  }
+  "title": "Assist satellite"
 }

homeassistant/components/assist_satellite/trigger.py

@@ -1,19 +0,0 @@
-"""Provides triggers for assist satellites."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import Trigger, make_entity_state_trigger
-
-from .const import DOMAIN
-from .entity import AssistSatelliteState
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "idle": make_entity_state_trigger(DOMAIN, AssistSatelliteState.IDLE),
-    "listening": make_entity_state_trigger(DOMAIN, AssistSatelliteState.LISTENING),
-    "processing": make_entity_state_trigger(DOMAIN, AssistSatelliteState.PROCESSING),
-    "responding": make_entity_state_trigger(DOMAIN, AssistSatelliteState.RESPONDING),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for assist satellites."""
-    return TRIGGERS

homeassistant/components/assist_satellite/triggers.yaml

@@ -1,20 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: assist_satellite
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-idle: *trigger_common
-listening: *trigger_common
-processing: *trigger_common
-responding: *trigger_common

homeassistant/components/august/manifest.json

@@ -29,5 +29,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.2.1"]
+  "requirements": ["yalexs==9.2.0", "yalexs-ble==3.1.2"]
 }

homeassistant/components/automation/__init__.py

@@ -12,9 +12,8 @@ from typing import Any, Protocol, cast
 from propcache.api import cached_property
 import voluptuous as vol
 
-from homeassistant.components import labs, websocket_api
+from homeassistant.components import websocket_api
 from homeassistant.components.blueprint import CONF_USE_BLUEPRINT
-from homeassistant.components.labs import async_listen as async_labs_listen
 from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
@@ -115,52 +114,6 @@ ATTR_SOURCE = "source"
 ATTR_VARIABLES = "variables"
 SERVICE_TRIGGER = "trigger"
 
-NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
-
-_EXPERIMENTAL_CONDITION_PLATFORMS = {
-    "light",
-}
-
-_EXPERIMENTAL_TRIGGER_PLATFORMS = {
-    "alarm_control_panel",
-    "assist_satellite",
-    "binary_sensor",
-    "climate",
-    "cover",
-    "fan",
-    "lawn_mower",
-    "light",
-    "media_player",
-    "text",
-    "vacuum",
-}
-
-
-@callback
-def is_disabled_experimental_condition(hass: HomeAssistant, platform: str) -> bool:
-    """Check if the platform is a disabled experimental condition platform."""
-    return (
-        platform in _EXPERIMENTAL_CONDITION_PLATFORMS
-        and not labs.async_is_preview_feature_enabled(
-            hass,
-            DOMAIN,
-            NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG,
-        )
-    )
-
-
-@callback
-def is_disabled_experimental_trigger(hass: HomeAssistant, platform: str) -> bool:
-    """Check if the platform is a disabled experimental trigger platform."""
-    return (
-        platform in _EXPERIMENTAL_TRIGGER_PLATFORMS
-        and not labs.async_is_preview_feature_enabled(
-            hass,
-            DOMAIN,
-            NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG,
-        )
-    )
-
 
 class IfAction(Protocol):
     """Define the format of if_action."""
@@ -364,20 +317,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         schema=vol.Schema({vol.Optional(CONF_ID): str}),
     )
 
-    @callback
-    def new_triggers_conditions_listener() -> None:
-        """Handle new_triggers_conditions flag change."""
-        hass.async_create_task(
-            reload_helper.execute_service(ServiceCall(hass, DOMAIN, SERVICE_RELOAD))
-        )
-
-    async_labs_listen(
-        hass,
-        DOMAIN,
-        NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG,
-        new_triggers_conditions_listener,
-    )
-
     websocket_api.async_register_command(hass, websocket_config)
 
     return True

homeassistant/components/automation/manifest.json

@@ -6,12 +6,5 @@
   "dependencies": ["blueprint", "trace"],
   "documentation": "https://www.home-assistant.io/integrations/automation",
   "integration_type": "system",
-  "preview_features": {
-    "new_triggers_conditions": {
-      "feedback_url": "https://forms.gle/fWFZqf5MzuwWTsCH8",
-      "learn_more_url": "https://www.home-assistant.io/blog/2025/12/03/release-202512/#purpose-specific-triggers-and-conditions",
-      "report_issue_url": "https://github.com/home-assistant/core/issues/new?template=bug_report.yml&integration_link=https://www.home-assistant.io/integrations/automation&integration_name=Automation"
-    }
-  },
   "quality_scale": "internal"
 }

homeassistant/components/automation/strings.json

@@ -67,14 +67,6 @@
       "title": "[%key:component::automation::common::validation_failed_title%]"
     }
   },
-  "preview_features": {
-    "new_triggers_conditions": {
-      "description": "Enables new purpose-specific triggers and conditions that are more user-friendly than technical state-based options.\n\nThese new automation features support targets across your entire home, letting you trigger automations for any entity, device, area, floor, or label (for example, when any light in your living room turned on). Integrations can now also provide their own purpose-specific triggers and conditions, just like actions.\n\nThis preview also includes a new tree view to help you navigate your home when adding triggers, conditions, and actions.",
-      "disable_confirmation": "Disabling this preview will cause automations and scripts that use the new purpose-specific triggers and conditions to fail.\n\nBefore disabling, ensure that your automations or scripts do not rely on this feature.",
-      "enable_confirmation": "This feature is still in development and may change. These new purpose-specific triggers and conditions are being refined based on user feedback and are not yet complete.\n\nBy enabling this preview, you'll have early access to these new capabilities, but be aware that they may be modified or updated in future releases.",
-      "name": "Purpose-specific triggers and conditions"
-    }
-  },
   "services": {
     "reload": {
       "description": "Reloads the automation configuration.",

homeassistant/components/awair/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "awair",
   "name": "Awair",
-  "codeowners": ["@ahayworth", "@ricohageman"],
+  "codeowners": ["@ahayworth", "@danielsjf"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/awair",
   "iot_class": "local_polling",

homeassistant/components/awair/quality_scale.yaml

@@ -1,98 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: No actions defined
-  appropriate-polling:
-    status: done
-    comment: |
-      We fetch both user and devices, could probably slow one down
-  brands: done
-  common-modules: done
-  config-flow:
-    status: todo
-    comment: |
-      data_description fields are missing
-      Should not abort in cloud step when anything else than invalid access token
-      Find out why access token is optional
-      Discovered devices step is redundant
-  config-flow-test-coverage:
-    status: todo
-    comment: |
-      Move happy flow to the top and merge with `test_show_form`
-      Reuse `result`
-      Cloud tests should initialize with data directly
-      Tests should finish in CREATE_ENTRY
-  dependency-transparency:
-    status: todo
-    comment: |
-      Dependency is not built in the CI
-  docs-actions: todo
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: No explicit event subscription
-  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: No actions defined
-  config-entry-unloading: done
-  docs-configuration-parameters: todo
-  docs-installation-parameters: todo
-  entity-unavailable: todo
-  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: todo
-  reauthentication-flow: done
-  test-coverage:
-    status: todo
-    comment: |
-      Patch objects where we use them
-      Use test helpers to load JSON
-      typo `no_devicess_fixture`
-      Make common config entries for cloud and local
-      Test setup of the integration
-
-  # Gold
-  devices:
-    status: done
-    comment: |
-      Can move to shorthand attribute
-      Can remove typecast
-  diagnostics: todo
-  discovery: done
-  discovery-update-info: done
-  docs-data-update: done
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: todo
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices: todo
-  entity-category: todo
-  entity-device-class:
-    status: done
-    comment: |
-      Can remove rounding
-  entity-disabled-by-default: done
-  entity-translations: done
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: todo
-  inject-websession: done
-  strict-typing: todo

homeassistant/components/bang_olufsen/config_flow.py

@@ -21,10 +21,10 @@ from .const import (
     ATTR_ITEM_NUMBER,
     ATTR_SERIAL_NUMBER,
     ATTR_TYPE_NUMBER,
+    COMPATIBLE_MODELS,
     CONF_SERIAL_NUMBER,
     DEFAULT_MODEL,
     DOMAIN,
-    SELECTABLE_MODELS,
 )
 from .util import get_serial_number_from_jid
 
@@ -70,7 +70,7 @@ class BangOlufsenConfigFlowHandler(ConfigFlow, domain=DOMAIN):
             {
                 vol.Required(CONF_HOST): str,
                 vol.Required(CONF_MODEL, default=DEFAULT_MODEL): SelectSelector(
-                    SelectSelectorConfig(options=SELECTABLE_MODELS)
+                    SelectSelectorConfig(options=COMPATIBLE_MODELS)
                 ),
             }
         )

homeassistant/components/bang_olufsen/const.py

@@ -17,12 +17,8 @@ from homeassistant.components.media_player import (
 class BangOlufsenSource:
     """Class used for associating device source ids with friendly names. May not include all sources."""
 
-    DEEZER: Final[Source] = Source(name="Deezer", id="deezer")
     LINE_IN: Final[Source] = Source(name="Line-In", id="lineIn")
-    NET_RADIO: Final[Source] = Source(name="B&O Radio", id="netRadio")
     SPDIF: Final[Source] = Source(name="Optical", id="spdif")
-    TIDAL: Final[Source] = Source(name="Tidal", id="tidal")
-    UNKNOWN: Final[Source] = Source(name="Unknown Source", id="unknown")
     URI_STREAMER: Final[Source] = Source(name="Audio Streamer", id="uriStreamer")
 
 
@@ -66,7 +62,6 @@ class BangOlufsenMediaType(StrEnum):
 class BangOlufsenModel(StrEnum):
     """Enum for compatible model names."""
 
-    # Mozart devices
     BEOCONNECT_CORE = "Beoconnect Core"
     BEOLAB_8 = "BeoLab 8"
     BEOLAB_28 = "BeoLab 28"
@@ -78,18 +73,6 @@ class BangOlufsenModel(StrEnum):
     BEOSOUND_LEVEL = "Beosound Level"
     BEOSOUND_PREMIERE = "Beosound Premiere"
     BEOSOUND_THEATRE = "Beosound Theatre"
-    # Remote devices
-    BEOREMOTE_ONE = "Beoremote One"
-
-
-class BangOlufsenAttribute(StrEnum):
-    """Enum for extra_state_attribute keys."""
-
-    BEOLINK = "beolink"
-    BEOLINK_PEERS = "peers"
-    BEOLINK_SELF = "self"
-    BEOLINK_LEADER = "leader"
-    BEOLINK_LISTENERS = "listeners"
 
 
 # Physical "buttons" on devices
@@ -113,7 +96,6 @@ class WebsocketNotification(StrEnum):
     """Enum for WebSocket notification types."""
 
     ACTIVE_LISTENING_MODE = "active_listening_mode"
-    BEO_REMOTE_BUTTON = "beo_remote_button"
     BUTTON = "button"
     PLAYBACK_ERROR = "playback_error"
     PLAYBACK_METADATA = "playback_metadata"
@@ -131,7 +113,6 @@ class WebsocketNotification(StrEnum):
     BEOLINK_AVAILABLE_LISTENERS = "beolinkAvailableListeners"
     CONFIGURATION = "configuration"
     NOTIFICATION = "notification"
-    REMOTE_CONTROL_DEVICES = "remoteControlDevices"
     REMOTE_MENU_CHANGED = "remoteMenuChanged"
 
     ALL = "all"
@@ -147,11 +128,7 @@ CONF_SERIAL_NUMBER: Final = "serial_number"
 CONF_BEOLINK_JID: Final = "jid"
 
 # Models to choose from in manual configuration.
-SELECTABLE_MODELS: list[str] = [
-    model.value for model in BangOlufsenModel if model != BangOlufsenModel.BEOREMOTE_ONE
-]
-
-MANUFACTURER: Final[str] = "Bang & Olufsen"
+COMPATIBLE_MODELS: list[str] = [x.value for x in BangOlufsenModel]
 
 # Attribute names for zeroconf discovery.
 ATTR_TYPE_NUMBER: Final[str] = "tn"
@@ -250,10 +227,6 @@ BANG_OLUFSEN_WEBSOCKET_EVENT: Final[str] = f"{DOMAIN}_websocket_event"
 
 # Dict used to translate native Bang & Olufsen event names to string.json compatible ones
 EVENT_TRANSLATION_MAP: dict[str, str] = {
-    # Beoremote One
-    "KeyPress": "key_press",
-    "KeyRelease": "key_release",
-    # Physical "buttons"
     "shortPress (Release)": "short_press_release",
     "longPress (Timeout)": "long_press_timeout",
     "longPress (Release)": "long_press_release",
@@ -274,70 +247,6 @@ DEVICE_BUTTON_EVENTS: Final[list[str]] = [
     "very_long_press_release",
 ]
 
-BEO_REMOTE_SUBMENU_CONTROL: Final[str] = "Control"
-BEO_REMOTE_SUBMENU_LIGHT: Final[str] = "Light"
-
-# Common for both submenus
-BEO_REMOTE_KEYS: Final[tuple[str, ...]] = (
-    "Blue",
-    "Digit0",
-    "Digit1",
-    "Digit2",
-    "Digit3",
-    "Digit4",
-    "Digit5",
-    "Digit6",
-    "Digit7",
-    "Digit8",
-    "Digit9",
-    "Down",
-    "Green",
-    "Left",
-    "Play",
-    "Red",
-    "Rewind",
-    "Right",
-    "Select",
-    "Stop",
-    "Up",
-    "Wind",
-    "Yellow",
-    "Func1",
-    "Func2",
-    "Func3",
-    "Func4",
-    "Func5",
-    "Func6",
-    "Func7",
-    "Func8",
-    "Func9",
-    "Func10",
-    "Func11",
-    "Func12",
-    "Func13",
-    "Func14",
-    "Func15",
-    "Func16",
-    "Func17",
-)
-
-# "keys" that are unique to the Control submenu
-BEO_REMOTE_CONTROL_KEYS: Final[tuple[str, ...]] = (
-    "Func18",
-    "Func19",
-    "Func20",
-    "Func21",
-    "Func22",
-    "Func23",
-    "Func24",
-    "Func25",
-    "Func26",
-    "Func27",
-)
-
-BEO_REMOTE_KEY_EVENTS: Final[list[str]] = ["key_press", "key_release"]
-
-
 # Beolink Converter NL/ML sources need to be transformed to upper case
 BEOLINK_JOIN_SOURCES_TO_UPPER = (
     "aux_a",

homeassistant/components/bang_olufsen/event.py

@@ -2,34 +2,16 @@
 
 from __future__ import annotations
 
-from typing import TYPE_CHECKING
-
-from mozart_api.models import PairedRemote
-
 from homeassistant.components.event import EventDeviceClass, EventEntity
 from homeassistant.const import CONF_MODEL
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import BangOlufsenConfigEntry
-from .const import (
-    BEO_REMOTE_CONTROL_KEYS,
-    BEO_REMOTE_KEY_EVENTS,
-    BEO_REMOTE_KEYS,
-    BEO_REMOTE_SUBMENU_CONTROL,
-    BEO_REMOTE_SUBMENU_LIGHT,
-    CONNECTION_STATUS,
-    DEVICE_BUTTON_EVENTS,
-    DOMAIN,
-    MANUFACTURER,
-    BangOlufsenModel,
-    WebsocketNotification,
-)
+from .const import CONNECTION_STATUS, DEVICE_BUTTON_EVENTS, WebsocketNotification
 from .entity import BangOlufsenEntity
-from .util import get_device_buttons, get_remotes
+from .util import get_device_buttons
 
 PARALLEL_UPDATES = 0
 
@@ -39,87 +21,24 @@ async def async_setup_entry(
     config_entry: BangOlufsenConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
-    """Set up Event entities from config entry."""
-    entities: list[BangOlufsenEvent] = []
+    """Set up Sensor entities from config entry."""
 
     async_add_entities(
         BangOlufsenButtonEvent(config_entry, button_type)
         for button_type in get_device_buttons(config_entry.data[CONF_MODEL])
     )
 
-    # Check for connected Beoremote One
-    remotes = await get_remotes(config_entry.runtime_data.client)
 
-    for remote in remotes:
-        # Add Light keys
-        entities.extend(
-            [
-                BangOlufsenRemoteKeyEvent(
-                    config_entry,
-                    remote,
-                    f"{BEO_REMOTE_SUBMENU_LIGHT}/{key_type}",
-                )
-                for key_type in BEO_REMOTE_KEYS
-            ]
-        )
-
-        # Add Control keys
-        entities.extend(
-            [
-                BangOlufsenRemoteKeyEvent(
-                    config_entry,
-                    remote,
-                    f"{BEO_REMOTE_SUBMENU_CONTROL}/{key_type}",
-                )
-                for key_type in (*BEO_REMOTE_KEYS, *BEO_REMOTE_CONTROL_KEYS)
-            ]
-        )
-
-    # If the remote is no longer available, then delete the device.
-    # The remote may appear as being available to the device after it has been unpaired on the remote
-    # As it has to be removed from the device on the app.
-
-    device_registry = dr.async_get(hass)
-    devices = device_registry.devices.get_devices_for_config_entry_id(
-        config_entry.entry_id
-    )
-    for device in devices:
-        if (
-            device.model == BangOlufsenModel.BEOREMOTE_ONE
-            and device.serial_number not in {remote.serial_number for remote in remotes}
-        ):
-            device_registry.async_update_device(
-                device.id, remove_config_entry_id=config_entry.entry_id
-            )
-
-    async_add_entities(new_entities=entities)
-
-
-class BangOlufsenEvent(BangOlufsenEntity, EventEntity):
-    """Base Event class."""
+class BangOlufsenButtonEvent(BangOlufsenEntity, EventEntity):
+    """Event class for Button events."""
 
     _attr_device_class = EventDeviceClass.BUTTON
     _attr_entity_registry_enabled_default = False
-
-    def __init__(self, config_entry: BangOlufsenConfigEntry) -> None:
-        """Initialize Event."""
-        super().__init__(config_entry, config_entry.runtime_data.client)
-
-    @callback
-    def _async_handle_event(self, event: str) -> None:
-        """Handle event."""
-        self._trigger_event(event)
-        self.async_write_ha_state()
-
-
-class BangOlufsenButtonEvent(BangOlufsenEvent):
-    """Event class for Button events."""
-
     _attr_event_types = DEVICE_BUTTON_EVENTS
 
     def __init__(self, config_entry: BangOlufsenConfigEntry, button_type: str) -> None:
         """Initialize Button."""
-        super().__init__(config_entry)
+        super().__init__(config_entry, config_entry.runtime_data.client)
 
         self._attr_unique_id = f"{self._unique_id}_{button_type}"
 
@@ -133,65 +52,20 @@ class BangOlufsenButtonEvent(BangOlufsenEvent):
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                f"{DOMAIN}_{self._unique_id}_{CONNECTION_STATUS}",
+                f"{self._unique_id}_{CONNECTION_STATUS}",
                 self._async_update_connection_state,
             )
         )
         self.async_on_remove(
             async_dispatcher_connect(
                 self.hass,
-                f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.BUTTON}_{self._button_type}",
+                f"{self._unique_id}_{WebsocketNotification.BUTTON}_{self._button_type}",
                 self._async_handle_event,
             )
         )
 
-
-class BangOlufsenRemoteKeyEvent(BangOlufsenEvent):
-    """Event class for Beoremote One key events."""
-
-    _attr_event_types = BEO_REMOTE_KEY_EVENTS
-
-    def __init__(
-        self,
-        config_entry: BangOlufsenConfigEntry,
-        remote: PairedRemote,
-        key_type: str,
-    ) -> None:
-        """Initialize Beoremote One key."""
-        super().__init__(config_entry)
-
-        if TYPE_CHECKING:
-            assert remote.serial_number
-
-        self._attr_unique_id = f"{remote.serial_number}_{self._unique_id}_{key_type}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"{remote.serial_number}_{self._unique_id}")},
-            name=f"{BangOlufsenModel.BEOREMOTE_ONE}-{remote.serial_number}-{self._unique_id}",
-            model=BangOlufsenModel.BEOREMOTE_ONE,
-            serial_number=remote.serial_number,
-            sw_version=remote.app_version,
-            manufacturer=MANUFACTURER,
-            via_device=(DOMAIN, self._unique_id),
-        )
-
-        # Make the native key name Home Assistant compatible
-        self._attr_translation_key = key_type.lower().replace("/", "_")
-
-        self._key_type = key_type
-
-    async def async_added_to_hass(self) -> None:
-        """Listen to WebSocket Beoremote One key events."""
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"{DOMAIN}_{self._unique_id}_{CONNECTION_STATUS}",
-                self._async_update_connection_state,
-            )
-        )
-        self.async_on_remove(
-            async_dispatcher_connect(
-                self.hass,
-                f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.BEO_REMOTE_BUTTON}_{self._key_type}",
-                self._async_handle_event,
-            )
-        )
+    @callback
+    def _async_handle_event(self, event: str) -> None:
+        """Handle event."""
+        self._trigger_event(event)
+        self.async_write_ha_state()

homeassistant/components/bang_olufsen/icons.json

@@ -1,278 +1,4 @@
 {
-  "entity": {
-    "event": {
-      "control_blue": {
-        "default": "mdi:remote"
-      },
-      "control_digit0": {
-        "default": "mdi:remote"
-      },
-      "control_digit1": {
-        "default": "mdi:remote"
-      },
-      "control_digit2": {
-        "default": "mdi:remote"
-      },
-      "control_digit3": {
-        "default": "mdi:remote"
-      },
-      "control_digit4": {
-        "default": "mdi:remote"
-      },
-      "control_digit5": {
-        "default": "mdi:remote"
-      },
-      "control_digit6": {
-        "default": "mdi:remote"
-      },
-      "control_digit7": {
-        "default": "mdi:remote"
-      },
-      "control_digit8": {
-        "default": "mdi:remote"
-      },
-      "control_digit9": {
-        "default": "mdi:remote"
-      },
-      "control_down": {
-        "default": "mdi:remote"
-      },
-      "control_func1": {
-        "default": "mdi:remote"
-      },
-      "control_func10": {
-        "default": "mdi:remote"
-      },
-      "control_func11": {
-        "default": "mdi:remote"
-      },
-      "control_func12": {
-        "default": "mdi:remote"
-      },
-      "control_func13": {
-        "default": "mdi:remote"
-      },
-      "control_func14": {
-        "default": "mdi:remote"
-      },
-      "control_func15": {
-        "default": "mdi:remote"
-      },
-      "control_func16": {
-        "default": "mdi:remote"
-      },
-      "control_func17": {
-        "default": "mdi:remote"
-      },
-      "control_func18": {
-        "default": "mdi:remote"
-      },
-      "control_func19": {
-        "default": "mdi:remote"
-      },
-      "control_func2": {
-        "default": "mdi:remote"
-      },
-      "control_func20": {
-        "default": "mdi:remote"
-      },
-      "control_func21": {
-        "default": "mdi:remote"
-      },
-      "control_func22": {
-        "default": "mdi:remote"
-      },
-      "control_func23": {
-        "default": "mdi:remote"
-      },
-      "control_func24": {
-        "default": "mdi:remote"
-      },
-      "control_func25": {
-        "default": "mdi:remote"
-      },
-      "control_func26": {
-        "default": "mdi:remote"
-      },
-      "control_func27": {
-        "default": "mdi:remote"
-      },
-      "control_func3": {
-        "default": "mdi:remote"
-      },
-      "control_func4": {
-        "default": "mdi:remote"
-      },
-      "control_func5": {
-        "default": "mdi:remote"
-      },
-      "control_func6": {
-        "default": "mdi:remote"
-      },
-      "control_func7": {
-        "default": "mdi:remote"
-      },
-      "control_func8": {
-        "default": "mdi:remote"
-      },
-      "control_func9": {
-        "default": "mdi:remote"
-      },
-      "control_green": {
-        "default": "mdi:remote"
-      },
-      "control_left": {
-        "default": "mdi:remote"
-      },
-      "control_play": {
-        "default": "mdi:remote"
-      },
-      "control_red": {
-        "default": "mdi:remote"
-      },
-      "control_rewind": {
-        "default": "mdi:remote"
-      },
-      "control_right": {
-        "default": "mdi:remote"
-      },
-      "control_select": {
-        "default": "mdi:remote"
-      },
-      "control_stop": {
-        "default": "mdi:remote"
-      },
-      "control_up": {
-        "default": "mdi:remote"
-      },
-      "control_wind": {
-        "default": "mdi:remote"
-      },
-      "control_yellow": {
-        "default": "mdi:remote"
-      },
-      "light_blue": {
-        "default": "mdi:remote"
-      },
-      "light_digit0": {
-        "default": "mdi:remote"
-      },
-      "light_digit1": {
-        "default": "mdi:remote"
-      },
-      "light_digit2": {
-        "default": "mdi:remote"
-      },
-      "light_digit3": {
-        "default": "mdi:remote"
-      },
-      "light_digit4": {
-        "default": "mdi:remote"
-      },
-      "light_digit5": {
-        "default": "mdi:remote"
-      },
-      "light_digit6": {
-        "default": "mdi:remote"
-      },
-      "light_digit7": {
-        "default": "mdi:remote"
-      },
-      "light_digit8": {
-        "default": "mdi:remote"
-      },
-      "light_digit9": {
-        "default": "mdi:remote"
-      },
-      "light_down": {
-        "default": "mdi:remote"
-      },
-      "light_func1": {
-        "default": "mdi:remote"
-      },
-      "light_func10": {
-        "default": "mdi:remote"
-      },
-      "light_func11": {
-        "default": "mdi:remote"
-      },
-      "light_func12": {
-        "default": "mdi:remote"
-      },
-      "light_func13": {
-        "default": "mdi:remote"
-      },
-      "light_func14": {
-        "default": "mdi:remote"
-      },
-      "light_func15": {
-        "default": "mdi:remote"
-      },
-      "light_func16": {
-        "default": "mdi:remote"
-      },
-      "light_func17": {
-        "default": "mdi:remote"
-      },
-      "light_func2": {
-        "default": "mdi:remote"
-      },
-      "light_func3": {
-        "default": "mdi:remote"
-      },
-      "light_func4": {
-        "default": "mdi:remote"
-      },
-      "light_func5": {
-        "default": "mdi:remote"
-      },
-      "light_func6": {
-        "default": "mdi:remote"
-      },
-      "light_func7": {
-        "default": "mdi:remote"
-      },
-      "light_func8": {
-        "default": "mdi:remote"
-      },
-      "light_func9": {
-        "default": "mdi:remote"
-      },
-      "light_green": {
-        "default": "mdi:remote"
-      },
-      "light_left": {
-        "default": "mdi:remote"
-      },
-      "light_play": {
-        "default": "mdi:remote"
-      },
-      "light_red": {
-        "default": "mdi:remote"
-      },
-      "light_rewind": {
-        "default": "mdi:remote"
-      },
-      "light_right": {
-        "default": "mdi:remote"
-      },
-      "light_select": {
-        "default": "mdi:remote"
-      },
-      "light_stop": {
-        "default": "mdi:remote"
-      },
-      "light_up": {
-        "default": "mdi:remote"
-      },
-      "light_wind": {
-        "default": "mdi:remote"
-      },
-      "light_yellow": {
-        "default": "mdi:remote"
-      }
-    }
-  },
   "services": {
     "beolink_allstandby": { "service": "mdi:close-circle-multiple-outline" },
     "beolink_expand": { "service": "mdi:location-enter" },

homeassistant/components/bang_olufsen/media_player.py

@@ -80,9 +80,7 @@ from .const import (
     CONNECTION_STATUS,
     DOMAIN,
     FALLBACK_SOURCES,
-    MANUFACTURER,
     VALID_MEDIA_TYPES,
-    BangOlufsenAttribute,
     BangOlufsenMediaType,
     BangOlufsenSource,
     WebsocketNotification,
@@ -203,7 +201,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         self._attr_device_info = DeviceInfo(
             configuration_url=f"http://{self._host}/#/",
             identifiers={(DOMAIN, self._unique_id)},
-            manufacturer=MANUFACTURER,
+            manufacturer="Bang & Olufsen",
             model=self._model,
             serial_number=self._unique_id,
         )
@@ -225,8 +223,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         # Beolink compatible sources
         self._beolink_sources: dict[str, bool] = {}
         self._remote_leader: BeolinkLeader | None = None
-        # Extra state attributes:
-        # Beolink: peer(s), listener(s), leader and self
+        # Extra state attributes for showing Beolink: peer(s), listener(s), leader and self
         self._beolink_attributes: dict[str, dict[str, dict[str, str]]] = {}
 
     async def async_added_to_hass(self) -> None:
@@ -252,7 +249,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
             self.async_on_remove(
                 async_dispatcher_connect(
                     self.hass,
-                    f"{DOMAIN}_{self._unique_id}_{signal}",
+                    f"{self._unique_id}_{signal}",
                     signal_handler,
                 )
             )
@@ -438,10 +435,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         await self._async_update_beolink()
 
     async def _async_update_beolink(self) -> None:
-        """Update the current Beolink leader, listeners, peers and self.
-
-        Updates Home Assistant state.
-        """
+        """Update the current Beolink leader, listeners, peers and self."""
 
         self._beolink_attributes = {}
 
@@ -450,24 +444,18 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
 
         # Add Beolink self
         self._beolink_attributes = {
-            BangOlufsenAttribute.BEOLINK: {
-                BangOlufsenAttribute.BEOLINK_SELF: {
-                    self.device_entry.name: self._beolink_jid
-                }
-            }
+            "beolink": {"self": {self.device_entry.name: self._beolink_jid}}
         }
 
         # Add Beolink peers
         peers = await self._client.get_beolink_peers()
 
         if len(peers) > 0:
-            self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
-                BangOlufsenAttribute.BEOLINK_PEERS
-            ] = {}
+            self._beolink_attributes["beolink"]["peers"] = {}
             for peer in peers:
-                self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
-                    BangOlufsenAttribute.BEOLINK_PEERS
-                ][peer.friendly_name] = peer.jid
+                self._beolink_attributes["beolink"]["peers"][peer.friendly_name] = (
+                    peer.jid
+                )
 
         # Add Beolink listeners / leader
         self._remote_leader = self._playback_metadata.remote_leader
@@ -488,9 +476,7 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
             # Add self
             group_members.append(self.entity_id)
 
-            self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
-                BangOlufsenAttribute.BEOLINK_LEADER
-            ] = {
+            self._beolink_attributes["beolink"]["leader"] = {
                 self._remote_leader.friendly_name: self._remote_leader.jid,
             }
 
@@ -527,9 +513,9 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
                                 beolink_listener.jid
                             )
                             break
-                self._beolink_attributes[BangOlufsenAttribute.BEOLINK][
-                    BangOlufsenAttribute.BEOLINK_LISTENERS
-                ] = beolink_listeners_attribute
+                self._beolink_attributes["beolink"]["listeners"] = (
+                    beolink_listeners_attribute
+                )
 
         self._attr_group_members = group_members
 
@@ -628,18 +614,11 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         return None
 
     @property
-    def media_content_type(self) -> MediaType | str | None:
+    def media_content_type(self) -> str:
         """Return the current media type."""
-        content_type = {
-            BangOlufsenSource.URI_STREAMER.id: MediaType.URL,
-            BangOlufsenSource.DEEZER.id: BangOlufsenMediaType.DEEZER,
-            BangOlufsenSource.TIDAL.id: BangOlufsenMediaType.TIDAL,
-            BangOlufsenSource.NET_RADIO.id: BangOlufsenMediaType.RADIO,
-        }
-        # Hard to determine content type.
-        if self._source_change.id in content_type:
-            return content_type[self._source_change.id]
-
+        # Hard to determine content type
+        if self._source_change.id == BangOlufsenSource.URI_STREAMER.id:
+            return MediaType.URL
         return MediaType.MUSIC
 
     @property
@@ -652,11 +631,6 @@ class BangOlufsenMediaPlayer(BangOlufsenEntity, MediaPlayerEntity):
         """Return the current playback progress."""
         return self._playback_progress.progress
 
-    @property
-    def media_content_id(self) -> str | None:
-        """Return internal ID of Deezer, Tidal and radio stations."""
-        return self._playback_metadata.source_internal_id
-
     @property
     def media_image_url(self) -> str | None:
         """Return URL of the currently playing music."""

homeassistant/components/bang_olufsen/util.py

@@ -2,11 +2,6 @@
 
 from __future__ import annotations
 
-from typing import cast
-
-from mozart_api.models import PairedRemote
-from mozart_api.mozart_client import MozartClient
-
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceEntry
@@ -28,18 +23,6 @@ def get_serial_number_from_jid(jid: str) -> str:
     return jid.split(".")[2].split("@")[0]
 
 
-async def get_remotes(client: MozartClient) -> list[PairedRemote]:
-    """Get paired remotes."""
-
-    bluetooth_remote_list = await client.get_bluetooth_remotes()
-
-    return [
-        remote
-        for remote in cast(list[PairedRemote], bluetooth_remote_list.items)
-        if remote.serial_number is not None
-    ]
-
-
 def get_device_buttons(model: BangOlufsenModel) -> list[str]:
     """Get supported buttons for a given model."""
     buttons = DEVICE_BUTTONS.copy()

homeassistant/components/bang_olufsen/websocket.py

@@ -6,7 +6,6 @@ import logging
 from typing import TYPE_CHECKING
 
 from mozart_api.models import (
-    BeoRemoteButton,
     ButtonEvent,
     ListeningModeProps,
     PlaybackContentMetadata,
@@ -29,13 +28,11 @@ from homeassistant.util.enum import try_parse_enum
 from .const import (
     BANG_OLUFSEN_WEBSOCKET_EVENT,
     CONNECTION_STATUS,
-    DOMAIN,
     EVENT_TRANSLATION_MAP,
-    BangOlufsenModel,
     WebsocketNotification,
 )
 from .entity import BangOlufsenBase
-from .util import get_device, get_remotes
+from .util import get_device
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -60,9 +57,6 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         self._client.get_active_listening_mode_notifications(
             self.on_active_listening_mode
         )
-        self._client.get_beo_remote_button_notifications(
-            self.on_beo_remote_button_notification
-        )
         self._client.get_button_notifications(self.on_button_notification)
 
         self._client.get_playback_error_notifications(
@@ -93,7 +87,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Update all entities of the connection status."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{CONNECTION_STATUS}",
+            f"{self._unique_id}_{CONNECTION_STATUS}",
             self._client.websocket_connected,
         )
 
@@ -111,22 +105,10 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send active_listening_mode dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.ACTIVE_LISTENING_MODE}",
+            f"{self._unique_id}_{WebsocketNotification.ACTIVE_LISTENING_MODE}",
             notification,
         )
 
-    def on_beo_remote_button_notification(self, notification: BeoRemoteButton) -> None:
-        """Send beo_remote_button dispatch."""
-        if TYPE_CHECKING:
-            assert notification.type
-
-        # Send to event entity
-        async_dispatcher_send(
-            self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.BEO_REMOTE_BUTTON}_{notification.key}",
-            EVENT_TRANSLATION_MAP[notification.type],
-        )
-
     def on_button_notification(self, notification: ButtonEvent) -> None:
         """Send button dispatch."""
         # State is expected to always be available.
@@ -136,11 +118,11 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         # Send to event entity
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.BUTTON}_{notification.button}",
+            f"{self._unique_id}_{WebsocketNotification.BUTTON}_{notification.button}",
             EVENT_TRANSLATION_MAP[notification.state],
         )
 
-    async def on_notification_notification(
+    def on_notification_notification(
         self, notification: WebsocketNotificationTag
     ) -> None:
         """Send notification dispatch."""
@@ -154,51 +136,24 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         ):
             async_dispatcher_send(
                 self.hass,
-                f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.BEOLINK}",
+                f"{self._unique_id}_{WebsocketNotification.BEOLINK}",
             )
         elif notification_type is WebsocketNotification.CONFIGURATION:
             async_dispatcher_send(
                 self.hass,
-                f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.CONFIGURATION}",
+                f"{self._unique_id}_{WebsocketNotification.CONFIGURATION}",
             )
         elif notification_type is WebsocketNotification.REMOTE_MENU_CHANGED:
             async_dispatcher_send(
                 self.hass,
-                f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.REMOTE_MENU_CHANGED}",
+                f"{self._unique_id}_{WebsocketNotification.REMOTE_MENU_CHANGED}",
             )
 
-        # This notification is triggered by a remote pairing, unpairing and connecting to a device
-        # So the current remote devices have to be compared to available remotes to determine action
-        elif notification_type is WebsocketNotification.REMOTE_CONTROL_DEVICES:
-            device_registry = dr.async_get(self.hass)
-            # Get remote devices connected to the device from Home Assistant
-            device_serial_numbers = [
-                device.serial_number
-                for device in device_registry.devices.get_devices_for_config_entry_id(
-                    self.entry.entry_id
-                )
-                if device.serial_number is not None
-                and device.model == BangOlufsenModel.BEOREMOTE_ONE
-            ]
-            # Get paired remotes from device
-            remote_serial_numbers = [
-                remote.serial_number
-                for remote in await get_remotes(self._client)
-                if remote.serial_number is not None
-            ]
-            # Check if number of remote devices correspond to number of paired remotes
-            if len(remote_serial_numbers) != len(device_serial_numbers):
-                _LOGGER.info(
-                    "A Beoremote One has been paired or unpaired to %s. Reloading config entry to add device and entities",
-                    self.entry.title,
-                )
-                self.hass.config_entries.async_schedule_reload(self.entry.entry_id)
-
     def on_playback_error_notification(self, notification: PlaybackError) -> None:
         """Send playback_error dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.PLAYBACK_ERROR}",
+            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_ERROR}",
             notification,
         )
 
@@ -208,7 +163,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send playback_metadata dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.PLAYBACK_METADATA}",
+            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_METADATA}",
             notification,
         )
 
@@ -216,7 +171,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send playback_progress dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.PLAYBACK_PROGRESS}",
+            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_PROGRESS}",
             notification,
         )
 
@@ -224,7 +179,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send playback_state dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.PLAYBACK_STATE}",
+            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_STATE}",
             notification,
         )
 
@@ -232,7 +187,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send playback_source dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.PLAYBACK_SOURCE}",
+            f"{self._unique_id}_{WebsocketNotification.PLAYBACK_SOURCE}",
             notification,
         )
 
@@ -240,7 +195,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send source_change dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.SOURCE_CHANGE}",
+            f"{self._unique_id}_{WebsocketNotification.SOURCE_CHANGE}",
             notification,
         )
 
@@ -248,7 +203,7 @@ class BangOlufsenWebsocket(BangOlufsenBase):
         """Send volume dispatch."""
         async_dispatcher_send(
             self.hass,
-            f"{DOMAIN}_{self._unique_id}_{WebsocketNotification.VOLUME}",
+            f"{self._unique_id}_{WebsocketNotification.VOLUME}",
             notification,
         )
 

homeassistant/components/binary_sensor/icons.json

@@ -174,13 +174,5 @@
         "on": "mdi:window-open"
       }
     }
-  },
-  "triggers": {
-    "occupancy_cleared": {
-      "trigger": "mdi:home-outline"
-    },
-    "occupancy_detected": {
-      "trigger": "mdi:home"
-    }
   }
 }

homeassistant/components/binary_sensor/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description_occupancy": "The behavior of the targeted occupancy sensors to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "device_automation": {
     "condition_type": {
       "is_bat_low": "{entity_name} battery is low",
@@ -321,36 +317,5 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Binary sensor",
-  "triggers": {
-    "occupancy_cleared": {
-      "description": "Triggers after one or more occupancy sensors stop detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::binary_sensor::common::trigger_behavior_description_occupancy%]",
-          "name": "[%key:component::binary_sensor::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Occupancy cleared"
-    },
-    "occupancy_detected": {
-      "description": "Triggers after one or more occupancy sensors start detecting occupancy.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::binary_sensor::common::trigger_behavior_description_occupancy%]",
-          "name": "[%key:component::binary_sensor::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Occupancy detected"
-    }
-  }
+  "title": "Binary sensor"
 }

homeassistant/components/binary_sensor/trigger.py

@@ -1,67 +0,0 @@
-"""Provides triggers for binary sensors."""
-
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity import get_device_class
-from homeassistant.helpers.trigger import EntityStateTriggerBase, Trigger
-from homeassistant.helpers.typing import UNDEFINED, UndefinedType
-
-from . import DOMAIN, BinarySensorDeviceClass
-
-
-def get_device_class_or_undefined(
-    hass: HomeAssistant, entity_id: str
-) -> str | None | UndefinedType:
-    """Get the device class of an entity or UNDEFINED if not found."""
-    try:
-        return get_device_class(hass, entity_id)
-    except HomeAssistantError:
-        return UNDEFINED
-
-
-class BinarySensorOnOffTrigger(EntityStateTriggerBase):
-    """Class for binary sensor on/off triggers."""
-
-    _device_class: BinarySensorDeviceClass | None
-    _domain: str = DOMAIN
-
-    def entity_filter(self, entities: set[str]) -> set[str]:
-        """Filter entities of this domain."""
-        entities = super().entity_filter(entities)
-        return {
-            entity_id
-            for entity_id in entities
-            if get_device_class_or_undefined(self._hass, entity_id)
-            == self._device_class
-        }
-
-
-def make_binary_sensor_trigger(
-    device_class: BinarySensorDeviceClass | None,
-    to_state: str,
-) -> type[BinarySensorOnOffTrigger]:
-    """Create an entity state trigger class."""
-
-    class CustomTrigger(BinarySensorOnOffTrigger):
-        """Trigger for entity state changes."""
-
-        _device_class = device_class
-        _to_state = to_state
-
-    return CustomTrigger
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "occupancy_detected": make_binary_sensor_trigger(
-        BinarySensorDeviceClass.OCCUPANCY, STATE_ON
-    ),
-    "occupancy_cleared": make_binary_sensor_trigger(
-        BinarySensorDeviceClass.OCCUPANCY, STATE_OFF
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for binary sensors."""
-    return TRIGGERS

homeassistant/components/binary_sensor/triggers.yaml

@@ -1,25 +0,0 @@
-.trigger_common_fields: &trigger_common_fields
-  behavior:
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
-
-occupancy_cleared:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: binary_sensor
-      device_class: occupancy
-
-occupancy_detected:
-  fields: *trigger_common_fields
-  target:
-    entity:
-      domain: binary_sensor
-      device_class: occupancy

homeassistant/components/bluetooth/manifest.json

@@ -20,7 +20,7 @@
     "bluetooth-adapters==2.1.0",
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
-    "dbus-fast==3.1.2",
-    "habluetooth==5.8.0"
+    "dbus-fast==3.0.0",
+    "habluetooth==5.7.0"
   ]
 }

homeassistant/components/bluetooth_tracker/__init__.py

@@ -0,0 +1 @@
+"""The bluetooth_tracker component."""

homeassistant/components/bluetooth_tracker/const.py

@@ -0,0 +1,10 @@
+"""Constants for the Bluetooth Tracker component."""
+
+from typing import Final
+
+DOMAIN: Final = "bluetooth_tracker"
+SERVICE_UPDATE: Final = "update"
+
+BT_PREFIX: Final = "BT_"
+CONF_REQUEST_RSSI: Final = "request_rssi"
+DEFAULT_DEVICE_ID: Final = -1

homeassistant/components/bluetooth_tracker/device_tracker.py

@@ -0,0 +1,213 @@
+"""Tracking for bluetooth devices."""
+
+from __future__ import annotations
+
+import asyncio
+from datetime import datetime, timedelta
+import logging
+from typing import Final
+
+import bluetooth
+from bt_proximity import BluetoothRSSI
+import voluptuous as vol
+
+from homeassistant.components.device_tracker import (
+    CONF_SCAN_INTERVAL,
+    CONF_TRACK_NEW,
+    DEFAULT_TRACK_NEW,
+    PLATFORM_SCHEMA as DEVICE_TRACKER_PLATFORM_SCHEMA,
+    SCAN_INTERVAL,
+    SourceType,
+)
+from homeassistant.components.device_tracker.legacy import (
+    YAML_DEVICES,
+    AsyncSeeCallback,
+    Device,
+    async_load_config,
+)
+from homeassistant.const import CONF_DEVICE_ID
+from homeassistant.core import HomeAssistant, ServiceCall
+from homeassistant.helpers import config_validation as cv
+from homeassistant.helpers.event import async_track_time_interval
+from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
+
+from .const import (
+    BT_PREFIX,
+    CONF_REQUEST_RSSI,
+    DEFAULT_DEVICE_ID,
+    DOMAIN,
+    SERVICE_UPDATE,
+)
+
+_LOGGER: Final = logging.getLogger(__name__)
+
+PLATFORM_SCHEMA: Final = DEVICE_TRACKER_PLATFORM_SCHEMA.extend(
+    {
+        vol.Optional(CONF_TRACK_NEW): cv.boolean,
+        vol.Optional(CONF_REQUEST_RSSI): cv.boolean,
+        vol.Optional(CONF_DEVICE_ID, default=DEFAULT_DEVICE_ID): vol.All(
+            vol.Coerce(int), vol.Range(min=-1)
+        ),
+    }
+)
+
+
+def is_bluetooth_device(device: Device) -> bool:
+    """Check whether a device is a bluetooth device by its mac."""
+    return device.mac is not None and device.mac[:3].upper() == BT_PREFIX
+
+
+def discover_devices(device_id: int) -> list[tuple[str, str]]:
+    """Discover Bluetooth devices."""
+    try:
+        result = bluetooth.discover_devices(
+            duration=8,
+            lookup_names=True,
+            flush_cache=True,
+            lookup_class=False,
+            device_id=device_id,
+        )
+    except OSError as ex:
+        # OSError is generally thrown if a bluetooth device isn't found
+        _LOGGER.error("Couldn't discover bluetooth devices: %s", ex)
+        return []
+    _LOGGER.debug("Bluetooth devices discovered = %d", len(result))
+    return result  # type: ignore[no-any-return]
+
+
+async def see_device(
+    hass: HomeAssistant,
+    async_see: AsyncSeeCallback,
+    mac: str,
+    device_name: str,
+    rssi: tuple[int] | None = None,
+) -> None:
+    """Mark a device as seen."""
+    attributes = {}
+    if rssi is not None:
+        attributes["rssi"] = rssi
+
+    await async_see(
+        mac=f"{BT_PREFIX}{mac}",
+        host_name=device_name,
+        attributes=attributes,
+        source_type=SourceType.BLUETOOTH,
+    )
+
+
+async def get_tracking_devices(hass: HomeAssistant) -> tuple[set[str], set[str]]:
+    """Load all known devices.
+
+    We just need the devices so set consider_home and home range to 0
+    """
+    yaml_path: str = hass.config.path(YAML_DEVICES)
+
+    devices = await async_load_config(yaml_path, hass, timedelta(0))
+    bluetooth_devices = [device for device in devices if is_bluetooth_device(device)]
+
+    devices_to_track: set[str] = {
+        device.mac[3:]
+        for device in bluetooth_devices
+        if device.track and device.mac is not None
+    }
+    devices_to_not_track: set[str] = {
+        device.mac[3:]
+        for device in bluetooth_devices
+        if not device.track and device.mac is not None
+    }
+
+    return devices_to_track, devices_to_not_track
+
+
+def lookup_name(mac: str) -> str | None:
+    """Lookup a Bluetooth device name."""
+    _LOGGER.debug("Scanning %s", mac)
+    return bluetooth.lookup_name(mac, timeout=5)  # type: ignore[no-any-return]
+
+
+async def async_setup_scanner(
+    hass: HomeAssistant,
+    config: ConfigType,
+    async_see: AsyncSeeCallback,
+    discovery_info: DiscoveryInfoType | None = None,
+) -> bool:
+    """Set up the Bluetooth Scanner."""
+    device_id: int = config[CONF_DEVICE_ID]
+    interval: timedelta = config.get(CONF_SCAN_INTERVAL, SCAN_INTERVAL)
+    request_rssi: bool = config.get(CONF_REQUEST_RSSI, False)
+    update_bluetooth_lock = asyncio.Lock()
+
+    # If track new devices is true discover new devices on startup.
+    track_new: bool = config.get(CONF_TRACK_NEW, DEFAULT_TRACK_NEW)
+    _LOGGER.debug("Tracking new devices is set to %s", track_new)
+
+    devices_to_track, devices_to_not_track = await get_tracking_devices(hass)
+
+    if not devices_to_track and not track_new:
+        _LOGGER.debug("No Bluetooth devices to track and not tracking new devices")
+
+    if request_rssi:
+        _LOGGER.debug("Detecting RSSI for devices")
+
+    async def perform_bluetooth_update() -> None:
+        """Discover Bluetooth devices and update status."""
+        _LOGGER.debug("Performing Bluetooth devices discovery and update")
+        tasks: list[asyncio.Task[None]] = []
+
+        try:
+            if track_new:
+                devices = await hass.async_add_executor_job(discover_devices, device_id)
+                for mac, _device_name in devices:
+                    if mac not in devices_to_track and mac not in devices_to_not_track:
+                        devices_to_track.add(mac)
+
+            for mac in devices_to_track:
+                friendly_name = await hass.async_add_executor_job(lookup_name, mac)
+                if friendly_name is None:
+                    # Could not lookup device name
+                    continue
+
+                rssi = None
+                if request_rssi:
+                    client = BluetoothRSSI(mac)
+                    rssi = await hass.async_add_executor_job(client.request_rssi)
+                    client.close()
+
+                tasks.append(
+                    asyncio.create_task(
+                        see_device(hass, async_see, mac, friendly_name, rssi)
+                    )
+                )
+
+            if tasks:
+                await asyncio.wait(tasks)
+
+        except bluetooth.BluetoothError:
+            _LOGGER.exception("Error looking up Bluetooth device")
+
+    async def update_bluetooth(now: datetime | None = None) -> None:
+        """Lookup Bluetooth devices and update status."""
+        # If an update is in progress, we don't do anything
+        if update_bluetooth_lock.locked():
+            _LOGGER.debug(
+                (
+                    "Previous execution of update_bluetooth is taking longer than the"
+                    " scheduled update of interval %s"
+                ),
+                interval,
+            )
+            return
+
+        async with update_bluetooth_lock:
+            await perform_bluetooth_update()
+
+    async def handle_manual_update_bluetooth(call: ServiceCall) -> None:
+        """Update bluetooth devices on demand."""
+        await update_bluetooth()
+
+    hass.async_create_task(update_bluetooth())
+    async_track_time_interval(hass, update_bluetooth, interval)
+
+    hass.services.async_register(DOMAIN, SERVICE_UPDATE, handle_manual_update_bluetooth)
+
+    return True

homeassistant/components/bluetooth_tracker/icons.json

@@ -0,0 +1,7 @@
+{
+  "services": {
+    "update": {
+      "service": "mdi:update"
+    }
+  }
+}

homeassistant/components/bluetooth_tracker/manifest.json

@@ -0,0 +1,10 @@
+{
+  "domain": "bluetooth_tracker",
+  "name": "Bluetooth Tracker",
+  "codeowners": [],
+  "documentation": "https://www.home-assistant.io/integrations/bluetooth_tracker",
+  "iot_class": "local_polling",
+  "loggers": ["bluetooth", "bt_proximity"],
+  "quality_scale": "legacy",
+  "requirements": ["bt-proximity==0.2.1", "PyBluez==0.22"]
+}

homeassistant/components/bluetooth_tracker/services.yaml

@@ -0,0 +1 @@
+update:

homeassistant/components/bluetooth_tracker/strings.json

@@ -0,0 +1,8 @@
+{
+  "services": {
+    "update": {
+      "description": "Triggers manual tracker update.",
+      "name": "Update"
+    }
+  }
+}

homeassistant/components/bosch_alarm/__init__.py

@@ -68,9 +68,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: BoschAlarmConfigEntry) -
         config_entry_id=entry.entry_id,
         connections={(CONNECTION_NETWORK_MAC, mac)} if mac else set(),
         identifiers={(DOMAIN, entry.unique_id or entry.entry_id)},
-        name=f"Bosch {panel.model.name}",
+        name=f"Bosch {panel.model}",
         manufacturer="Bosch Security Systems",
-        model=panel.model.name,
+        model=panel.model,
         sw_version=panel.firmware_version,
     )
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)

homeassistant/components/bosch_alarm/config_flow.py

@@ -83,7 +83,7 @@ async def try_connect(
     finally:
         await panel.disconnect()
 
-    return (panel.model.name, panel.serial_number)
+    return (panel.model, panel.serial_number)
 
 
 class BoschAlarmConfigFlow(ConfigFlow, domain=DOMAIN):

homeassistant/components/bosch_alarm/diagnostics.py

@@ -20,8 +20,7 @@ async def async_get_config_entry_diagnostics(
     return {
         "entry_data": async_redact_data(entry.data, TO_REDACT),
         "data": {
-            "model": entry.runtime_data.model.name,
-            "family": entry.runtime_data.model.family.name,
+            "model": entry.runtime_data.model,
             "serial_number": entry.runtime_data.serial_number,
             "protocol_version": entry.runtime_data.protocol_version,
             "firmware_version": entry.runtime_data.firmware_version,

homeassistant/components/bosch_alarm/entity.py

@@ -26,7 +26,7 @@ class BoschAlarmEntity(Entity):
         self._attr_should_poll = False
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
-            name=f"Bosch {panel.model.name}",
+            name=f"Bosch {panel.model}",
             manufacturer="Bosch Security Systems",
         )
 

homeassistant/components/bosch_alarm/manifest.json

@@ -12,5 +12,5 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "platinum",
-  "requirements": ["bosch-alarm-mode2==0.4.10"]
+  "requirements": ["bosch-alarm-mode2==0.4.6"]
 }

homeassistant/components/broadlink/manifest.json

@@ -36,7 +36,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/broadlink",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["broadlink"],
   "requirements": ["broadlink==0.19.0"]

homeassistant/components/camera/__init__.py

@@ -407,8 +407,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
         return [
             RTCIceServer(
                 urls=[
-                    "stun:stun.home-assistant.io:3478",
                     "stun:stun.home-assistant.io:80",
+                    "stun:stun.home-assistant.io:3478",
                 ]
             ),
         ]

homeassistant/components/climate/icons.json

@@ -96,22 +96,5 @@
     "turn_on": {
       "service": "mdi:power-on"
     }
-  },
-  "triggers": {
-    "started_cooling": {
-      "trigger": "mdi:snowflake"
-    },
-    "started_drying": {
-      "trigger": "mdi:water-percent"
-    },
-    "started_heating": {
-      "trigger": "mdi:fire"
-    },
-    "turned_off": {
-      "trigger": "mdi:power-off"
-    },
-    "turned_on": {
-      "trigger": "mdi:power-on"
-    }
   }
 }

homeassistant/components/climate/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "device_automation": {
     "action_type": {
       "set_hvac_mode": "Change HVAC mode on {entity_name}",
@@ -191,13 +187,6 @@
         "heat_cool": "Heat/cool",
         "off": "[%key:common::state::off%]"
       }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
     }
   },
   "services": {
@@ -296,57 +285,5 @@
       "name": "[%key:common::action::turn_on%]"
     }
   },
-  "title": "Climate",
-  "triggers": {
-    "started_cooling": {
-      "description": "Triggers after one or more climate-control devices start cooling.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Climate-control device started cooling"
-    },
-    "started_drying": {
-      "description": "Triggers after one or more climate-control devices start drying.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Climate-control device started drying"
-    },
-    "started_heating": {
-      "description": "Triggers after one or more climate-control devices start heating.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Climate-control device started heating"
-    },
-    "turned_off": {
-      "description": "Triggers after one or more climate-control devices turn off.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Climate-control device turned off"
-    },
-    "turned_on": {
-      "description": "Triggers after one or more climate-control devices turn on, regardless of the mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Climate-control device turned on"
-    }
-  }
+  "title": "Climate"
 }

homeassistant/components/climate/trigger.py

@@ -1,43 +0,0 @@
-"""Provides triggers for climates."""
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import (
-    Trigger,
-    make_conditional_entity_state_trigger,
-    make_entity_state_attribute_trigger,
-    make_entity_state_trigger,
-)
-
-from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "started_cooling": make_entity_state_attribute_trigger(
-        DOMAIN, ATTR_HVAC_ACTION, HVACAction.COOLING
-    ),
-    "started_drying": make_entity_state_attribute_trigger(
-        DOMAIN, ATTR_HVAC_ACTION, HVACAction.DRYING
-    ),
-    "turned_off": make_entity_state_trigger(DOMAIN, HVACMode.OFF),
-    "turned_on": make_conditional_entity_state_trigger(
-        DOMAIN,
-        from_states={
-            HVACMode.OFF,
-        },
-        to_states={
-            HVACMode.AUTO,
-            HVACMode.COOL,
-            HVACMode.DRY,
-            HVACMode.FAN_ONLY,
-            HVACMode.HEAT,
-            HVACMode.HEAT_COOL,
-        },
-    ),
-    "started_heating": make_entity_state_attribute_trigger(
-        DOMAIN, ATTR_HVAC_ACTION, HVACAction.HEATING
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for climates."""
-    return TRIGGERS

homeassistant/components/climate/triggers.yaml

@@ -1,21 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: climate
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: trigger_behavior
-          options:
-            - first
-            - last
-            - any
-
-started_cooling: *trigger_common
-started_drying: *trigger_common
-started_heating: *trigger_common
-turned_off: *trigger_common
-turned_on: *trigger_common

homeassistant/components/cloud/__init__.py

@@ -4,13 +4,12 @@ from __future__ import annotations
 
 import asyncio
 from collections.abc import Awaitable, Callable
-from contextlib import suppress
 from datetime import datetime, timedelta
 from enum import Enum
 import logging
 from typing import Any, cast
 
-from hass_nabucasa import Cloud, NabuCasaBaseError
+from hass_nabucasa import Cloud
 import voluptuous as vol
 
 from homeassistant.components import alexa, google_assistant
@@ -78,16 +77,7 @@ from .subscription import async_subscription_info
 
 DEFAULT_MODE = MODE_PROD
 
-PLATFORMS = [
-    Platform.BINARY_SENSOR,
-    Platform.STT,
-    Platform.TTS,
-]
-
-LLM_PLATFORMS = [
-    Platform.AI_TASK,
-    Platform.CONVERSATION,
-]
+PLATFORMS = [Platform.BINARY_SENSOR, Platform.STT, Platform.TTS]
 
 SERVICE_REMOTE_CONNECT = "remote_connect"
 SERVICE_REMOTE_DISCONNECT = "remote_disconnect"
@@ -435,14 +425,7 @@ def _handle_prefs_updated(hass: HomeAssistant, cloud: Cloud[CloudClient]) -> Non
 
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up a config entry."""
-    platforms = PLATFORMS.copy()
-    if (cloud := hass.data[DATA_CLOUD]).is_logged_in:
-        with suppress(NabuCasaBaseError):
-            await cloud.llm.async_ensure_token()
-            platforms += LLM_PLATFORMS
-
-    await hass.config_entries.async_forward_entry_setups(entry, platforms)
-    entry.runtime_data = {"platforms": platforms}
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     stt_tts_entities_added = hass.data[DATA_PLATFORMS_SETUP]["stt_tts_entities_added"]
     stt_tts_entities_added.set()
 
@@ -451,9 +434,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
 
 async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(
-        entry, entry.runtime_data["platforms"]
-    )
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
 @callback

homeassistant/components/cloud/ai_task.py

@@ -1,195 +0,0 @@
-"""AI Task integration for Home Assistant Cloud."""
-
-from __future__ import annotations
-
-import io
-from json import JSONDecodeError
-import logging
-
-from hass_nabucasa.llm import (
-    LLMAuthenticationError,
-    LLMError,
-    LLMImageAttachment,
-    LLMRateLimitError,
-    LLMResponseError,
-    LLMServiceError,
-)
-from PIL import Image
-
-from homeassistant.components import ai_task, conversation
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.util.json import json_loads
-
-from .const import AI_TASK_ENTITY_UNIQUE_ID, DATA_CLOUD
-from .entity import BaseCloudLLMEntity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-def _convert_image_for_editing(data: bytes) -> tuple[bytes, str]:
-    """Ensure the image data is in a format accepted by OpenAI image edits."""
-    stream = io.BytesIO(data)
-    with Image.open(stream) as img:
-        mode = img.mode
-        if mode not in ("RGBA", "LA", "L"):
-            img = img.convert("RGBA")
-
-        output = io.BytesIO()
-        if img.mode in ("RGBA", "LA", "L"):
-            img.save(output, format="PNG")
-            return output.getvalue(), "image/png"
-
-        img.save(output, format=img.format or "PNG")
-        return output.getvalue(), f"image/{(img.format or 'png').lower()}"
-
-
-async def async_prepare_image_generation_attachments(
-    hass: HomeAssistant, attachments: list[conversation.Attachment]
-) -> list[LLMImageAttachment]:
-    """Load attachment data for image generation."""
-
-    def prepare() -> list[LLMImageAttachment]:
-        items: list[LLMImageAttachment] = []
-        for attachment in attachments:
-            if not attachment.mime_type or not attachment.mime_type.startswith(
-                "image/"
-            ):
-                raise HomeAssistantError(
-                    "Only image attachments are supported for image generation"
-                )
-            path = attachment.path
-            if not path.exists():
-                raise HomeAssistantError(f"`{path}` does not exist")
-
-            data = path.read_bytes()
-            mime_type = attachment.mime_type
-
-            try:
-                data, mime_type = _convert_image_for_editing(data)
-            except HomeAssistantError:
-                raise
-            except Exception as err:
-                raise HomeAssistantError("Failed to process image attachment") from err
-
-            items.append(
-                LLMImageAttachment(
-                    filename=path.name,
-                    mime_type=mime_type,
-                    data=data,
-                )
-            )
-
-        return items
-
-    return await hass.async_add_executor_job(prepare)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Home Assistant Cloud AI Task entity."""
-    cloud = hass.data[DATA_CLOUD]
-    async_add_entities([CloudAITaskEntity(cloud, config_entry)])
-
-
-class CloudAITaskEntity(BaseCloudLLMEntity, ai_task.AITaskEntity):
-    """Home Assistant Cloud AI Task entity."""
-
-    _attr_has_entity_name = True
-    _attr_supported_features = (
-        ai_task.AITaskEntityFeature.GENERATE_DATA
-        | ai_task.AITaskEntityFeature.GENERATE_IMAGE
-        | ai_task.AITaskEntityFeature.SUPPORT_ATTACHMENTS
-    )
-    _attr_translation_key = "cloud_ai"
-    _attr_unique_id = AI_TASK_ENTITY_UNIQUE_ID
-
-    @property
-    def available(self) -> bool:
-        """Return if the entity is available."""
-        return self._cloud.is_logged_in and self._cloud.valid_subscription
-
-    async def _async_generate_data(
-        self,
-        task: ai_task.GenDataTask,
-        chat_log: conversation.ChatLog,
-    ) -> ai_task.GenDataTaskResult:
-        """Handle a generate data task."""
-        await self._async_handle_chat_log(
-            "ai_task", chat_log, task.name, task.structure
-        )
-
-        if not isinstance(chat_log.content[-1], conversation.AssistantContent):
-            raise HomeAssistantError(
-                "Last content in chat log is not an AssistantContent"
-            )
-
-        text = chat_log.content[-1].content or ""
-
-        if not task.structure:
-            return ai_task.GenDataTaskResult(
-                conversation_id=chat_log.conversation_id,
-                data=text,
-            )
-        try:
-            data = json_loads(text)
-        except JSONDecodeError as err:
-            _LOGGER.error(
-                "Failed to parse JSON response: %s. Response: %s",
-                err,
-                text,
-            )
-            raise HomeAssistantError("Error with OpenAI structured response") from err
-
-        return ai_task.GenDataTaskResult(
-            conversation_id=chat_log.conversation_id,
-            data=data,
-        )
-
-    async def _async_generate_image(
-        self,
-        task: ai_task.GenImageTask,
-        chat_log: conversation.ChatLog,
-    ) -> ai_task.GenImageTaskResult:
-        """Handle a generate image task."""
-        attachments: list[LLMImageAttachment] | None = None
-        if task.attachments:
-            attachments = await async_prepare_image_generation_attachments(
-                self.hass, task.attachments
-            )
-
-        try:
-            if attachments is None:
-                image = await self._cloud.llm.async_generate_image(
-                    prompt=task.instructions,
-                )
-            else:
-                image = await self._cloud.llm.async_edit_image(
-                    prompt=task.instructions,
-                    attachments=attachments,
-                )
-        except LLMAuthenticationError as err:
-            raise HomeAssistantError("Cloud LLM authentication failed") from err
-        except LLMRateLimitError as err:
-            raise HomeAssistantError("Cloud LLM is rate limited") from err
-        except LLMResponseError as err:
-            raise HomeAssistantError(str(err)) from err
-        except LLMServiceError as err:
-            raise HomeAssistantError("Error talking to Cloud LLM") from err
-        except LLMError as err:
-            raise HomeAssistantError(str(err)) from err
-
-        return ai_task.GenImageTaskResult(
-            conversation_id=chat_log.conversation_id,
-            mime_type=image["mime_type"],
-            image_data=image["image_data"],
-            model=image.get("model"),
-            width=image.get("width"),
-            height=image.get("height"),
-            revised_prompt=image.get("revised_prompt"),
-        )

homeassistant/components/cloud/client.py

@@ -71,7 +71,6 @@ class CloudClient(Interface):
         self._google_config_init_lock = asyncio.Lock()
         self._relayer_region: str | None = None
         self._cloud_ice_servers_listener: Callable[[], None] | None = None
-        self._ice_servers: list[RTCIceServer] = []
 
     @property
     def base_path(self) -> Path:
@@ -118,11 +117,6 @@ class CloudClient(Interface):
         """Return the connected relayer region."""
         return self._relayer_region
 
-    @property
-    def ice_servers(self) -> list[RTCIceServer]:
-        """Return the current ICE servers."""
-        return self._ice_servers
-
     async def get_alexa_config(self) -> alexa_config.CloudAlexaConfig:
         """Return Alexa config."""
         if self._alexa_config is None:
@@ -209,8 +203,11 @@ class CloudClient(Interface):
                 ice_servers: list[RTCIceServer],
             ) -> Callable[[], None]:
                 """Register cloud ice server."""
-                self._ice_servers = ice_servers
-                return async_register_ice_servers(self._hass, lambda: self._ice_servers)
+
+                def get_ice_servers() -> list[RTCIceServer]:
+                    return ice_servers
+
+                return async_register_ice_servers(self._hass, get_ice_servers)
 
             async def async_register_cloud_ice_servers_listener(
                 prefs: CloudPreferences,
@@ -271,7 +268,6 @@ class CloudClient(Interface):
 
     async def logout_cleanups(self) -> None:
         """Cleanup some stuff after logout."""
-        self._ice_servers = []
         await self.prefs.async_set_username(None)
 
         if self._alexa_config:

homeassistant/components/cloud/const.py

@@ -91,8 +91,6 @@ DISPATCHER_REMOTE_UPDATE: SignalType[Any] = SignalType("cloud_remote_update")
 
 STT_ENTITY_UNIQUE_ID = "cloud-speech-to-text"
 TTS_ENTITY_UNIQUE_ID = "cloud-text-to-speech"
-AI_TASK_ENTITY_UNIQUE_ID = "cloud-ai-task"
-CONVERSATION_ENTITY_UNIQUE_ID = "cloud-conversation-agent"
 
 LOGIN_MFA_TIMEOUT = 60
 

homeassistant/components/cloud/conversation.py

@@ -1,68 +0,0 @@
-"""Conversation support for Home Assistant Cloud."""
-
-from __future__ import annotations
-
-from typing import Literal
-
-from homeassistant.components import conversation
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import MATCH_ALL
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import llm
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .const import CONVERSATION_ENTITY_UNIQUE_ID, DATA_CLOUD, DOMAIN
-from .entity import BaseCloudLLMEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the Home Assistant Cloud conversation entity."""
-    cloud = hass.data[DATA_CLOUD]
-    async_add_entities([CloudConversationEntity(cloud, config_entry)])
-
-
-class CloudConversationEntity(
-    BaseCloudLLMEntity,
-    conversation.ConversationEntity,
-):
-    """Home Assistant Cloud conversation agent."""
-
-    _attr_has_entity_name = True
-    _attr_name = "Home Assistant Cloud"
-    _attr_translation_key = "cloud_conversation"
-    _attr_unique_id = CONVERSATION_ENTITY_UNIQUE_ID
-    _attr_supported_features = conversation.ConversationEntityFeature.CONTROL
-
-    @property
-    def available(self) -> bool:
-        """Return if the entity is available."""
-        return self._cloud.is_logged_in and self._cloud.valid_subscription
-
-    @property
-    def supported_languages(self) -> list[str] | Literal["*"]:
-        """Return a list of supported languages."""
-        return MATCH_ALL
-
-    async def _async_handle_message(
-        self,
-        user_input: conversation.ConversationInput,
-        chat_log: conversation.ChatLog,
-    ) -> conversation.ConversationResult:
-        """Process a user input."""
-        try:
-            await chat_log.async_provide_llm_data(
-                user_input.as_llm_context(DOMAIN),
-                llm.LLM_API_ASSIST,
-                None,
-                user_input.extra_system_prompt,
-            )
-        except conversation.ConverseError as err:
-            return err.as_conversation_result()
-
-        await self._async_handle_chat_log("conversation", chat_log)
-
-        return conversation.async_get_result_from_chat_log(user_input, chat_log)

homeassistant/components/cloud/entity.py

@@ -1,614 +0,0 @@
-"""Helpers for cloud LLM chat handling."""
-
-import base64
-from collections.abc import AsyncGenerator, Callable, Iterable
-from enum import Enum
-import json
-import logging
-import re
-from typing import Any, Literal, cast
-
-from hass_nabucasa import Cloud, NabuCasaBaseError
-from hass_nabucasa.llm import (
-    LLMAuthenticationError,
-    LLMRateLimitError,
-    LLMResponseError,
-    LLMServiceError,
-)
-from litellm import (
-    ResponseFunctionToolCall,
-    ResponseInputParam,
-    ResponsesAPIStreamEvents,
-)
-from openai.types.responses import (
-    FunctionToolParam,
-    ResponseInputItemParam,
-    ResponseReasoningItem,
-    ToolParam,
-    WebSearchToolParam,
-)
-from openai.types.responses.response_input_param import (
-    ImageGenerationCall as ImageGenerationCallParam,
-)
-from openai.types.responses.response_output_item import ImageGenerationCall
-import voluptuous as vol
-from voluptuous_openapi import convert
-
-from homeassistant.components import conversation
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import llm
-from homeassistant.helpers.entity import Entity
-from homeassistant.util import slugify
-
-from .client import CloudClient
-
-_LOGGER = logging.getLogger(__name__)
-
-_MAX_TOOL_ITERATIONS = 10
-
-
-class ResponseItemType(str, Enum):
-    """Response item types."""
-
-    FUNCTION_CALL = "function_call"
-    MESSAGE = "message"
-    REASONING = "reasoning"
-    WEB_SEARCH_CALL = "web_search_call"
-    IMAGE = "image"
-
-
-def _convert_content_to_param(
-    chat_content: Iterable[conversation.Content],
-) -> ResponseInputParam:
-    """Convert any native chat message for this agent to the native format."""
-    messages: ResponseInputParam = []
-    reasoning_summary: list[str] = []
-    web_search_calls: dict[str, dict[str, Any]] = {}
-
-    for content in chat_content:
-        if isinstance(content, conversation.ToolResultContent):
-            if (
-                content.tool_name == "web_search_call"
-                and content.tool_call_id in web_search_calls
-            ):
-                web_search_call = web_search_calls.pop(content.tool_call_id)
-                web_search_call["status"] = content.tool_result.get(
-                    "status", "completed"
-                )
-                messages.append(cast("ResponseInputItemParam", web_search_call))
-            else:
-                messages.append(
-                    {
-                        "type": "function_call_output",
-                        "call_id": content.tool_call_id,
-                        "output": json.dumps(content.tool_result),
-                    }
-                )
-            continue
-
-        if content.content:
-            role: Literal["user", "assistant", "system", "developer"] = content.role
-            if role == "system":
-                role = "developer"
-            messages.append(
-                {"type": "message", "role": role, "content": content.content}
-            )
-
-        if isinstance(content, conversation.AssistantContent):
-            if content.tool_calls:
-                for tool_call in content.tool_calls:
-                    if (
-                        tool_call.external
-                        and tool_call.tool_name == "web_search_call"
-                        and "action" in tool_call.tool_args
-                    ):
-                        web_search_calls[tool_call.id] = {
-                            "type": "web_search_call",
-                            "id": tool_call.id,
-                            "action": tool_call.tool_args["action"],
-                            "status": "completed",
-                        }
-                    else:
-                        messages.append(
-                            {
-                                "type": "function_call",
-                                "name": tool_call.tool_name,
-                                "arguments": json.dumps(tool_call.tool_args),
-                                "call_id": tool_call.id,
-                            }
-                        )
-
-            if content.thinking_content:
-                reasoning_summary.append(content.thinking_content)
-
-            if isinstance(content.native, ResponseReasoningItem):
-                messages.append(
-                    {
-                        "type": "reasoning",
-                        "id": content.native.id,
-                        "summary": (
-                            [
-                                {
-                                    "type": "summary_text",
-                                    "text": summary,
-                                }
-                                for summary in reasoning_summary
-                            ]
-                            if content.thinking_content
-                            else []
-                        ),
-                        "encrypted_content": content.native.encrypted_content,
-                    }
-                )
-                reasoning_summary = []
-
-            elif isinstance(content.native, ImageGenerationCall):
-                messages.append(
-                    cast(ImageGenerationCallParam, content.native.to_dict())
-                )
-
-    return messages
-
-
-def _format_tool(
-    tool: llm.Tool,
-    custom_serializer: Callable[[Any], Any] | None,
-) -> ToolParam:
-    """Format a Home Assistant tool for the OpenAI Responses API."""
-    parameters = convert(tool.parameters, custom_serializer=custom_serializer)
-
-    spec: FunctionToolParam = {
-        "type": "function",
-        "name": tool.name,
-        "strict": False,
-        "description": tool.description,
-        "parameters": parameters,
-    }
-
-    return spec
-
-
-def _adjust_schema(schema: dict[str, Any]) -> None:
-    """Adjust the schema to be compatible with OpenAI API."""
-    if schema["type"] == "object":
-        schema.setdefault("strict", True)
-        schema.setdefault("additionalProperties", False)
-        if "properties" not in schema:
-            return
-
-        if "required" not in schema:
-            schema["required"] = []
-
-        # Ensure all properties are required
-        for prop, prop_info in schema["properties"].items():
-            _adjust_schema(prop_info)
-            if prop not in schema["required"]:
-                prop_info["type"] = [prop_info["type"], "null"]
-                schema["required"].append(prop)
-
-    elif schema["type"] == "array":
-        if "items" not in schema:
-            return
-
-        _adjust_schema(schema["items"])
-
-
-def _format_structured_output(
-    schema: vol.Schema, llm_api: llm.APIInstance | None
-) -> dict[str, Any]:
-    """Format the schema to be compatible with OpenAI API."""
-    result: dict[str, Any] = convert(
-        schema,
-        custom_serializer=(
-            llm_api.custom_serializer if llm_api else llm.selector_serializer
-        ),
-    )
-
-    _ensure_schema_constraints(result)
-
-    return result
-
-
-def _ensure_schema_constraints(schema: dict[str, Any]) -> None:
-    """Ensure generated schemas match the Responses API expectations."""
-    schema_type = schema.get("type")
-
-    if schema_type == "object":
-        schema.setdefault("additionalProperties", False)
-        properties = schema.get("properties")
-        if isinstance(properties, dict):
-            for property_schema in properties.values():
-                if isinstance(property_schema, dict):
-                    _ensure_schema_constraints(property_schema)
-    elif schema_type == "array":
-        items = schema.get("items")
-        if isinstance(items, dict):
-            _ensure_schema_constraints(items)
-
-
-# Borrowed and adapted from openai_conversation component
-async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
-    chat_log: conversation.ChatLog,
-    stream: Any,
-    remove_citations: bool = False,
-) -> AsyncGenerator[
-    conversation.AssistantContentDeltaDict | conversation.ToolResultContentDeltaDict
-]:
-    """Transform stream result into HA format."""
-    last_summary_index = None
-    last_role: Literal["assistant", "tool_result"] | None = None
-    current_tool_call: ResponseFunctionToolCall | None = None
-
-    # Non-reasoning models don't follow our request to remove citations, so we remove
-    # them manually here. They always follow the same pattern: the citation is always
-    # in parentheses in Markdown format, the citation is always in a single delta event,
-    # and sometimes the closing parenthesis is split into a separate delta event.
-    remove_parentheses: bool = False
-    citation_regexp = re.compile(r"\(\[([^\]]+)\]\((https?:\/\/[^\)]+)\)")
-
-    async for event in stream:
-        event_type = getattr(event, "type", None)
-        event_item = getattr(event, "item", None)
-        event_item_type = getattr(event_item, "type", None) if event_item else None
-
-        _LOGGER.debug(
-            "Event[%s] | item: %s",
-            event_type,
-            event_item_type,
-        )
-
-        if event_type == ResponsesAPIStreamEvents.OUTPUT_ITEM_ADDED:
-            # Detect function_call even when it's a BaseLiteLLMOpenAIResponseObject
-            if event_item_type == ResponseItemType.FUNCTION_CALL:
-                # OpenAI has tool calls as individual events
-                # while HA puts tool calls inside the assistant message.
-                # We turn them into individual assistant content for HA
-                # to ensure that tools are called as soon as possible.
-                yield {"role": "assistant"}
-                last_role = "assistant"
-                last_summary_index = None
-                current_tool_call = cast(ResponseFunctionToolCall, event.item)
-            elif (
-                event_item_type == ResponseItemType.MESSAGE
-                or (
-                    event_item_type == ResponseItemType.REASONING
-                    and last_summary_index is not None
-                )  # Subsequent ResponseReasoningItem
-                or last_role != "assistant"
-            ):
-                yield {"role": "assistant"}
-                last_role = "assistant"
-                last_summary_index = None
-
-        elif event_type == ResponsesAPIStreamEvents.OUTPUT_ITEM_DONE:
-            if event_item_type == ResponseItemType.REASONING:
-                encrypted_content = getattr(event.item, "encrypted_content", None)
-                summary = getattr(event.item, "summary", []) or []
-
-                yield {
-                    "native": ResponseReasoningItem(
-                        type="reasoning",
-                        id=event.item.id,
-                        summary=[],
-                        encrypted_content=encrypted_content,
-                    )
-                }
-
-                last_summary_index = len(summary) - 1 if summary else None
-            elif event_item_type == ResponseItemType.WEB_SEARCH_CALL:
-                action = getattr(event.item, "action", None)
-                if isinstance(action, dict):
-                    action_dict = action
-                elif action is not None:
-                    action_dict = action.to_dict()
-                else:
-                    action_dict = {}
-                yield {
-                    "tool_calls": [
-                        llm.ToolInput(
-                            id=event.item.id,
-                            tool_name="web_search_call",
-                            tool_args={"action": action_dict},
-                            external=True,
-                        )
-                    ]
-                }
-                yield {
-                    "role": "tool_result",
-                    "tool_call_id": event.item.id,
-                    "tool_name": "web_search_call",
-                    "tool_result": {"status": event.item.status},
-                }
-                last_role = "tool_result"
-            elif event_item_type == ResponseItemType.IMAGE:
-                yield {"native": event.item}
-                last_summary_index = -1  # Trigger new assistant message on next turn
-
-        elif event_type == ResponsesAPIStreamEvents.OUTPUT_TEXT_DELTA:
-            data = event.delta
-            if remove_parentheses:
-                data = data.removeprefix(")")
-                remove_parentheses = False
-            elif remove_citations and (match := citation_regexp.search(data)):
-                match_start, match_end = match.span()
-                # remove leading space if any
-                if data[match_start - 1 : match_start] == " ":
-                    match_start -= 1
-                # remove closing parenthesis:
-                if data[match_end : match_end + 1] == ")":
-                    match_end += 1
-                else:
-                    remove_parentheses = True
-                data = data[:match_start] + data[match_end:]
-            if data:
-                yield {"content": data}
-
-        elif event_type == ResponsesAPIStreamEvents.REASONING_SUMMARY_TEXT_DELTA:
-            # OpenAI can output several reasoning summaries
-            # in a single ResponseReasoningItem. We split them as separate
-            # AssistantContent messages. Only last of them will have
-            # the reasoning `native` field set.
-            if (
-                last_summary_index is not None
-                and event.summary_index != last_summary_index
-            ):
-                yield {"role": "assistant"}
-                last_role = "assistant"
-            last_summary_index = event.summary_index
-            yield {"thinking_content": event.delta}
-
-        elif event_type == ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DELTA:
-            if current_tool_call is not None:
-                current_tool_call.arguments += event.delta
-
-        elif event_type == ResponsesAPIStreamEvents.WEB_SEARCH_CALL_SEARCHING:
-            yield {"role": "assistant"}
-
-        elif event_type == ResponsesAPIStreamEvents.FUNCTION_CALL_ARGUMENTS_DONE:
-            if current_tool_call is not None:
-                current_tool_call.status = "completed"
-
-                raw_args = json.loads(current_tool_call.arguments)
-                for key in ("area", "floor"):
-                    if key in raw_args and not raw_args[key]:
-                        # Remove keys that are "" or None
-                        raw_args.pop(key, None)
-
-                yield {
-                    "tool_calls": [
-                        llm.ToolInput(
-                            id=current_tool_call.call_id,
-                            tool_name=current_tool_call.name,
-                            tool_args=raw_args,
-                        )
-                    ]
-                }
-
-        elif event_type == ResponsesAPIStreamEvents.RESPONSE_COMPLETED:
-            if event.response.usage is not None:
-                chat_log.async_trace(
-                    {
-                        "stats": {
-                            "input_tokens": event.response.usage.input_tokens,
-                            "output_tokens": event.response.usage.output_tokens,
-                        }
-                    }
-                )
-
-        elif event_type == ResponsesAPIStreamEvents.RESPONSE_INCOMPLETE:
-            if event.response.usage is not None:
-                chat_log.async_trace(
-                    {
-                        "stats": {
-                            "input_tokens": event.response.usage.input_tokens,
-                            "output_tokens": event.response.usage.output_tokens,
-                        }
-                    }
-                )
-
-            if (
-                event.response.incomplete_details
-                and event.response.incomplete_details.reason
-            ):
-                reason: str = event.response.incomplete_details.reason
-            else:
-                reason = "unknown reason"
-
-            if reason == "max_output_tokens":
-                reason = "max output tokens reached"
-            elif reason == "content_filter":
-                reason = "content filter triggered"
-
-            raise HomeAssistantError(f"OpenAI response incomplete: {reason}")
-
-        elif event_type == ResponsesAPIStreamEvents.RESPONSE_FAILED:
-            if event.response.usage is not None:
-                chat_log.async_trace(
-                    {
-                        "stats": {
-                            "input_tokens": event.response.usage.input_tokens,
-                            "output_tokens": event.response.usage.output_tokens,
-                        }
-                    }
-                )
-            reason = "unknown reason"
-            if event.response.error is not None:
-                reason = event.response.error.message
-            raise HomeAssistantError(f"OpenAI response failed: {reason}")
-
-        elif event_type == ResponsesAPIStreamEvents.ERROR:
-            raise HomeAssistantError(f"OpenAI response error: {event.message}")
-
-
-class BaseCloudLLMEntity(Entity):
-    """Cloud LLM conversation agent."""
-
-    def __init__(self, cloud: Cloud[CloudClient], config_entry: ConfigEntry) -> None:
-        """Initialize the entity."""
-        self._cloud = cloud
-        self._entry = config_entry
-
-    async def _prepare_chat_for_generation(
-        self,
-        chat_log: conversation.ChatLog,
-        messages: ResponseInputParam,
-        response_format: dict[str, Any] | None = None,
-    ) -> dict[str, Any]:
-        """Prepare kwargs for Cloud LLM from the chat log."""
-
-        last_content: Any = chat_log.content[-1]
-        if last_content.role == "user" and last_content.attachments:
-            files = await self._async_prepare_files_for_prompt(last_content.attachments)
-            current_content = last_content.content
-            last_content = [*(current_content or []), *files]
-
-        tools: list[ToolParam] = []
-        tool_choice: str | None = None
-
-        if chat_log.llm_api:
-            ha_tools: list[ToolParam] = [
-                _format_tool(tool, chat_log.llm_api.custom_serializer)
-                for tool in chat_log.llm_api.tools
-            ]
-
-            if ha_tools:
-                if not chat_log.unresponded_tool_results:
-                    tools = ha_tools
-                    tool_choice = "auto"
-                else:
-                    tools = []
-                    tool_choice = "none"
-
-        web_search = WebSearchToolParam(
-            type="web_search",
-            search_context_size="medium",
-        )
-        tools.append(web_search)
-
-        response_kwargs: dict[str, Any] = {
-            "messages": messages,
-            "conversation_id": chat_log.conversation_id,
-        }
-
-        if response_format is not None:
-            response_kwargs["response_format"] = response_format
-        if tools is not None:
-            response_kwargs["tools"] = tools
-        if tool_choice is not None:
-            response_kwargs["tool_choice"] = tool_choice
-
-        response_kwargs["stream"] = True
-
-        return response_kwargs
-
-    async def _async_prepare_files_for_prompt(
-        self,
-        attachments: list[conversation.Attachment],
-    ) -> list[dict[str, Any]]:
-        """Prepare files for multimodal prompts."""
-
-        def prepare() -> list[dict[str, Any]]:
-            content: list[dict[str, Any]] = []
-            for attachment in attachments:
-                mime_type = attachment.mime_type
-                path = attachment.path
-                if not path.exists():
-                    raise HomeAssistantError(f"`{path}` does not exist")
-
-                data = base64.b64encode(path.read_bytes()).decode("utf-8")
-                if mime_type and mime_type.startswith("image/"):
-                    content.append(
-                        {
-                            "type": "input_image",
-                            "image_url": f"data:{mime_type};base64,{data}",
-                            "detail": "auto",
-                        }
-                    )
-                elif mime_type and mime_type.startswith("application/pdf"):
-                    content.append(
-                        {
-                            "type": "input_file",
-                            "filename": str(path.name),
-                            "file_data": f"data:{mime_type};base64,{data}",
-                        }
-                    )
-                else:
-                    raise HomeAssistantError(
-                        "Only images and PDF are currently supported as attachments"
-                    )
-
-            return content
-
-        return await self.hass.async_add_executor_job(prepare)
-
-    async def _async_handle_chat_log(
-        self,
-        type: Literal["ai_task", "conversation"],
-        chat_log: conversation.ChatLog,
-        structure_name: str | None = None,
-        structure: vol.Schema | None = None,
-    ) -> None:
-        """Generate a response for the chat log."""
-
-        for _ in range(_MAX_TOOL_ITERATIONS):
-            response_format: dict[str, Any] | None = None
-            if structure and structure_name:
-                response_format = {
-                    "type": "json_schema",
-                    "json_schema": {
-                        "name": slugify(structure_name),
-                        "schema": _format_structured_output(
-                            structure, chat_log.llm_api
-                        ),
-                        "strict": False,
-                    },
-                }
-
-            messages = _convert_content_to_param(chat_log.content)
-
-            response_kwargs = await self._prepare_chat_for_generation(
-                chat_log,
-                messages,
-                response_format,
-            )
-
-            try:
-                if type == "conversation":
-                    raw_stream = await self._cloud.llm.async_process_conversation(
-                        **response_kwargs,
-                    )
-                else:
-                    raw_stream = await self._cloud.llm.async_generate_data(
-                        **response_kwargs,
-                    )
-
-                messages.extend(
-                    _convert_content_to_param(
-                        [
-                            content
-                            async for content in chat_log.async_add_delta_content_stream(
-                                self.entity_id,
-                                _transform_stream(
-                                    chat_log,
-                                    raw_stream,
-                                    True,
-                                ),
-                            )
-                        ]
-                    )
-                )
-
-            except LLMAuthenticationError as err:
-                raise HomeAssistantError("Cloud LLM authentication failed") from err
-            except LLMRateLimitError as err:
-                raise HomeAssistantError("Cloud LLM is rate limited") from err
-            except LLMResponseError as err:
-                raise HomeAssistantError(str(err)) from err
-            except LLMServiceError as err:
-                raise HomeAssistantError("Error talking to Cloud LLM") from err
-            except NabuCasaBaseError as err:
-                raise HomeAssistantError(str(err)) from err
-
-            if not chat_log.unresponded_tool_results:
-                break

homeassistant/components/cloud/helpers.py

@@ -1,7 +1,5 @@
 """Helpers for the cloud component."""
 
-from __future__ import annotations
-
 from collections import deque
 import logging
 

homeassistant/components/cloud/http_api.py

@@ -99,7 +99,6 @@ def async_setup(hass: HomeAssistant) -> None:
     websocket_api.async_register_command(hass, websocket_hook_delete)
     websocket_api.async_register_command(hass, websocket_remote_connect)
     websocket_api.async_register_command(hass, websocket_remote_disconnect)
-    websocket_api.async_register_command(hass, websocket_webrtc_ice_servers)
 
     websocket_api.async_register_command(hass, google_assistant_get)
     websocket_api.async_register_command(hass, google_assistant_list)
@@ -1108,7 +1107,6 @@ async def alexa_sync(
 
 
 @websocket_api.websocket_command({"type": "cloud/tts/info"})
-@callback
 def tts_info(
     hass: HomeAssistant,
     connection: websocket_api.ActiveConnection,
@@ -1136,22 +1134,3 @@ def tts_info(
             )
 
     connection.send_result(msg["id"], {"languages": result})
-
-
-@websocket_api.websocket_command(
-    {
-        vol.Required("type"): "cloud/webrtc/ice_servers",
-    }
-)
-@_require_cloud_login
-@callback
-def websocket_webrtc_ice_servers(
-    hass: HomeAssistant,
-    connection: websocket_api.ActiveConnection,
-    msg: dict[str, Any],
-) -> None:
-    """Handle get WebRTC ICE servers websocket command."""
-    connection.send_result(
-        msg["id"],
-        [server.to_dict() for server in hass.data[DATA_CLOUD].client.ice_servers],
-    )

homeassistant/components/cloud/manifest.json

@@ -13,6 +13,6 @@
   "integration_type": "system",
   "iot_class": "cloud_push",
   "loggers": ["acme", "hass_nabucasa", "snitun"],
-  "requirements": ["hass-nabucasa==1.7.0"],
+  "requirements": ["hass-nabucasa==1.5.1"],
   "single_config_entry": true
 }

homeassistant/components/cloud/strings.json

@@ -1,11 +1,4 @@
 {
-  "entity": {
-    "ai_task": {
-      "cloud_ai": {
-        "name": "Home Assistant Cloud AI"
-      }
-    }
-  },
   "exceptions": {
     "backup_size_too_large": {
       "message": "The backup size of {size}GB is too large to be uploaded to Home Assistant Cloud."

homeassistant/components/conversation/__init__.py

@@ -236,9 +236,7 @@ async def async_prepare_agent(
 
 
 async def async_handle_sentence_triggers(
-    hass: HomeAssistant,
-    user_input: ConversationInput,
-    chat_log: ChatLog,
+    hass: HomeAssistant, user_input: ConversationInput
 ) -> str | None:
     """Try to match input against sentence triggers and return response text.
 
@@ -247,13 +245,12 @@ async def async_handle_sentence_triggers(
     agent = get_agent_manager(hass).default_agent
     assert agent is not None
 
-    return await agent.async_handle_sentence_triggers(user_input, chat_log)
+    return await agent.async_handle_sentence_triggers(user_input)
 
 
 async def async_handle_intents(
     hass: HomeAssistant,
     user_input: ConversationInput,
-    chat_log: ChatLog,
     *,
     intent_filter: Callable[[RecognizeResult], bool] | None = None,
 ) -> intent.IntentResponse | None:
@@ -264,9 +261,7 @@ async def async_handle_intents(
     agent = get_agent_manager(hass).default_agent
     assert agent is not None
 
-    return await agent.async_handle_intents(
-        user_input, chat_log, intent_filter=intent_filter
-    )
+    return await agent.async_handle_intents(user_input, intent_filter=intent_filter)
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool: