Tibber refresh token for real time streaming

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

.claude/skills/integrations/SKILL.md

@@ -620,14 +620,12 @@ rules:
 
 ### Config Flow Testing
 - **100% Coverage Required**: All config flow paths must be tested
-- **Patch Boundaries**: Only patch library or client methods when testing config flows. Do not patch methods defined in `config_flow.py`; exercise the flow logic end-to-end.
 - **Test Scenarios**:
   - All flow initiation methods (user, discovery, import)
   - Successful configuration paths
   - Error recovery scenarios
   - Prevention of duplicate entries
   - Flow completion after errors
-  - Reauthentication/reconfigure flows
 
 ### Testing
 - **Integration-specific tests** (recommended):

.gitattributes

@@ -16,7 +16,6 @@ Dockerfile.dev linguist-language=Dockerfile
 CODEOWNERS linguist-generated=true
 Dockerfile linguist-generated=true
 homeassistant/generated/*.py linguist-generated=true
-machine/* linguist-generated=true
 mypy.ini linguist-generated=true
 requirements.txt linguist-generated=true
 requirements_all.txt linguist-generated=true

.github/copilot-instructions.md

@@ -1,12 +1,6 @@
 <!-- Automatically generated by gen_copilot_instructions.py, do not edit -->
 
 
-
-# Copilot code review instructions
-
-- Start review comments with a short, one-sentence summary of the suggested fix.
-- Do not add comments about code style, formatting or linting issues.
-
 # GitHub Copilot & Claude Code Instructions
 
 This repository contains the core of Home Assistant, a Python 3 based home automation application.

.github/workflows/builder.yml

@@ -35,7 +35,6 @@ jobs:
       channel: ${{ steps.version.outputs.channel }}
       publish: ${{ steps.version.outputs.publish }}
       architectures: ${{ env.ARCHITECTURES }}
-      base_image_version: ${{ env.BASE_IMAGE_VERSION }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -101,7 +100,7 @@ jobs:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         include:
           - arch: amd64
-            os: ubuntu-24.04
+            os: ubuntu-latest
           - arch: aarch64
             os: ubuntu-24.04-arm
     steps:
@@ -182,7 +181,7 @@ jobs:
           fi
 
       - name: Download translations
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: translations
 
@@ -196,20 +195,77 @@ jobs:
         run: |
           echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE
 
-      - name: Build base image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          cosign-base-identity: "https://github.com/home-assistant/docker/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          image: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant
-          image-tags: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        with:
+          cosign-release: "v2.5.3"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v4.0.0
+
+      - name: Build variables
+        id: vars
+        shell: bash
+        env:
+          ARCH: ${{ matrix.arch }}
+        run: |
+          echo "base_image=ghcr.io/home-assistant/${ARCH}-homeassistant-base:${BASE_IMAGE_VERSION}" >> "$GITHUB_OUTPUT"
+          echo "cache_image=ghcr.io/home-assistant/${ARCH}-homeassistant:latest" >> "$GITHUB_OUTPUT"
+          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
+
+      - name: Verify base image signature
+        env:
+          BASE_IMAGE: ${{ steps.vars.outputs.base_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
+            "${BASE_IMAGE}"
+
+      - name: Verify cache image signature
+        id: cache
+        continue-on-error: true
+        env:
+          CACHE_IMAGE: ${{ steps.vars.outputs.cache_image }}
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
+            "${CACHE_IMAGE}"
+
+      - name: Build base image
+        id: build
+        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        with:
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ steps.vars.outputs.platform }}
           push: true
-          version: ${{ needs.init.outputs.version }}
+          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 }}
+          outputs: type=image,push=true,compression=zstd,compression-level=9,force-compression=true,oci-mediatypes=true
+          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
+        env:
+          ARCH: ${{ matrix.arch }}
+          VERSION: ${{ needs.init.outputs.version }}
+          DIGEST: ${{ steps.build.outputs.digest }}
+        run: |
+          cosign sign --yes "ghcr.io/home-assistant/${ARCH}-homeassistant:${VERSION}@${DIGEST}"
 
   build_machine:
     name: Build ${{ matrix.machine }} machine core image
@@ -224,6 +280,7 @@ jobs:
       matrix:
         machine:
           - generic-x86-64
+          - intel-nuc
           - khadas-vim3
           - odroid-c2
           - odroid-c4
@@ -247,44 +304,45 @@ jobs:
           - machine: qemux86-64
             arch: amd64
             runs-on: ubuntu-24.04
+          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
+          - machine: intel-nuc
+            arch: amd64
+            runs-on: ubuntu-24.04
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
-      - name: Compute extra tags
-        id: tags
-        shell: bash
+      - name: Set build additional args
         env:
           VERSION: ${{ needs.init.outputs.version }}
         run: |
+          # Create general tags
           if [[ "${VERSION}" =~ d ]]; then
-            echo "extra_tags=dev" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
           elif [[ "${VERSION}" =~ b ]]; then
-            echo "extra_tags=beta" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
           else
-            echo "extra_tags=stable" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
           fi
 
-      - name: Build machine image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          context: machine/
-          cosign-base-identity: "https://github.com/home-assistant/core/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          file: machine/${{ matrix.machine }}
-          image: ghcr.io/home-assistant/${{ matrix.machine }}-homeassistant
-          image-tags: |
-            ${{ needs.init.outputs.version }}
-            ${{ steps.tags.outputs.extra_tags }}
-          push: true
-          version: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build base image
+        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
+        with:
+          image: ${{ matrix.arch }}
+          args: |
+            $BUILD_ARGS \
+            --target /data/machine \
+            --cosign \
+            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
 
   publish_ha:
     name: Publish version files
@@ -485,7 +543,7 @@ jobs:
           python-version-file: ".python-version"
 
       - name: Download translations
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: translations
 

.github/workflows/ci.yaml

@@ -120,7 +120,7 @@ jobs:
         run: |
           echo "key=$(lsb_release -rs)-apt-${CACHE_VERSION}-${HA_SHORT_VERSION}" >> $GITHUB_OUTPUT
       - name: Filter for core changes
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: core
         with:
           filters: .core_files.yaml
@@ -135,7 +135,7 @@ jobs:
           echo "Result:"
           cat .integration_paths.yaml
       - name: Filter for integration changes
-        uses: dorny/paths-filter@fbd0ab8f3e69293af611ebaee6363fc25e6d187d # v4.0.1
+        uses: dorny/paths-filter@de90cc6fb38fc0963ad72b210f1f284cd68cea36 # v3.0.2
         id: integrations
         with:
           filters: .integration_paths.yaml
@@ -978,7 +978,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -1387,7 +1387,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1558,7 +1558,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1587,7 +1587,7 @@ jobs:
       && needs.info.outputs.skip_coverage != 'true' && !cancelled()
     steps:
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov

.github/workflows/wheels.yml

@@ -121,12 +121,12 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: requirements_diff
 
@@ -172,17 +172,17 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
         with:
           name: requirements_all_wheels
 

.strict-typing

@@ -137,7 +137,6 @@ homeassistant.components.calendar.*
 homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
-homeassistant.components.casper_glow.*
 homeassistant.components.cert_expiry.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
@@ -174,7 +173,6 @@ homeassistant.components.dnsip.*
 homeassistant.components.doorbird.*
 homeassistant.components.dormakaba_dkey.*
 homeassistant.components.downloader.*
-homeassistant.components.dropbox.*
 homeassistant.components.droplet.*
 homeassistant.components.dsmr.*
 homeassistant.components.duckdns.*
@@ -274,12 +272,10 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
-homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
-homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
 homeassistant.components.hypontech.*
@@ -329,7 +325,6 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
-homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*

CODEOWNERS

@@ -214,8 +214,6 @@ build.json @home-assistant/supervisor
 /tests/components/balboa/ @garbled1 @natekspencer
 /homeassistant/components/bang_olufsen/ @mj23000
 /tests/components/bang_olufsen/ @mj23000
-/homeassistant/components/battery/ @home-assistant/core
-/tests/components/battery/ @home-assistant/core
 /homeassistant/components/bayesian/ @HarvsG
 /tests/components/bayesian/ @HarvsG
 /homeassistant/components/beewi_smartclim/ @alemuro
@@ -275,8 +273,6 @@ build.json @home-assistant/supervisor
 /tests/components/cambridge_audio/ @noahhusby
 /homeassistant/components/camera/ @home-assistant/core
 /tests/components/camera/ @home-assistant/core
-/homeassistant/components/casper_glow/ @mikeodr
-/tests/components/casper_glow/ @mikeodr
 /homeassistant/components/cast/ @emontnemery
 /tests/components/cast/ @emontnemery
 /homeassistant/components/ccm15/ @ocalvo
@@ -401,8 +397,6 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dropbox/ @bdr99
-/tests/components/dropbox/ @bdr99
 /homeassistant/components/droplet/ @sarahseidman
 /tests/components/droplet/ @sarahseidman
 /homeassistant/components/dsmr/ @Robbie1221
@@ -739,8 +733,6 @@ build.json @home-assistant/supervisor
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/hr_energy_qube/ @MattieGit
-/tests/components/hr_energy_qube/ @MattieGit
 /homeassistant/components/html5/ @alexyao2015
 /tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
@@ -788,8 +780,6 @@ build.json @home-assistant/supervisor
 /tests/components/igloohome/ @keithle888
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
-/homeassistant/components/illuminance/ @home-assistant/core
-/tests/components/illuminance/ @home-assistant/core
 /homeassistant/components/image/ @home-assistant/core
 /tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
@@ -949,16 +939,12 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
-/homeassistant/components/lg_infrared/ @home-assistant/core
-/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/libre_hardware_monitor/ @Sab44
 /tests/components/libre_hardware_monitor/ @Sab44
-/homeassistant/components/lichess/ @aryanhasgithub
-/tests/components/lichess/ @aryanhasgithub
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/liebherr/ @mettolen
@@ -1079,8 +1065,6 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
-/homeassistant/components/moisture/ @home-assistant/core
-/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1319,8 +1303,6 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
-/homeassistant/components/power/ @home-assistant/core
-/tests/components/power/ @home-assistant/core
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
 /homeassistant/components/powerfox_local/ @klaasnicolaas
@@ -1579,8 +1561,8 @@ build.json @home-assistant/supervisor
 /tests/components/sma/ @kellerza @rklomp @erwindouna
 /homeassistant/components/smappee/ @bsmappee
 /tests/components/smappee/ @bsmappee
-/homeassistant/components/smarla/ @explicatis @johannes-exp
-/tests/components/smarla/ @explicatis @johannes-exp
+/homeassistant/components/smarla/ @explicatis @rlint-explicatis
+/tests/components/smarla/ @explicatis @rlint-explicatis
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
 /homeassistant/components/smartthings/ @joostlek
@@ -1606,8 +1588,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
-/homeassistant/components/solarman/ @solarmanpv
-/tests/components/solarman/ @solarmanpv
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept
@@ -1636,6 +1616,8 @@ build.json @home-assistant/supervisor
 /tests/components/srp_energy/ @briglx
 /homeassistant/components/starline/ @anonym-tsk
 /tests/components/starline/ @anonym-tsk
+/homeassistant/components/starlink/ @boswelja
+/tests/components/starlink/ @boswelja
 /homeassistant/components/statistics/ @ThomDietrich @gjohansson-ST
 /tests/components/statistics/ @ThomDietrich @gjohansson-ST
 /homeassistant/components/steam_online/ @tkdrob
@@ -1717,8 +1699,6 @@ build.json @home-assistant/supervisor
 /tests/components/tellduslive/ @fredrike
 /homeassistant/components/teltonika/ @karlbeecken
 /tests/components/teltonika/ @karlbeecken
-/homeassistant/components/temperature/ @home-assistant/core
-/tests/components/temperature/ @home-assistant/core
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1764,8 +1744,6 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/touchline/ @mnordseth
-/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696
@@ -1853,8 +1831,8 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @thulrus
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @pawlizio @wollew
-/tests/components/velux/ @Julius2342 @pawlizio @wollew
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
@@ -1937,8 +1915,6 @@ build.json @home-assistant/supervisor
 /tests/components/whois/ @frenck
 /homeassistant/components/wiffi/ @mampfes
 /tests/components/wiffi/ @mampfes
-/homeassistant/components/wiim/ @Linkplay2020
-/tests/components/wiim/ @Linkplay2020
 /homeassistant/components/wilight/ @leofig-rj
 /tests/components/wilight/ @leofig-rj
 /homeassistant/components/window/ @home-assistant/core

Dockerfile

@@ -10,6 +10,7 @@ LABEL \
     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/"
 
@@ -29,7 +30,7 @@ RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.11.1
+    && pip3 install uv==0.10.6
 
 WORKDIR /usr/src
 

homeassistant/bootstrap.py

@@ -241,18 +241,12 @@ DEFAULT_INTEGRATIONS = {
     *BASE_PLATFORMS,
     #
     # Integrations providing triggers and conditions for base platforms:
-    "air_quality",
-    "battery",
     "door",
     "garage_door",
     "gate",
     "humidity",
-    "illuminance",
-    "moisture",
     "motion",
     "occupancy",
-    "power",
-    "temperature",
     "window",
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {

homeassistant/brands/lg.json

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

homeassistant/components/abode/manifest.json

@@ -9,6 +9,6 @@
   },
   "iot_class": "cloud_push",
   "loggers": ["jaraco.abode", "lomond"],
-  "requirements": ["jaraco.abode==6.4.0"],
+  "requirements": ["jaraco.abode==6.2.1"],
   "single_config_entry": true
 }

homeassistant/components/abode/sensor.py

@@ -12,7 +12,6 @@ from homeassistant.components.sensor import (
     SensorDeviceClass,
     SensorEntity,
     SensorEntityDescription,
-    SensorStateClass,
 )
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import LIGHT_LUX, PERCENTAGE, UnitOfTemperature
@@ -41,7 +40,6 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="temperature",
         device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda device: ABODE_TEMPERATURE_UNIT_HA_UNIT[
             device.temp_unit
         ],
@@ -50,14 +48,12 @@ SENSOR_TYPES: tuple[AbodeSensorDescription, ...] = (
     AbodeSensorDescription(
         key="humidity",
         device_class=SensorDeviceClass.HUMIDITY,
-        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: PERCENTAGE,
         value_fn=lambda device: cast(float, device.humidity),
     ),
     AbodeSensorDescription(
         key="lux",
         device_class=SensorDeviceClass.ILLUMINANCE,
-        state_class=SensorStateClass.MEASUREMENT,
         native_unit_of_measurement_fn=lambda _: LIGHT_LUX,
         value_fn=lambda device: cast(float, device.lux),
     ),

homeassistant/components/actron_air/config_flow.py

@@ -120,7 +120,7 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
             return self.async_show_form(
                 step_id="timeout",
             )
-        self.login_task = None
+        del self.login_task
         return await self.async_step_user()
 
     async def async_step_reauth(

homeassistant/components/actron_air/manifest.json

@@ -12,6 +12,6 @@
   "documentation": "https://www.home-assistant.io/integrations/actron_air",
   "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "quality_scale": "silver",
+  "quality_scale": "bronze",
   "requirements": ["actron-neo-api==0.4.1"]
 }

homeassistant/components/actron_air/quality_scale.yaml

@@ -37,7 +37,7 @@ rules:
   log-when-unavailable: done
   parallel-updates: done
   reauthentication-flow: done
-  test-coverage: done
+  test-coverage: todo
 
   # Gold
   devices: done

homeassistant/components/air_quality/condition.py

@@ -1,134 +0,0 @@
-"""Provides conditions for air quality."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    STATE_OFF,
-    STATE_ON,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import (
-    Condition,
-    make_entity_numerical_condition,
-    make_entity_numerical_condition_with_unit,
-    make_entity_state_condition,
-)
-from homeassistant.util.unit_conversion import (
-    CarbonMonoxideConcentrationConverter,
-    MassVolumeConcentrationConverter,
-    NitrogenDioxideConcentrationConverter,
-    NitrogenMonoxideConcentrationConverter,
-    OzoneConcentrationConverter,
-    SulphurDioxideConcentrationConverter,
-    UnitlessRatioConverter,
-)
-
-
-def _make_detected_condition(
-    device_class: BinarySensorDeviceClass,
-) -> type[Condition]:
-    """Create a detected condition for a binary sensor device class."""
-    return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
-    )
-
-
-def _make_cleared_condition(
-    device_class: BinarySensorDeviceClass,
-) -> type[Condition]:
-    """Create a cleared condition for a binary sensor device class."""
-    return make_entity_state_condition(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
-    )
-
-
-CONDITIONS: dict[str, type[Condition]] = {
-    # Binary sensor conditions (detected/cleared)
-    "is_gas_detected": _make_detected_condition(BinarySensorDeviceClass.GAS),
-    "is_gas_cleared": _make_cleared_condition(BinarySensorDeviceClass.GAS),
-    "is_co_detected": _make_detected_condition(BinarySensorDeviceClass.CO),
-    "is_co_cleared": _make_cleared_condition(BinarySensorDeviceClass.CO),
-    "is_smoke_detected": _make_detected_condition(BinarySensorDeviceClass.SMOKE),
-    "is_smoke_cleared": _make_cleared_condition(BinarySensorDeviceClass.SMOKE),
-    # Numerical sensor conditions with unit conversion
-    "is_co_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "is_ozone_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "is_voc_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "is_voc_ratio_value": make_entity_numerical_condition_with_unit(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "is_no_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "is_no2_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "is_so2_value": make_entity_numerical_condition_with_unit(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    # Numerical sensor conditions without unit conversion (single-unit device classes)
-    "is_co2_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "is_pm1_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm25_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm4_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_pm10_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "is_n2o_value": make_entity_numerical_condition(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the air quality conditions."""
-    return CONDITIONS

homeassistant/components/air_quality/conditions.yaml

@@ -1,449 +0,0 @@
-# --- Common condition fields ---
-
-.condition_behavior: &condition_behavior
-  required: true
-  default: any
-  selector:
-    select:
-      translation_key: condition_behavior
-      options:
-        - all
-        - any
-
-# --- Unit lists for multi-unit pollutants ---
-
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
-
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
-
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
-
-.no_units: &no_units
-  - "ppb"
-  - "μg/m³"
-
-.no2_units: &no2_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.so2_units: &so2_units
-  - "ppb"
-  - "μg/m³"
-
-# --- Entity filter anchors ---
-
-.co_threshold_entity: &co_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *co_units
-  - domain: sensor
-    device_class: carbon_monoxide
-  - domain: number
-    device_class: carbon_monoxide
-
-.co2_threshold_entity: &co2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "ppm"
-  - domain: sensor
-    device_class: carbon_dioxide
-  - domain: number
-    device_class: carbon_dioxide
-
-.pm1_threshold_entity: &pm1_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm1
-  - domain: number
-    device_class: pm1
-
-.pm25_threshold_entity: &pm25_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm25
-  - domain: number
-    device_class: pm25
-
-.pm4_threshold_entity: &pm4_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm4
-  - domain: number
-    device_class: pm4
-
-.pm10_threshold_entity: &pm10_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm10
-  - domain: number
-    device_class: pm10
-
-.ozone_threshold_entity: &ozone_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *ozone_units
-  - domain: sensor
-    device_class: ozone
-  - domain: number
-    device_class: ozone
-
-.voc_threshold_entity: &voc_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_units
-  - domain: sensor
-    device_class: volatile_organic_compounds
-  - domain: number
-    device_class: volatile_organic_compounds
-
-.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_ratio_units
-  - domain: sensor
-    device_class: volatile_organic_compounds_parts
-  - domain: number
-    device_class: volatile_organic_compounds_parts
-
-.no_threshold_entity: &no_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no_units
-  - domain: sensor
-    device_class: nitrogen_monoxide
-  - domain: number
-    device_class: nitrogen_monoxide
-
-.no2_threshold_entity: &no2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no2_units
-  - domain: sensor
-    device_class: nitrogen_dioxide
-  - domain: number
-    device_class: nitrogen_dioxide
-
-.n2o_threshold_entity: &n2o_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: nitrous_oxide
-  - domain: number
-    device_class: nitrous_oxide
-
-.so2_threshold_entity: &so2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *so2_units
-  - domain: sensor
-    device_class: sulphur_dioxide
-  - domain: number
-    device_class: sulphur_dioxide
-
-# --- Number anchors for single-unit pollutants ---
-
-.co2_threshold_number: &co2_threshold_number
-  mode: box
-  unit_of_measurement: "ppm"
-
-.ugm3_threshold_number: &ugm3_threshold_number
-  mode: box
-  unit_of_measurement: "μg/m³"
-
-# --- Binary sensor targets ---
-
-.target_gas: &target_gas
-  entity:
-    - domain: binary_sensor
-      device_class: gas
-
-.target_co_binary: &target_co_binary
-  entity:
-    - domain: binary_sensor
-      device_class: carbon_monoxide
-
-.target_smoke: &target_smoke
-  entity:
-    - domain: binary_sensor
-      device_class: smoke
-
-# --- Sensor targets ---
-
-.target_co_sensor: &target_co_sensor
-  entity:
-    - domain: sensor
-      device_class: carbon_monoxide
-
-.target_co2: &target_co2
-  entity:
-    - domain: sensor
-      device_class: carbon_dioxide
-
-.target_pm1: &target_pm1
-  entity:
-    - domain: sensor
-      device_class: pm1
-
-.target_pm25: &target_pm25
-  entity:
-    - domain: sensor
-      device_class: pm25
-
-.target_pm4: &target_pm4
-  entity:
-    - domain: sensor
-      device_class: pm4
-
-.target_pm10: &target_pm10
-  entity:
-    - domain: sensor
-      device_class: pm10
-
-.target_ozone: &target_ozone
-  entity:
-    - domain: sensor
-      device_class: ozone
-
-.target_voc: &target_voc
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds
-
-.target_voc_ratio: &target_voc_ratio
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds_parts
-
-.target_no: &target_no
-  entity:
-    - domain: sensor
-      device_class: nitrogen_monoxide
-
-.target_no2: &target_no2
-  entity:
-    - domain: sensor
-      device_class: nitrogen_dioxide
-
-.target_n2o: &target_n2o
-  entity:
-    - domain: sensor
-      device_class: nitrous_oxide
-
-.target_so2: &target_so2
-  entity:
-    - domain: sensor
-      device_class: sulphur_dioxide
-
-# --- Binary sensor conditions ---
-
-.condition_binary_common: &condition_binary_common
-  fields:
-    behavior: *condition_behavior
-
-is_gas_detected:
-  <<: *condition_binary_common
-  target: *target_gas
-
-is_gas_cleared:
-  <<: *condition_binary_common
-  target: *target_gas
-
-is_co_detected:
-  <<: *condition_binary_common
-  target: *target_co_binary
-
-is_co_cleared:
-  <<: *condition_binary_common
-  target: *target_co_binary
-
-is_smoke_detected:
-  <<: *condition_binary_common
-  target: *target_smoke
-
-is_smoke_cleared:
-  <<: *condition_binary_common
-  target: *target_smoke
-
-# --- Numerical sensor conditions with unit conversion ---
-
-is_co_value:
-  target: *target_co_sensor
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-is_ozone_value:
-  target: *target_ozone
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-is_voc_value:
-  target: *target_voc
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-is_voc_ratio_value:
-  target: *target_voc_ratio
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-is_no_value:
-  target: *target_no
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-is_no2_value:
-  target: *target_no2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-is_so2_value:
-  target: *target_so2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *so2_units
-
-# --- Numerical sensor conditions without unit conversion ---
-
-is_co2_value:
-  target: *target_co2
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: is
-          number: *co2_threshold_number
-
-is_pm1_value:
-  target: *target_pm1
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm25_value:
-  target: *target_pm25
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm4_value:
-  target: *target_pm4
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_pm10_value:
-  target: *target_pm10
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number
-
-is_n2o_value:
-  target: *target_n2o
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: is
-          number: *ugm3_threshold_number

homeassistant/components/air_quality/icons.json

@@ -1,164 +1,7 @@
 {
-  "conditions": {
-    "is_co2_value": {
-      "condition": "mdi:molecule-co2"
-    },
-    "is_co_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_co_detected": {
-      "condition": "mdi:molecule-co"
-    },
-    "is_co_value": {
-      "condition": "mdi:molecule-co"
-    },
-    "is_gas_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_gas_detected": {
-      "condition": "mdi:gas-cylinder"
-    },
-    "is_n2o_value": {
-      "condition": "mdi:factory"
-    },
-    "is_no2_value": {
-      "condition": "mdi:factory"
-    },
-    "is_no_value": {
-      "condition": "mdi:factory"
-    },
-    "is_ozone_value": {
-      "condition": "mdi:weather-sunny-alert"
-    },
-    "is_pm10_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm1_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm25_value": {
-      "condition": "mdi:blur"
-    },
-    "is_pm4_value": {
-      "condition": "mdi:blur"
-    },
-    "is_smoke_cleared": {
-      "condition": "mdi:check-circle"
-    },
-    "is_smoke_detected": {
-      "condition": "mdi:smoke-detector-variant"
-    },
-    "is_so2_value": {
-      "condition": "mdi:factory"
-    },
-    "is_voc_ratio_value": {
-      "condition": "mdi:air-filter"
-    },
-    "is_voc_value": {
-      "condition": "mdi:air-filter"
-    }
-  },
   "entity_component": {
     "_": {
       "default": "mdi:air-filter"
     }
-  },
-  "triggers": {
-    "co2_changed": {
-      "trigger": "mdi:molecule-co2"
-    },
-    "co2_crossed_threshold": {
-      "trigger": "mdi:molecule-co2"
-    },
-    "co_changed": {
-      "trigger": "mdi:molecule-co"
-    },
-    "co_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "co_crossed_threshold": {
-      "trigger": "mdi:molecule-co"
-    },
-    "co_detected": {
-      "trigger": "mdi:molecule-co"
-    },
-    "gas_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "gas_detected": {
-      "trigger": "mdi:gas-cylinder"
-    },
-    "n2o_changed": {
-      "trigger": "mdi:factory"
-    },
-    "n2o_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "no2_changed": {
-      "trigger": "mdi:factory"
-    },
-    "no2_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "no_changed": {
-      "trigger": "mdi:factory"
-    },
-    "no_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "ozone_changed": {
-      "trigger": "mdi:weather-sunny-alert"
-    },
-    "ozone_crossed_threshold": {
-      "trigger": "mdi:weather-sunny-alert"
-    },
-    "pm10_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm10_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm1_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm1_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm25_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm25_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "pm4_changed": {
-      "trigger": "mdi:blur"
-    },
-    "pm4_crossed_threshold": {
-      "trigger": "mdi:blur"
-    },
-    "smoke_cleared": {
-      "trigger": "mdi:check-circle"
-    },
-    "smoke_detected": {
-      "trigger": "mdi:smoke-detector-variant"
-    },
-    "so2_changed": {
-      "trigger": "mdi:factory"
-    },
-    "so2_crossed_threshold": {
-      "trigger": "mdi:factory"
-    },
-    "voc_changed": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_crossed_threshold": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_ratio_changed": {
-      "trigger": "mdi:air-filter"
-    },
-    "voc_ratio_crossed_threshold": {
-      "trigger": "mdi:air-filter"
-    }
   }
 }

homeassistant/components/air_quality/strings.json

@@ -1,647 +0,0 @@
-{
-  "common": {
-    "condition_behavior_description": "How the value should match on the targeted entities.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted entities to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
-  },
-  "conditions": {
-    "is_co2_value": {
-      "description": "Tests the carbon dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide value"
-    },
-    "is_co_cleared": {
-      "description": "Tests if one or more carbon monoxide sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide cleared"
-    },
-    "is_co_detected": {
-      "description": "Tests if one or more carbon monoxide sensors are detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide detected"
-    },
-    "is_co_value": {
-      "description": "Tests the carbon monoxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide value"
-    },
-    "is_gas_cleared": {
-      "description": "Tests if one or more gas sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gas cleared"
-    },
-    "is_gas_detected": {
-      "description": "Tests if one or more gas sensors are detecting gas.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Gas detected"
-    },
-    "is_n2o_value": {
-      "description": "Tests the nitrous oxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide value"
-    },
-    "is_no2_value": {
-      "description": "Tests the nitrogen dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide value"
-    },
-    "is_no_value": {
-      "description": "Tests the nitrogen monoxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide value"
-    },
-    "is_ozone_value": {
-      "description": "Tests the ozone level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Ozone value"
-    },
-    "is_pm10_value": {
-      "description": "Tests the PM10 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM10 value"
-    },
-    "is_pm1_value": {
-      "description": "Tests the PM1 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM1 value"
-    },
-    "is_pm25_value": {
-      "description": "Tests the PM2.5 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 value"
-    },
-    "is_pm4_value": {
-      "description": "Tests the PM4 level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "PM4 value"
-    },
-    "is_smoke_cleared": {
-      "description": "Tests if one or more smoke sensors are cleared.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Smoke cleared"
-    },
-    "is_smoke_detected": {
-      "description": "Tests if one or more smoke sensors are detecting smoke.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Smoke detected"
-    },
-    "is_so2_value": {
-      "description": "Tests the sulphur dioxide level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide value"
-    },
-    "is_voc_ratio_value": {
-      "description": "Tests the volatile organic compounds ratio of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio value"
-    },
-    "is_voc_value": {
-      "description": "Tests the volatile organic compounds level of one or more entities.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::condition_behavior_description%]",
-          "name": "[%key:component::air_quality::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::condition_threshold_description%]",
-          "name": "[%key:component::air_quality::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds value"
-    }
-  },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Air Quality",
-  "triggers": {
-    "co2_changed": {
-      "description": "Triggers after one or more carbon dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide level changed"
-    },
-    "co2_crossed_threshold": {
-      "description": "Triggers after one or more carbon dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon dioxide level crossed threshold"
-    },
-    "co_changed": {
-      "description": "Triggers after one or more carbon monoxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide level changed"
-    },
-    "co_cleared": {
-      "description": "Triggers after one or more carbon monoxide sensors stop detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide cleared"
-    },
-    "co_crossed_threshold": {
-      "description": "Triggers after one or more carbon monoxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Carbon monoxide level crossed threshold"
-    },
-    "co_detected": {
-      "description": "Triggers after one or more carbon monoxide sensors start detecting carbon monoxide.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Carbon monoxide detected"
-    },
-    "gas_cleared": {
-      "description": "Triggers after one or more gas sensors stop detecting gas.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Gas cleared"
-    },
-    "gas_detected": {
-      "description": "Triggers after one or more gas sensors start detecting gas.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Gas detected"
-    },
-    "n2o_changed": {
-      "description": "Triggers after one or more nitrous oxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide level changed"
-    },
-    "n2o_crossed_threshold": {
-      "description": "Triggers after one or more nitrous oxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrous oxide level crossed threshold"
-    },
-    "no2_changed": {
-      "description": "Triggers after one or more nitrogen dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide level changed"
-    },
-    "no2_crossed_threshold": {
-      "description": "Triggers after one or more nitrogen dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen dioxide level crossed threshold"
-    },
-    "no_changed": {
-      "description": "Triggers after one or more nitrogen monoxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide level changed"
-    },
-    "no_crossed_threshold": {
-      "description": "Triggers after one or more nitrogen monoxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Nitrogen monoxide level crossed threshold"
-    },
-    "ozone_changed": {
-      "description": "Triggers after one or more ozone levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Ozone level changed"
-    },
-    "ozone_crossed_threshold": {
-      "description": "Triggers after one or more ozone levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Ozone level crossed threshold"
-    },
-    "pm10_changed": {
-      "description": "Triggers after one or more PM10 levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM10 level changed"
-    },
-    "pm10_crossed_threshold": {
-      "description": "Triggers after one or more PM10 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM10 level crossed threshold"
-    },
-    "pm1_changed": {
-      "description": "Triggers after one or more PM1 levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM1 level changed"
-    },
-    "pm1_crossed_threshold": {
-      "description": "Triggers after one or more PM1 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM1 level crossed threshold"
-    },
-    "pm25_changed": {
-      "description": "Triggers after one or more PM2.5 levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 level changed"
-    },
-    "pm25_crossed_threshold": {
-      "description": "Triggers after one or more PM2.5 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM2.5 level crossed threshold"
-    },
-    "pm4_changed": {
-      "description": "Triggers after one or more PM4 levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM4 level changed"
-    },
-    "pm4_crossed_threshold": {
-      "description": "Triggers after one or more PM4 levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "PM4 level crossed threshold"
-    },
-    "smoke_cleared": {
-      "description": "Triggers after one or more smoke sensors stop detecting smoke.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Smoke cleared"
-    },
-    "smoke_detected": {
-      "description": "Triggers after one or more smoke sensors start detecting smoke.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Smoke detected"
-    },
-    "so2_changed": {
-      "description": "Triggers after one or more sulphur dioxide levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide level changed"
-    },
-    "so2_crossed_threshold": {
-      "description": "Triggers after one or more sulphur dioxide levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Sulphur dioxide level crossed threshold"
-    },
-    "voc_changed": {
-      "description": "Triggers after one or more volatile organic compound levels change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds level changed"
-    },
-    "voc_crossed_threshold": {
-      "description": "Triggers after one or more volatile organic compounds levels cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds level crossed threshold"
-    },
-    "voc_ratio_changed": {
-      "description": "Triggers after one or more volatile organic compound ratios change.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio changed"
-    },
-    "voc_ratio_crossed_threshold": {
-      "description": "Triggers after one or more volatile organic compounds ratios cross a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::air_quality::common::trigger_behavior_description%]",
-          "name": "[%key:component::air_quality::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::air_quality::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::air_quality::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Volatile organic compounds ratio crossed threshold"
-    }
-  }
-}

homeassistant/components/air_quality/trigger.py

@@ -1,206 +0,0 @@
-"""Provides triggers for air quality."""
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import (
-    CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    CONCENTRATION_PARTS_PER_BILLION,
-    CONCENTRATION_PARTS_PER_MILLION,
-    STATE_OFF,
-    STATE_ON,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import (
-    EntityTargetStateTriggerBase,
-    Trigger,
-    make_entity_numerical_state_changed_trigger,
-    make_entity_numerical_state_changed_with_unit_trigger,
-    make_entity_numerical_state_crossed_threshold_trigger,
-    make_entity_numerical_state_crossed_threshold_with_unit_trigger,
-    make_entity_target_state_trigger,
-)
-from homeassistant.util.unit_conversion import (
-    CarbonMonoxideConcentrationConverter,
-    MassVolumeConcentrationConverter,
-    NitrogenDioxideConcentrationConverter,
-    NitrogenMonoxideConcentrationConverter,
-    OzoneConcentrationConverter,
-    SulphurDioxideConcentrationConverter,
-    UnitlessRatioConverter,
-)
-
-
-def _make_detected_trigger(
-    device_class: BinarySensorDeviceClass,
-) -> type[EntityTargetStateTriggerBase]:
-    """Create a detected trigger for a binary sensor device class."""
-
-    return make_entity_target_state_trigger(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_ON
-    )
-
-
-def _make_cleared_trigger(
-    device_class: BinarySensorDeviceClass,
-) -> type[EntityTargetStateTriggerBase]:
-    """Create a cleared trigger for a binary sensor device class."""
-
-    return make_entity_target_state_trigger(
-        {BINARY_SENSOR_DOMAIN: DomainSpec(device_class=device_class)}, STATE_OFF
-    )
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    # Binary sensor triggers (detected/cleared)
-    "gas_detected": _make_detected_trigger(BinarySensorDeviceClass.GAS),
-    "gas_cleared": _make_cleared_trigger(BinarySensorDeviceClass.GAS),
-    "co_detected": _make_detected_trigger(BinarySensorDeviceClass.CO),
-    "co_cleared": _make_cleared_trigger(BinarySensorDeviceClass.CO),
-    "smoke_detected": _make_detected_trigger(BinarySensorDeviceClass.SMOKE),
-    "smoke_cleared": _make_cleared_trigger(BinarySensorDeviceClass.SMOKE),
-    # Numerical sensor triggers with unit conversion
-    "co_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "co_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        CarbonMonoxideConcentrationConverter,
-    ),
-    "ozone_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "ozone_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.OZONE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        OzoneConcentrationConverter,
-    ),
-    "voc_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "voc_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS
-            )
-        },
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        MassVolumeConcentrationConverter,
-    ),
-    "voc_ratio_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "voc_ratio_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {
-            SENSOR_DOMAIN: DomainSpec(
-                device_class=SensorDeviceClass.VOLATILE_ORGANIC_COMPOUNDS_PARTS
-            )
-        },
-        CONCENTRATION_PARTS_PER_BILLION,
-        UnitlessRatioConverter,
-    ),
-    "no_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "no_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_MONOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenMonoxideConcentrationConverter,
-    ),
-    "no2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "no2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROGEN_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        NitrogenDioxideConcentrationConverter,
-    ),
-    "so2_changed": make_entity_numerical_state_changed_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    "so2_crossed_threshold": make_entity_numerical_state_crossed_threshold_with_unit_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.SULPHUR_DIOXIDE)},
-        CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-        SulphurDioxideConcentrationConverter,
-    ),
-    # Numerical sensor triggers without unit conversion (single-unit device classes)
-    "co2_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "co2_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.CO2)},
-        valid_unit=CONCENTRATION_PARTS_PER_MILLION,
-    ),
-    "pm1_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm1_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM1)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm25_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm25_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM25)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm4_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm4_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM4)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm10_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "pm10_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.PM10)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "n2o_changed": make_entity_numerical_state_changed_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-    "n2o_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.NITROUS_OXIDE)},
-        valid_unit=CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for air quality."""
-    return TRIGGERS

homeassistant/components/air_quality/triggers.yaml

@@ -1,617 +0,0 @@
-.trigger_common_fields:
-  behavior: &trigger_behavior
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
-
-# --- Unit lists for multi-unit pollutants ---
-
-.co_units: &co_units
-  - "ppb"
-  - "ppm"
-  - "mg/m³"
-  - "μg/m³"
-
-.ozone_units: &ozone_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.voc_units: &voc_units
-  - "μg/m³"
-  - "mg/m³"
-
-.voc_ratio_units: &voc_ratio_units
-  - "ppb"
-  - "ppm"
-
-.no_units: &no_units
-  - "ppb"
-  - "μg/m³"
-
-.no2_units: &no2_units
-  - "ppb"
-  - "ppm"
-  - "μg/m³"
-
-.so2_units: &so2_units
-  - "ppb"
-  - "μg/m³"
-
-# --- Entity filter anchors ---
-
-.co_threshold_entity: &co_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *co_units
-  - domain: sensor
-    device_class: carbon_monoxide
-  - domain: number
-    device_class: carbon_monoxide
-
-.co2_threshold_entity: &co2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "ppm"
-  - domain: sensor
-    device_class: carbon_dioxide
-  - domain: number
-    device_class: carbon_dioxide
-
-.pm1_threshold_entity: &pm1_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm1
-  - domain: number
-    device_class: pm1
-
-.pm25_threshold_entity: &pm25_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm25
-  - domain: number
-    device_class: pm25
-
-.pm4_threshold_entity: &pm4_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm4
-  - domain: number
-    device_class: pm4
-
-.pm10_threshold_entity: &pm10_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: pm10
-  - domain: number
-    device_class: pm10
-
-.ozone_threshold_entity: &ozone_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *ozone_units
-  - domain: sensor
-    device_class: ozone
-  - domain: number
-    device_class: ozone
-
-.voc_threshold_entity: &voc_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_units
-  - domain: sensor
-    device_class: volatile_organic_compounds
-  - domain: number
-    device_class: volatile_organic_compounds
-
-.voc_ratio_threshold_entity: &voc_ratio_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *voc_ratio_units
-  - domain: sensor
-    device_class: volatile_organic_compounds_parts
-  - domain: number
-    device_class: volatile_organic_compounds_parts
-
-.no_threshold_entity: &no_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no_units
-  - domain: sensor
-    device_class: nitrogen_monoxide
-  - domain: number
-    device_class: nitrogen_monoxide
-
-.no2_threshold_entity: &no2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *no2_units
-  - domain: sensor
-    device_class: nitrogen_dioxide
-  - domain: number
-    device_class: nitrogen_dioxide
-
-.n2o_threshold_entity: &n2o_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "μg/m³"
-  - domain: sensor
-    device_class: nitrous_oxide
-  - domain: number
-    device_class: nitrous_oxide
-
-.so2_threshold_entity: &so2_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *so2_units
-  - domain: sensor
-    device_class: sulphur_dioxide
-  - domain: number
-    device_class: sulphur_dioxide
-
-# --- Number anchors for single-unit pollutants ---
-
-.co2_threshold_number: &co2_threshold_number
-  mode: box
-  unit_of_measurement: "ppm"
-
-.ugm3_threshold_number: &ugm3_threshold_number
-  mode: box
-  unit_of_measurement: "μg/m³"
-
-# Binary sensor detected/cleared trigger fields
-.trigger_binary_fields: &trigger_binary_fields
-  behavior: *trigger_behavior
-
-# --- Binary sensor targets ---
-
-.target_gas: &target_gas
-  entity:
-    - domain: binary_sensor
-      device_class: gas
-
-.target_co_binary: &target_co_binary
-  entity:
-    - domain: binary_sensor
-      device_class: carbon_monoxide
-
-.target_smoke: &target_smoke
-  entity:
-    - domain: binary_sensor
-      device_class: smoke
-
-# --- Sensor targets ---
-
-.target_co_sensor: &target_co_sensor
-  entity:
-    - domain: sensor
-      device_class: carbon_monoxide
-
-.target_co2: &target_co2
-  entity:
-    - domain: sensor
-      device_class: carbon_dioxide
-
-.target_pm1: &target_pm1
-  entity:
-    - domain: sensor
-      device_class: pm1
-
-.target_pm25: &target_pm25
-  entity:
-    - domain: sensor
-      device_class: pm25
-
-.target_pm4: &target_pm4
-  entity:
-    - domain: sensor
-      device_class: pm4
-
-.target_pm10: &target_pm10
-  entity:
-    - domain: sensor
-      device_class: pm10
-
-.target_ozone: &target_ozone
-  entity:
-    - domain: sensor
-      device_class: ozone
-
-.target_voc: &target_voc
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds
-
-.target_voc_ratio: &target_voc_ratio
-  entity:
-    - domain: sensor
-      device_class: volatile_organic_compounds_parts
-
-.target_no: &target_no
-  entity:
-    - domain: sensor
-      device_class: nitrogen_monoxide
-
-.target_no2: &target_no2
-  entity:
-    - domain: sensor
-      device_class: nitrogen_dioxide
-
-.target_n2o: &target_n2o
-  entity:
-    - domain: sensor
-      device_class: nitrous_oxide
-
-.target_so2: &target_so2
-  entity:
-    - domain: sensor
-      device_class: sulphur_dioxide
-
-# --- Binary sensor triggers ---
-
-gas_detected:
-  fields: *trigger_binary_fields
-  target: *target_gas
-
-gas_cleared:
-  fields: *trigger_binary_fields
-  target: *target_gas
-
-co_detected:
-  fields: *trigger_binary_fields
-  target: *target_co_binary
-
-co_cleared:
-  fields: *trigger_binary_fields
-  target: *target_co_binary
-
-smoke_detected:
-  fields: *trigger_binary_fields
-  target: *target_smoke
-
-smoke_cleared:
-  fields: *trigger_binary_fields
-  target: *target_smoke
-
-# --- Numerical sensor triggers ---
-
-# CO (multi-unit)
-co_changed:
-  target: *target_co_sensor
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-co_crossed_threshold:
-  target: *target_co_sensor
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *co_units
-
-# CO2 (single-unit: ppm)
-co2_changed:
-  target: *target_co2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: changed
-          number: *co2_threshold_number
-
-co2_crossed_threshold:
-  target: *target_co2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *co2_threshold_entity
-          mode: crossed
-          number: *co2_threshold_number
-
-# PM1 (single-unit: μg/m³)
-pm1_changed:
-  target: *target_pm1
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm1_crossed_threshold:
-  target: *target_pm1
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm1_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM2.5 (single-unit: μg/m³)
-pm25_changed:
-  target: *target_pm25
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm25_crossed_threshold:
-  target: *target_pm25
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm25_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM4 (single-unit: μg/m³)
-pm4_changed:
-  target: *target_pm4
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm4_crossed_threshold:
-  target: *target_pm4
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm4_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# PM10 (single-unit: μg/m³)
-pm10_changed:
-  target: *target_pm10
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-pm10_crossed_threshold:
-  target: *target_pm10
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *pm10_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# Ozone (multi-unit)
-ozone_changed:
-  target: *target_ozone
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-ozone_crossed_threshold:
-  target: *target_ozone
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *ozone_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *ozone_units
-
-# VOC (multi-unit)
-voc_changed:
-  target: *target_voc
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-voc_crossed_threshold:
-  target: *target_voc
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *voc_units
-
-# VOC ratio (multi-unit)
-voc_ratio_changed:
-  target: *target_voc_ratio
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-voc_ratio_crossed_threshold:
-  target: *target_voc_ratio
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *voc_ratio_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *voc_ratio_units
-
-# NO (multi-unit)
-no_changed:
-  target: *target_no
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-no_crossed_threshold:
-  target: *target_no
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *no_units
-
-# NO2 (multi-unit)
-no2_changed:
-  target: *target_no2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-no2_crossed_threshold:
-  target: *target_no2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *no2_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *no2_units
-
-# N2O (single-unit: μg/m³)
-n2o_changed:
-  target: *target_n2o
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: changed
-          number: *ugm3_threshold_number
-
-n2o_crossed_threshold:
-  target: *target_n2o
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *n2o_threshold_entity
-          mode: crossed
-          number: *ugm3_threshold_number
-
-# SO2 (multi-unit)
-so2_changed:
-  target: *target_so2
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *so2_units
-
-so2_crossed_threshold:
-  target: *target_so2
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *so2_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *so2_units

homeassistant/components/airq/config_flow.py

@@ -87,7 +87,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])
 
             device_info = await airq.fetch_device_info()
-            await self.async_set_unique_id(device_info["id"], raise_on_progress=False)
+            await self.async_set_unique_id(device_info["id"])
             self._abort_if_unique_id_configured()
 
             _LOGGER.debug("Creating an entry for %s", device_info["name"])

homeassistant/components/airq/diagnostics.py

@@ -1,36 +0,0 @@
-"""Diagnostics support for air-Q."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_UNIQUE_ID
-from homeassistant.core import HomeAssistant
-
-from . import AirQConfigEntry
-
-REDACT_CONFIG = {CONF_PASSWORD, CONF_UNIQUE_ID, CONF_IP_ADDRESS, "title"}
-REDACT_DEVICE_INFO = {"identifiers", "name"}
-REDACT_COORDINATOR_DATA = {"DeviceID"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, entry: AirQConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-
-    return {
-        "config_entry": async_redact_data(entry.as_dict(), REDACT_CONFIG),
-        "device_info": async_redact_data(
-            dict(coordinator.device_info), REDACT_DEVICE_INFO
-        ),
-        "coordinator_data": async_redact_data(
-            coordinator.data, REDACT_COORDINATOR_DATA
-        ),
-        "options": {
-            "clip_negative": coordinator.clip_negative,
-            "return_average": coordinator.return_average,
-        },
-    }

homeassistant/components/airq/strings.json

@@ -2,7 +2,6 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
     },
     "error": {

homeassistant/components/alarm_control_panel/strings.json

@@ -173,7 +173,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm alarm away"
+      "name": "Arm away"
     },
     "alarm_arm_custom_bypass": {
       "description": "Arms an alarm while allowing to bypass a custom area.",
@@ -183,7 +183,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm alarm with custom bypass"
+      "name": "Arm with custom bypass"
     },
     "alarm_arm_home": {
       "description": "Arms an alarm in the home mode.",
@@ -193,7 +193,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm alarm home"
+      "name": "Arm home"
     },
     "alarm_arm_night": {
       "description": "Arms an alarm in the night mode.",
@@ -203,7 +203,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm alarm night"
+      "name": "Arm night"
     },
     "alarm_arm_vacation": {
       "description": "Arms an alarm in the vacation mode.",
@@ -213,7 +213,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Arm alarm vacation"
+      "name": "Arm vacation"
     },
     "alarm_disarm": {
       "description": "Disarms an alarm.",
@@ -223,7 +223,7 @@
           "name": "Code"
         }
       },
-      "name": "Disarm alarm"
+      "name": "Disarm"
     },
     "alarm_trigger": {
       "description": "Triggers an alarm manually.",
@@ -233,7 +233,7 @@
           "name": "[%key:component::alarm_control_panel::services::alarm_disarm::fields::code::name%]"
         }
       },
-      "name": "Trigger alarm"
+      "name": "Trigger"
     }
   },
   "title": "Alarm control panel",

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/androidtv_remote/manifest.json

@@ -8,6 +8,6 @@
   "iot_class": "local_push",
   "loggers": ["androidtvremote2"],
   "quality_scale": "platinum",
-  "requirements": ["androidtvremote2==0.3.1"],
+  "requirements": ["androidtvremote2==0.2.3"],
   "zeroconf": ["_androidtvremote2._tcp.local."]
 }

homeassistant/components/anglian_water/manifest.json

@@ -9,5 +9,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["pyanglianwater"],
   "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.2"]
+  "requirements": ["pyanglianwater==3.1.1"]
 }

homeassistant/components/assist_pipeline/__init__.py

@@ -137,4 +137,5 @@ async def async_pipeline_from_audio_stream(
                 audio_settings=audio_settings or AudioSettings(),
             ),
         )
-        await pipeline_input.execute(validate=True)
+        await pipeline_input.validate()
+        await pipeline_input.execute()

homeassistant/components/assist_pipeline/error.py

@@ -1,14 +1,7 @@
 """Assist pipeline errors."""
 
-from __future__ import annotations
-
-from typing import TYPE_CHECKING
-
 from homeassistant.exceptions import HomeAssistantError
 
-if TYPE_CHECKING:
-    from .pipeline import PipelineStage
-
 
 class PipelineError(HomeAssistantError):
     """Base class for pipeline errors."""
@@ -62,25 +55,3 @@ class IntentRecognitionError(PipelineError):
 
 class TextToSpeechError(PipelineError):
     """Error in text-to-speech portion of pipeline."""
-
-
-class PipelineRunValidationError(PipelineError):
-    """Error when a pipeline run is not valid."""
-
-    def __init__(self, message: str) -> None:
-        """Set error message."""
-        super().__init__("validation-error", message)
-
-
-class InvalidPipelineStagesError(PipelineRunValidationError):
-    """Error when given an invalid combination of start/end stages."""
-
-    def __init__(
-        self,
-        start_stage: PipelineStage,
-        end_stage: PipelineStage,
-    ) -> None:
-        """Set error message."""
-        super().__init__(
-            f"Invalid stage combination: start={start_stage}, end={end_stage}"
-        )

homeassistant/components/assist_pipeline/pipeline.py

@@ -73,10 +73,8 @@ from .const import (
 from .error import (
     DuplicateWakeUpDetectedError,
     IntentRecognitionError,
-    InvalidPipelineStagesError,
     PipelineError,
     PipelineNotFound,
-    PipelineRunValidationError,
     SpeechToTextError,
     TextToSpeechError,
     WakeWordDetectionAborted,
@@ -494,6 +492,24 @@ PIPELINE_STAGE_ORDER = [
 ]
 
 
+class PipelineRunValidationError(Exception):
+    """Error when a pipeline run is not valid."""
+
+
+class InvalidPipelineStagesError(PipelineRunValidationError):
+    """Error when given an invalid combination of start/end stages."""
+
+    def __init__(
+        self,
+        start_stage: PipelineStage,
+        end_stage: PipelineStage,
+    ) -> None:
+        """Set error message."""
+        super().__init__(
+            f"Invalid stage combination: start={start_stage}, end={end_stage}"
+        )
+
+
 @dataclass(frozen=True)
 class WakeWordSettings:
     """Settings for wake word detection."""
@@ -646,8 +662,7 @@ class PipelineRun:
         """Emit run start event."""
         self._device_id = device_id
         self._satellite_id = satellite_id
-        if self.start_stage in (PipelineStage.WAKE_WORD, PipelineStage.STT):
-            self._start_debug_recording_thread()
+        self._start_debug_recording_thread()
 
         data: dict[str, Any] = {
             "pipeline": self.pipeline.id,
@@ -1489,7 +1504,9 @@ class PipelineRun:
 
     def _start_debug_recording_thread(self) -> None:
         """Start thread to record wake/stt audio if debug_recording_dir is set."""
-        assert self.debug_recording_thread is None
+        if self.debug_recording_thread is not None:
+            # Already started
+            return
 
         # Directory to save audio for each pipeline run.
         # Configured in YAML for assist_pipeline.
@@ -1664,39 +1681,26 @@ class PipelineInput:
     satellite_id: str | None = None
     """Identifier of the satellite that is processing the input/output of the pipeline."""
 
-    async def execute(self, validate: bool = False) -> None:
+    async def execute(self) -> None:
         """Run pipeline."""
-        validation_error: PipelineError | None = None
-        if validate:
-            try:
-                await self.validate()
-            except PipelineError as err:
-                validation_error = err
-
         self.run.start(
             conversation_id=self.session.conversation_id,
             device_id=self.device_id,
             satellite_id=self.satellite_id,
         )
         current_stage: PipelineStage | None = self.run.start_stage
+        stt_audio_buffer: list[EnhancedAudioChunk] = []
+        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
+
+        if self.stt_stream is not None:
+            if self.run.audio_settings.needs_processor:
+                # VAD/noise suppression/auto gain/volume
+                stt_processed_stream = self.run.process_enhance_audio(self.stt_stream)
+            else:
+                # Volume multiplier only
+                stt_processed_stream = self.run.process_volume_only(self.stt_stream)
 
         try:
-            if validation_error is not None:
-                raise validation_error
-
-            stt_audio_buffer: list[EnhancedAudioChunk] = []
-            stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
-
-            if self.stt_stream is not None:
-                if self.run.audio_settings.needs_processor:
-                    # VAD/noise suppression/auto gain/volume
-                    stt_processed_stream = self.run.process_enhance_audio(
-                        self.stt_stream
-                    )
-                else:
-                    # Volume multiplier only
-                    stt_processed_stream = self.run.process_volume_only(self.stt_stream)
-
             if current_stage == PipelineStage.WAKE_WORD:
                 # wake-word-detection
                 assert stt_processed_stream is not None

homeassistant/components/auth/__init__.py

@@ -626,7 +626,7 @@ def websocket_delete_all_refresh_tokens(
     hass: HomeAssistant, connection: websocket_api.ActiveConnection, msg: dict[str, Any]
 ) -> None:
     """Handle delete all refresh tokens request."""
-    current_refresh_token: RefreshToken | None = None
+    current_refresh_token: RefreshToken
     remove_failed = False
     token_type = msg.get("token_type")
     delete_current_token = msg.get("delete_current_token")
@@ -654,7 +654,7 @@ def websocket_delete_all_refresh_tokens(
     else:
         connection.send_result(msg["id"], {})
 
-    async def _delete_current_token_soon(current_refresh_token: RefreshToken) -> None:
+    async def _delete_current_token_soon() -> None:
         """Delete the current token after a delay.
 
         We do not want to delete the current token immediately as it will
@@ -675,15 +675,13 @@ def websocket_delete_all_refresh_tokens(
             # the token right away.
             hass.auth.async_remove_refresh_token(current_refresh_token)
 
-    if (
-        delete_current_token
-        and current_refresh_token
-        and (not limit_token_types or current_refresh_token.token_type == token_type)
+    if delete_current_token and (
+        not limit_token_types or current_refresh_token.token_type == token_type
     ):
         # Deleting the token will close the connection so we need
         # to do it with a delay in a tracked task to ensure it still
         # happens if Home Assistant is shutting down.
-        hass.async_create_task(_delete_current_token_soon(current_refresh_token))
+        hass.async_create_task(_delete_current_token_soon())
 
 
 @websocket_api.websocket_command(

homeassistant/components/auth/login_flow.py

@@ -115,7 +115,6 @@ def async_setup(
 ) -> None:
     """Component to allow users to login."""
     hass.http.register_view(WellKnownOAuthInfoView)
-    hass.http.register_view(WellKnownProtectedResourceView)
     hass.http.register_view(AuthProvidersView)
     hass.http.register_view(LoginFlowIndexView(hass.auth.login_flow, store_result))
     hass.http.register_view(LoginFlowResourceView(hass.auth.login_flow, store_result))
@@ -155,32 +154,6 @@ class WellKnownOAuthInfoView(HomeAssistantView):
         return self.json(metadata)
 
 
-class WellKnownProtectedResourceView(HomeAssistantView):
-    """View to host the OAuth2 Protected Resource Metadata per RFC9728."""
-
-    requires_auth = False
-    url = "/.well-known/oauth-protected-resource"
-    name = "well-known/oauth-protected-resource"
-
-    async def get(self, request: web.Request) -> web.Response:
-        """Return the protected resource metadata."""
-        hass = request.app[KEY_HASS]
-        try:
-            url_prefix = get_url(hass, require_current_request=True)
-        except NoURLAvailableError:
-            return self.json_message("No URL available", HTTPStatus.NOT_FOUND)
-
-        return self.json(
-            {
-                "resource": url_prefix,
-                "authorization_servers": [url_prefix],
-                "resource_documentation": (
-                    "https://developers.home-assistant.io/docs/auth_api"
-                ),
-            }
-        )
-
-
 class AuthProvidersView(HomeAssistantView):
     """View to get available auth providers."""
 

homeassistant/components/automation/__init__.py

@@ -118,78 +118,52 @@ SERVICE_TRIGGER = "trigger"
 NEW_TRIGGERS_CONDITIONS_FEATURE_FLAG = "new_triggers_conditions"
 
 _EXPERIMENTAL_CONDITION_PLATFORMS = {
-    "air_quality",
     "alarm_control_panel",
     "assist_satellite",
-    "battery",
     "climate",
     "cover",
     "device_tracker",
-    "door",
     "fan",
-    "garage_door",
-    "gate",
     "humidifier",
-    "humidity",
-    "illuminance",
     "lawn_mower",
     "light",
     "lock",
     "media_player",
-    "moisture",
-    "motion",
-    "occupancy",
     "person",
-    "power",
-    "schedule",
     "siren",
     "switch",
-    "temperature",
-    "text",
     "vacuum",
-    "water_heater",
-    "window",
 }
 
 _EXPERIMENTAL_TRIGGER_PLATFORMS = {
-    "air_quality",
     "alarm_control_panel",
     "assist_satellite",
-    "battery",
     "button",
     "climate",
-    "counter",
     "cover",
     "device_tracker",
     "door",
-    "event",
     "fan",
     "garage_door",
     "gate",
     "humidifier",
     "humidity",
-    "illuminance",
+    "input_boolean",
     "lawn_mower",
     "light",
     "lock",
     "media_player",
-    "moisture",
     "motion",
     "occupancy",
     "person",
-    "power",
     "remote",
     "scene",
     "schedule",
-    "select",
     "siren",
     "switch",
-    "temperature",
     "text",
-    "todo",
     "update",
     "vacuum",
-    "water_heater",
     "window",
 }
 

homeassistant/components/automation/strings.json

@@ -78,11 +78,11 @@
   "services": {
     "reload": {
       "description": "Reloads the automation configuration.",
-      "name": "Reload automations"
+      "name": "[%key:common::action::reload%]"
     },
     "toggle": {
       "description": "Toggles (enable / disable) an automation.",
-      "name": "Toggle automation"
+      "name": "[%key:common::action::toggle%]"
     },
     "trigger": {
       "description": "Triggers the actions of an automation.",
@@ -92,7 +92,7 @@
           "name": "Skip conditions"
         }
       },
-      "name": "Trigger automation"
+      "name": "Trigger"
     },
     "turn_off": {
       "description": "Disables an automation.",
@@ -102,11 +102,11 @@
           "name": "Stop actions"
         }
       },
-      "name": "Turn off automation"
+      "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
       "description": "Enables an automation.",
-      "name": "Turn on automation"
+      "name": "[%key:common::action::turn_on%]"
     }
   },
   "title": "Automation"

homeassistant/components/aws_s3/backup.py

@@ -147,7 +147,7 @@ class S3BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream, on_progress)
+                await self._upload_multipart(tar_filename, open_stream)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -188,13 +188,11 @@ class S3BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        on_progress: OnProgressCallback,
-    ) -> None:
+    ):
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
-        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         multipart_upload = await self._client.create_multipart_upload(
@@ -207,7 +205,6 @@ class S3BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
-            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -236,8 +233,6 @@ class S3BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                        bytes_uploaded += len(part_data)
-                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -266,8 +261,6 @@ class S3BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                bytes_uploaded += len(remaining_data)
-                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/axis/hub/api.py

@@ -15,7 +15,7 @@ from homeassistant.const import (
     CONF_USERNAME,
 )
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.httpx_client import get_async_client
 
 from ..const import LOGGER
 from ..errors import AuthenticationRequired, CannotConnect
@@ -26,7 +26,7 @@ async def get_axis_api(
     config: Mapping[str, Any],
 ) -> axis.AxisDevice:
     """Create a Axis device API."""
-    session = async_get_clientsession(hass, verify_ssl=False)
+    session = get_async_client(hass, verify_ssl=False)
 
     api = axis.AxisDevice(
         Configuration(

homeassistant/components/axis/manifest.json

@@ -29,7 +29,7 @@
   "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["axis"],
-  "requirements": ["axis==67"],
+  "requirements": ["axis==66"],
   "ssdp": [
     {
       "manufacturer": "AXIS"

homeassistant/components/backup/const.py

@@ -34,4 +34,4 @@ EXCLUDE_DATABASE_FROM_BACKUP = [
     "home-assistant_v2.db-wal",
 ]
 
-SECURETAR_CREATE_VERSION = 3
+SECURETAR_CREATE_VERSION = 2

homeassistant/components/backup/util.py

@@ -246,8 +246,6 @@ def decrypt_backup(
         except (DecryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error decrypting backup: %s", err)
             error = err
-        except Abort:
-            raise
         except Exception as err:  # noqa: BLE001
             LOGGER.exception("Unexpected error when decrypting backup: %s", err)
             error = err
@@ -334,10 +332,8 @@ def encrypt_backup(
         except (EncryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error encrypting backup: %s", err)
             error = err
-        except Abort:
-            raise
         except Exception as err:  # noqa: BLE001
-            LOGGER.exception("Unexpected error when encrypting backup: %s", err)
+            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
             error = err
         else:
             # Pad the output stream to the requested minimum size

homeassistant/components/battery/__init__.py

@@ -1,17 +0,0 @@
-"""Integration for battery triggers and conditions."""
-
-from __future__ import annotations
-
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.typing import ConfigType
-
-DOMAIN = "battery"
-CONFIG_SCHEMA = cv.empty_config_schema(DOMAIN)
-
-__all__ = []
-
-
-async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up the component."""
-    return True

homeassistant/components/battery/condition.py

@@ -1,46 +0,0 @@
-"""Provides conditions for batteries."""
-
-from __future__ import annotations
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import PERCENTAGE, STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import (
-    Condition,
-    make_entity_numerical_condition,
-    make_entity_state_condition,
-)
-
-BATTERY_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY)
-}
-BATTERY_CHARGING_DOMAIN_SPECS = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(
-        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
-    )
-}
-BATTERY_PERCENTAGE_DOMAIN_SPECS = {
-    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
-}
-
-CONDITIONS: dict[str, type[Condition]] = {
-    "is_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_ON),
-    "is_not_low": make_entity_state_condition(BATTERY_DOMAIN_SPECS, STATE_OFF),
-    "is_charging": make_entity_state_condition(BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON),
-    "is_not_charging": make_entity_state_condition(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
-    ),
-    "is_level": make_entity_numerical_condition(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS, PERCENTAGE
-    ),
-}
-
-
-async def async_get_conditions(hass: HomeAssistant) -> dict[str, type[Condition]]:
-    """Return the conditions for batteries."""
-    return CONDITIONS

homeassistant/components/battery/conditions.yaml

@@ -1,64 +0,0 @@
-.condition_common: &condition_common
-  target: &target_battery_binary_sensor
-    entity:
-      - domain: binary_sensor
-        device_class: battery
-  fields:
-    behavior: &condition_behavior
-      required: true
-      default: any
-      selector:
-        select:
-          translation_key: condition_behavior
-          options:
-            - all
-            - any
-
-.battery_threshold_entity: &battery_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: battery
-  - domain: number
-    device_class: battery
-
-.battery_threshold_number: &battery_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
-
-is_low: *condition_common
-
-is_not_low: *condition_common
-
-is_charging:
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: battery_charging
-  fields:
-    behavior: *condition_behavior
-
-is_not_charging:
-  target:
-    entity:
-      - domain: binary_sensor
-        device_class: battery_charging
-  fields:
-    behavior: *condition_behavior
-
-is_level:
-  target:
-    entity:
-      - domain: sensor
-        device_class: battery
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *battery_threshold_entity
-          mode: is
-          number: *battery_threshold_number

homeassistant/components/battery/icons.json

@@ -1,39 +0,0 @@
-{
-  "conditions": {
-    "is_charging": {
-      "condition": "mdi:battery-charging"
-    },
-    "is_level": {
-      "condition": "mdi:battery-unknown"
-    },
-    "is_low": {
-      "condition": "mdi:battery-alert"
-    },
-    "is_not_charging": {
-      "condition": "mdi:battery"
-    },
-    "is_not_low": {
-      "condition": "mdi:battery"
-    }
-  },
-  "triggers": {
-    "level_changed": {
-      "trigger": "mdi:battery-unknown"
-    },
-    "level_crossed_threshold": {
-      "trigger": "mdi:battery-alert"
-    },
-    "low": {
-      "trigger": "mdi:battery-alert"
-    },
-    "not_low": {
-      "trigger": "mdi:battery"
-    },
-    "started_charging": {
-      "trigger": "mdi:battery-charging"
-    },
-    "stopped_charging": {
-      "trigger": "mdi:battery"
-    }
-  }
-}

homeassistant/components/battery/manifest.json

@@ -1,8 +0,0 @@
-{
-  "domain": "battery",
-  "name": "Battery",
-  "codeowners": ["@home-assistant/core"],
-  "documentation": "https://www.home-assistant.io/integrations/battery",
-  "integration_type": "system",
-  "quality_scale": "internal"
-}

homeassistant/components/battery/strings.json

@@ -1,151 +0,0 @@
-{
-  "common": {
-    "condition_behavior_description": "How the state should match on the targeted batteries.",
-    "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
-    "trigger_behavior_description": "The behavior of the targeted batteries to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
-  },
-  "conditions": {
-    "is_charging": {
-      "description": "Tests if one or more batteries are charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is charging"
-    },
-    "is_level": {
-      "description": "Tests the battery level of one or more batteries.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::battery::common::condition_threshold_description%]",
-          "name": "[%key:component::battery::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Battery level"
-    },
-    "is_low": {
-      "description": "Tests if one or more batteries are low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is low"
-    },
-    "is_not_charging": {
-      "description": "Tests if one or more batteries are not charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is not charging"
-    },
-    "is_not_low": {
-      "description": "Tests if one or more batteries are not low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::condition_behavior_description%]",
-          "name": "[%key:component::battery::common::condition_behavior_name%]"
-        }
-      },
-      "name": "Battery is not low"
-    }
-  },
-  "selector": {
-    "condition_behavior": {
-      "options": {
-        "all": "All",
-        "any": "Any"
-      }
-    },
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
-  "title": "Battery",
-  "triggers": {
-    "level_changed": {
-      "description": "Triggers after the battery level of one or more batteries changes.",
-      "fields": {
-        "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level changed"
-    },
-    "level_crossed_threshold": {
-      "description": "Triggers after the battery level of one or more batteries crosses a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::battery::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::battery::common::trigger_threshold_name%]"
-        }
-      },
-      "name": "Battery level crossed threshold"
-    },
-    "low": {
-      "description": "Triggers after one or more batteries become low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery low"
-    },
-    "not_low": {
-      "description": "Triggers after one or more batteries are no longer low.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery not low"
-    },
-    "started_charging": {
-      "description": "Triggers after one or more batteries start charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery started charging"
-    },
-    "stopped_charging": {
-      "description": "Triggers after one or more batteries stop charging.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::battery::common::trigger_behavior_description%]",
-          "name": "[%key:component::battery::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Battery stopped charging"
-    }
-  }
-}

homeassistant/components/battery/trigger.py

@@ -1,54 +0,0 @@
-"""Provides triggers for batteries."""
-
-from __future__ import annotations
-
-from homeassistant.components.binary_sensor import (
-    DOMAIN as BINARY_SENSOR_DOMAIN,
-    BinarySensorDeviceClass,
-)
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN, SensorDeviceClass
-from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import (
-    Trigger,
-    make_entity_numerical_state_changed_trigger,
-    make_entity_numerical_state_crossed_threshold_trigger,
-    make_entity_target_state_trigger,
-)
-
-BATTERY_LOW_DOMAIN_SPECS: dict[str, DomainSpec] = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(device_class=BinarySensorDeviceClass.BATTERY),
-}
-
-BATTERY_CHARGING_DOMAIN_SPECS: dict[str, DomainSpec] = {
-    BINARY_SENSOR_DOMAIN: DomainSpec(
-        device_class=BinarySensorDeviceClass.BATTERY_CHARGING
-    ),
-}
-
-BATTERY_PERCENTAGE_DOMAIN_SPECS: dict[str, DomainSpec] = {
-    SENSOR_DOMAIN: DomainSpec(device_class=SensorDeviceClass.BATTERY),
-}
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_ON),
-    "not_low": make_entity_target_state_trigger(BATTERY_LOW_DOMAIN_SPECS, STATE_OFF),
-    "started_charging": make_entity_target_state_trigger(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_ON
-    ),
-    "stopped_charging": make_entity_target_state_trigger(
-        BATTERY_CHARGING_DOMAIN_SPECS, STATE_OFF
-    ),
-    "level_changed": make_entity_numerical_state_changed_trigger(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
-    ),
-    "level_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        BATTERY_PERCENTAGE_DOMAIN_SPECS, valid_unit="%"
-    ),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for batteries."""
-    return TRIGGERS

homeassistant/components/battery/triggers.yaml

@@ -1,83 +0,0 @@
-.trigger_common_fields:
-  behavior: &trigger_behavior
-    required: true
-    default: any
-    selector:
-      select:
-        translation_key: trigger_behavior
-        options:
-          - first
-          - last
-          - any
-
-.battery_threshold_entity: &battery_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: number
-    device_class: battery
-  - domain: sensor
-    device_class: battery
-
-.battery_threshold_number: &battery_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
-
-.trigger_target_battery: &trigger_target_battery
-  entity:
-    - domain: binary_sensor
-      device_class: battery
-
-.trigger_target_charging: &trigger_target_charging
-  entity:
-    - domain: binary_sensor
-      device_class: battery_charging
-
-.trigger_target_percentage: &trigger_target_percentage
-  entity:
-    - domain: sensor
-      device_class: battery
-
-low:
-  fields:
-    behavior: *trigger_behavior
-  target: *trigger_target_battery
-
-not_low:
-  fields:
-    behavior: *trigger_behavior
-  target: *trigger_target_battery
-
-started_charging:
-  fields:
-    behavior: *trigger_behavior
-  target: *trigger_target_charging
-
-stopped_charging:
-  fields:
-    behavior: *trigger_behavior
-  target: *trigger_target_charging
-
-level_changed:
-  target: *trigger_target_percentage
-  fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *battery_threshold_entity
-          mode: changed
-          number: *battery_threshold_number
-
-level_crossed_threshold:
-  target: *trigger_target_percentage
-  fields:
-    behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *battery_threshold_entity
-          mode: crossed
-          number: *battery_threshold_number

homeassistant/components/bluetooth/manifest.json

@@ -21,6 +21,6 @@
     "bluetooth-auto-recovery==1.5.3",
     "bluetooth-data-tools==1.28.4",
     "dbus-fast==3.1.2",
-    "habluetooth==5.11.1"
+    "habluetooth==5.10.2"
   ]
 }

homeassistant/components/bsblan/__init__.py

@@ -32,7 +32,7 @@ from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.typing import ConfigType
 
-from .const import CONF_PASSKEY, DOMAIN, LOGGER
+from .const import CONF_PASSKEY, DOMAIN
 from .coordinator import BSBLanFastCoordinator, BSBLanSlowCoordinator
 from .services import async_setup_services
 
@@ -52,7 +52,7 @@ class BSBLanData:
     client: BSBLAN
     device: Device
     info: Info
-    static: StaticState | None
+    static: StaticState
 
 
 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
@@ -82,10 +82,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
         # the connection by fetching firmware version
         await bsblan.initialize()
 
-        # Fetch required device metadata in parallel for faster startup
-        device, info = await asyncio.gather(
+        # Fetch device metadata in parallel for faster startup
+        device, info, static = await asyncio.gather(
             bsblan.device(),
             bsblan.info(),
+            bsblan.static_values(),
         )
     except BSBLANConnectionError as err:
         raise ConfigEntryNotReady(
@@ -110,16 +111,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: BSBLanConfigEntry) -> bo
             translation_key="setup_general_error",
         ) from err
 
-    try:
-        static = await bsblan.static_values()
-    except (BSBLANError, TimeoutError) as err:
-        LOGGER.debug(
-            "Static values not available for %s: %s",
-            entry.data[CONF_HOST],
-            err,
-        )
-        static = None
-
     # Create coordinators with the already-initialized client
     fast_coordinator = BSBLanFastCoordinator(hass, entry, bsblan)
     slow_coordinator = BSBLanSlowCoordinator(hass, entry, bsblan)

homeassistant/components/bsblan/climate.py

@@ -90,11 +90,10 @@ class BSBLANClimate(BSBLanEntity, ClimateEntity):
         self._attr_unique_id = f"{format_mac(data.device.MAC)}-climate"
 
         # Set temperature range if available, otherwise use Home Assistant defaults
-        if (static := data.static) is not None:
-            if (min_temp := static.min_temp) is not None and min_temp.value is not None:
-                self._attr_min_temp = min_temp.value
-            if (max_temp := static.max_temp) is not None and max_temp.value is not None:
-                self._attr_max_temp = max_temp.value
+        if data.static.min_temp is not None and data.static.min_temp.value is not None:
+            self._attr_min_temp = data.static.min_temp.value
+        if data.static.max_temp is not None and data.static.max_temp.value is not None:
+            self._attr_max_temp = data.static.max_temp.value
         self._attr_temperature_unit = data.fast_coordinator.client.get_temperature_unit
 
     @property

homeassistant/components/bsblan/config_flow.py

@@ -183,122 +183,90 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
         existing_entry = self._get_reauth_entry()
 
         if user_input is None:
+            # Preserve existing values as defaults
             return self.async_show_form(
                 step_id="reauth_confirm",
-                data_schema=self._build_credentials_schema(existing_entry.data),
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=existing_entry.data.get(
+                                CONF_PASSKEY, vol.UNDEFINED
+                            ),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=existing_entry.data.get(
+                                CONF_USERNAME, vol.UNDEFINED
+                            ),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
             )
 
-        # Merge existing data with user input for validation
-        validate_data = {**existing_entry.data, **user_input}
-        errors = await self._async_validate_credentials(validate_data)
+        # Combine existing data with the user's new input for validation.
+        # This correctly handles adding, changing, and clearing credentials.
+        config_data = existing_entry.data.copy()
+        config_data.update(user_input)
 
-        if errors:
-            return self.async_show_form(
-                step_id="reauth_confirm",
-                data_schema=self._build_credentials_schema(user_input),
-                errors=errors,
-            )
+        self.host = config_data[CONF_HOST]
+        self.port = config_data[CONF_PORT]
+        self.passkey = config_data.get(CONF_PASSKEY)
+        self.username = config_data.get(CONF_USERNAME)
+        self.password = config_data.get(CONF_PASSWORD)
 
-        return self.async_update_reload_and_abort(
-            existing_entry, data_updates=user_input, reason="reauth_successful"
-        )
-
-    async def async_step_reconfigure(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle reconfiguration flow."""
-        existing_entry = self._get_reconfigure_entry()
-
-        if user_input is None:
-            return self.async_show_form(
-                step_id="reconfigure",
-                data_schema=self._build_connection_schema(existing_entry.data),
-            )
-
-        # Merge existing data with user input for validation
-        validate_data = {**existing_entry.data, **user_input}
-        errors = await self._async_validate_credentials(validate_data)
-
-        if errors:
-            return self.async_show_form(
-                step_id="reconfigure",
-                data_schema=self._build_connection_schema(user_input),
-                errors=errors,
-            )
-
-        # Prevent reconfiguring to a different physical device
-        # it gets the unique ID from the device info when it validates credentials
-        self._abort_if_unique_id_mismatch()
-
-        return self.async_update_reload_and_abort(
-            existing_entry,
-            data_updates=user_input,
-            reason="reconfigure_successful",
-        )
-
-    async def _async_validate_credentials(self, data: dict[str, Any]) -> dict[str, str]:
-        """Validate connection credentials and return errors dict."""
-        self.host = data[CONF_HOST]
-        self.port = data.get(CONF_PORT, DEFAULT_PORT)
-        self.passkey = data.get(CONF_PASSKEY)
-        self.username = data.get(CONF_USERNAME)
-        self.password = data.get(CONF_PASSWORD)
-
-        errors: dict[str, str] = {}
         try:
             await self._get_bsblan_info(raise_on_progress=False, is_reauth=True)
         except BSBLANAuthError:
-            errors["base"] = "invalid_auth"
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=user_input.get(CONF_PASSKEY, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=user_input.get(CONF_USERNAME, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
+                errors={"base": "invalid_auth"},
+            )
         except BSBLANError:
-            errors["base"] = "cannot_connect"
-        return errors
+            return self.async_show_form(
+                step_id="reauth_confirm",
+                data_schema=vol.Schema(
+                    {
+                        vol.Optional(
+                            CONF_PASSKEY,
+                            default=user_input.get(CONF_PASSKEY, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_USERNAME,
+                            default=user_input.get(CONF_USERNAME, vol.UNDEFINED),
+                        ): str,
+                        vol.Optional(
+                            CONF_PASSWORD,
+                            default=vol.UNDEFINED,
+                        ): str,
+                    }
+                ),
+                errors={"base": "cannot_connect"},
+            )
 
-    @callback
-    def _build_credentials_schema(self, defaults: Mapping[str, Any]) -> vol.Schema:
-        """Build schema for credentials-only forms (reauth)."""
-        return vol.Schema(
-            {
-                vol.Optional(
-                    CONF_PASSKEY,
-                    default=defaults.get(CONF_PASSKEY) or vol.UNDEFINED,
-                ): str,
-                vol.Optional(
-                    CONF_USERNAME,
-                    default=defaults.get(CONF_USERNAME) or vol.UNDEFINED,
-                ): str,
-                vol.Optional(
-                    CONF_PASSWORD,
-                    default=vol.UNDEFINED,
-                ): str,
-            }
-        )
-
-    @callback
-    def _build_connection_schema(self, defaults: Mapping[str, Any]) -> vol.Schema:
-        """Build schema for full connection forms (user and reconfigure)."""
-        return vol.Schema(
-            {
-                vol.Required(
-                    CONF_HOST,
-                    default=defaults.get(CONF_HOST, vol.UNDEFINED),
-                ): str,
-                vol.Optional(
-                    CONF_PORT,
-                    default=defaults.get(CONF_PORT, DEFAULT_PORT),
-                ): int,
-                vol.Optional(
-                    CONF_PASSKEY,
-                    default=defaults.get(CONF_PASSKEY) or vol.UNDEFINED,
-                ): str,
-                vol.Optional(
-                    CONF_USERNAME,
-                    default=defaults.get(CONF_USERNAME) or vol.UNDEFINED,
-                ): str,
-                vol.Optional(
-                    CONF_PASSWORD,
-                    default=vol.UNDEFINED,
-                ): str,
-            }
+        # Update only the fields that were provided by the user
+        return self.async_update_reload_and_abort(
+            existing_entry, data_updates=user_input, reason="reauth_successful"
         )
 
     @callback
@@ -306,9 +274,32 @@ class BSBLANFlowHandler(ConfigFlow, domain=DOMAIN):
         self, errors: dict | None = None, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Show the setup form to the user."""
+        # Preserve user input if provided, otherwise use defaults
+        defaults = user_input or {}
+
         return self.async_show_form(
             step_id="user",
-            data_schema=self._build_connection_schema(user_input or {}),
+            data_schema=vol.Schema(
+                {
+                    vol.Required(
+                        CONF_HOST, default=defaults.get(CONF_HOST, vol.UNDEFINED)
+                    ): str,
+                    vol.Optional(
+                        CONF_PORT, default=defaults.get(CONF_PORT, DEFAULT_PORT)
+                    ): int,
+                    vol.Optional(
+                        CONF_PASSKEY, default=defaults.get(CONF_PASSKEY, vol.UNDEFINED)
+                    ): str,
+                    vol.Optional(
+                        CONF_USERNAME,
+                        default=defaults.get(CONF_USERNAME, vol.UNDEFINED),
+                    ): str,
+                    vol.Optional(
+                        CONF_PASSWORD,
+                        default=defaults.get(CONF_PASSWORD, vol.UNDEFINED),
+                    ): str,
+                }
+            ),
             errors=errors or {},
         )
 

homeassistant/components/bsblan/diagnostics.py

@@ -24,7 +24,7 @@ async def async_get_config_entry_diagnostics(
             "sensor": data.fast_coordinator.data.sensor.model_dump(),
             "dhw": data.fast_coordinator.data.dhw.model_dump(),
         },
-        "static": data.static.model_dump() if data.static is not None else None,
+        "static": data.static.model_dump(),
     }
 
     # Add DHW config and schedule from slow coordinator if available

homeassistant/components/bsblan/manifest.json

@@ -8,7 +8,7 @@
   "iot_class": "local_polling",
   "loggers": ["bsblan"],
   "quality_scale": "silver",
-  "requirements": ["python-bsblan==5.1.3"],
+  "requirements": ["python-bsblan==5.1.2"],
   "zeroconf": [
     {
       "name": "bsb-lan*",

homeassistant/components/bsblan/quality_scale.yaml

@@ -58,7 +58,7 @@ rules:
   entity-translations: done
   exception-translations: done
   icon-translations: todo
-  reconfiguration-flow: done
+  reconfiguration-flow: todo
   repair-issues:
     status: exempt
     comment: |

homeassistant/components/bsblan/strings.json

@@ -3,9 +3,7 @@
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
-      "unique_id_mismatch": "The device you are trying to reconfigure is not the same as the one previously configured."
+      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
@@ -41,24 +39,6 @@
         "description": "The BSB-LAN integration needs to re-authenticate with {name}",
         "title": "[%key:common::config_flow::title::reauth%]"
       },
-      "reconfigure": {
-        "data": {
-          "host": "[%key:common::config_flow::data::host%]",
-          "passkey": "[%key:component::bsblan::config::step::user::data::passkey%]",
-          "password": "[%key:common::config_flow::data::password%]",
-          "port": "[%key:common::config_flow::data::port%]",
-          "username": "[%key:common::config_flow::data::username%]"
-        },
-        "data_description": {
-          "host": "[%key:component::bsblan::config::step::user::data_description::host%]",
-          "passkey": "[%key:component::bsblan::config::step::user::data_description::passkey%]",
-          "password": "[%key:component::bsblan::config::step::user::data_description::password%]",
-          "port": "[%key:component::bsblan::config::step::user::data_description::port%]",
-          "username": "[%key:component::bsblan::config::step::user::data_description::username%]"
-        },
-        "description": "Update connection settings for your BSB-LAN device.",
-        "title": "Reconfigure BSB-LAN"
-      },
       "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",

homeassistant/components/button/strings.json

@@ -23,8 +23,8 @@
   },
   "services": {
     "press": {
-      "description": "Presses a button.",
-      "name": "Press button"
+      "description": "Presses a button entity.",
+      "name": "Press"
     }
   },
   "title": "Button",

homeassistant/components/calendar/strings.json

@@ -90,7 +90,7 @@
           "name": "Summary"
         }
       },
-      "name": "Create calendar event"
+      "name": "Create event"
     },
     "get_events": {
       "description": "Retrieves events on a calendar within a time range.",
@@ -108,7 +108,7 @@
           "name": "Start time"
         }
       },
-      "name": "Get calendar events"
+      "name": "Get events"
     }
   },
   "title": "Calendar",

homeassistant/components/camera/__init__.py

@@ -432,7 +432,6 @@ class Camera(Entity, cached_properties=CACHED_PROPERTIES_WITH_ATTR_):
     )
 
     # Entity Properties
-    entity_description: CameraEntityDescription
     _attr_brand: str | None = None
     _attr_frame_interval: float = MIN_STREAM_INTERVAL
     _attr_is_on: bool = True

homeassistant/components/camera/strings.json

@@ -51,11 +51,11 @@
   "services": {
     "disable_motion_detection": {
       "description": "Disables the motion detection of a camera.",
-      "name": "Disable camera motion detection"
+      "name": "Disable motion detection"
     },
     "enable_motion_detection": {
       "description": "Enables the motion detection of a camera.",
-      "name": "Enable camera motion detection"
+      "name": "Enable motion detection"
     },
     "play_stream": {
       "description": "Plays a camera stream on a supported media player.",
@@ -69,7 +69,7 @@
           "name": "Media player"
         }
       },
-      "name": "Play camera stream"
+      "name": "Play stream"
     },
     "record": {
       "description": "Creates a recording of a live camera feed.",
@@ -87,7 +87,7 @@
           "name": "Lookback"
         }
       },
-      "name": "Record camera feed"
+      "name": "Record"
     },
     "snapshot": {
       "description": "Takes a snapshot from a camera.",
@@ -97,15 +97,15 @@
           "name": "Filename"
         }
       },
-      "name": "Take camera snapshot"
+      "name": "Take snapshot"
     },
     "turn_off": {
       "description": "Turns off a camera.",
-      "name": "Turn off camera"
+      "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
       "description": "Turns on a camera.",
-      "name": "Turn on camera"
+      "name": "[%key:common::action::turn_on%]"
     }
   },
   "title": "Camera"

homeassistant/components/casper_glow/__init__.py

@@ -1,39 +0,0 @@
-"""The Casper Glow integration."""
-
-from __future__ import annotations
-
-from pycasperglow import CasperGlow
-
-from homeassistant.components import bluetooth
-from homeassistant.const import CONF_ADDRESS, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-
-from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
-
-PLATFORMS: list[Platform] = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.LIGHT]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:
-    """Set up Casper Glow from a config entry."""
-    address: str = entry.data[CONF_ADDRESS]
-    ble_device = bluetooth.async_ble_device_from_address(hass, address.upper(), True)
-    if not ble_device:
-        raise ConfigEntryNotReady(
-            f"Could not find Casper Glow device with address {address}"
-        )
-
-    glow = CasperGlow(ble_device)
-    coordinator = CasperGlowCoordinator(hass, glow, entry.title)
-    entry.runtime_data = coordinator
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    entry.async_on_unload(coordinator.async_start())
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: CasperGlowConfigEntry) -> bool:
-    """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/casper_glow/binary_sensor.py

@@ -1,51 +0,0 @@
-"""Casper Glow integration binary sensor platform."""
-
-from __future__ import annotations
-
-from pycasperglow import GlowState
-
-from homeassistant.components.binary_sensor import BinarySensorEntity
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
-from .entity import CasperGlowEntity
-
-PARALLEL_UPDATES = 0
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: CasperGlowConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the binary sensor platform for Casper Glow."""
-    async_add_entities([CasperGlowPausedBinarySensor(entry.runtime_data)])
-
-
-class CasperGlowPausedBinarySensor(CasperGlowEntity, BinarySensorEntity):
-    """Binary sensor indicating whether the Casper Glow dimming is paused."""
-
-    _attr_translation_key = "paused"
-
-    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
-        """Initialize the paused binary sensor."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{format_mac(coordinator.device.address)}_paused"
-        if coordinator.device.state.is_paused is not None:
-            self._attr_is_on = coordinator.device.state.is_paused
-
-    async def async_added_to_hass(self) -> None:
-        """Register state update callback when entity is added."""
-        await super().async_added_to_hass()
-        self.async_on_remove(
-            self._device.register_callback(self._async_handle_state_update)
-        )
-
-    @callback
-    def _async_handle_state_update(self, state: GlowState) -> None:
-        """Handle a state update from the device."""
-        if state.is_paused is not None:
-            self._attr_is_on = state.is_paused
-        self.async_write_ha_state()

homeassistant/components/casper_glow/button.py

@@ -1,73 +0,0 @@
-"""Casper Glow integration button platform."""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-
-from pycasperglow import CasperGlow
-
-from homeassistant.components.button import ButtonEntity, ButtonEntityDescription
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
-from .entity import CasperGlowEntity
-
-PARALLEL_UPDATES = 1
-
-
-@dataclass(frozen=True, kw_only=True)
-class CasperGlowButtonEntityDescription(ButtonEntityDescription):
-    """Describe a Casper Glow button entity."""
-
-    press_fn: Callable[[CasperGlow], Awaitable[None]]
-
-
-BUTTON_DESCRIPTIONS: tuple[CasperGlowButtonEntityDescription, ...] = (
-    CasperGlowButtonEntityDescription(
-        key="pause",
-        translation_key="pause",
-        press_fn=lambda device: device.pause(),
-    ),
-    CasperGlowButtonEntityDescription(
-        key="resume",
-        translation_key="resume",
-        press_fn=lambda device: device.resume(),
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: CasperGlowConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the button platform for Casper Glow."""
-    async_add_entities(
-        CasperGlowButton(entry.runtime_data, description)
-        for description in BUTTON_DESCRIPTIONS
-    )
-
-
-class CasperGlowButton(CasperGlowEntity, ButtonEntity):
-    """A Casper Glow button entity."""
-
-    entity_description: CasperGlowButtonEntityDescription
-
-    def __init__(
-        self,
-        coordinator: CasperGlowCoordinator,
-        description: CasperGlowButtonEntityDescription,
-    ) -> None:
-        """Initialize a Casper Glow button."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = (
-            f"{format_mac(coordinator.device.address)}_{description.key}"
-        )
-
-    async def async_press(self) -> None:
-        """Press the button."""
-        await self._async_command(self.entity_description.press_fn(self._device))

homeassistant/components/casper_glow/config_flow.py

@@ -1,151 +0,0 @@
-"""Config flow for Casper Glow integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import Any
-
-from bluetooth_data_tools import human_readable_name
-from pycasperglow import CasperGlow, CasperGlowError
-import voluptuous as vol
-
-from homeassistant.components.bluetooth import (
-    BluetoothServiceInfoBleak,
-    async_discovered_service_info,
-)
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_ADDRESS
-from homeassistant.helpers.device_registry import format_mac
-
-from .const import DOMAIN, LOCAL_NAMES
-
-_LOGGER = logging.getLogger(__name__)
-
-
-class CasperGlowConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Casper Glow."""
-
-    VERSION = 1
-    MINOR_VERSION = 1
-
-    def __init__(self) -> None:
-        """Initialize the config flow."""
-        self._discovery_info: BluetoothServiceInfoBleak | None = None
-        self._discovered_devices: dict[str, BluetoothServiceInfoBleak] = {}
-
-    async def async_step_bluetooth(
-        self, discovery_info: BluetoothServiceInfoBleak
-    ) -> ConfigFlowResult:
-        """Handle the bluetooth discovery step."""
-        await self.async_set_unique_id(format_mac(discovery_info.address))
-        self._abort_if_unique_id_configured()
-        self._discovery_info = discovery_info
-        self.context["title_placeholders"] = {
-            "name": human_readable_name(
-                None, discovery_info.name, discovery_info.address
-            )
-        }
-        return await self.async_step_bluetooth_confirm()
-
-    async def async_step_bluetooth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm a discovered Casper Glow device."""
-        assert self._discovery_info is not None
-        if user_input is not None:
-            return self.async_create_entry(
-                title=self.context["title_placeholders"]["name"],
-                data={CONF_ADDRESS: self._discovery_info.address},
-            )
-        glow = CasperGlow(self._discovery_info.device)
-        try:
-            await glow.handshake()
-        except CasperGlowError:
-            return self.async_abort(reason="cannot_connect")
-        except Exception:
-            _LOGGER.exception(
-                "Unexpected error during Casper Glow config flow "
-                "(step=bluetooth_confirm, address=%s)",
-                self._discovery_info.address,
-            )
-            return self.async_abort(reason="unknown")
-        self._set_confirm_only()
-        return self.async_show_form(
-            step_id="bluetooth_confirm",
-            description_placeholders=self.context["title_placeholders"],
-        )
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the user step to pick discovered device."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            address = user_input[CONF_ADDRESS]
-            discovery_info = self._discovered_devices[address]
-            await self.async_set_unique_id(
-                format_mac(discovery_info.address), raise_on_progress=False
-            )
-            self._abort_if_unique_id_configured()
-            glow = CasperGlow(discovery_info.device)
-            try:
-                await glow.handshake()
-            except CasperGlowError:
-                errors["base"] = "cannot_connect"
-            except Exception:
-                _LOGGER.exception(
-                    "Unexpected error during Casper Glow config flow "
-                    "(step=user, address=%s)",
-                    discovery_info.address,
-                )
-                errors["base"] = "unknown"
-            else:
-                return self.async_create_entry(
-                    title=human_readable_name(
-                        None, discovery_info.name, discovery_info.address
-                    ),
-                    data={
-                        CONF_ADDRESS: discovery_info.address,
-                    },
-                )
-
-        if discovery := self._discovery_info:
-            self._discovered_devices[discovery.address] = discovery
-        else:
-            current_addresses = self._async_current_ids(include_ignore=False)
-            for discovery in async_discovered_service_info(self.hass):
-                if (
-                    format_mac(discovery.address) in current_addresses
-                    or discovery.address in self._discovered_devices
-                    or not (
-                        discovery.name
-                        and any(
-                            discovery.name.startswith(local_name)
-                            for local_name in LOCAL_NAMES
-                        )
-                    )
-                ):
-                    continue
-                self._discovered_devices[discovery.address] = discovery
-
-        if not self._discovered_devices:
-            return self.async_abort(reason="no_devices_found")
-
-        data_schema = vol.Schema(
-            {
-                vol.Required(CONF_ADDRESS): vol.In(
-                    {
-                        service_info.address: human_readable_name(
-                            None, service_info.name, service_info.address
-                        )
-                        for service_info in self._discovered_devices.values()
-                    }
-                ),
-            }
-        )
-        return self.async_show_form(
-            step_id="user",
-            data_schema=data_schema,
-            errors=errors,
-        )

homeassistant/components/casper_glow/const.py

@@ -1,16 +0,0 @@
-"""Constants for the Casper Glow integration."""
-
-from datetime import timedelta
-
-from pycasperglow import BRIGHTNESS_LEVELS, DEVICE_NAME_PREFIX, DIMMING_TIME_MINUTES
-
-DOMAIN = "casper_glow"
-
-LOCAL_NAMES = {DEVICE_NAME_PREFIX}
-
-SORTED_BRIGHTNESS_LEVELS = sorted(BRIGHTNESS_LEVELS)
-
-DEFAULT_DIMMING_TIME_MINUTES: int = DIMMING_TIME_MINUTES[0]
-
-# Interval between periodic state polls to catch externally-triggered changes.
-STATE_POLL_INTERVAL = timedelta(seconds=30)

homeassistant/components/casper_glow/coordinator.py

@@ -1,103 +0,0 @@
-"""Coordinator for the Casper Glow integration."""
-
-from __future__ import annotations
-
-import logging
-
-from bleak import BleakError
-from bluetooth_data_tools import monotonic_time_coarse
-from pycasperglow import CasperGlow
-
-from homeassistant.components.bluetooth import (
-    BluetoothChange,
-    BluetoothScanningMode,
-    BluetoothServiceInfoBleak,
-)
-from homeassistant.components.bluetooth.active_update_coordinator import (
-    ActiveBluetoothDataUpdateCoordinator,
-)
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant, callback
-
-from .const import STATE_POLL_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-type CasperGlowConfigEntry = ConfigEntry[CasperGlowCoordinator]
-
-
-class CasperGlowCoordinator(ActiveBluetoothDataUpdateCoordinator[None]):
-    """Coordinator for Casper Glow BLE devices."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        device: CasperGlow,
-        title: str,
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass=hass,
-            logger=_LOGGER,
-            address=device.address,
-            mode=BluetoothScanningMode.PASSIVE,
-            needs_poll_method=self._needs_poll,
-            poll_method=self._async_update,
-            connectable=True,
-        )
-        self.device = device
-        self.last_dimming_time_minutes: int | None = (
-            device.state.configured_dimming_time_minutes
-        )
-        self.title = title
-
-    @callback
-    def _needs_poll(
-        self,
-        service_info: BluetoothServiceInfoBleak,
-        seconds_since_last_poll: float | None,
-    ) -> bool:
-        """Return True if a poll is needed."""
-        return (
-            seconds_since_last_poll is None
-            or seconds_since_last_poll >= STATE_POLL_INTERVAL.total_seconds()
-        )
-
-    async def _async_update(self, service_info: BluetoothServiceInfoBleak) -> None:
-        """Poll device state."""
-        await self.device.query_state()
-
-    async def _async_poll(self) -> None:
-        """Poll the device and log availability changes."""
-        assert self._last_service_info
-
-        try:
-            await self._async_poll_data(self._last_service_info)
-        except BleakError as exc:
-            if self.last_poll_successful:
-                _LOGGER.info("%s is unavailable: %s", self.title, exc)
-                self.last_poll_successful = False
-            return
-        except Exception:
-            if self.last_poll_successful:
-                _LOGGER.exception("%s: unexpected error while polling", self.title)
-                self.last_poll_successful = False
-            return
-        finally:
-            self._last_poll = monotonic_time_coarse()
-
-        if not self.last_poll_successful:
-            _LOGGER.info("%s is back online", self.title)
-            self.last_poll_successful = True
-
-        self._async_handle_bluetooth_poll()
-
-    @callback
-    def _async_handle_bluetooth_event(
-        self,
-        service_info: BluetoothServiceInfoBleak,
-        change: BluetoothChange,
-    ) -> None:
-        """Update BLE device reference on each advertisement."""
-        self.device.set_ble_device(service_info.device)
-        super()._async_handle_bluetooth_event(service_info, change)

homeassistant/components/casper_glow/entity.py

@@ -1,47 +0,0 @@
-"""Base entity for the Casper Glow integration."""
-
-from __future__ import annotations
-
-from collections.abc import Awaitable
-
-from pycasperglow import CasperGlowError
-
-from homeassistant.components.bluetooth.passive_update_coordinator import (
-    PassiveBluetoothCoordinatorEntity,
-)
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr
-from homeassistant.helpers.device_registry import DeviceInfo, format_mac
-
-from .const import DOMAIN
-from .coordinator import CasperGlowCoordinator
-
-
-class CasperGlowEntity(PassiveBluetoothCoordinatorEntity[CasperGlowCoordinator]):
-    """Base class for Casper Glow entities."""
-
-    _attr_has_entity_name = True
-
-    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
-        """Initialize a Casper Glow entity."""
-        super().__init__(coordinator)
-        self._device = coordinator.device
-        self._attr_device_info = DeviceInfo(
-            manufacturer="Casper",
-            model="Glow",
-            model_id="G01",
-            connections={
-                (dr.CONNECTION_BLUETOOTH, format_mac(coordinator.device.address))
-            },
-        )
-
-    async def _async_command(self, coro: Awaitable[None]) -> None:
-        """Execute a device command."""
-        try:
-            await coro
-        except CasperGlowError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="communication_error",
-                translation_placeholders={"error": str(err)},
-            ) from err

homeassistant/components/casper_glow/icons.json

@@ -1,17 +0,0 @@
-{
-  "entity": {
-    "binary_sensor": {
-      "paused": {
-        "default": "mdi:timer-pause"
-      }
-    },
-    "button": {
-      "pause": {
-        "default": "mdi:pause"
-      },
-      "resume": {
-        "default": "mdi:play"
-      }
-    }
-  }
-}

homeassistant/components/casper_glow/light.py

@@ -1,104 +0,0 @@
-"""Casper Glow integration light platform."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from pycasperglow import GlowState
-
-from homeassistant.components.light import ATTR_BRIGHTNESS, ColorMode, LightEntity
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import format_mac
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.util.percentage import (
-    ordered_list_item_to_percentage,
-    percentage_to_ordered_list_item,
-)
-
-from .const import DEFAULT_DIMMING_TIME_MINUTES, SORTED_BRIGHTNESS_LEVELS
-from .coordinator import CasperGlowConfigEntry, CasperGlowCoordinator
-from .entity import CasperGlowEntity
-
-PARALLEL_UPDATES = 1
-
-
-def _ha_brightness_to_device_pct(brightness: int) -> int:
-    """Convert HA brightness (1-255) to device percentage by snapping to nearest."""
-    return percentage_to_ordered_list_item(
-        SORTED_BRIGHTNESS_LEVELS, round(brightness * 100 / 255)
-    )
-
-
-def _device_pct_to_ha_brightness(pct: int) -> int:
-    """Convert device brightness percentage (60-100) to HA brightness (1-255)."""
-    percent = ordered_list_item_to_percentage(SORTED_BRIGHTNESS_LEVELS, pct)
-    return round(percent * 255 / 100)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: CasperGlowConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the light platform for Casper Glow."""
-    async_add_entities([CasperGlowLight(entry.runtime_data)])
-
-
-class CasperGlowLight(CasperGlowEntity, LightEntity):
-    """Representation of a Casper Glow light."""
-
-    _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
-    _attr_name = None
-
-    def __init__(self, coordinator: CasperGlowCoordinator) -> None:
-        """Initialize a Casper Glow light."""
-        super().__init__(coordinator)
-        self._attr_unique_id = format_mac(coordinator.device.address)
-        self._update_from_state(coordinator.device.state)
-
-    async def async_added_to_hass(self) -> None:
-        """Register state update callback when entity is added."""
-        await super().async_added_to_hass()
-        self.async_on_remove(
-            self._device.register_callback(self._async_handle_state_update)
-        )
-
-    @callback
-    def _update_from_state(self, state: GlowState) -> None:
-        """Update entity attributes from device state."""
-        if state.is_on is not None:
-            self._attr_is_on = state.is_on
-            self._attr_color_mode = ColorMode.BRIGHTNESS
-        if state.brightness_level is not None:
-            self._attr_brightness = _device_pct_to_ha_brightness(state.brightness_level)
-
-    @callback
-    def _async_handle_state_update(self, state: GlowState) -> None:
-        """Handle a state update from the device."""
-        self._update_from_state(state)
-        self.async_write_ha_state()
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the light on."""
-        brightness_pct: int | None = None
-        if ATTR_BRIGHTNESS in kwargs:
-            brightness_pct = _ha_brightness_to_device_pct(kwargs[ATTR_BRIGHTNESS])
-
-        await self._async_command(self._device.turn_on())
-        self._attr_is_on = True
-        self._attr_color_mode = ColorMode.BRIGHTNESS
-        if brightness_pct is not None:
-            await self._async_command(
-                self._device.set_brightness_and_dimming_time(
-                    brightness_pct,
-                    self.coordinator.last_dimming_time_minutes
-                    if self.coordinator.last_dimming_time_minutes is not None
-                    else DEFAULT_DIMMING_TIME_MINUTES,
-                )
-            )
-            self._attr_brightness = _device_pct_to_ha_brightness(brightness_pct)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the light off."""
-        await self._async_command(self._device.turn_off())
-        self._attr_is_on = False

homeassistant/components/casper_glow/manifest.json

@@ -1,19 +0,0 @@
-{
-  "domain": "casper_glow",
-  "name": "Casper Glow",
-  "bluetooth": [
-    {
-      "connectable": true,
-      "local_name": "Jar*"
-    }
-  ],
-  "codeowners": ["@mikeodr"],
-  "config_flow": true,
-  "dependencies": ["bluetooth_adapters"],
-  "documentation": "https://www.home-assistant.io/integrations/casper_glow",
-  "integration_type": "device",
-  "iot_class": "local_polling",
-  "loggers": ["pycasperglow"],
-  "quality_scale": "silver",
-  "requirements": ["pycasperglow==1.1.0"]
-}

homeassistant/components/casper_glow/quality_scale.yaml

@@ -1,70 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: No custom services.
-  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/services.
-  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: done
-  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:
-    status: exempt
-    comment: Bluetooth device with no authentication credentials.
-  test-coverage: done
-
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: No network discovery.
-  discovery: done
-  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: todo
-  entity-device-class: todo
-  entity-disabled-by-default: todo
-  entity-translations: done
-  exception-translations: done
-  icon-translations: done
-  reconfiguration-flow: todo
-  repair-issues: todo
-  stale-devices: todo
-
-  # Platinum
-  async-dependency: done
-  inject-websession:
-    status: exempt
-    comment: No web session is used by this integration.
-  strict-typing: done

homeassistant/components/casper_glow/strings.json

@@ -1,49 +0,0 @@
-{
-  "config": {
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    },
-    "flow_title": "{name}",
-    "step": {
-      "bluetooth_confirm": {
-        "description": "Do you want to set up {name}?"
-      },
-      "user": {
-        "data": {
-          "address": "Bluetooth address"
-        },
-        "data_description": {
-          "address": "The Bluetooth address of the Casper Glow light"
-        }
-      }
-    }
-  },
-  "entity": {
-    "binary_sensor": {
-      "paused": {
-        "name": "Dimming paused"
-      }
-    },
-    "button": {
-      "pause": {
-        "name": "Pause dimming"
-      },
-      "resume": {
-        "name": "Resume dimming"
-      }
-    }
-  },
-  "exceptions": {
-    "communication_error": {
-      "message": "An error occurred while communicating with the Casper Glow: {error}"
-    }
-  }
-}

homeassistant/components/chess_com/icons.json

@@ -1,68 +1,20 @@
 {
   "entity": {
     "sensor": {
-      "chess960_daily_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess960_daily_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess960_daily_rating": {
-        "default": "mdi:chart-line"
-      },
-      "chess960_daily_won": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_blitz_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_blitz_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_blitz_rating": {
-        "default": "mdi:chart-line"
-      },
-      "chess_blitz_won": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_bullet_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_bullet_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_bullet_rating": {
-        "default": "mdi:chart-line"
-      },
-      "chess_bullet_won": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_daily_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_daily_lost": {
-        "default": "mdi:chess-pawn"
-      },
       "chess_daily_rating": {
         "default": "mdi:chart-line"
       },
-      "chess_daily_won": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_rapid_draw": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_rapid_lost": {
-        "default": "mdi:chess-pawn"
-      },
-      "chess_rapid_rating": {
-        "default": "mdi:chart-line"
-      },
-      "chess_rapid_won": {
-        "default": "mdi:chess-pawn"
-      },
       "followers": {
         "default": "mdi:account-multiple"
+      },
+      "total_daily_draw": {
+        "default": "mdi:chess-pawn"
+      },
+      "total_daily_lost": {
+        "default": "mdi:chess-pawn"
+      },
+      "total_daily_won": {
+        "default": "mdi:chess-pawn"
       }
     }
   }

homeassistant/components/chess_com/sensor.py

@@ -2,9 +2,6 @@
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
-
-from chess_com_api import PlayerStats
 
 from homeassistant.components.sensor import (
     SensorEntity,
@@ -27,14 +24,7 @@ class ChessEntityDescription(SensorEntityDescription):
     value_fn: Callable[[ChessData], float]
 
 
-@dataclass(kw_only=True, frozen=True)
-class ChessModeEntityDescription(SensorEntityDescription):
-    """Sensor description for a Chess.com game mode."""
-
-    value_fn: Callable[[dict[str, Any]], float]
-
-
-PLAYER_SENSORS: tuple[ChessEntityDescription, ...] = (
+SENSORS: tuple[ChessEntityDescription, ...] = (
     ChessEntityDescription(
         key="followers",
         translation_key="followers",
@@ -43,46 +33,35 @@ PLAYER_SENSORS: tuple[ChessEntityDescription, ...] = (
         value_fn=lambda state: state.player.followers,
         entity_registry_enabled_default=False,
     ),
-)
-
-GAME_MODE_SENSORS: tuple[ChessModeEntityDescription, ...] = (
-    ChessModeEntityDescription(
-        key="rating",
-        translation_key="rating",
+    ChessEntityDescription(
+        key="chess_daily_rating",
+        translation_key="chess_daily_rating",
         state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda mode: mode["last"]["rating"],
+        value_fn=lambda state: state.stats.chess_daily["last"]["rating"],
     ),
-    ChessModeEntityDescription(
-        key="won",
-        translation_key="won",
+    ChessEntityDescription(
+        key="total_daily_won",
+        translation_key="total_daily_won",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["win"],
+        value_fn=lambda state: state.stats.chess_daily["record"]["win"],
     ),
-    ChessModeEntityDescription(
-        key="lost",
-        translation_key="lost",
+    ChessEntityDescription(
+        key="total_daily_lost",
+        translation_key="total_daily_lost",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["loss"],
+        value_fn=lambda state: state.stats.chess_daily["record"]["loss"],
     ),
-    ChessModeEntityDescription(
-        key="draw",
-        translation_key="draw",
+    ChessEntityDescription(
+        key="total_daily_draw",
+        translation_key="total_daily_draw",
         entity_category=EntityCategory.DIAGNOSTIC,
         state_class=SensorStateClass.TOTAL_INCREASING,
-        value_fn=lambda mode: mode["record"]["draw"],
+        value_fn=lambda state: state.stats.chess_daily["record"]["draw"],
     ),
 )
 
-GAME_MODES: dict[str, Callable[[PlayerStats], dict[str, Any] | None]] = {
-    "chess_daily": lambda stats: stats.chess_daily,
-    "chess_rapid": lambda stats: stats.chess_rapid,
-    "chess_bullet": lambda stats: stats.chess_bullet,
-    "chess_blitz": lambda stats: stats.chess_blitz,
-    "chess960_daily": lambda stats: stats.chess960_daily,
-}
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -92,22 +71,13 @@ async def async_setup_entry(
     """Initialize the entries."""
     coordinator = entry.runtime_data
 
-    entities: list[SensorEntity] = [
-        ChessPlayerSensor(coordinator, description) for description in PLAYER_SENSORS
-    ]
-
-    for game_mode, stats_fn in GAME_MODES.items():
-        if stats_fn(coordinator.data.stats) is not None:
-            entities.extend(
-                ChessGameModeSensor(coordinator, description, game_mode, stats_fn)
-                for description in GAME_MODE_SENSORS
-            )
-
-    async_add_entities(entities)
+    async_add_entities(
+        ChessPlayerSensor(coordinator, description) for description in SENSORS
+    )
 
 
 class ChessPlayerSensor(ChessEntity, SensorEntity):
-    """Chess.com player sensor."""
+    """Chess.com sensor."""
 
     entity_description: ChessEntityDescription
 
@@ -125,33 +95,3 @@ class ChessPlayerSensor(ChessEntity, SensorEntity):
     def native_value(self) -> float:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.coordinator.data)
-
-
-class ChessGameModeSensor(ChessEntity, SensorEntity):
-    """Chess.com game mode sensor."""
-
-    entity_description: ChessModeEntityDescription
-
-    def __init__(
-        self,
-        coordinator: ChessCoordinator,
-        description: ChessModeEntityDescription,
-        game_mode: str,
-        stats_fn: Callable[[PlayerStats], dict[str, Any] | None],
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._stats_fn = stats_fn
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.unique_id}.{game_mode}.{description.key}"
-        )
-        self._attr_translation_key = f"{game_mode}_{description.translation_key}"
-
-    @property
-    def native_value(self) -> float:
-        """Return the state of the sensor."""
-        mode_data = self._stats_fn(self.coordinator.data.stats)
-        if TYPE_CHECKING:
-            assert mode_data is not None
-        return self.entity_description.value_fn(mode_data)

homeassistant/components/chess_com/strings.json

@@ -23,84 +23,24 @@
   },
   "entity": {
     "sensor": {
-      "chess960_daily_draw": {
-        "name": "Total daily Chess960 games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess960_daily_lost": {
-        "name": "Total daily Chess960 games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess960_daily_rating": {
-        "name": "Daily Chess960 rating"
-      },
-      "chess960_daily_won": {
-        "name": "Total daily Chess960 games won",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_blitz_draw": {
-        "name": "Total blitz chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_blitz_lost": {
-        "name": "Total blitz chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_blitz_rating": {
-        "name": "Blitz chess rating"
-      },
-      "chess_blitz_won": {
-        "name": "Total blitz chess games won",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_bullet_draw": {
-        "name": "Total bullet chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_bullet_lost": {
-        "name": "Total bullet chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_bullet_rating": {
-        "name": "Bullet chess rating"
-      },
-      "chess_bullet_won": {
-        "name": "Total bullet chess games won",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_daily_draw": {
-        "name": "Total daily chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_daily_lost": {
-        "name": "Total daily chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
       "chess_daily_rating": {
         "name": "Daily chess rating"
       },
-      "chess_daily_won": {
-        "name": "Total daily chess games won",
-        "unit_of_measurement": "games"
-      },
-      "chess_rapid_draw": {
-        "name": "Total rapid chess games drawn",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_rapid_lost": {
-        "name": "Total rapid chess games lost",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
-      "chess_rapid_rating": {
-        "name": "Rapid chess rating"
-      },
-      "chess_rapid_won": {
-        "name": "Total rapid chess games won",
-        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::chess_daily_won::unit_of_measurement%]"
-      },
       "followers": {
         "name": "Followers",
         "unit_of_measurement": "followers"
+      },
+      "total_daily_draw": {
+        "name": "Total chess games drawn",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
+      },
+      "total_daily_lost": {
+        "name": "Total chess games lost",
+        "unit_of_measurement": "[%key:component::chess_com::entity::sensor::total_daily_won::unit_of_measurement%]"
+      },
+      "total_daily_won": {
+        "name": "Total chess games won",
+        "unit_of_measurement": "games"
       }
     }
   }

homeassistant/components/clementine/media_player.py

@@ -66,7 +66,6 @@ class ClementineDevice(MediaPlayerEntity):
         | MediaPlayerEntityFeature.SELECT_SOURCE
         | MediaPlayerEntityFeature.PLAY
     )
-    _attr_volume_step = 0.04
 
     def __init__(self, client, name):
         """Initialize the Clementine device."""
@@ -125,6 +124,16 @@ class ClementineDevice(MediaPlayerEntity):
 
         return None, None
 
+    def volume_up(self) -> None:
+        """Volume up the media player."""
+        newvolume = min(self._client.volume + 4, 100)
+        self._client.set_volume(newvolume)
+
+    def volume_down(self) -> None:
+        """Volume down media player."""
+        newvolume = max(self._client.volume - 4, 0)
+        self._client.set_volume(newvolume)
+
     def mute_volume(self, mute: bool) -> None:
         """Send mute command."""
         self._client.set_volume(0)

homeassistant/components/climate/condition.py

@@ -1,72 +1,12 @@
 """Provides conditions for climates."""
 
-from typing import TYPE_CHECKING
-
-import voluptuous as vol
-
-from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
-from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers import config_validation as cv
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.condition import (
-    ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL,
-    Condition,
-    ConditionConfig,
-    EntityConditionBase,
-    EntityNumericalConditionWithUnitBase,
-    make_entity_numerical_condition,
-    make_entity_state_condition,
-)
-from homeassistant.util.unit_conversion import TemperatureConverter
-
-from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
-
-CONF_HVAC_MODE = "hvac_mode"
-
-_HVAC_MODE_CONDITION_SCHEMA = ENTITY_STATE_CONDITION_SCHEMA_ANY_ALL.extend(
-    {
-        vol.Required(CONF_OPTIONS): {
-            vol.Required(CONF_HVAC_MODE): vol.All(
-                cv.ensure_list, vol.Length(min=1), [vol.Coerce(HVACMode)]
-            ),
-        },
-    }
-)
-
-
-class ClimateHVACModeCondition(EntityConditionBase):
-    """Condition for climate HVAC mode."""
-
-    _domain_specs = {DOMAIN: DomainSpec()}
-    _schema = _HVAC_MODE_CONDITION_SCHEMA
-
-    def __init__(self, hass: HomeAssistant, config: ConditionConfig) -> None:
-        """Initialize the HVAC mode condition."""
-        super().__init__(hass, config)
-        if TYPE_CHECKING:
-            assert config.options is not None
-        self._hvac_modes: set[str] = set(config.options[CONF_HVAC_MODE])
-
-    def is_valid_state(self, entity_state: State) -> bool:
-        """Check if the state matches any of the expected HVAC modes."""
-        return entity_state.state in self._hvac_modes
-
-
-class ClimateTargetTemperatureCondition(EntityNumericalConditionWithUnitBase):
-    """Mixin for climate target temperature conditions with unit conversion."""
-
-    _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
-    _unit_converter = TemperatureConverter
-
-    def _get_entity_unit(self, entity_state: State) -> str | None:
-        """Get the temperature unit of a climate entity from its state."""
-        # Climate entities convert temperatures to the system unit via show_temp
-        return self._hass.config.units.temperature_unit
+from homeassistant.helpers.condition import Condition, make_entity_state_condition
 
+from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
 CONDITIONS: dict[str, type[Condition]] = {
-    "is_hvac_mode": ClimateHVACModeCondition,
     "is_off": make_entity_state_condition(DOMAIN, HVACMode.OFF),
     "is_on": make_entity_state_condition(
         DOMAIN,
@@ -88,11 +28,6 @@ CONDITIONS: dict[str, type[Condition]] = {
     "is_heating": make_entity_state_condition(
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.HEATING
     ),
-    "target_humidity": make_entity_numerical_condition(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
-    ),
-    "target_temperature": ClimateTargetTemperatureCondition,
 }
 
 

homeassistant/components/climate/conditions.yaml

@@ -1,9 +1,9 @@
 .condition_common: &condition_common
-  target: &condition_climate_target
+  target:
     entity:
       domain: climate
   fields:
-    behavior: &condition_behavior
+    behavior:
       required: true
       default: any
       selector:
@@ -13,75 +13,8 @@
             - all
             - any
 
-.humidity_threshold_entity: &humidity_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: humidity
-  - domain: number
-    device_class: humidity
-
-.humidity_threshold_number: &humidity_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
-
-.temperature_units: &temperature_units
-  - "°C"
-  - "°F"
-
-.temperature_threshold_entity: &temperature_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *temperature_units
-  - domain: sensor
-    device_class: temperature
-  - domain: number
-    device_class: temperature
-
 is_off: *condition_common
 is_on: *condition_common
 is_cooling: *condition_common
 is_drying: *condition_common
 is_heating: *condition_common
-
-is_hvac_mode:
-  target: *condition_climate_target
-  fields:
-    behavior: *condition_behavior
-    hvac_mode:
-      context:
-        filter_target: target
-      required: true
-      selector:
-        state:
-          hide_states:
-            - unavailable
-            - unknown
-          multiple: true
-
-target_humidity:
-  target: *condition_climate_target
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: is
-          number: *humidity_threshold_number
-
-target_temperature:
-  target: *condition_climate_target
-  fields:
-    behavior: *condition_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *temperature_threshold_entity
-          mode: is
-          number:
-            mode: box
-          unit_of_measurement: *temperature_units

homeassistant/components/climate/icons.json

@@ -9,20 +9,11 @@
     "is_heating": {
       "condition": "mdi:fire"
     },
-    "is_hvac_mode": {
-      "condition": "mdi:thermostat"
-    },
     "is_off": {
       "condition": "mdi:power-off"
     },
     "is_on": {
       "condition": "mdi:power-on"
-    },
-    "target_humidity": {
-      "condition": "mdi:water-percent"
-    },
-    "target_temperature": {
-      "condition": "mdi:thermometer"
     }
   },
   "entity_component": {

homeassistant/components/climate/services.yaml

@@ -11,8 +11,7 @@ set_preset_mode:
       required: true
       example: "away"
       selector:
-        state:
-          attribute: preset_mode
+        text:
 
 set_temperature:
   target:
@@ -56,10 +55,16 @@ set_temperature:
           mode: box
     hvac_mode:
       selector:
-        state:
-          hide_states:
-            - unavailable
-            - unknown
+        select:
+          options:
+            - "off"
+            - "auto"
+            - "cool"
+            - "dry"
+            - "fan_only"
+            - "heat_cool"
+            - "heat"
+          translation_key: hvac_mode
 set_humidity:
   target:
     entity:
@@ -86,8 +91,7 @@ set_fan_mode:
       required: true
       example: "low"
       selector:
-        state:
-          attribute: fan_mode
+        text:
 
 set_hvac_mode:
   target:
@@ -111,8 +115,7 @@ set_swing_mode:
       required: true
       example: "on"
       selector:
-        state:
-          attribute: swing_mode
+        text:
 
 set_swing_horizontal_mode:
   target:
@@ -125,8 +128,7 @@ set_swing_horizontal_mode:
       required: true
       example: "on"
       selector:
-        state:
-          attribute: swing_horizontal_mode
+        text:
 
 turn_on:
   target:

homeassistant/components/climate/strings.json

@@ -2,13 +2,8 @@
   "common": {
     "condition_behavior_description": "How the state should match on the targeted climate-control devices.",
     "condition_behavior_name": "Behavior",
-    "condition_threshold_description": "What to test for and threshold values.",
-    "condition_threshold_name": "Threshold configuration",
     "trigger_behavior_description": "The behavior of the targeted climates to trigger on.",
-    "trigger_behavior_name": "Behavior",
-    "trigger_threshold_changed_description": "Which changes to trigger on and threshold values.",
-    "trigger_threshold_crossed_description": "Which threshold crossing to trigger on and threshold values.",
-    "trigger_threshold_name": "Threshold configuration"
+    "trigger_behavior_name": "Behavior"
   },
   "conditions": {
     "is_cooling": {
@@ -41,20 +36,6 @@
       },
       "name": "Climate-control device is heating"
     },
-    "is_hvac_mode": {
-      "description": "Tests if one or more climate-control devices are set to a specific HVAC mode.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
-          "name": "[%key:component::climate::common::condition_behavior_name%]"
-        },
-        "hvac_mode": {
-          "description": "The HVAC modes to test for.",
-          "name": "Modes"
-        }
-      },
-      "name": "Climate-control device HVAC mode"
-    },
     "is_off": {
       "description": "Tests if one or more climate-control devices are off.",
       "fields": {
@@ -74,34 +55,6 @@
         }
       },
       "name": "Climate-control device is on"
-    },
-    "target_humidity": {
-      "description": "Tests the humidity setpoint of one or more climate-control devices.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
-          "name": "[%key:component::climate::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
-          "name": "[%key:component::climate::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Climate-control device target humidity"
-    },
-    "target_temperature": {
-      "description": "Tests the temperature setpoint of one or more climate-control devices.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::condition_behavior_description%]",
-          "name": "[%key:component::climate::common::condition_behavior_name%]"
-        },
-        "threshold": {
-          "description": "[%key:component::climate::common::condition_threshold_description%]",
-          "name": "[%key:component::climate::common::condition_threshold_name%]"
-        }
-      },
-      "name": "Climate-control device target temperature"
     }
   },
   "device_automation": {
@@ -288,77 +241,102 @@
         "any": "Any"
       }
     },
+    "hvac_mode": {
+      "options": {
+        "auto": "[%key:common::state::auto%]",
+        "cool": "Cool",
+        "dry": "Dry",
+        "fan_only": "Fan only",
+        "heat": "Heat",
+        "heat_cool": "Heat/cool",
+        "off": "[%key:common::state::off%]"
+      }
+    },
+    "number_or_entity": {
+      "choices": {
+        "entity": "Entity",
+        "number": "Number"
+      }
+    },
     "trigger_behavior": {
       "options": {
         "any": "Any",
         "first": "First",
         "last": "Last"
       }
+    },
+    "trigger_threshold_type": {
+      "options": {
+        "above": "Above a value",
+        "below": "Below a value",
+        "between": "In a range",
+        "outside": "Outside a range"
+      }
     }
   },
   "services": {
     "set_fan_mode": {
-      "description": "Sets the fan mode of a climate-control device.",
+      "description": "Sets fan operation mode.",
       "fields": {
         "fan_mode": {
           "description": "Fan operation mode.",
           "name": "Fan mode"
         }
       },
-      "name": "Set climate-control device fan mode"
+      "name": "Set fan mode"
     },
     "set_humidity": {
-      "description": "Sets the target humidity of a climate-control device.",
+      "description": "Sets target humidity.",
       "fields": {
         "humidity": {
           "description": "Target humidity.",
           "name": "Humidity"
         }
       },
-      "name": "Set climate-control device target humidity"
+      "name": "Set target humidity"
     },
     "set_hvac_mode": {
-      "description": "Sets the HVAC mode of a climate-control device.",
+      "description": "Sets HVAC operation mode.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
           "name": "HVAC mode"
         }
       },
-      "name": "Set climate-control device HVAC mode"
+      "name": "Set HVAC mode"
     },
     "set_preset_mode": {
-      "description": "Sets the preset mode of a climate-control device.",
+      "description": "Sets preset mode.",
       "fields": {
         "preset_mode": {
           "description": "Preset mode.",
           "name": "Preset mode"
         }
       },
-      "name": "Set climate-control device preset mode"
+      "name": "Set preset mode"
     },
     "set_swing_horizontal_mode": {
-      "description": "Sets the horizontal swing mode of a climate-control device.",
+      "description": "Sets horizontal swing operation mode.",
       "fields": {
         "swing_horizontal_mode": {
           "description": "Horizontal swing operation mode.",
           "name": "Horizontal swing mode"
         }
       },
-      "name": "Set climate-control device horizontal swing mode"
+      "name": "Set horizontal swing mode"
     },
     "set_swing_mode": {
-      "description": "Sets the swing mode of a climate-control device.",
+      "description": "Sets swing operation mode.",
       "fields": {
         "swing_mode": {
           "description": "Swing operation mode.",
           "name": "Swing mode"
         }
       },
-      "name": "Set climate-control device swing mode"
+      "name": "Set swing mode"
     },
     "set_temperature": {
-      "description": "Sets the target temperature of a climate-control device.",
+      "description": "Sets the temperature setpoint.",
       "fields": {
         "hvac_mode": {
           "description": "HVAC operation mode.",
@@ -377,19 +355,19 @@
           "name": "Target temperature"
         }
       },
-      "name": "Set climate-control device target temperature"
+      "name": "Set target temperature"
     },
     "toggle": {
-      "description": "Toggles a climate-control device on/off.",
-      "name": "Toggle climate-control device"
+      "description": "Toggles climate device, from on to off, or off to on.",
+      "name": "[%key:common::action::toggle%]"
     },
     "turn_off": {
-      "description": "Turns off a climate-control device.",
-      "name": "Turn off climate-control device"
+      "description": "Turns climate device off.",
+      "name": "[%key:common::action::turn_off%]"
     },
     "turn_on": {
-      "description": "Turns on a climate-control device.",
-      "name": "Turn on climate-control device"
+      "description": "Turns climate device on.",
+      "name": "[%key:common::action::turn_on%]"
     }
   },
   "title": "Climate",
@@ -441,9 +419,13 @@
     "target_humidity_changed": {
       "description": "Triggers after the humidity setpoint of one or more climate-control devices changes.",
       "fields": {
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "above": {
+          "description": "Trigger when the target humidity is above this value.",
+          "name": "Above"
+        },
+        "below": {
+          "description": "Trigger when the target humidity is below this value.",
+          "name": "Below"
         }
       },
       "name": "Climate-control device target humidity changed"
@@ -455,9 +437,17 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "lower_limit": {
+          "description": "Lower threshold limit.",
+          "name": "Lower threshold"
+        },
+        "threshold_type": {
+          "description": "Type of threshold crossing to trigger on.",
+          "name": "Threshold type"
+        },
+        "upper_limit": {
+          "description": "Upper threshold limit.",
+          "name": "Upper threshold"
         }
       },
       "name": "Climate-control device target humidity crossed threshold"
@@ -465,9 +455,13 @@
     "target_temperature_changed": {
       "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
       "fields": {
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_changed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "above": {
+          "description": "Trigger when the target temperature is above this value.",
+          "name": "Above"
+        },
+        "below": {
+          "description": "Trigger when the target temperature is below this value.",
+          "name": "Below"
         }
       },
       "name": "Climate-control device target temperature changed"
@@ -479,9 +473,17 @@
           "description": "[%key:component::climate::common::trigger_behavior_description%]",
           "name": "[%key:component::climate::common::trigger_behavior_name%]"
         },
-        "threshold": {
-          "description": "[%key:component::climate::common::trigger_threshold_crossed_description%]",
-          "name": "[%key:component::climate::common::trigger_threshold_name%]"
+        "lower_limit": {
+          "description": "Lower threshold limit.",
+          "name": "Lower threshold"
+        },
+        "threshold_type": {
+          "description": "Type of threshold crossing to trigger on.",
+          "name": "Threshold type"
+        },
+        "upper_limit": {
+          "description": "Upper threshold limit.",
+          "name": "Upper threshold"
         }
       },
       "name": "Climate-control device target temperature crossed threshold"

homeassistant/components/climate/trigger.py

@@ -2,15 +2,12 @@
 
 import voluptuous as vol
 
-from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS, UnitOfTemperature
-from homeassistant.core import HomeAssistant, State
+from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS
+from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.automation import DomainSpec
+from homeassistant.helpers.automation import DomainSpec, NumericalDomainSpec
 from homeassistant.helpers.trigger import (
     ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
-    EntityNumericalStateChangedTriggerWithUnitBase,
-    EntityNumericalStateCrossedThresholdTriggerWithUnitBase,
-    EntityNumericalStateTriggerWithUnitBase,
     EntityTargetStateTriggerBase,
     Trigger,
     TriggerConfig,
@@ -19,7 +16,6 @@ from homeassistant.helpers.trigger import (
     make_entity_target_state_trigger,
     make_entity_transition_trigger,
 )
-from homeassistant.util.unit_conversion import TemperatureConverter
 
 from .const import ATTR_HUMIDITY, ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
@@ -48,33 +44,6 @@ class HVACModeChangedTrigger(EntityTargetStateTriggerBase):
         self._to_states = set(self._options[CONF_HVAC_MODE])
 
 
-class _ClimateTargetTemperatureTriggerMixin(EntityNumericalStateTriggerWithUnitBase):
-    """Mixin for climate target temperature triggers with unit conversion."""
-
-    _base_unit = UnitOfTemperature.CELSIUS
-    _domain_specs = {DOMAIN: DomainSpec(value_source=ATTR_TEMPERATURE)}
-    _unit_converter = TemperatureConverter
-
-    def _get_entity_unit(self, state: State) -> str | None:
-        """Get the temperature unit of a climate entity from its state."""
-        # Climate entities convert temperatures to the system unit via show_temp
-        return self._hass.config.units.temperature_unit
-
-
-class ClimateTargetTemperatureChangedTrigger(
-    _ClimateTargetTemperatureTriggerMixin,
-    EntityNumericalStateChangedTriggerWithUnitBase,
-):
-    """Trigger for climate target temperature value changes."""
-
-
-class ClimateTargetTemperatureCrossedThresholdTrigger(
-    _ClimateTargetTemperatureTriggerMixin,
-    EntityNumericalStateCrossedThresholdTriggerWithUnitBase,
-):
-    """Trigger for climate target temperature value crossing a threshold."""
-
-
 TRIGGERS: dict[str, type[Trigger]] = {
     "hvac_mode_changed": HVACModeChangedTrigger,
     "started_cooling": make_entity_target_state_trigger(
@@ -84,15 +53,17 @@ TRIGGERS: dict[str, type[Trigger]] = {
         {DOMAIN: DomainSpec(value_source=ATTR_HVAC_ACTION)}, HVACAction.DRYING
     ),
     "target_humidity_changed": make_entity_numerical_state_changed_trigger(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)}
     ),
     "target_humidity_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
-        {DOMAIN: DomainSpec(value_source=ATTR_HUMIDITY)},
-        valid_unit="%",
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_HUMIDITY)}
+    ),
+    "target_temperature_changed": make_entity_numerical_state_changed_trigger(
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
+    ),
+    "target_temperature_crossed_threshold": make_entity_numerical_state_crossed_threshold_trigger(
+        {DOMAIN: NumericalDomainSpec(value_source=ATTR_TEMPERATURE)}
     ),
-    "target_temperature_changed": ClimateTargetTemperatureChangedTrigger,
-    "target_temperature_crossed_threshold": ClimateTargetTemperatureCrossedThresholdTrigger,
     "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),
     "turned_on": make_entity_transition_trigger(
         DOMAIN,

homeassistant/components/climate/triggers.yaml

@@ -14,31 +14,36 @@
             - last
             - any
 
-.humidity_threshold_entity: &humidity_threshold_entity
-  - domain: input_number
-    unit_of_measurement: "%"
-  - domain: sensor
-    device_class: humidity
-  - domain: number
-    device_class: humidity
+.number_or_entity: &number_or_entity
+  required: false
+  selector:
+    choose:
+      choices:
+        number:
+          selector:
+            number:
+              mode: box
+        entity:
+          selector:
+            entity:
+              filter:
+                domain:
+                  - input_number
+                  - number
+                  - sensor
+      translation_key: number_or_entity
 
-.humidity_threshold_number: &humidity_threshold_number
-  min: 0
-  max: 100
-  mode: box
-  unit_of_measurement: "%"
-
-.temperature_units: &temperature_units
-  - "°C"
-  - "°F"
-
-.temperature_threshold_entity: &temperature_threshold_entity
-  - domain: input_number
-    unit_of_measurement: *temperature_units
-  - domain: sensor
-    device_class: temperature
-  - domain: number
-    device_class: temperature
+.trigger_threshold_type: &trigger_threshold_type
+  required: true
+  default: above
+  selector:
+    select:
+      options:
+        - above
+        - below
+        - between
+        - outside
+      translation_key: trigger_threshold_type
 
 started_cooling: *trigger_common
 started_drying: *trigger_common
@@ -64,49 +69,27 @@ hvac_mode_changed:
 target_humidity_changed:
   target: *trigger_climate_target
   fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: changed
-          number: *humidity_threshold_number
+    above: *number_or_entity
+    below: *number_or_entity
 
 target_humidity_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *humidity_threshold_entity
-          mode: crossed
-          number: *humidity_threshold_number
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity
+    upper_limit: *number_or_entity
 
 target_temperature_changed:
   target: *trigger_climate_target
   fields:
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *temperature_threshold_entity
-          mode: changed
-          number:
-            mode: box
-          unit_of_measurement: *temperature_units
+    above: *number_or_entity
+    below: *number_or_entity
 
 target_temperature_crossed_threshold:
   target: *trigger_climate_target
   fields:
     behavior: *trigger_behavior
-    threshold:
-      required: true
-      selector:
-        numeric_threshold:
-          entity: *temperature_threshold_entity
-          mode: crossed
-          number:
-            mode: box
-          unit_of_measurement: *temperature_units
+    threshold_type: *trigger_threshold_type
+    lower_limit: *number_or_entity
+    upper_limit: *number_or_entity

homeassistant/components/cloud/backup.py

@@ -138,7 +138,6 @@ class CloudBackupAgent(BackupAgent):
                     base64md5hash=base64md5hash,
                     metadata=metadata,
                     size=size,
-                    on_progress=on_progress,
                 )
                 break
             except CloudApiNonRetryableError as err:

homeassistant/components/cloud/manifest.json

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

homeassistant/components/cloud/strings.json

@@ -75,11 +75,11 @@
   "services": {
     "remote_connect": {
       "description": "Makes the instance UI accessible from outside of the local network by enabling your Home Assistant Cloud connection.",
-      "name": "Enable Home Assistant Cloud remote access"
+      "name": "Enable remote access"
     },
     "remote_disconnect": {
       "description": "Disconnects the instance UI from Home Assistant Cloud. This disables access to it from outside your local network.",
-      "name": "Disable Home Assistant Cloud remote access"
+      "name": "Disable remote access"
     }
   },
   "system_health": {

homeassistant/components/cloudflare_r2/backup.py

@@ -144,7 +144,7 @@ class R2BackupAgent(BackupAgent):
             if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
                 await self._upload_simple(tar_filename, open_stream)
             else:
-                await self._upload_multipart(tar_filename, open_stream, on_progress)
+                await self._upload_multipart(tar_filename, open_stream)
 
             # Upload the metadata file
             metadata_content = json.dumps(backup.as_dict())
@@ -185,13 +185,11 @@ class R2BackupAgent(BackupAgent):
         self,
         tar_filename: str,
         open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        on_progress: OnProgressCallback,
-    ) -> None:
+    ):
         """Upload a large file using multipart upload.
 
         :param tar_filename: The target filename for the backup.
         :param open_stream: A function returning an async iterator that yields bytes.
-        :param on_progress: A callback to report the number of uploaded bytes.
         """
         _LOGGER.debug("Starting multipart upload for %s", tar_filename)
         key = self._with_prefix(tar_filename)
@@ -205,7 +203,6 @@ class R2BackupAgent(BackupAgent):
             part_number = 1
             buffer = bytearray()  # bytes buffer to store the data
             offset = 0  # start index of unread data inside buffer
-            bytes_uploaded = 0
 
             stream = await open_stream()
             async for chunk in stream:
@@ -234,8 +231,6 @@ class R2BackupAgent(BackupAgent):
                             Body=part_data.tobytes(),
                         )
                         parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                        bytes_uploaded += len(part_data)
-                        on_progress(bytes_uploaded=bytes_uploaded)
                         part_number += 1
                 finally:
                     view.release()
@@ -264,8 +259,6 @@ class R2BackupAgent(BackupAgent):
                     Body=remaining_data.tobytes(),
                 )
                 parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                bytes_uploaded += len(remaining_data)
-                on_progress(bytes_uploaded=bytes_uploaded)
 
             await cast(Any, self._client).complete_multipart_upload(
                 Bucket=self._bucket,

homeassistant/components/conversation/manifest.json

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

homeassistant/components/conversation/strings.json

@@ -6,7 +6,7 @@
   },
   "services": {
     "process": {
-      "description": "Sends text to a conversation agent for processing.",
+      "description": "Launches a conversation from a transcribed text.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to process your request. The conversation agent is the brains of your assistant. It processes the incoming text commands.",
@@ -25,10 +25,10 @@
           "name": "Text"
         }
       },
-      "name": "Process conversation"
+      "name": "Process"
     },
     "reload": {
-      "description": "Reloads the intent configuration of conversation agents.",
+      "description": "Reloads the intent configuration.",
       "fields": {
         "agent_id": {
           "description": "Conversation agent to reload.",
@@ -39,7 +39,7 @@
           "name": "[%key:common::config_flow::data::language%]"
         }
       },
-      "name": "Reload conversation agents"
+      "name": "[%key:common::action::reload%]"
     }
   },
   "title": "Conversation"

homeassistant/components/counter/icons.json

@@ -12,22 +12,5 @@
     "set_value": {
       "service": "mdi:counter"
     }
-  },
-  "triggers": {
-    "decremented": {
-      "trigger": "mdi:numeric-negative-1"
-    },
-    "incremented": {
-      "trigger": "mdi:numeric-positive-1"
-    },
-    "maximum_reached": {
-      "trigger": "mdi:sort-numeric-ascending-variant"
-    },
-    "minimum_reached": {
-      "trigger": "mdi:sort-numeric-descending-variant"
-    },
-    "reset": {
-      "trigger": "mdi:refresh"
-    }
   }
 }

homeassistant/components/counter/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted counters to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "entity_component": {
     "_": {
       "name": "[%key:component::counter::title%]",
@@ -29,78 +25,29 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "decrement": {
       "description": "Decrements a counter by its step size.",
-      "name": "Decrement counter"
+      "name": "Decrement"
     },
     "increment": {
       "description": "Increments a counter by its step size.",
-      "name": "Increment counter"
+      "name": "Increment"
     },
     "reset": {
       "description": "Resets a counter to its initial value.",
-      "name": "Reset counter"
+      "name": "Reset"
     },
     "set_value": {
-      "description": "Sets a counter to a specific value.",
+      "description": "Sets the counter to a specific value.",
       "fields": {
         "value": {
           "description": "The new counter value the entity should be set to.",
           "name": "Value"
         }
       },
-      "name": "Set counter value"
+      "name": "Set"
     }
   },
-  "title": "Counter",
-  "triggers": {
-    "decremented": {
-      "description": "Triggers after one or more counters decrement.",
-      "name": "Counter decremented"
-    },
-    "incremented": {
-      "description": "Triggers after one or more counters increment.",
-      "name": "Counter incremented"
-    },
-    "maximum_reached": {
-      "description": "Triggers after one or more counters reach their maximum value.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
-          "name": "[%key:component::counter::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Counter reached maximum"
-    },
-    "minimum_reached": {
-      "description": "Triggers after one or more counters reach their minimum value.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
-          "name": "[%key:component::counter::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Counter reached minimum"
-    },
-    "reset": {
-      "description": "Triggers after one or more counters are reset.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::counter::common::trigger_behavior_description%]",
-          "name": "[%key:component::counter::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Counter reset"
-    }
-  }
+  "title": "Counter"
 }

homeassistant/components/counter/trigger.py

@@ -1,113 +0,0 @@
-"""Provides triggers for counters."""
-
-from homeassistant.const import (
-    CONF_MAXIMUM,
-    CONF_MINIMUM,
-    STATE_UNAVAILABLE,
-    STATE_UNKNOWN,
-)
-from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.automation import DomainSpec
-from homeassistant.helpers.trigger import (
-    ENTITY_STATE_TRIGGER_SCHEMA,
-    EntityTriggerBase,
-    Trigger,
-)
-
-from . import CONF_INITIAL, DOMAIN
-
-
-def _is_integer_state(state: State) -> bool:
-    """Return True if the state's value can be interpreted as an integer."""
-    try:
-        int(state.state)
-    except TypeError, ValueError:
-        return False
-    return True
-
-
-class CounterBaseIntegerTrigger(EntityTriggerBase):
-    """Base trigger for valid counter integer states."""
-
-    _domain_specs = {DOMAIN: DomainSpec()}
-    _schema = ENTITY_STATE_TRIGGER_SCHEMA
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state is valid."""
-        return _is_integer_state(state)
-
-
-class CounterDecrementedTrigger(CounterBaseIntegerTrigger):
-    """Trigger for when a counter is decremented."""
-
-    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
-        """Check if the origin state is valid and the state has changed."""
-        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
-            return False
-        return int(from_state.state) > int(to_state.state)
-
-
-class CounterIncrementedTrigger(CounterBaseIntegerTrigger):
-    """Trigger for when a counter is incremented."""
-
-    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
-        """Check if the origin state is valid and the state has changed."""
-        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
-            return False
-        return int(from_state.state) < int(to_state.state)
-
-
-class CounterValueBaseTrigger(EntityTriggerBase):
-    """Base trigger for counter value changes."""
-
-    _domain_specs = {DOMAIN: DomainSpec()}
-
-    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
-        """Check if the origin state is valid and the state has changed."""
-        if from_state.state in (STATE_UNAVAILABLE, STATE_UNKNOWN):
-            return False
-        return from_state.state != to_state.state
-
-
-class CounterMaxReachedTrigger(CounterValueBaseTrigger):
-    """Trigger for when a counter reaches its maximum value."""
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state matches the expected state(s)."""
-        if (max_value := state.attributes.get(CONF_MAXIMUM)) is None:
-            return False
-        return state.state == str(max_value)
-
-
-class CounterMinReachedTrigger(CounterValueBaseTrigger):
-    """Trigger for when a counter reaches its minimum value."""
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state matches the expected state(s)."""
-        if (min_value := state.attributes.get(CONF_MINIMUM)) is None:
-            return False
-        return state.state == str(min_value)
-
-
-class CounterResetTrigger(CounterValueBaseTrigger):
-    """Trigger for reset of counter entities."""
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state matches the expected state(s)."""
-        if (init_state := state.attributes.get(CONF_INITIAL)) is None:
-            return False
-        return state.state == str(init_state)
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "decremented": CounterDecrementedTrigger,
-    "incremented": CounterIncrementedTrigger,
-    "maximum_reached": CounterMaxReachedTrigger,
-    "minimum_reached": CounterMinReachedTrigger,
-    "reset": CounterResetTrigger,
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for counters."""
-    return TRIGGERS

homeassistant/components/cover/__init__.py

@@ -32,7 +32,6 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.loader import bind_hass
 from homeassistant.util.hass_dict import HassKey
 
-from .condition import make_cover_is_closed_condition, make_cover_is_open_condition
 from .const import (
     ATTR_CURRENT_POSITION,
     ATTR_CURRENT_TILT_POSITION,
@@ -81,8 +80,6 @@ __all__ = [
     "CoverEntityFeature",
     "CoverState",
     "make_cover_closed_trigger",
-    "make_cover_is_closed_condition",
-    "make_cover_is_open_condition",
     "make_cover_opened_trigger",
 ]
 

homeassistant/components/cover/condition.py

@@ -1,23 +1,19 @@
 """Provides conditions for covers."""
 
-from collections.abc import Mapping
-
 from homeassistant.const import STATE_OFF, STATE_ON
-from homeassistant.core import HomeAssistant, State
+from homeassistant.core import HomeAssistant, State, split_entity_id
 from homeassistant.helpers.condition import Condition, EntityConditionBase
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverConditionBase(EntityConditionBase):
+class CoverConditionBase(EntityConditionBase[CoverDomainSpec]):
     """Base condition for cover state checks."""
 
-    _domain_specs: Mapping[str, CoverDomainSpec]
-
     def is_valid_state(self, entity_state: State) -> bool:
         """Check if the state matches the expected cover state."""
-        domain_spec = self._domain_specs[entity_state.domain]
+        domain_spec = self._domain_specs[split_entity_id(entity_state.entity_id)[0]]
         if domain_spec.value_source is not None:
             return (
                 entity_state.attributes.get(domain_spec.value_source)

homeassistant/components/cover/strings.json

@@ -208,19 +208,19 @@
   "services": {
     "close_cover": {
       "description": "Closes a cover.",
-      "name": "Close cover"
+      "name": "[%key:common::action::close%]"
     },
     "close_cover_tilt": {
       "description": "Tilts a cover to close.",
-      "name": "Close cover tilt"
+      "name": "Close tilt"
     },
     "open_cover": {
       "description": "Opens a cover.",
-      "name": "Open cover"
+      "name": "[%key:common::action::open%]"
     },
     "open_cover_tilt": {
       "description": "Tilts a cover open.",
-      "name": "Open cover tilt"
+      "name": "Open tilt"
     },
     "set_cover_position": {
       "description": "Moves a cover to a specific position.",
@@ -230,7 +230,7 @@
           "name": "Position"
         }
       },
-      "name": "Set cover position"
+      "name": "Set position"
     },
     "set_cover_tilt_position": {
       "description": "Moves a cover tilt to a specific position.",
@@ -240,23 +240,23 @@
           "name": "Tilt position"
         }
       },
-      "name": "Set cover tilt position"
+      "name": "Set tilt position"
     },
     "stop_cover": {
-      "description": "Stops a cover's movement.",
-      "name": "Stop cover"
+      "description": "Stops the cover movement.",
+      "name": "[%key:common::action::stop%]"
     },
     "stop_cover_tilt": {
       "description": "Stops a tilting cover movement.",
-      "name": "Stop cover tilt"
+      "name": "Stop tilt"
     },
     "toggle": {
       "description": "Toggles a cover open/closed.",
-      "name": "Toggle cover"
+      "name": "[%key:common::action::toggle%]"
     },
     "toggle_cover_tilt": {
       "description": "Toggles a cover tilt open/closed.",
-      "name": "Toggle cover tilt"
+      "name": "Toggle tilt"
     }
   },
   "title": "Cover",

homeassistant/components/cover/trigger.py

@@ -1,30 +1,26 @@
 """Provides triggers for covers."""
 
-from collections.abc import Mapping
-
 from homeassistant.const import STATE_OFF, STATE_ON, STATE_UNAVAILABLE, STATE_UNKNOWN
-from homeassistant.core import HomeAssistant, State
+from homeassistant.core import HomeAssistant, State, split_entity_id
 from homeassistant.helpers.trigger import EntityTriggerBase, Trigger
 
 from .const import ATTR_IS_CLOSED, DOMAIN, CoverDeviceClass
 from .models import CoverDomainSpec
 
 
-class CoverTriggerBase(EntityTriggerBase):
+class CoverTriggerBase(EntityTriggerBase[CoverDomainSpec]):
     """Base trigger for cover state changes."""
 
-    _domain_specs: Mapping[str, CoverDomainSpec]
-
     def _get_value(self, state: State) -> str | bool | None:
         """Extract the relevant value from state based on domain spec."""
-        domain_spec = self._domain_specs[state.domain]
+        domain_spec = self._domain_specs[split_entity_id(state.entity_id)[0]]
         if domain_spec.value_source is not None:
             return state.attributes.get(domain_spec.value_source)
         return state.state
 
     def is_valid_state(self, state: State) -> bool:
         """Check if the state matches the target cover state."""
-        domain_spec = self._domain_specs[state.domain]
+        domain_spec = self._domain_specs[split_entity_id(state.entity_id)[0]]
         return self._get_value(state) == domain_spec.target_value
 
     def is_valid_transition(self, from_state: State, to_state: State) -> bool:

homeassistant/components/decora_wifi/__init__.py

@@ -1,91 +1 @@
-"""The Leviton Decora Wi-Fi integration."""
-
-from __future__ import annotations
-
-from contextlib import suppress
-from dataclasses import dataclass
-
-from decora_wifi import DecoraWiFiSession
-from decora_wifi.models.iot_switch import IotSwitch
-from decora_wifi.models.person import Person
-from decora_wifi.models.residence import Residence
-from decora_wifi.models.residential_account import ResidentialAccount
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import (
-    CONF_PASSWORD,
-    CONF_USERNAME,
-    EVENT_HOMEASSISTANT_STOP,
-    Platform,
-)
-from homeassistant.core import Event, HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
-
-PLATFORMS = [Platform.LIGHT]
-
-type DecoraWifiConfigEntry = ConfigEntry[DecoraWifiData]
-
-
-@dataclass
-class DecoraWifiData:
-    """Runtime data for the Decora Wi-Fi integration."""
-
-    session: DecoraWiFiSession
-    switches: list[IotSwitch]
-
-
-def _login_and_get_switches(email: str, password: str) -> DecoraWifiData:
-    """Log in and fetch all IoT switches. Runs in executor."""
-    session = DecoraWiFiSession()
-    success = session.login(email, password)
-
-    if success is None:
-        raise ConfigEntryAuthFailed("Invalid credentials for myLeviton account")
-
-    perms = session.user.get_residential_permissions()
-    all_switches: list[IotSwitch] = []
-    for permission in perms:
-        if permission.residentialAccountId is not None:
-            acct = ResidentialAccount(session, permission.residentialAccountId)
-            all_switches.extend(
-                switch
-                for residence in acct.get_residences()
-                for switch in residence.get_iot_switches()
-            )
-        elif permission.residenceId is not None:
-            residence = Residence(session, permission.residenceId)
-            all_switches.extend(residence.get_iot_switches())
-
-    return DecoraWifiData(session, all_switches)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: DecoraWifiConfigEntry) -> bool:
-    """Set up Leviton Decora Wi-Fi from a config entry."""
-    try:
-        data = await hass.async_add_executor_job(
-            _login_and_get_switches,
-            entry.data[CONF_USERNAME],
-            entry.data[CONF_PASSWORD],
-        )
-    except ValueError as err:
-        raise ConfigEntryNotReady(
-            "Failed to communicate with myLeviton service"
-        ) from err
-
-    entry.runtime_data = data
-
-    async def _logout(_: Event | None = None) -> None:
-        with suppress(ValueError):
-            await hass.async_add_executor_job(Person.logout, data.session)
-
-    entry.async_on_unload(hass.bus.async_listen_once(EVENT_HOMEASSISTANT_STOP, _logout))
-    entry.async_on_unload(_logout)
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: DecoraWifiConfigEntry) -> bool:
-    """Unload a Decora Wi-Fi config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+"""The decora_wifi component."""

homeassistant/components/decora_wifi/config_flow.py

@@ -1,104 +0,0 @@
-"""Config flow for Leviton Decora Wi-Fi integration."""
-
-from __future__ import annotations
-
-import contextlib
-from typing import Any
-
-from decora_wifi import DecoraWiFiSession
-from decora_wifi.models.person import Person
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_PASSWORD, CONF_USERNAME
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
-
-from .const import DOMAIN
-
-USER_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_USERNAME): TextSelector(),
-        vol.Required(CONF_PASSWORD): TextSelector(
-            TextSelectorConfig(type=TextSelectorType.PASSWORD)
-        ),
-    }
-)
-
-
-def _try_login(email: str, password: str) -> str | None:
-    """Attempt to log in, return the user ID, or None on auth failure."""
-    session = DecoraWiFiSession()
-    if session.login(email, password) is None:
-        return None
-    user_id = str(session.user._id)  # noqa: SLF001
-    with contextlib.suppress(ValueError):
-        Person.logout(session)
-    return user_id
-
-
-class DecoraWifiConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Leviton Decora Wi-Fi config flow."""
-
-    VERSION = 1
-    MINOR_VERSION = 1
-
-    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:
-            try:
-                user_id = await self.hass.async_add_executor_job(
-                    _try_login,
-                    user_input[CONF_USERNAME],
-                    user_input[CONF_PASSWORD],
-                )
-            except ValueError:
-                errors["base"] = "cannot_connect"
-            else:
-                if user_id is None:
-                    errors["base"] = "invalid_auth"
-                else:
-                    await self.async_set_unique_id(user_id)
-                    self._abort_if_unique_id_configured()
-
-                    return self.async_create_entry(
-                        title=user_input[CONF_USERNAME],
-                        data=user_input,
-                    )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=self.add_suggested_values_to_schema(USER_SCHEMA, user_input),
-            errors=errors,
-        )
-
-    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
-        """Handle import from YAML configuration."""
-        self._async_abort_entries_match({CONF_USERNAME: import_data[CONF_USERNAME]})
-
-        try:
-            user_id = await self.hass.async_add_executor_job(
-                _try_login,
-                import_data[CONF_USERNAME],
-                import_data[CONF_PASSWORD],
-            )
-        except ValueError:
-            return self.async_abort(reason="cannot_connect")
-
-        if user_id is None:
-            return self.async_abort(reason="invalid_auth")
-
-        await self.async_set_unique_id(user_id)
-        self._abort_if_unique_id_configured()
-
-        return self.async_create_entry(
-            title=import_data[CONF_USERNAME],
-            data=import_data,
-        )

homeassistant/components/decora_wifi/const.py

@@ -1,4 +0,0 @@
-"""Constants for the Leviton Decora Wi-Fi integration."""
-
-DOMAIN = "decora_wifi"
-INTEGRATION_TITLE = "Leviton Decora Wi-Fi"