Merge branch 'dev' into ingress_dropping_close

Becuase the async iterator was used, it would stop iteration as soon
as a close message was seen. This meant we would never send close to
the other side

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,6 +1,5 @@
 name: Report an issue with Home Assistant Core
 description: Report an issue with Home Assistant Core.
-type: Bug
 body:
   - type: markdown
     attributes:

.github/workflows/builder.yml

@@ -32,7 +32,7 @@ jobs:
           fetch-depth: 0
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -116,7 +116,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
@@ -175,7 +175,7 @@ jobs:
           sed -i "s|pykrakenapi|# pykrakenapi|g" requirements_all.txt
 
       - name: Download translations
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: translations
 
@@ -324,7 +324,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.8.2
+        uses: sigstore/cosign-installer@v3.8.1
         with:
           cosign-release: "v2.2.3"
 
@@ -457,12 +457,12 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: translations
 
@@ -509,7 +509,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -522,7 +522,7 @@ jobs:
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@1dc73863535b631f98b2378be8619f83b136f4a0 # v6.17.0
+        uses: docker/build-push-action@471d1dc4e07e5cdedd4c2171150001c434f0b7a4 # v6.15.0
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -531,7 +531,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@db473fddc028af60658334401dc6fa3ffd8669fd # v2.3.0
+        uses: actions/attest-build-provenance@c074443f1aee8d4aeeae555aebba3282517141b2 # v2.2.3
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/ci.yaml

@@ -37,10 +37,10 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 2
+  CACHE_VERSION: 12
   UV_CACHE_VERSION: 1
-  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2025.6"
+  MYPY_CACHE_VERSION: 9
+  HA_SHORT_VERSION: "2025.5"
   DEFAULT_PYTHON: "3.13"
   ALL_PYTHON_VERSIONS: "['3.13']"
   # 10.3 is the oldest supported version
@@ -249,7 +249,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -259,7 +259,7 @@ jobs:
         with:
           path: venv
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Create Python virtual environment
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -276,7 +276,7 @@ jobs:
           path: ${{ env.PRE_COMMIT_CACHE }}
           lookup-only: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Install pre-commit dependencies
         if: steps.cache-precommit.outputs.cache-hit != 'true'
@@ -294,7 +294,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -306,7 +306,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
@@ -315,7 +315,7 @@ jobs:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Run ruff-format
         run: |
@@ -334,7 +334,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -346,7 +346,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
@@ -355,7 +355,7 @@ jobs:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Run ruff
         run: |
@@ -374,7 +374,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         id: python
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
@@ -386,7 +386,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-venv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-venv-${{
               needs.info.outputs.pre-commit_cache_key }}
       - name: Restore pre-commit environment from cache
         id: cache-precommit
@@ -395,7 +395,7 @@ jobs:
           path: ${{ env.PRE_COMMIT_CACHE }}
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
               needs.info.outputs.pre-commit_cache_key }}
 
       - name: Register yamllint problem matcher
@@ -484,7 +484,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -501,7 +501,7 @@ jobs:
         with:
           path: venv
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore uv wheel cache
         if: steps.cache-venv.outputs.cache-hit != 'true'
@@ -509,10 +509,10 @@ jobs:
         with:
           path: ${{ env.UV_CACHE_DIR }}
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             steps.generate-uv-key.outputs.key }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-uv-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-uv-${{
             env.UV_CACHE_VERSION }}-${{ steps.generate-uv-key.outputs.version }}-${{
             env.HA_SHORT_VERSION }}-
       - name: Install additional OS dependencies
@@ -587,7 +587,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -598,7 +598,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Run hassfest
         run: |
@@ -620,7 +620,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -631,7 +631,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Run gen_requirements_all.py
         run: |
@@ -653,7 +653,7 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Dependency review
-        uses: actions/dependency-review-action@v4.7.1
+        uses: actions/dependency-review-action@v4.5.0
         with:
           license-check: false # We use our own license audit checks
 
@@ -677,7 +677,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -688,7 +688,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Extract license data
         run: |
@@ -720,7 +720,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -731,7 +731,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register pylint problem matcher
         run: |
@@ -767,7 +767,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -778,7 +778,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register pylint problem matcher
         run: |
@@ -812,7 +812,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -830,17 +830,17 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Restore mypy cache
         uses: actions/cache@v4.2.3
         with:
           path: .mypy_cache
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             steps.generate-mypy-key.outputs.key }}
           restore-keys: |
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-mypy-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-mypy-${{
             env.MYPY_CACHE_VERSION }}-${{ steps.generate-mypy-key.outputs.version }}-${{
             env.HA_SHORT_VERSION }}-
       - name: Register mypy problem matcher
@@ -889,7 +889,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -900,7 +900,7 @@ jobs:
           path: venv
           fail-on-cache-miss: true
           key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+            ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Run split_tests.py
         run: |
@@ -949,7 +949,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -959,8 +959,7 @@ jobs:
         with:
           path: venv
           fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register Python problem matcher
         run: |
@@ -969,7 +968,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -1075,7 +1074,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1085,8 +1084,7 @@ jobs:
         with:
           path: venv
           fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register Python problem matcher
         run: |
@@ -1210,7 +1208,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1220,8 +1218,7 @@ jobs:
         with:
           path: venv
           fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register Python problem matcher
         run: |
@@ -1315,12 +1312,12 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'true'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           flags: full-suite
@@ -1362,7 +1359,7 @@ jobs:
         uses: actions/checkout@v4.2.2
       - name: Set up Python ${{ matrix.python-version }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ matrix.python-version }}
           check-latest: true
@@ -1372,8 +1369,7 @@ jobs:
         with:
           path: venv
           fail-on-cache-miss: true
-          key: >-
-            ${{ runner.os }}-${{ runner.arch }}-${{ steps.python.outputs.python-version }}-${{
+          key: ${{ runner.os }}-${{ steps.python.outputs.python-version }}-${{
             needs.info.outputs.python_cache_key }}
       - name: Register Python problem matcher
         run: |
@@ -1458,12 +1454,12 @@ jobs:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.2.2
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
         if: needs.info.outputs.test_full_suite == 'false'
-        uses: codecov/codecov-action@v5.4.3
+        uses: codecov/codecov-action@v5.4.0
         with:
           fail_ci_if_error: true
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -1483,7 +1479,7 @@ jobs:
     timeout-minutes: 10
     steps:
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.28.17
+        uses: github/codeql-action/init@v3.28.13
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.28.17
+        uses: github/codeql-action/analyze@v3.28.13
         with:
           category: "/language:python"

.github/workflows/translations.yml

@@ -22,7 +22,7 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
 

.github/workflows/wheels.yml

@@ -36,7 +36,7 @@ jobs:
 
       - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
-        uses: actions/setup-python@v5.6.0
+        uses: actions/setup-python@v5.5.0
         with:
           python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
@@ -138,17 +138,17 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_diff
 
@@ -187,22 +187,22 @@ jobs:
         uses: actions/checkout@v4.2.2
 
       - name: Download env_file
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: env_file
 
       - name: Download build_constraints
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: build_constraints
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@v4.3.0
+        uses: actions/download-artifact@v4.2.1
         with:
           name: requirements_all_wheels
 

.strict-typing

@@ -270,7 +270,6 @@ homeassistant.components.image_processing.*
 homeassistant.components.image_upload.*
 homeassistant.components.imap.*
 homeassistant.components.imgw_pib.*
-homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
@@ -292,7 +291,6 @@ homeassistant.components.kaleidescape.*
 homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
-homeassistant.components.kulersky.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -333,7 +331,6 @@ homeassistant.components.media_player.*
 homeassistant.components.media_source.*
 homeassistant.components.met_eireann.*
 homeassistant.components.metoffice.*
-homeassistant.components.miele.*
 homeassistant.components.mikrotik.*
 homeassistant.components.min_max.*
 homeassistant.components.minecraft_server.*
@@ -365,10 +362,8 @@ homeassistant.components.no_ip.*
 homeassistant.components.nordpool.*
 homeassistant.components.notify.*
 homeassistant.components.notion.*
-homeassistant.components.ntfy.*
 homeassistant.components.number.*
 homeassistant.components.nut.*
-homeassistant.components.ohme.*
 homeassistant.components.onboarding.*
 homeassistant.components.oncue.*
 homeassistant.components.onedrive.*
@@ -388,7 +383,6 @@ homeassistant.components.pandora.*
 homeassistant.components.panel_custom.*
 homeassistant.components.peblar.*
 homeassistant.components.peco.*
-homeassistant.components.pegel_online.*
 homeassistant.components.persistent_notification.*
 homeassistant.components.person.*
 homeassistant.components.pi_hole.*
@@ -435,6 +429,7 @@ homeassistant.components.roku.*
 homeassistant.components.romy.*
 homeassistant.components.rpi_power.*
 homeassistant.components.rss_feed_template.*
+homeassistant.components.rtsp_to_webrtc.*
 homeassistant.components.russound_rio.*
 homeassistant.components.ruuvi_gateway.*
 homeassistant.components.ruuvitag_ble.*
@@ -464,7 +459,6 @@ homeassistant.components.slack.*
 homeassistant.components.sleepiq.*
 homeassistant.components.smhi.*
 homeassistant.components.smlight.*
-homeassistant.components.smtp.*
 homeassistant.components.snooz.*
 homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*

CODEOWNERS

@@ -46,8 +46,8 @@ build.json @home-assistant/supervisor
 /tests/components/accuweather/ @bieniu
 /homeassistant/components/acmeda/ @atmurray
 /tests/components/acmeda/ @atmurray
-/homeassistant/components/adax/ @danielhiversen @lazytarget
-/tests/components/adax/ @danielhiversen @lazytarget
+/homeassistant/components/adax/ @danielhiversen
+/tests/components/adax/ @danielhiversen
 /homeassistant/components/adguard/ @frenck
 /tests/components/adguard/ @frenck
 /homeassistant/components/ads/ @mrpasztoradam
@@ -171,8 +171,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/avea/ @pattyland
 /homeassistant/components/awair/ @ahayworth @danielsjf
 /tests/components/awair/ @ahayworth @danielsjf
-/homeassistant/components/aws_s3/ @tomasbedrich
-/tests/components/aws_s3/ @tomasbedrich
 /homeassistant/components/axis/ @Kane610
 /tests/components/axis/ @Kane610
 /homeassistant/components/azure_data_explorer/ @kaareseras
@@ -434,7 +432,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/entur_public_transport/ @hfurubotten
 /homeassistant/components/environment_canada/ @gwww @michaeldavie
 /tests/components/environment_canada/ @gwww @michaeldavie
-/homeassistant/components/ephember/ @ttroy50 @roberty99
+/homeassistant/components/ephember/ @ttroy50
 /homeassistant/components/epic_games_store/ @hacf-fr @Quentame
 /tests/components/epic_games_store/ @hacf-fr @Quentame
 /homeassistant/components/epion/ @lhgravendeel
@@ -455,8 +453,8 @@ build.json @home-assistant/supervisor
 /tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
 /tests/components/evohome/ @zxdavb
-/homeassistant/components/ezviz/ @RenierM26
-/tests/components/ezviz/ @RenierM26
+/homeassistant/components/ezviz/ @RenierM26 @baqs
+/tests/components/ezviz/ @RenierM26 @baqs
 /homeassistant/components/faa_delays/ @ntilley905
 /tests/components/faa_delays/ @ntilley905
 /homeassistant/components/fan/ @home-assistant/core
@@ -706,12 +704,8 @@ build.json @home-assistant/supervisor
 /tests/components/image_upload/ @home-assistant/core
 /homeassistant/components/imap/ @jbouwh
 /tests/components/imap/ @jbouwh
-/homeassistant/components/imeon_inverter/ @Imeon-Energy
-/tests/components/imeon_inverter/ @Imeon-Energy
 /homeassistant/components/imgw_pib/ @bieniu
 /tests/components/imgw_pib/ @bieniu
-/homeassistant/components/immich/ @mib1185
-/tests/components/immich/ @mib1185
 /homeassistant/components/improv_ble/ @emontnemery
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
@@ -941,8 +935,6 @@ build.json @home-assistant/supervisor
 /tests/components/metoffice/ @MrHarcombe @avee87
 /homeassistant/components/microbees/ @microBeesTech
 /tests/components/microbees/ @microBeesTech
-/homeassistant/components/miele/ @astrandb
-/tests/components/miele/ @astrandb
 /homeassistant/components/mikrotik/ @engrbm87
 /tests/components/mikrotik/ @engrbm87
 /homeassistant/components/mill/ @danielhiversen
@@ -1055,8 +1047,6 @@ build.json @home-assistant/supervisor
 /tests/components/nsw_fuel_station/ @nickw444
 /homeassistant/components/nsw_rural_fire_service_feed/ @exxamalte
 /tests/components/nsw_rural_fire_service_feed/ @exxamalte
-/homeassistant/components/ntfy/ @tr4nt0r
-/tests/components/ntfy/ @tr4nt0r
 /homeassistant/components/nuheat/ @tstabrawa
 /tests/components/nuheat/ @tstabrawa
 /homeassistant/components/nuki/ @pschmitt @pvizeli @pree
@@ -1085,6 +1075,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/ombi/ @larssont
 /homeassistant/components/onboarding/ @home-assistant/core
 /tests/components/onboarding/ @home-assistant/core
+/homeassistant/components/oncue/ @bdraco @peterager
+/tests/components/oncue/ @bdraco @peterager
 /homeassistant/components/ondilo_ico/ @JeromeHXP
 /tests/components/ondilo_ico/ @JeromeHXP
 /homeassistant/components/onedrive/ @zweckj
@@ -1113,8 +1105,8 @@ build.json @home-assistant/supervisor
 /tests/components/opentherm_gw/ @mvn23
 /homeassistant/components/openuv/ @bachya
 /tests/components/openuv/ @bachya
-/homeassistant/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
-/tests/components/openweathermap/ @fabaff @freekode @nzapponi @wittypluck
+/homeassistant/components/openweathermap/ @fabaff @freekode @nzapponi
+/tests/components/openweathermap/ @fabaff @freekode @nzapponi
 /homeassistant/components/opnsense/ @mtreinish
 /tests/components/opnsense/ @mtreinish
 /homeassistant/components/opower/ @tronikos
@@ -1262,8 +1254,6 @@ build.json @home-assistant/supervisor
 /tests/components/recovery_mode/ @home-assistant/core
 /homeassistant/components/refoss/ @ashionky
 /tests/components/refoss/ @ashionky
-/homeassistant/components/rehlko/ @bdraco @peterager
-/tests/components/rehlko/ @bdraco @peterager
 /homeassistant/components/remote/ @home-assistant/core
 /tests/components/remote/ @home-assistant/core
 /homeassistant/components/remote_calendar/ @Thomas55555
@@ -1309,6 +1299,8 @@ build.json @home-assistant/supervisor
 /tests/components/rpi_power/ @shenxn @swetoast
 /homeassistant/components/rss_feed_template/ @home-assistant/core
 /tests/components/rss_feed_template/ @home-assistant/core
+/homeassistant/components/rtsp_to_webrtc/ @allenporter
+/tests/components/rtsp_to_webrtc/ @allenporter
 /homeassistant/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
 /tests/components/ruckus_unleashed/ @lanrat @ms264556 @gabe565
 /homeassistant/components/russound_rio/ @noahhusby
@@ -1395,6 +1387,7 @@ build.json @home-assistant/supervisor
 /homeassistant/components/siren/ @home-assistant/core @raman325
 /tests/components/siren/ @home-assistant/core @raman325
 /homeassistant/components/sisyphus/ @jkeljo
+/homeassistant/components/sky_hub/ @rogerselwyn
 /homeassistant/components/sky_remote/ @dunnmj @saty9
 /tests/components/sky_remote/ @dunnmj @saty9
 /homeassistant/components/skybell/ @tkdrob
@@ -1441,8 +1434,8 @@ build.json @home-assistant/supervisor
 /tests/components/solarlog/ @Ernst79 @dontinelli
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
-/homeassistant/components/soma/ @ratsept
-/tests/components/soma/ @ratsept
+/homeassistant/components/soma/ @ratsept @sebfortier2288
+/tests/components/soma/ @ratsept @sebfortier2288
 /homeassistant/components/sonarr/ @ctalkington
 /tests/components/sonarr/ @ctalkington
 /homeassistant/components/songpal/ @rytilahti @shenxn
@@ -1474,8 +1467,7 @@ build.json @home-assistant/supervisor
 /tests/components/steam_online/ @tkdrob
 /homeassistant/components/steamist/ @bdraco
 /tests/components/steamist/ @bdraco
-/homeassistant/components/stiebel_eltron/ @fucm @ThyMYthOS
-/tests/components/stiebel_eltron/ @fucm @ThyMYthOS
+/homeassistant/components/stiebel_eltron/ @fucm
 /homeassistant/components/stookwijzer/ @fwestenberg
 /tests/components/stookwijzer/ @fwestenberg
 /homeassistant/components/stream/ @hunterjm @uvjustin @allenporter
@@ -1486,8 +1478,10 @@ build.json @home-assistant/supervisor
 /tests/components/subaru/ @G-Two
 /homeassistant/components/suez_water/ @ooii @jb101010-2
 /tests/components/suez_water/ @ooii @jb101010-2
-/homeassistant/components/sun/ @home-assistant/core
-/tests/components/sun/ @home-assistant/core
+/homeassistant/components/sun/ @Swamp-Ig
+/tests/components/sun/ @Swamp-Ig
+/homeassistant/components/sunweg/ @rokam
+/tests/components/sunweg/ @rokam
 /homeassistant/components/supla/ @mwegrzynek
 /homeassistant/components/surepetcare/ @benleb @danielhiversen
 /tests/components/surepetcare/ @benleb @danielhiversen
@@ -1500,8 +1494,8 @@ build.json @home-assistant/supervisor
 /tests/components/switch_as_x/ @home-assistant/core
 /homeassistant/components/switchbee/ @jafar-atili
 /tests/components/switchbee/ @jafar-atili
-/homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
-/tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski @zerzhang
+/homeassistant/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
+/tests/components/switchbot/ @danielhiversen @RenierM26 @murtas @Eloston @dsypniewski
 /homeassistant/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
 /tests/components/switchbot_cloud/ @SeraphicRav @laurence-presland @Gigatrappeur
 /homeassistant/components/switcher_kis/ @thecode @YogevBokobza
@@ -1678,8 +1672,8 @@ build.json @home-assistant/supervisor
 /tests/components/vlc_telnet/ @rodripf @MartinHjelmare
 /homeassistant/components/vodafone_station/ @paoloantinori @chemelli74
 /tests/components/vodafone_station/ @paoloantinori @chemelli74
-/homeassistant/components/voip/ @balloob @synesthesiam @jaminh
-/tests/components/voip/ @balloob @synesthesiam @jaminh
+/homeassistant/components/voip/ @balloob @synesthesiam
+/tests/components/voip/ @balloob @synesthesiam
 /homeassistant/components/volumio/ @OnFreund
 /tests/components/volumio/ @OnFreund
 /homeassistant/components/volvooncall/ @molobrakos
@@ -1796,8 +1790,6 @@ build.json @home-assistant/supervisor
 /tests/components/zeversolar/ @kvanzuijlen
 /homeassistant/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
 /tests/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
-/homeassistant/components/zimi/ @markhannon
-/tests/components/zimi/ @markhannon
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core

Dockerfile

@@ -31,7 +31,7 @@ RUN \
     && go2rtc --version
 
 # Install uv
-RUN pip3 install uv==0.7.1
+RUN pip3 install uv==0.6.10
 
 WORKDIR /usr/src
 

build.yaml

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

homeassistant/bootstrap.py

@@ -53,7 +53,6 @@ from .components import (
     logbook as logbook_pre_import,  # noqa: F401
     lovelace as lovelace_pre_import,  # noqa: F401
     onboarding as onboarding_pre_import,  # noqa: F401
-    person as person_pre_import,  # noqa: F401
     recorder as recorder_import,  # noqa: F401 - not named pre_import since it has requirements
     repairs as repairs_pre_import,  # noqa: F401
     search as search_pre_import,  # noqa: F401

homeassistant/brands/amazon.json

@@ -1,12 +1,5 @@
 {
   "domain": "amazon",
   "name": "Amazon",
-  "integrations": [
-    "alexa",
-    "amazon_polly",
-    "aws",
-    "aws_s3",
-    "fire_tv",
-    "route53"
-  ]
+  "integrations": ["alexa", "amazon_polly", "aws", "fire_tv", "route53"]
 }

homeassistant/brands/bosch.json

@@ -1,5 +0,0 @@
-{
-  "domain": "bosch",
-  "name": "Bosch",
-  "integrations": ["bosch_alarm", "bosch_shc", "home_connect"]
-}

homeassistant/brands/eve.json

@@ -1,5 +0,0 @@
-{
-  "domain": "eve",
-  "name": "Eve",
-  "iot_standards": ["matter"]
-}

homeassistant/brands/google.json

@@ -6,7 +6,6 @@
     "google_assistant_sdk",
     "google_cloud",
     "google_drive",
-    "google_gemini",
     "google_generative_ai_conversation",
     "google_mail",
     "google_maps",

homeassistant/brands/nuki.json

@@ -1,6 +0,0 @@
-{
-  "domain": "nuki",
-  "name": "Nuki",
-  "integrations": ["nuki"],
-  "iot_standards": ["matter"]
-}

homeassistant/components/accuweather/const.py

@@ -67,7 +67,6 @@ POLLEN_CATEGORY_MAP = {
     2: "moderate",
     3: "high",
     4: "very_high",
-    5: "extreme",
 }
 UPDATE_INTERVAL_OBSERVATION = timedelta(minutes=40)
 UPDATE_INTERVAL_DAILY_FORECAST = timedelta(hours=6)

homeassistant/components/accuweather/strings.json

@@ -72,11 +72,10 @@
           "level": {
             "name": "Level",
             "state": {
-              "extreme": "Extreme",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "High",
+              "low": "Low",
               "moderate": "Moderate",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "Very high"
             }
           }
         }
@@ -90,11 +89,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -125,11 +123,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -170,11 +167,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -185,11 +181,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }
@@ -200,11 +195,10 @@
           "level": {
             "name": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::name%]",
             "state": {
-              "extreme": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::extreme%]",
-              "high": "[%key:common::state::high%]",
-              "low": "[%key:common::state::low%]",
+              "high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::high%]",
+              "low": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::low%]",
               "moderate": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::moderate%]",
-              "very_high": "[%key:common::state::very_high%]"
+              "very_high": "[%key:component::accuweather::entity::sensor::grass_pollen::state_attributes::level::state::very_high%]"
             }
           }
         }

homeassistant/components/adax/__init__.py

@@ -2,38 +2,25 @@
 
 from __future__ import annotations
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 
-from .const import CONNECTION_TYPE, LOCAL
-from .coordinator import AdaxCloudCoordinator, AdaxConfigEntry, AdaxLocalCoordinator
-
 PLATFORMS = [Platform.CLIMATE]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Adax from a config entry."""
-    if entry.data.get(CONNECTION_TYPE) == LOCAL:
-        local_coordinator = AdaxLocalCoordinator(hass, entry)
-        entry.runtime_data = local_coordinator
-    else:
-        cloud_coordinator = AdaxCloudCoordinator(hass, entry)
-        entry.runtime_data = cloud_coordinator
-
-    await entry.runtime_data.async_config_entry_first_refresh()
-
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
     return True
 
 
-async def async_unload_entry(hass: HomeAssistant, entry: AdaxConfigEntry) -> bool:
+async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Unload a config entry."""
     return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
 
 
-async def async_migrate_entry(
-    hass: HomeAssistant, config_entry: AdaxConfigEntry
-) -> bool:
+async def async_migrate_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Migrate old entry."""
     # convert title and unique_id to string
     if config_entry.version == 1:

homeassistant/components/adax/climate.py

@@ -12,42 +12,57 @@ from homeassistant.components.climate import (
     ClimateEntityFeature,
     HVACMode,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_TEMPERATURE,
+    CONF_IP_ADDRESS,
+    CONF_PASSWORD,
+    CONF_TOKEN,
     CONF_UNIQUE_ID,
     PRECISION_WHOLE,
     UnitOfTemperature,
 )
-from homeassistant.core import HomeAssistant, callback
+from homeassistant.core import HomeAssistant
+from homeassistant.helpers.aiohttp_client import async_get_clientsession
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from . import AdaxConfigEntry
-from .const import CONNECTION_TYPE, DOMAIN, LOCAL
-from .coordinator import AdaxCloudCoordinator, AdaxLocalCoordinator
+from .const import ACCOUNT_ID, CONNECTION_TYPE, DOMAIN, LOCAL
 
 
 async def async_setup_entry(
     hass: HomeAssistant,
-    entry: AdaxConfigEntry,
+    entry: ConfigEntry,
     async_add_entities: AddConfigEntryEntitiesCallback,
 ) -> None:
     """Set up the Adax thermostat with config flow."""
     if entry.data.get(CONNECTION_TYPE) == LOCAL:
-        local_coordinator = cast(AdaxLocalCoordinator, entry.runtime_data)
-        async_add_entities(
-            [LocalAdaxDevice(local_coordinator, entry.data[CONF_UNIQUE_ID])],
+        adax_data_handler = AdaxLocal(
+            entry.data[CONF_IP_ADDRESS],
+            entry.data[CONF_TOKEN],
+            websession=async_get_clientsession(hass, verify_ssl=False),
         )
-    else:
-        cloud_coordinator = cast(AdaxCloudCoordinator, entry.runtime_data)
         async_add_entities(
-            AdaxDevice(cloud_coordinator, device_id)
-            for device_id in cloud_coordinator.data
+            [LocalAdaxDevice(adax_data_handler, entry.data[CONF_UNIQUE_ID])], True
         )
+        return
+
+    adax_data_handler = Adax(
+        entry.data[ACCOUNT_ID],
+        entry.data[CONF_PASSWORD],
+        websession=async_get_clientsession(hass),
+    )
+
+    async_add_entities(
+        (
+            AdaxDevice(room, adax_data_handler)
+            for room in await adax_data_handler.get_rooms()
+        ),
+        True,
+    )
 
 
-class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
+class AdaxDevice(ClimateEntity):
     """Representation of a heater."""
 
     _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
@@ -61,37 +76,20 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    def __init__(
-        self,
-        coordinator: AdaxCloudCoordinator,
-        device_id: str,
-    ) -> None:
+    def __init__(self, heater_data: dict[str, Any], adax_data_handler: Adax) -> None:
         """Initialize the heater."""
-        super().__init__(coordinator)
-        self._adax_data_handler: Adax = coordinator.adax_data_handler
-        self._device_id = device_id
+        self._device_id = heater_data["id"]
+        self._adax_data_handler = adax_data_handler
 
-        self._attr_name = self.room["name"]
-        self._attr_unique_id = f"{self.room['homeId']}_{self._device_id}"
+        self._attr_unique_id = f"{heater_data['homeId']}_{heater_data['id']}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, device_id)},
+            identifiers={(DOMAIN, heater_data["id"])},
             # Instead of setting the device name to the entity name, adax
             # should be updated to set has_entity_name = True, and set the entity
             # name to None
             name=cast(str | None, self.name),
             manufacturer="Adax",
         )
-        self._apply_data(self.room)
-
-    @property
-    def available(self) -> bool:
-        """Whether the entity is available or not."""
-        return super().available and self._device_id in self.coordinator.data
-
-    @property
-    def room(self) -> dict[str, Any]:
-        """Gets the data for this particular device."""
-        return self.coordinator.data[self._device_id]
 
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set hvac mode."""
@@ -106,9 +104,7 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
             )
         else:
             return
-
-        # Request data refresh from source to verify that update was successful
-        await self.coordinator.async_request_refresh()
+        await self._adax_data_handler.update()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
@@ -118,31 +114,28 @@ class AdaxDevice(CoordinatorEntity[AdaxCloudCoordinator], ClimateEntity):
             self._device_id, temperature, True
         )
 
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if room := self.room:
-            self._apply_data(room)
-        super()._handle_coordinator_update()
-
-    def _apply_data(self, room: dict[str, Any]) -> None:
-        """Update the appropriate attributues based on received data."""
-        self._attr_current_temperature = room.get("temperature")
-        self._attr_target_temperature = room.get("targetTemperature")
-        if room["heatingEnabled"]:
-            self._attr_hvac_mode = HVACMode.HEAT
-            self._attr_icon = "mdi:radiator"
-        else:
-            self._attr_hvac_mode = HVACMode.OFF
-            self._attr_icon = "mdi:radiator-off"
+    async def async_update(self) -> None:
+        """Get the latest data."""
+        for room in await self._adax_data_handler.get_rooms():
+            if room["id"] != self._device_id:
+                continue
+            self._attr_name = room["name"]
+            self._attr_current_temperature = room.get("temperature")
+            self._attr_target_temperature = room.get("targetTemperature")
+            if room["heatingEnabled"]:
+                self._attr_hvac_mode = HVACMode.HEAT
+                self._attr_icon = "mdi:radiator"
+            else:
+                self._attr_hvac_mode = HVACMode.OFF
+                self._attr_icon = "mdi:radiator-off"
+            return
 
 
-class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
+class LocalAdaxDevice(ClimateEntity):
     """Representation of a heater."""
 
     _attr_hvac_modes = [HVACMode.HEAT, HVACMode.OFF]
-    _attr_hvac_mode = HVACMode.OFF
-    _attr_icon = "mdi:radiator-off"
+    _attr_hvac_mode = HVACMode.HEAT
     _attr_max_temp = 35
     _attr_min_temp = 5
     _attr_supported_features = (
@@ -153,10 +146,9 @@ class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
     _attr_target_temperature_step = PRECISION_WHOLE
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
 
-    def __init__(self, coordinator: AdaxLocalCoordinator, unique_id: str) -> None:
+    def __init__(self, adax_data_handler: AdaxLocal, unique_id: str) -> None:
         """Initialize the heater."""
-        super().__init__(coordinator)
-        self._adax_data_handler: AdaxLocal = coordinator.adax_data_handler
+        self._adax_data_handler = adax_data_handler
         self._attr_unique_id = unique_id
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, unique_id)},
@@ -177,20 +169,17 @@ class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
             return
         await self._adax_data_handler.set_target_temperature(temperature)
 
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        if data := self.coordinator.data:
-            self._attr_current_temperature = data["current_temperature"]
-            self._attr_available = self._attr_current_temperature is not None
-            if (target_temp := data["target_temperature"]) == 0:
-                self._attr_hvac_mode = HVACMode.OFF
-                self._attr_icon = "mdi:radiator-off"
-                if target_temp == 0:
-                    self._attr_target_temperature = self._attr_min_temp
-            else:
-                self._attr_hvac_mode = HVACMode.HEAT
-                self._attr_icon = "mdi:radiator"
-                self._attr_target_temperature = target_temp
-
-        super()._handle_coordinator_update()
+    async def async_update(self) -> None:
+        """Get the latest data."""
+        data = await self._adax_data_handler.get_status()
+        self._attr_current_temperature = data["current_temperature"]
+        self._attr_available = self._attr_current_temperature is not None
+        if (target_temp := data["target_temperature"]) == 0:
+            self._attr_hvac_mode = HVACMode.OFF
+            self._attr_icon = "mdi:radiator-off"
+            if target_temp == 0:
+                self._attr_target_temperature = self._attr_min_temp
+        else:
+            self._attr_hvac_mode = HVACMode.HEAT
+            self._attr_icon = "mdi:radiator"
+            self._attr_target_temperature = target_temp

homeassistant/components/adax/const.py

@@ -1,6 +1,5 @@
 """Constants for the Adax integration."""
 
-import datetime
 from typing import Final
 
 ACCOUNT_ID: Final = "account_id"
@@ -10,5 +9,3 @@ DOMAIN: Final = "adax"
 LOCAL = "Local"
 WIFI_SSID = "wifi_ssid"
 WIFI_PSWD = "wifi_pswd"
-
-SCAN_INTERVAL = datetime.timedelta(seconds=60)

homeassistant/components/adax/coordinator.py

@@ -1,71 +0,0 @@
-"""DataUpdateCoordinator for the Adax component."""
-
-import logging
-from typing import Any, cast
-
-from adax import Adax
-from adax_local import Adax as AdaxLocal
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PASSWORD, CONF_TOKEN
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import ACCOUNT_ID, SCAN_INTERVAL
-
-_LOGGER = logging.getLogger(__name__)
-
-
-type AdaxConfigEntry = ConfigEntry[AdaxCloudCoordinator | AdaxLocalCoordinator]
-
-
-class AdaxCloudCoordinator(DataUpdateCoordinator[dict[str, dict[str, Any]]]):
-    """Coordinator for updating data to and from Adax (cloud)."""
-
-    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
-        """Initialize the Adax coordinator used for Cloud mode."""
-        super().__init__(
-            hass,
-            config_entry=entry,
-            logger=_LOGGER,
-            name="AdaxCloud",
-            update_interval=SCAN_INTERVAL,
-        )
-
-        self.adax_data_handler = Adax(
-            entry.data[ACCOUNT_ID],
-            entry.data[CONF_PASSWORD],
-            websession=async_get_clientsession(hass),
-        )
-
-    async def _async_update_data(self) -> dict[str, dict[str, Any]]:
-        """Fetch data from the Adax."""
-        rooms = await self.adax_data_handler.get_rooms() or []
-        return {r["id"]: r for r in rooms}
-
-
-class AdaxLocalCoordinator(DataUpdateCoordinator[dict[str, Any] | None]):
-    """Coordinator for updating data to and from Adax (local)."""
-
-    def __init__(self, hass: HomeAssistant, entry: AdaxConfigEntry) -> None:
-        """Initialize the Adax coordinator used for Local mode."""
-        super().__init__(
-            hass,
-            config_entry=entry,
-            logger=_LOGGER,
-            name="AdaxLocal",
-            update_interval=SCAN_INTERVAL,
-        )
-
-        self.adax_data_handler = AdaxLocal(
-            entry.data[CONF_IP_ADDRESS],
-            entry.data[CONF_TOKEN],
-            websession=async_get_clientsession(hass, verify_ssl=False),
-        )
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Fetch data from the Adax."""
-        if result := await self.adax_data_handler.get_status():
-            return cast(dict[str, Any], result)
-        raise UpdateFailed("Got invalid status from device")

homeassistant/components/adax/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "adax",
   "name": "Adax",
-  "codeowners": ["@danielhiversen", "@lazytarget"],
+  "codeowners": ["@danielhiversen"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/adax",
   "iot_class": "local_polling",

homeassistant/components/advantage_air/light.py

@@ -8,7 +8,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
-from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN
+from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity, AdvantageAirThingEntity
 from .models import AdvantageAirData
 
@@ -52,8 +52,8 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
         self._id: str = light["id"]
         self._attr_unique_id += f"-{self._id}"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self._attr_unique_id)},
-            via_device=(DOMAIN, self.coordinator.data["system"]["rid"]),
+            identifiers={(ADVANTAGE_AIR_DOMAIN, self._attr_unique_id)},
+            via_device=(ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"]),
             manufacturer="Advantage Air",
             model=light.get("moduleType"),
             name=light["name"],

homeassistant/components/advantage_air/update.py

@@ -6,7 +6,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
-from .const import DOMAIN
+from .const import DOMAIN as ADVANTAGE_AIR_DOMAIN
 from .entity import AdvantageAirEntity
 from .models import AdvantageAirData
 
@@ -32,7 +32,9 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
         """Initialize the Advantage Air App."""
         super().__init__(instance)
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.data["system"]["rid"])},
+            identifiers={
+                (ADVANTAGE_AIR_DOMAIN, self.coordinator.data["system"]["rid"])
+            },
             manufacturer="Advantage Air",
             model=self.coordinator.data["system"]["sysType"],
             name=self.coordinator.data["system"]["name"],

homeassistant/components/agent_dvr/__init__.py

@@ -10,7 +10,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import DOMAIN, SERVER_URL
+from .const import DOMAIN as AGENT_DOMAIN, SERVER_URL
 
 ATTRIBUTION = "ispyconnect.com"
 DEFAULT_BRAND = "Agent DVR by ispyconnect.com"
@@ -46,7 +46,7 @@ async def async_setup_entry(
 
     device_registry.async_get_or_create(
         config_entry_id=config_entry.entry_id,
-        identifiers={(DOMAIN, agent_client.unique)},
+        identifiers={(AGENT_DOMAIN, agent_client.unique)},
         manufacturer="iSpyConnect",
         name=f"Agent {agent_client.name}",
         model="Agent DVR",

homeassistant/components/agent_dvr/alarm_control_panel.py

@@ -12,7 +12,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AgentDVRConfigEntry
-from .const import DOMAIN
+from .const import DOMAIN as AGENT_DOMAIN
 
 CONF_HOME_MODE_NAME = "home"
 CONF_AWAY_MODE_NAME = "away"
@@ -47,7 +47,7 @@ class AgentBaseStation(AlarmControlPanelEntity):
         self._client = client
         self._attr_unique_id = f"{client.unique}_CP"
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, client.unique)},
+            identifiers={(AGENT_DOMAIN, client.unique)},
             name=f"{client.name} {CONST_ALARM_CONTROL_PANEL_NAME}",
             manufacturer="Agent",
             model=CONST_ALARM_CONTROL_PANEL_NAME,

homeassistant/components/airgradient/entity.py

@@ -6,7 +6,6 @@ from typing import Any, Concatenate
 from airgradient import AirGradientConnectionError, AirGradientError, get_model_name
 
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers import device_registry as dr
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
@@ -30,7 +29,6 @@ class AirGradientEntity(CoordinatorEntity[AirGradientCoordinator]):
             model_id=measures.model,
             serial_number=coordinator.serial_number,
             sw_version=measures.firmware_version,
-            connections={(dr.CONNECTION_NETWORK_MAC, coordinator.serial_number)},
         )
 
 

homeassistant/components/airgradient/strings.json

@@ -68,8 +68,8 @@
       "led_bar_mode": {
         "name": "LED bar mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "Off",
+          "co2": "Carbon dioxide",
           "pm": "Particulate matter"
         }
       },
@@ -143,8 +143,8 @@
       "led_bar_mode": {
         "name": "[%key:component::airgradient::entity::select::led_bar_mode::name%]",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "co2": "[%key:component::sensor::entity_component::carbon_dioxide::name%]",
+          "off": "[%key:component::airgradient::entity::select::led_bar_mode::state::off%]",
+          "co2": "[%key:component::airgradient::entity::select::led_bar_mode::state::co2%]",
           "pm": "[%key:component::airgradient::entity::select::led_bar_mode::state::pm%]"
         }
       },

homeassistant/components/airnow/coordinator.py

@@ -8,7 +8,7 @@ from aiohttp import ClientSession
 from aiohttp.client_exceptions import ClientConnectorError
 from pyairnow import WebServiceAPI
 from pyairnow.conv import aqi_to_concentration
-from pyairnow.errors import AirNowError, InvalidJsonError
+from pyairnow.errors import AirNowError
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -79,7 +79,7 @@ class AirNowDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
                 distance=self.distance,
             )
 
-        except (AirNowError, ClientConnectorError, InvalidJsonError) as error:
+        except (AirNowError, ClientConnectorError) as error:
             raise UpdateFailed(error) from error
 
         if not obs:

homeassistant/components/airthings/manifest.json

@@ -3,19 +3,6 @@
   "name": "Airthings",
   "codeowners": ["@danielhiversen", "@LaStrada"],
   "config_flow": true,
-  "dhcp": [
-    {
-      "hostname": "airthings-view"
-    },
-    {
-      "hostname": "airthings-hub",
-      "macaddress": "D0141190*"
-    },
-    {
-      "hostname": "airthings-hub",
-      "macaddress": "70B3D52A0*"
-    }
-  ],
   "documentation": "https://www.home-assistant.io/integrations/airthings",
   "iot_class": "cloud_polling",
   "loggers": ["airthings"],

homeassistant/components/airthings/sensor.py

@@ -14,7 +14,6 @@ from homeassistant.const import (
     CONCENTRATION_MICROGRAMS_PER_CUBIC_METER,
     CONCENTRATION_PARTS_PER_BILLION,
     CONCENTRATION_PARTS_PER_MILLION,
-    LIGHT_LUX,
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS,
     EntityCategory,
@@ -79,12 +78,6 @@ SENSORS: dict[str, SensorEntityDescription] = {
         translation_key="light",
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "lux": SensorEntityDescription(
-        key="lux",
-        device_class=SensorDeviceClass.ILLUMINANCE,
-        native_unit_of_measurement=LIGHT_LUX,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
     "virusRisk": SensorEntityDescription(
         key="virusRisk",
         translation_key="virus_risk",

homeassistant/components/airvisual/strings.json

@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "geography_by_coords": {
-        "title": "Configure a geography",
+        "title": "Configure a Geography",
         "description": "Use the AirVisual cloud API to monitor a latitude/longitude.",
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
@@ -16,8 +16,8 @@
         "data": {
           "api_key": "[%key:common::config_flow::data::api_key%]",
           "city": "City",
-          "state": "State",
-          "country": "[%key:common::config_flow::data::country%]"
+          "country": "Country",
+          "state": "State"
         }
       },
       "reauth_confirm": {
@@ -56,12 +56,12 @@
     "sensor": {
       "pollutant_label": {
         "state": {
-          "co": "[%key:component::sensor::entity_component::carbon_monoxide::name%]",
-          "n2": "[%key:component::sensor::entity_component::nitrogen_dioxide::name%]",
-          "o3": "[%key:component::sensor::entity_component::ozone::name%]",
-          "p1": "[%key:component::sensor::entity_component::pm10::name%]",
-          "p2": "[%key:component::sensor::entity_component::pm25::name%]",
-          "s2": "[%key:component::sensor::entity_component::sulphur_dioxide::name%]"
+          "co": "Carbon Monoxide",
+          "n2": "Nitrogen Dioxide",
+          "o3": "Ozone",
+          "p1": "PM10",
+          "p2": "PM2.5",
+          "s2": "Sulfur Dioxide"
         }
       },
       "pollutant_level": {

homeassistant/components/airzone/manifest.json

@@ -11,5 +11,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
-  "requirements": ["aioairzone==1.0.0"]
+  "requirements": ["aioairzone==0.9.9"]
 }

homeassistant/components/airzone/sensor.py

@@ -9,8 +9,6 @@ from aioairzone.const import (
     AZD_HUMIDITY,
     AZD_TEMP,
     AZD_TEMP_UNIT,
-    AZD_THERMOSTAT_BATTERY,
-    AZD_THERMOSTAT_SIGNAL,
     AZD_WEBSERVER,
     AZD_WIFI_RSSI,
     AZD_ZONES,
@@ -75,20 +73,6 @@ ZONE_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
         native_unit_of_measurement=PERCENTAGE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    SensorEntityDescription(
-        device_class=SensorDeviceClass.BATTERY,
-        key=AZD_THERMOSTAT_BATTERY,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-    ),
-    SensorEntityDescription(
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        key=AZD_THERMOSTAT_SIGNAL,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="thermostat_signal",
-    ),
 )
 
 

homeassistant/components/airzone/strings.json

@@ -76,9 +76,6 @@
     "sensor": {
       "rssi": {
         "name": "RSSI"
-      },
-      "thermostat_signal": {
-        "name": "Signal strength"
       }
     }
   }

homeassistant/components/airzone_cloud/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
-  "requirements": ["aioairzone-cloud==0.6.12"]
+  "requirements": ["aioairzone-cloud==0.6.11"]
 }

homeassistant/components/airzone_cloud/strings.json

@@ -32,9 +32,9 @@
       "air_quality": {
         "name": "Air Quality mode",
         "state": {
-          "off": "[%key:common::state::off%]",
-          "on": "[%key:common::state::on%]",
-          "auto": "[%key:common::state::auto%]"
+          "off": "Off",
+          "on": "On",
+          "auto": "Auto"
         }
       },
       "modes": {

homeassistant/components/alarmdecoder/strings.json

@@ -2,7 +2,7 @@
   "config": {
     "step": {
       "user": {
-        "title": "Choose AlarmDecoder protocol",
+        "title": "Choose AlarmDecoder Protocol",
         "data": {
           "protocol": "Protocol"
         }
@@ -12,8 +12,8 @@
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "port": "[%key:common::config_flow::data::port%]",
-          "device_baudrate": "Device baud rate",
-          "device_path": "Device path"
+          "device_baudrate": "Device Baud Rate",
+          "device_path": "Device Path"
         },
         "data_description": {
           "host": "The hostname or IP address of the AlarmDecoder device that is connected to your alarm panel.",
@@ -44,36 +44,36 @@
       "arm_settings": {
         "title": "[%key:component::alarmdecoder::options::step::init::title%]",
         "data": {
-          "auto_bypass": "Auto-bypass on arm",
-          "code_arm_required": "Code required for arming",
-          "alt_night_mode": "Alternative night mode"
+          "auto_bypass": "Auto Bypass on Arm",
+          "code_arm_required": "Code Required for Arming",
+          "alt_night_mode": "Alternative Night Mode"
         }
       },
       "zone_select": {
         "title": "[%key:component::alarmdecoder::options::step::init::title%]",
         "description": "Enter the zone number you'd like to to add, edit, or remove.",
         "data": {
-          "zone_number": "Zone number"
+          "zone_number": "Zone Number"
         }
       },
       "zone_details": {
         "title": "[%key:component::alarmdecoder::options::step::init::title%]",
-        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave 'Zone name' blank.",
+        "description": "Enter details for zone {zone_number}. To delete zone {zone_number}, leave Zone Name blank.",
         "data": {
-          "zone_name": "Zone name",
-          "zone_type": "Zone type",
-          "zone_rfid": "RF serial",
-          "zone_loop": "RF loop",
-          "zone_relayaddr": "Relay address",
-          "zone_relaychan": "Relay channel"
+          "zone_name": "Zone Name",
+          "zone_type": "Zone Type",
+          "zone_rfid": "RF Serial",
+          "zone_loop": "RF Loop",
+          "zone_relayaddr": "Relay Address",
+          "zone_relaychan": "Relay Channel"
         }
       }
     },
     "error": {
-      "relay_inclusive": "'Relay address' and 'Relay channel' are codependent and must be included together.",
+      "relay_inclusive": "Relay Address and Relay Channel are codependent and must be included together.",
       "int": "The field below must be an integer.",
-      "loop_rfid": "'RF loop' cannot be used without 'RF serial'.",
-      "loop_range": "'RF loop' must be an integer between 1 and 4."
+      "loop_rfid": "RF Loop cannot be used without RF Serial.",
+      "loop_range": "RF Loop must be an integer between 1 and 4."
     }
   },
   "services": {

homeassistant/components/alexa/entities.py

@@ -719,7 +719,7 @@ class LockCapabilities(AlexaEntity):
         yield Alexa(self.entity)
 
 
-@ENTITY_ADAPTERS.register(media_player.DOMAIN)
+@ENTITY_ADAPTERS.register(media_player.const.DOMAIN)
 class MediaPlayerCapabilities(AlexaEntity):
     """Class to represent MediaPlayer capabilities."""
 
@@ -757,7 +757,9 @@ class MediaPlayerCapabilities(AlexaEntity):
 
         if supported & media_player.MediaPlayerEntityFeature.SELECT_SOURCE:
             inputs = AlexaInputController.get_valid_inputs(
-                self.entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST, [])
+                self.entity.attributes.get(
+                    media_player.const.ATTR_INPUT_SOURCE_LIST, []
+                )
             )
             if len(inputs) > 0:
                 yield AlexaInputController(self.entity)
@@ -774,7 +776,8 @@ class MediaPlayerCapabilities(AlexaEntity):
             and domain != "denonavr"
         ):
             inputs = AlexaEqualizerController.get_valid_inputs(
-                self.entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST) or []
+                self.entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
+                or []
             )
             if len(inputs) > 0:
                 yield AlexaEqualizerController(self.entity)

homeassistant/components/alexa/handlers.py

@@ -566,7 +566,7 @@ async def async_api_set_volume(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
     }
 
     await hass.services.async_call(
@@ -589,7 +589,7 @@ async def async_api_select_input(
 
     # Attempt to map the ALL UPPERCASE payload name to a source.
     # Strips trailing 1 to match single input devices.
-    source_list = entity.attributes.get(media_player.ATTR_INPUT_SOURCE_LIST) or []
+    source_list = entity.attributes.get(media_player.const.ATTR_INPUT_SOURCE_LIST) or []
     for source in source_list:
         formatted_source = (
             source.lower().replace("-", "").replace("_", "").replace(" ", "")
@@ -611,7 +611,7 @@ async def async_api_select_input(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_INPUT_SOURCE: media_input,
+        media_player.const.ATTR_INPUT_SOURCE: media_input,
     }
 
     await hass.services.async_call(
@@ -636,7 +636,7 @@ async def async_api_adjust_volume(
     volume_delta = int(directive.payload["volume"])
 
     entity = directive.entity
-    current_level = entity.attributes[media_player.ATTR_MEDIA_VOLUME_LEVEL]
+    current_level = entity.attributes[media_player.const.ATTR_MEDIA_VOLUME_LEVEL]
 
     # read current state
     try:
@@ -648,7 +648,7 @@ async def async_api_adjust_volume(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_LEVEL: volume,
+        media_player.const.ATTR_MEDIA_VOLUME_LEVEL: volume,
     }
 
     await hass.services.async_call(
@@ -709,7 +709,7 @@ async def async_api_set_mute(
     entity = directive.entity
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_VOLUME_MUTED: mute,
+        media_player.const.ATTR_MEDIA_VOLUME_MUTED: mute,
     }
 
     await hass.services.async_call(
@@ -1708,13 +1708,15 @@ async def async_api_changechannel(
 
     data: dict[str, Any] = {
         ATTR_ENTITY_ID: entity.entity_id,
-        media_player.ATTR_MEDIA_CONTENT_ID: channel,
-        media_player.ATTR_MEDIA_CONTENT_TYPE: (media_player.MediaType.CHANNEL),
+        media_player.const.ATTR_MEDIA_CONTENT_ID: channel,
+        media_player.const.ATTR_MEDIA_CONTENT_TYPE: (
+            media_player.const.MEDIA_TYPE_CHANNEL
+        ),
     }
 
     await hass.services.async_call(
         entity.domain,
-        media_player.SERVICE_PLAY_MEDIA,
+        media_player.const.SERVICE_PLAY_MEDIA,
         data,
         blocking=False,
         context=context,
@@ -1823,13 +1825,13 @@ async def async_api_set_eq_mode(
     context: ha.Context,
 ) -> AlexaResponse:
     """Process a SetMode request for EqualizerController."""
-    mode: str = directive.payload["mode"]
+    mode = directive.payload["mode"]
     entity = directive.entity
     data: dict[str, Any] = {ATTR_ENTITY_ID: entity.entity_id}
 
-    sound_mode_list = entity.attributes.get(media_player.ATTR_SOUND_MODE_LIST)
+    sound_mode_list = entity.attributes.get(media_player.const.ATTR_SOUND_MODE_LIST)
     if sound_mode_list and mode.lower() in sound_mode_list:
-        data[media_player.ATTR_SOUND_MODE] = mode.lower()
+        data[media_player.const.ATTR_SOUND_MODE] = mode.lower()
     else:
         msg = f"failed to map sound mode {mode} to a mode on {entity.entity_id}"
         raise AlexaInvalidValueError(msg)

homeassistant/components/alexa/state_report.py

@@ -3,10 +3,10 @@
 from __future__ import annotations
 
 from asyncio import timeout
-from collections.abc import Mapping
 from http import HTTPStatus
 import json
 import logging
+from types import MappingProxyType
 from typing import TYPE_CHECKING, Any, cast
 from uuid import uuid4
 
@@ -260,10 +260,10 @@ async def async_enable_proactive_mode(
     def extra_significant_check(
         hass: HomeAssistant,
         old_state: str,
-        old_attrs: Mapping[Any, Any],
+        old_attrs: dict[Any, Any] | MappingProxyType[Any, Any],
         old_extra_arg: Any,
         new_state: str,
-        new_attrs: Mapping[Any, Any],
+        new_attrs: dict[str, Any] | MappingProxyType[Any, Any],
         new_extra_arg: Any,
     ) -> bool:
         """Check if the serialized data has changed."""

homeassistant/components/amazon_polly/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["boto3", "botocore", "s3transfer"],
   "quality_scale": "legacy",
-  "requirements": ["boto3==1.37.1"]
+  "requirements": ["boto3==1.34.131"]
 }

homeassistant/components/analytics_insights/strings.json

@@ -3,12 +3,12 @@
     "step": {
       "user": {
         "data": {
-          "tracked_addons": "Add-ons",
+          "tracked_addons": "Addons",
           "tracked_integrations": "Integrations",
           "tracked_custom_integrations": "Custom integrations"
         },
         "data_description": {
-          "tracked_addons": "Select the add-ons you want to track",
+          "tracked_addons": "Select the addons you want to track",
           "tracked_integrations": "Select the integrations you want to track",
           "tracked_custom_integrations": "Select the custom integrations you want to track"
         }

homeassistant/components/android_ip_webcam/manifest.json

@@ -5,5 +5,5 @@
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
   "iot_class": "local_polling",
-  "requirements": ["pydroid-ipcam==3.0.0"]
+  "requirements": ["pydroid-ipcam==2.0.0"]
 }

homeassistant/components/androidtv_remote/entity.py

@@ -73,7 +73,7 @@ class AndroidTVRemoteBaseEntity(Entity):
             self._api.send_key_command(key_code, direction)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc
 
     def _send_launch_app_command(self, app_link: str) -> None:
@@ -85,5 +85,5 @@ class AndroidTVRemoteBaseEntity(Entity):
             self._api.send_launch_app_command(app_link)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc

homeassistant/components/androidtv_remote/media_player.py

@@ -21,7 +21,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AndroidTVRemoteConfigEntry
-from .const import CONF_APP_ICON, CONF_APP_NAME, DOMAIN
+from .const import CONF_APP_ICON, CONF_APP_NAME
 from .entity import AndroidTVRemoteBaseEntity
 
 PARALLEL_UPDATES = 0
@@ -233,5 +233,5 @@ class AndroidTVRemoteMediaPlayerEntity(AndroidTVRemoteBaseEntity, MediaPlayerEnt
                 await asyncio.sleep(delay_secs)
         except ConnectionClosed as exc:
             raise HomeAssistantError(
-                translation_domain=DOMAIN, translation_key="connection_closed"
+                "Connection to Android TV device is closed"
             ) from exc

homeassistant/components/androidtv_remote/strings.json

@@ -54,10 +54,5 @@
         }
       }
     }
-  },
-  "exceptions": {
-    "connection_closed": {
-      "message": "Connection to the Android TV device is closed"
-    }
   }
 }

homeassistant/components/anthropic/config_flow.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections.abc import Mapping
 from functools import partial
 import logging
 from types import MappingProxyType
@@ -53,7 +52,7 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
 
 RECOMMENDED_OPTIONS = {
     CONF_RECOMMENDED: True,
-    CONF_LLM_HASS_API: [llm.LLM_API_ASSIST],
+    CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
     CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
 }
 
@@ -135,8 +134,9 @@ class AnthropicOptionsFlow(OptionsFlow):
 
         if user_input is not None:
             if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
-                if not user_input.get(CONF_LLM_HASS_API):
-                    user_input.pop(CONF_LLM_HASS_API, None)
+                if user_input[CONF_LLM_HASS_API] == "none":
+                    user_input.pop(CONF_LLM_HASS_API)
+
                 if user_input.get(
                     CONF_THINKING_BUDGET, RECOMMENDED_THINKING_BUDGET
                 ) >= user_input.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS):
@@ -151,16 +151,12 @@ class AnthropicOptionsFlow(OptionsFlow):
                 options = {
                     CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
                     CONF_PROMPT: user_input[CONF_PROMPT],
-                    CONF_LLM_HASS_API: user_input.get(CONF_LLM_HASS_API),
+                    CONF_LLM_HASS_API: user_input[CONF_LLM_HASS_API],
                 }
 
         suggested_values = options.copy()
         if not suggested_values.get(CONF_PROMPT):
             suggested_values[CONF_PROMPT] = llm.DEFAULT_INSTRUCTIONS_PROMPT
-        if (
-            suggested_llm_apis := suggested_values.get(CONF_LLM_HASS_API)
-        ) and isinstance(suggested_llm_apis, str):
-            suggested_values[CONF_LLM_HASS_API] = [suggested_llm_apis]
 
         schema = self.add_suggested_values_to_schema(
             vol.Schema(anthropic_config_option_schema(self.hass, options)),
@@ -176,22 +172,28 @@ class AnthropicOptionsFlow(OptionsFlow):
 
 def anthropic_config_option_schema(
     hass: HomeAssistant,
-    options: Mapping[str, Any],
+    options: dict[str, Any] | MappingProxyType[str, Any],
 ) -> dict:
     """Return a schema for Anthropic completion options."""
     hass_apis: list[SelectOptionDict] = [
+        SelectOptionDict(
+            label="No control",
+            value="none",
+        )
+    ]
+    hass_apis.extend(
         SelectOptionDict(
             label=api.name,
             value=api.id,
         )
         for api in llm.async_get_apis(hass)
-    ]
+    )
 
     schema = {
         vol.Optional(CONF_PROMPT): TemplateSelector(),
-        vol.Optional(
-            CONF_LLM_HASS_API,
-        ): SelectSelector(SelectSelectorConfig(options=hass_apis, multiple=True)),
+        vol.Optional(CONF_LLM_HASS_API, default="none"): SelectSelector(
+            SelectSelectorConfig(options=hass_apis)
+        ),
         vol.Required(
             CONF_RECOMMENDED, default=options.get(CONF_RECOMMENDED, False)
         ): bool,

homeassistant/components/anthropic/conversation.py

@@ -9,13 +9,11 @@ from anthropic import AsyncStream
 from anthropic._types import NOT_GIVEN
 from anthropic.types import (
     InputJSONDelta,
-    MessageDeltaUsage,
     MessageParam,
     MessageStreamEvent,
     RawContentBlockDeltaEvent,
     RawContentBlockStartEvent,
     RawContentBlockStopEvent,
-    RawMessageDeltaEvent,
     RawMessageStartEvent,
     RawMessageStopEvent,
     RedactedThinkingBlock,
@@ -33,7 +31,6 @@ from anthropic.types import (
     ToolResultBlockParam,
     ToolUseBlock,
     ToolUseBlockParam,
-    Usage,
 )
 from voluptuous_openapi import convert
 
@@ -165,8 +162,7 @@ def _convert_content(
     return messages
 
 
-async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
-    chat_log: conversation.ChatLog,
+async def _transform_stream(
     result: AsyncStream[MessageStreamEvent],
     messages: list[MessageParam],
 ) -> AsyncGenerator[conversation.AssistantContentDeltaDict]:
@@ -211,7 +207,6 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
         | None
     ) = None
     current_tool_args: str
-    input_usage: Usage | None = None
 
     async for response in result:
         LOGGER.debug("Received response: %s", response)
@@ -220,7 +215,6 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
             if response.message.role != "assistant":
                 raise ValueError("Unexpected message role")
             current_message = MessageParam(role=response.message.role, content=[])
-            input_usage = response.message.usage
         elif isinstance(response, RawContentBlockStartEvent):
             if isinstance(response.content_block, ToolUseBlock):
                 current_block = ToolUseBlockParam(
@@ -271,54 +265,32 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
             if current_block is None:
                 raise ValueError("Unexpected stop event without a current block")
             if current_block["type"] == "tool_use":
-                # tool block
-                tool_args = json.loads(current_tool_args) if current_tool_args else {}
-                current_block["input"] = tool_args
+                tool_block = cast(ToolUseBlockParam, current_block)
+                tool_args = json.loads(current_tool_args)
+                tool_block["input"] = tool_args
                 yield {
                     "tool_calls": [
                         llm.ToolInput(
-                            id=current_block["id"],
-                            tool_name=current_block["name"],
+                            id=tool_block["id"],
+                            tool_name=tool_block["name"],
                             tool_args=tool_args,
                         )
                     ]
                 }
             elif current_block["type"] == "thinking":
-                # thinking block
-                LOGGER.debug("Thinking: %s", current_block["thinking"])
+                thinking_block = cast(ThinkingBlockParam, current_block)
+                LOGGER.debug("Thinking: %s", thinking_block["thinking"])
 
             if current_message is None:
                 raise ValueError("Unexpected stop event without a current message")
             current_message["content"].append(current_block)  # type: ignore[union-attr]
             current_block = None
-        elif isinstance(response, RawMessageDeltaEvent):
-            if (usage := response.usage) is not None:
-                chat_log.async_trace(_create_token_stats(input_usage, usage))
         elif isinstance(response, RawMessageStopEvent):
             if current_message is not None:
                 messages.append(current_message)
                 current_message = None
 
 
-def _create_token_stats(
-    input_usage: Usage | None, response_usage: MessageDeltaUsage
-) -> dict[str, Any]:
-    """Create token stats for conversation agent tracing."""
-    input_tokens = 0
-    cached_input_tokens = 0
-    if input_usage:
-        input_tokens = input_usage.input_tokens
-        cached_input_tokens = input_usage.cache_creation_input_tokens or 0
-    output_tokens = response_usage.output_tokens
-    return {
-        "stats": {
-            "input_tokens": input_tokens,
-            "cached_input_tokens": cached_input_tokens,
-            "output_tokens": output_tokens,
-        }
-    }
-
-
 class AnthropicConversationEntity(
     conversation.ConversationEntity, conversation.AbstractConversationAgent
 ):
@@ -421,8 +393,7 @@ class AnthropicConversationEntity(
                     [
                         content
                         async for content in chat_log.async_add_delta_content_stream(
-                            user_input.agent_id,
-                            _transform_stream(chat_log, stream, messages),
+                            user_input.agent_id, _transform_stream(stream, messages)
                         )
                         if not isinstance(content, conversation.AssistantContent)
                     ]

homeassistant/components/apcupsd/binary_sensor.py

@@ -53,8 +53,10 @@ class OnlineStatus(CoordinatorEntity[APCUPSdCoordinator], BinarySensorEntity):
         """Initialize the APCUPSd binary device."""
         super().__init__(coordinator, context=description.key.upper())
 
+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
         self._attr_device_info = coordinator.device_info
 
     @property

homeassistant/components/apcupsd/coordinator.py

@@ -85,16 +85,11 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
         self._host = host
         self._port = port
 
-    @property
-    def unique_device_id(self) -> str:
-        """Return a unique ID of the device, which is the serial number (if available) or the config entry ID."""
-        return self.data.serial_no or self.config_entry.entry_id
-
     @property
     def device_info(self) -> DeviceInfo:
         """Return the DeviceInfo of this APC UPS, if serial number is available."""
         return DeviceInfo(
-            identifiers={(DOMAIN, self.unique_device_id)},
+            identifiers={(DOMAIN, self.data.serial_no or self.config_entry.entry_id)},
             model=self.data.model,
             manufacturer="APC",
             name=self.data.name or "APC UPS",
@@ -113,7 +108,4 @@ class APCUPSdCoordinator(DataUpdateCoordinator[APCUPSdData]):
                 data = await aioapcaccess.request_status(self._host, self._port)
                 return APCUPSdData(data)
             except (OSError, asyncio.IncompleteReadError) as error:
-                raise UpdateFailed(
-                    translation_domain=DOMAIN,
-                    translation_key="cannot_connect",
-                ) from error
+                raise UpdateFailed(error) from error

homeassistant/components/apcupsd/sensor.py

@@ -458,8 +458,11 @@ class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
         """Initialize the sensor."""
         super().__init__(coordinator=coordinator, context=description.key.upper())
 
+        # Set up unique id and device info if serial number is available.
+        if (serial_no := coordinator.data.serial_no) is not None:
+            self._attr_unique_id = f"{serial_no}_{description.key}"
+
         self.entity_description = description
-        self._attr_unique_id = f"{coordinator.unique_device_id}_{description.key}"
         self._attr_device_info = coordinator.device_info
 
         # Initial update of attributes.

homeassistant/components/apcupsd/strings.json

@@ -93,7 +93,7 @@
         "name": "Internal temperature"
       },
       "last_self_test": {
-        "name": "Last self-test"
+        "name": "Last self test"
       },
       "last_transfer": {
         "name": "Last transfer"
@@ -177,7 +177,7 @@
         "name": "Restore requirement"
       },
       "self_test_result": {
-        "name": "Self-test result"
+        "name": "Self test result"
       },
       "sensitivity": {
         "name": "Sensitivity"
@@ -195,7 +195,7 @@
         "name": "Status"
       },
       "self_test_interval": {
-        "name": "Self-test interval"
+        "name": "Self test interval"
       },
       "time_left": {
         "name": "Time left"
@@ -219,10 +219,5 @@
         "name": "Transfer to battery"
       }
     }
-  },
-  "exceptions": {
-    "cannot_connect": {
-      "message": "Cannot connect to APC UPS Daemon."
-    }
   }
 }

homeassistant/components/apple_tv/config_flow.py

@@ -20,7 +20,6 @@ import voluptuous as vol
 from homeassistant.components import zeroconf
 from homeassistant.config_entries import (
     SOURCE_IGNORE,
-    SOURCE_REAUTH,
     SOURCE_ZEROCONF,
     ConfigEntry,
     ConfigFlow,
@@ -382,9 +381,7 @@ class AppleTVConfigFlow(ConfigFlow, domain=DOMAIN):
                         CONF_IDENTIFIERS: list(combined_identifiers),
                     },
                 )
-                # Don't reload ignored entries or in the middle of reauth,
-                # e.g. if the user is entering a new PIN
-                if entry.source != SOURCE_IGNORE and self.source != SOURCE_REAUTH:
+                if entry.source != SOURCE_IGNORE:
                     self.hass.config_entries.async_schedule_reload(entry.entry_id)
             if not allow_exist:
                 raise DeviceAlreadyConfigured

homeassistant/components/apple_tv/media_player.py

@@ -120,7 +120,6 @@ class AppleTvMediaPlayer(
         """Initialize the Apple TV media player."""
         super().__init__(name, identifier, manager)
         self._playing: Playing | None = None
-        self._playing_last_updated: datetime | None = None
         self._app_list: dict[str, str] = {}
 
     @callback
@@ -210,7 +209,6 @@ class AppleTvMediaPlayer(
         This is a callback function from pyatv.interface.PushListener.
         """
         self._playing = playstatus
-        self._playing_last_updated = dt_util.utcnow()
         self.async_write_ha_state()
 
     @callback
@@ -318,7 +316,7 @@ class AppleTvMediaPlayer(
     def media_position_updated_at(self) -> datetime | None:
         """Last valid time of media position."""
         if self.state in {MediaPlayerState.PLAYING, MediaPlayerState.PAUSED}:
-            return self._playing_last_updated
+            return dt_util.utcnow()
         return None
 
     async def async_play_media(

homeassistant/components/apsystems/coordinator.py

@@ -43,7 +43,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
 
     config_entry: ApSystemsConfigEntry
     device_version: str
-    battery_system: bool
 
     def __init__(
         self,
@@ -69,7 +68,6 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
         self.api.max_power = device_info.maxPower
         self.api.min_power = device_info.minPower
         self.device_version = device_info.devVer
-        self.battery_system = device_info.isBatterySystem
 
     async def _async_update_data(self) -> ApSystemsSensorData:
         try:

homeassistant/components/apsystems/manifest.json

@@ -6,6 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/apsystems",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "loggers": ["APsystemsEZ1"],
-  "requirements": ["apsystems-ez1==2.6.0"]
+  "requirements": ["apsystems-ez1==2.4.0"]
 }

homeassistant/components/apsystems/strings.json

@@ -21,7 +21,7 @@
   "entity": {
     "binary_sensor": {
       "off_grid_status": {
-        "name": "Off-grid status"
+        "name": "Off grid status"
       },
       "dc_1_short_circuit_error_status": {
         "name": "DC 1 short circuit error status"

homeassistant/components/apsystems/switch.py

@@ -36,8 +36,6 @@ class ApSystemsInverterSwitch(ApSystemsEntity, SwitchEntity):
         super().__init__(data)
         self._api = data.coordinator.api
         self._attr_unique_id = f"{data.device_id}_inverter_status"
-        if data.coordinator.battery_system:
-            self._attr_available = False
 
     async def async_update(self) -> None:
         """Update switch status and availability."""

homeassistant/components/aquacell/strings.json

@@ -36,9 +36,9 @@
       "wi_fi_strength": {
         "name": "Wi-Fi strength",
         "state": {
-          "low": "[%key:common::state::low%]",
-          "medium": "[%key:common::state::medium%]",
-          "high": "[%key:common::state::high%]"
+          "low": "Low",
+          "medium": "Medium",
+          "high": "High"
         }
       }
     }

homeassistant/components/aranet/strings.json

@@ -26,7 +26,7 @@
     "sensor": {
       "threshold": {
         "state": {
-          "error": "[%key:common::state::error%]",
+          "error": "Error",
           "green": "Green",
           "yellow": "Yellow",
           "red": "Red"

homeassistant/components/assist_satellite/__init__.py

@@ -1,11 +1,9 @@
 """Base class for assist satellite entities."""
 
 import logging
-from pathlib import Path
 
 import voluptuous as vol
 
-from homeassistant.components.http import StaticPathConfig
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
@@ -17,8 +15,6 @@ from .const import (
     CONNECTION_TEST_DATA,
     DATA_COMPONENT,
     DOMAIN,
-    PREANNOUNCE_FILENAME,
-    PREANNOUNCE_URL,
     AssistSatelliteEntityFeature,
 )
 from .entity import (
@@ -60,7 +56,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("message"): str,
                     vol.Optional("media_id"): str,
-                    vol.Optional("preannounce"): bool,
                     vol.Optional("preannounce_media_id"): str,
                 }
             ),
@@ -76,7 +71,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
                 {
                     vol.Optional("start_message"): str,
                     vol.Optional("start_media_id"): str,
-                    vol.Optional("preannounce"): bool,
                     vol.Optional("preannounce_media_id"): str,
                     vol.Optional("extra_system_prompt"): str,
                 }
@@ -90,15 +84,6 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     async_register_websocket_api(hass)
     hass.http.register_view(ConnectionTestView())
 
-    # Default preannounce sound
-    await hass.http.async_register_static_paths(
-        [
-            StaticPathConfig(
-                PREANNOUNCE_URL, str(Path(__file__).parent / PREANNOUNCE_FILENAME)
-            )
-        ]
-    )
-
     return True
 
 

homeassistant/components/assist_satellite/const.py

@@ -20,9 +20,6 @@ CONNECTION_TEST_DATA: HassKey[dict[str, asyncio.Event]] = HassKey(
     f"{DOMAIN}_connection_tests"
 )
 
-PREANNOUNCE_FILENAME = "preannounce.mp3"
-PREANNOUNCE_URL = f"/api/assist_satellite/static/{PREANNOUNCE_FILENAME}"
-
 
 class AssistSatelliteEntityFeature(IntFlag):
     """Supported features of Assist satellite entity."""

homeassistant/components/assist_satellite/entity.py

@@ -28,7 +28,7 @@ from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import chat_session, entity
 from homeassistant.helpers.entity import EntityDescription
 
-from .const import PREANNOUNCE_URL, AssistSatelliteEntityFeature
+from .const import AssistSatelliteEntityFeature
 from .errors import AssistSatelliteError, SatelliteBusyError
 
 _LOGGER = logging.getLogger(__name__)
@@ -180,8 +180,7 @@ class AssistSatelliteEntity(entity.Entity):
         self,
         message: str | None = None,
         media_id: str | None = None,
-        preannounce: bool = True,
-        preannounce_media_id: str = PREANNOUNCE_URL,
+        preannounce_media_id: str | None = None,
     ) -> None:
         """Play and show an announcement on the satellite.
 
@@ -191,8 +190,7 @@ class AssistSatelliteEntity(entity.Entity):
         If media_id is provided, it is played directly. It is possible
         to omit the message and the satellite will not show any text.
 
-        If preannounce is True, a sound is played before the announcement.
-        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is provided, it is played before the announcement.
 
         Calls async_announce with message and media id.
         """
@@ -202,9 +200,7 @@ class AssistSatelliteEntity(entity.Entity):
             message = ""
 
         announcement = await self._resolve_announcement_media_id(
-            message,
-            media_id,
-            preannounce_media_id=preannounce_media_id if preannounce else None,
+            message, media_id, preannounce_media_id
         )
 
         if self._is_announcing:
@@ -232,8 +228,7 @@ class AssistSatelliteEntity(entity.Entity):
         start_message: str | None = None,
         start_media_id: str | None = None,
         extra_system_prompt: str | None = None,
-        preannounce: bool = True,
-        preannounce_media_id: str = PREANNOUNCE_URL,
+        preannounce_media_id: str | None = None,
     ) -> None:
         """Start a conversation from the satellite.
 
@@ -243,8 +238,7 @@ class AssistSatelliteEntity(entity.Entity):
         If start_media_id is provided, it is played directly. It is possible
         to omit the message and the satellite will not show any text.
 
-        If preannounce is True, a sound is played before the start message or media.
-        If preannounce_media_id is provided, it overrides the default sound.
+        If preannounce_media_id is provided, it is played before the announcement.
 
         Calls async_start_conversation.
         """
@@ -261,9 +255,7 @@ class AssistSatelliteEntity(entity.Entity):
             start_message = ""
 
         announcement = await self._resolve_announcement_media_id(
-            start_message,
-            start_media_id,
-            preannounce_media_id=preannounce_media_id if preannounce else None,
+            start_message, start_media_id, preannounce_media_id
         )
 
         if self._is_announcing:

homeassistant/components/assist_satellite/services.yaml

@@ -8,18 +8,12 @@ announce:
     message:
       required: false
       example: "Time to wake up!"
-      default: ""
       selector:
         text:
     media_id:
       required: false
       selector:
         text:
-    preannounce:
-      required: false
-      default: true
-      selector:
-        boolean:
     preannounce_media_id:
       required: false
       selector:
@@ -34,7 +28,6 @@ start_conversation:
     start_message:
       required: false
       example: "You left the lights on in the living room. Turn them off?"
-      default: ""
       selector:
         text:
     start_media_id:
@@ -45,11 +38,6 @@ start_conversation:
       required: false
       selector:
         text:
-    preannounce:
-      required: false
-      default: true
-      selector:
-        boolean:
     preannounce_media_id:
       required: false
       selector:

homeassistant/components/assist_satellite/strings.json

@@ -24,13 +24,9 @@
           "name": "Media ID",
           "description": "The media ID to announce instead of using text-to-speech."
         },
-        "preannounce": {
-          "name": "Preannounce",
-          "description": "Play a sound before the announcement."
-        },
         "preannounce_media_id": {
-          "name": "Preannounce media ID",
-          "description": "Custom media ID to play before the announcement."
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the announcement."
         }
       }
     },
@@ -50,13 +46,9 @@
           "name": "Extra system prompt",
           "description": "Provide background information to the AI about the request."
         },
-        "preannounce": {
-          "name": "Preannounce",
-          "description": "Play a sound before the start message or media."
-        },
         "preannounce_media_id": {
-          "name": "Preannounce media ID",
-          "description": "Custom media ID to play before the start message or media."
+          "name": "Preannounce Media ID",
+          "description": "The media ID to play before the start message or media."
         }
       }
     }

homeassistant/components/assist_satellite/websocket_api.py

@@ -198,8 +198,7 @@ async def websocket_test_connection(
 
     hass.async_create_background_task(
         satellite.async_internal_announce(
-            media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}",
-            preannounce=False,
+            media_id=f"{CONNECTION_TEST_URL_BASE}/{connection_id}"
         ),
         f"assist_satellite_connection_test_{msg['entity_id']}",
     )

homeassistant/components/asuswrt/router.py

@@ -2,9 +2,10 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable, Mapping
+from collections.abc import Callable
 from datetime import datetime, timedelta
 import logging
+from types import MappingProxyType
 from typing import Any
 
 from pyasuswrt import AsusWrtError
@@ -362,7 +363,7 @@ class AsusWrtRouter:
         """Add a function to call when router is closed."""
         self._on_close.append(func)
 
-    def update_options(self, new_options: Mapping[str, Any]) -> bool:
+    def update_options(self, new_options: MappingProxyType[str, Any]) -> bool:
         """Update router options."""
         req_reload = False
         for name, new_opt in new_options.items():

homeassistant/components/august/manifest.json

@@ -28,5 +28,5 @@
   "documentation": "https://www.home-assistant.io/integrations/august",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
-  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.6.0"]
+  "requirements": ["yalexs==8.10.0", "yalexs-ble==2.5.7"]
 }

homeassistant/components/august/strings.json

@@ -18,7 +18,7 @@
     },
     "step": {
       "validation": {
-        "title": "Two-factor authentication",
+        "title": "Two factor authentication",
         "data": {
           "verification_code": "Verification code"
         },

homeassistant/components/aurora_abb_powerone/strings.json

@@ -4,8 +4,8 @@
       "user": {
         "description": "The inverter must be connected via an RS485 adaptor, please select serial port and the inverter's address as configured on the LCD panel",
         "data": {
-          "port": "RS485 or USB-RS485 adaptor port",
-          "address": "Inverter address"
+          "port": "RS485 or USB-RS485 Adaptor Port",
+          "address": "Inverter Address"
         }
       }
     },
@@ -16,7 +16,7 @@
     },
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "no_serial_ports": "No com ports found. The integration needs a valid RS485 device to communicate."
+      "no_serial_ports": "No com ports found.  Need a valid RS485 device to communicate."
     }
   },
   "entity": {

homeassistant/components/auth/strings.json

@@ -5,7 +5,7 @@
       "step": {
         "init": {
           "title": "Set up two-factor authentication using TOTP",
-          "description": "To activate two-factor authentication using time-based one-time passwords, scan the QR code with your authentication app. If you don't have one, we recommend either [Google Authenticator](https://support.google.com/accounts/answer/1066447) or [Authy](https://authy.com/).\n\n{qr_code}\n\nAfter scanning the code, enter the six-digit code from your app to verify the setup. If you have problems scanning the QR code, do a manual setup with code **`{code}`**."
+          "description": "To activate two factor authentication using time-based one-time passwords, scan the QR code with your authentication app. If you don't have one, we recommend either [Google Authenticator](https://support.google.com/accounts/answer/1066447) or [Authy](https://authy.com/).\n\n{qr_code}\n\nAfter scanning the code, enter the six digit code from your app to verify the setup. If you have problems scanning the QR code, do a manual setup with code **`{code}`**."
         }
       },
       "error": {
@@ -13,7 +13,7 @@
       }
     },
     "notify": {
-      "title": "Notify one-time password",
+      "title": "Notify One-Time Password",
       "step": {
         "init": {
           "title": "Set up one-time password delivered by notify component",

homeassistant/components/automation/__init__.py

@@ -18,7 +18,6 @@ from homeassistant.const import (
     ATTR_ENTITY_ID,
     ATTR_MODE,
     ATTR_NAME,
-    CONF_ACTIONS,
     CONF_ALIAS,
     CONF_CONDITIONS,
     CONF_DEVICE_ID,
@@ -28,7 +27,6 @@ from homeassistant.const import (
     CONF_MODE,
     CONF_PATH,
     CONF_PLATFORM,
-    CONF_TRIGGERS,
     CONF_VARIABLES,
     CONF_ZONE,
     EVENT_HOMEASSISTANT_STARTED,
@@ -88,9 +86,11 @@ from homeassistant.util.hass_dict import HassKey
 
 from .config import AutomationConfig, ValidationStatus
 from .const import (
+    CONF_ACTIONS,
     CONF_INITIAL_STATE,
     CONF_TRACE,
     CONF_TRIGGER_VARIABLES,
+    CONF_TRIGGERS,
     DEFAULT_INITIAL_STATE,
     DOMAIN,
     LOGGER,

homeassistant/components/automation/config.py

@@ -14,15 +14,11 @@ from homeassistant.components import blueprint
 from homeassistant.components.trace import TRACE_CONFIG_SCHEMA
 from homeassistant.config import config_per_platform, config_without_domain
 from homeassistant.const import (
-    CONF_ACTION,
-    CONF_ACTIONS,
     CONF_ALIAS,
     CONF_CONDITION,
     CONF_CONDITIONS,
     CONF_DESCRIPTION,
     CONF_ID,
-    CONF_TRIGGER,
-    CONF_TRIGGERS,
     CONF_VARIABLES,
 )
 from homeassistant.core import HomeAssistant
@@ -34,10 +30,14 @@ from homeassistant.helpers.typing import ConfigType
 from homeassistant.util.yaml.input import UndefinedSubstitution
 
 from .const import (
+    CONF_ACTION,
+    CONF_ACTIONS,
     CONF_HIDE_ENTITY,
     CONF_INITIAL_STATE,
     CONF_TRACE,
+    CONF_TRIGGER,
     CONF_TRIGGER_VARIABLES,
+    CONF_TRIGGERS,
     DOMAIN,
     LOGGER,
 )
@@ -58,9 +58,34 @@ _MINIMAL_PLATFORM_SCHEMA = vol.Schema(
 def _backward_compat_schema(value: Any | None) -> Any:
     """Backward compatibility for automations."""
 
-    value = cv.renamed(CONF_TRIGGER, CONF_TRIGGERS)(value)
-    value = cv.renamed(CONF_ACTION, CONF_ACTIONS)(value)
-    return cv.renamed(CONF_CONDITION, CONF_CONDITIONS)(value)
+    if not isinstance(value, dict):
+        return value
+
+    # `trigger` has been renamed to `triggers`
+    if CONF_TRIGGER in value:
+        if CONF_TRIGGERS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'trigger' and 'triggers'. Please use 'triggers' only."
+            )
+        value[CONF_TRIGGERS] = value.pop(CONF_TRIGGER)
+
+    # `condition` has been renamed to `conditions`
+    if CONF_CONDITION in value:
+        if CONF_CONDITIONS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'condition' and 'conditions'. Please use 'conditions' only."
+            )
+        value[CONF_CONDITIONS] = value.pop(CONF_CONDITION)
+
+    # `action` has been renamed to `actions`
+    if CONF_ACTION in value:
+        if CONF_ACTIONS in value:
+            raise vol.Invalid(
+                "Cannot specify both 'action' and 'actions'. Please use 'actions' only."
+            )
+        value[CONF_ACTIONS] = value.pop(CONF_ACTION)
+
+    return value
 
 
 PLATFORM_SCHEMA = vol.All(

homeassistant/components/automation/const.py

@@ -2,6 +2,10 @@
 
 import logging
 
+CONF_ACTION = "action"
+CONF_ACTIONS = "actions"
+CONF_TRIGGER = "trigger"
+CONF_TRIGGERS = "triggers"
 CONF_TRIGGER_VARIABLES = "trigger_variables"
 DOMAIN = "automation"
 

homeassistant/components/aws/manifest.json

@@ -6,5 +6,5 @@
   "iot_class": "cloud_push",
   "loggers": ["aiobotocore", "botocore"],
   "quality_scale": "legacy",
-  "requirements": ["aiobotocore==2.21.1", "botocore==1.37.1"]
+  "requirements": ["aiobotocore==2.13.1", "botocore==1.34.131"]
 }

homeassistant/components/aws_s3/__init__.py

@@ -1,82 +0,0 @@
-"""The AWS S3 integration."""
-
-from __future__ import annotations
-
-import logging
-from typing import cast
-
-from aiobotocore.client import AioBaseClient as S3Client
-from aiobotocore.session import AioSession
-from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady
-
-from .const import (
-    CONF_ACCESS_KEY_ID,
-    CONF_BUCKET,
-    CONF_ENDPOINT_URL,
-    CONF_SECRET_ACCESS_KEY,
-    DATA_BACKUP_AGENT_LISTENERS,
-    DOMAIN,
-)
-
-type S3ConfigEntry = ConfigEntry[S3Client]
-
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
-    """Set up S3 from a config entry."""
-
-    data = cast(dict, entry.data)
-    try:
-        session = AioSession()
-        # pylint: disable-next=unnecessary-dunder-call
-        client = await session.create_client(
-            "s3",
-            endpoint_url=data.get(CONF_ENDPOINT_URL),
-            aws_secret_access_key=data[CONF_SECRET_ACCESS_KEY],
-            aws_access_key_id=data[CONF_ACCESS_KEY_ID],
-        ).__aenter__()
-        await client.head_bucket(Bucket=data[CONF_BUCKET])
-    except ClientError as err:
-        raise ConfigEntryError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_credentials",
-        ) from err
-    except ParamValidationError as err:
-        if "Invalid bucket name" in str(err):
-            raise ConfigEntryError(
-                translation_domain=DOMAIN,
-                translation_key="invalid_bucket_name",
-            ) from err
-    except ValueError as err:
-        raise ConfigEntryError(
-            translation_domain=DOMAIN,
-            translation_key="invalid_endpoint_url",
-        ) from err
-    except ConnectionError as err:
-        raise ConfigEntryNotReady(
-            translation_domain=DOMAIN,
-            translation_key="cannot_connect",
-        ) from err
-
-    entry.runtime_data = client
-
-    def notify_backup_listeners() -> None:
-        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
-            listener()
-
-    entry.async_on_unload(entry.async_on_state_change(notify_backup_listeners))
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
-    """Unload a config entry."""
-    client = entry.runtime_data
-    await client.__aexit__(None, None, None)
-    return True

homeassistant/components/aws_s3/backup.py

@@ -1,330 +0,0 @@
-"""Backup platform for the AWS S3 integration."""
-
-from collections.abc import AsyncIterator, Callable, Coroutine
-import functools
-import json
-import logging
-from time import time
-from typing import Any
-
-from botocore.exceptions import BotoCoreError
-
-from homeassistant.components.backup import (
-    AgentBackup,
-    BackupAgent,
-    BackupAgentError,
-    BackupNotFound,
-    suggested_filename,
-)
-from homeassistant.core import HomeAssistant, callback
-
-from . import S3ConfigEntry
-from .const import CONF_BUCKET, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-
-_LOGGER = logging.getLogger(__name__)
-CACHE_TTL = 300
-
-# S3 part size requirements: 5 MiB to 5 GiB per part
-# https://docs.aws.amazon.com/AmazonS3/latest/userguide/qfacts.html
-# We set the threshold to 20 MiB to avoid too many parts.
-# Note that each part is allocated in the memory.
-MULTIPART_MIN_PART_SIZE_BYTES = 20 * 2**20
-
-
-def handle_boto_errors[T](
-    func: Callable[..., Coroutine[Any, Any, T]],
-) -> Callable[..., Coroutine[Any, Any, T]]:
-    """Handle BotoCoreError exceptions by converting them to BackupAgentError."""
-
-    @functools.wraps(func)
-    async def wrapper(*args: Any, **kwargs: Any) -> T:
-        """Catch BotoCoreError and raise BackupAgentError."""
-        try:
-            return await func(*args, **kwargs)
-        except BotoCoreError as err:
-            error_msg = f"Failed during {func.__name__}"
-            raise BackupAgentError(error_msg) from err
-
-    return wrapper
-
-
-async def async_get_backup_agents(
-    hass: HomeAssistant,
-) -> list[BackupAgent]:
-    """Return a list of backup agents."""
-    entries: list[S3ConfigEntry] = hass.config_entries.async_loaded_entries(DOMAIN)
-    return [S3BackupAgent(hass, entry) for entry in entries]
-
-
-@callback
-def async_register_backup_agents_listener(
-    hass: HomeAssistant,
-    *,
-    listener: Callable[[], None],
-    **kwargs: Any,
-) -> Callable[[], None]:
-    """Register a listener to be called when agents are added or removed.
-
-    :return: A function to unregister the listener.
-    """
-    hass.data.setdefault(DATA_BACKUP_AGENT_LISTENERS, []).append(listener)
-
-    @callback
-    def remove_listener() -> None:
-        """Remove the listener."""
-        hass.data[DATA_BACKUP_AGENT_LISTENERS].remove(listener)
-        if not hass.data[DATA_BACKUP_AGENT_LISTENERS]:
-            del hass.data[DATA_BACKUP_AGENT_LISTENERS]
-
-    return remove_listener
-
-
-def suggested_filenames(backup: AgentBackup) -> tuple[str, str]:
-    """Return the suggested filenames for the backup and metadata files."""
-    base_name = suggested_filename(backup).rsplit(".", 1)[0]
-    return f"{base_name}.tar", f"{base_name}.metadata.json"
-
-
-class S3BackupAgent(BackupAgent):
-    """Backup agent for the S3 integration."""
-
-    domain = DOMAIN
-
-    def __init__(self, hass: HomeAssistant, entry: S3ConfigEntry) -> None:
-        """Initialize the S3 agent."""
-        super().__init__()
-        self._client = entry.runtime_data
-        self._bucket: str = entry.data[CONF_BUCKET]
-        self.name = entry.title
-        self.unique_id = entry.entry_id
-        self._backup_cache: dict[str, AgentBackup] = {}
-        self._cache_expiration = time()
-
-    @handle_boto_errors
-    async def async_download_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AsyncIterator[bytes]:
-        """Download a backup file.
-
-        :param backup_id: The ID of the backup that was returned in async_list_backups.
-        :return: An async iterator that yields bytes.
-        """
-        backup = await self._find_backup_by_id(backup_id)
-        tar_filename, _ = suggested_filenames(backup)
-
-        response = await self._client.get_object(Bucket=self._bucket, Key=tar_filename)
-        return response["Body"].iter_chunks()
-
-    async def async_upload_backup(
-        self,
-        *,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-        backup: AgentBackup,
-        **kwargs: Any,
-    ) -> None:
-        """Upload a backup.
-
-        :param open_stream: A function returning an async iterator that yields bytes.
-        :param backup: Metadata about the backup that should be uploaded.
-        """
-        tar_filename, metadata_filename = suggested_filenames(backup)
-
-        try:
-            if backup.size < MULTIPART_MIN_PART_SIZE_BYTES:
-                await self._upload_simple(tar_filename, open_stream)
-            else:
-                await self._upload_multipart(tar_filename, open_stream)
-
-            # Upload the metadata file
-            metadata_content = json.dumps(backup.as_dict())
-            await self._client.put_object(
-                Bucket=self._bucket,
-                Key=metadata_filename,
-                Body=metadata_content,
-            )
-        except BotoCoreError as err:
-            raise BackupAgentError("Failed to upload backup") from err
-        else:
-            # Reset cache after successful upload
-            self._cache_expiration = time()
-
-    async def _upload_simple(
-        self,
-        tar_filename: str,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ) -> None:
-        """Upload a small file using simple upload.
-
-        :param tar_filename: The target filename for the backup.
-        :param open_stream: A function returning an async iterator that yields bytes.
-        """
-        _LOGGER.debug("Starting simple upload for %s", tar_filename)
-        stream = await open_stream()
-        file_data = bytearray()
-        async for chunk in stream:
-            file_data.extend(chunk)
-
-        await self._client.put_object(
-            Bucket=self._bucket,
-            Key=tar_filename,
-            Body=bytes(file_data),
-        )
-
-    async def _upload_multipart(
-        self,
-        tar_filename: str,
-        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
-    ):
-        """Upload a large file using multipart upload.
-
-        :param tar_filename: The target filename for the backup.
-        :param open_stream: A function returning an async iterator that yields bytes.
-        """
-        _LOGGER.debug("Starting multipart upload for %s", tar_filename)
-        multipart_upload = await self._client.create_multipart_upload(
-            Bucket=self._bucket,
-            Key=tar_filename,
-        )
-        upload_id = multipart_upload["UploadId"]
-        try:
-            parts = []
-            part_number = 1
-            buffer_size = 0  # bytes
-            buffer: list[bytes] = []
-
-            stream = await open_stream()
-            async for chunk in stream:
-                buffer_size += len(chunk)
-                buffer.append(chunk)
-
-                # If buffer size meets minimum part size, upload it as a part
-                if buffer_size >= MULTIPART_MIN_PART_SIZE_BYTES:
-                    _LOGGER.debug(
-                        "Uploading part number %d, size %d", part_number, buffer_size
-                    )
-                    part = await self._client.upload_part(
-                        Bucket=self._bucket,
-                        Key=tar_filename,
-                        PartNumber=part_number,
-                        UploadId=upload_id,
-                        Body=b"".join(buffer),
-                    )
-                    parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-                    part_number += 1
-                    buffer_size = 0
-                    buffer = []
-
-            # Upload the final buffer as the last part (no minimum size requirement)
-            if buffer:
-                _LOGGER.debug(
-                    "Uploading final part number %d, size %d", part_number, buffer_size
-                )
-                part = await self._client.upload_part(
-                    Bucket=self._bucket,
-                    Key=tar_filename,
-                    PartNumber=part_number,
-                    UploadId=upload_id,
-                    Body=b"".join(buffer),
-                )
-                parts.append({"PartNumber": part_number, "ETag": part["ETag"]})
-
-            await self._client.complete_multipart_upload(
-                Bucket=self._bucket,
-                Key=tar_filename,
-                UploadId=upload_id,
-                MultipartUpload={"Parts": parts},
-            )
-
-        except BotoCoreError:
-            try:
-                await self._client.abort_multipart_upload(
-                    Bucket=self._bucket,
-                    Key=tar_filename,
-                    UploadId=upload_id,
-                )
-            except BotoCoreError:
-                _LOGGER.exception("Failed to abort multipart upload")
-            raise
-
-    @handle_boto_errors
-    async def async_delete_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> None:
-        """Delete a backup file.
-
-        :param backup_id: The ID of the backup that was returned in async_list_backups.
-        """
-        backup = await self._find_backup_by_id(backup_id)
-        tar_filename, metadata_filename = suggested_filenames(backup)
-
-        # Delete both the backup file and its metadata file
-        await self._client.delete_object(Bucket=self._bucket, Key=tar_filename)
-        await self._client.delete_object(Bucket=self._bucket, Key=metadata_filename)
-
-        # Reset cache after successful deletion
-        self._cache_expiration = time()
-
-    @handle_boto_errors
-    async def async_list_backups(self, **kwargs: Any) -> list[AgentBackup]:
-        """List backups."""
-        backups = await self._list_backups()
-        return list(backups.values())
-
-    @handle_boto_errors
-    async def async_get_backup(
-        self,
-        backup_id: str,
-        **kwargs: Any,
-    ) -> AgentBackup:
-        """Return a backup."""
-        return await self._find_backup_by_id(backup_id)
-
-    async def _find_backup_by_id(self, backup_id: str) -> AgentBackup:
-        """Find a backup by its backup ID."""
-        backups = await self._list_backups()
-        if backup := backups.get(backup_id):
-            return backup
-
-        raise BackupNotFound(f"Backup {backup_id} not found")
-
-    async def _list_backups(self) -> dict[str, AgentBackup]:
-        """List backups, using a cache if possible."""
-        if time() <= self._cache_expiration:
-            return self._backup_cache
-
-        backups = {}
-        response = await self._client.list_objects_v2(Bucket=self._bucket)
-
-        # Filter for metadata files only
-        metadata_files = [
-            obj
-            for obj in response.get("Contents", [])
-            if obj["Key"].endswith(".metadata.json")
-        ]
-
-        for metadata_file in metadata_files:
-            try:
-                # Download and parse metadata file
-                metadata_response = await self._client.get_object(
-                    Bucket=self._bucket, Key=metadata_file["Key"]
-                )
-                metadata_content = await metadata_response["Body"].read()
-                metadata_json = json.loads(metadata_content)
-            except (BotoCoreError, json.JSONDecodeError) as err:
-                _LOGGER.warning(
-                    "Failed to process metadata file %s: %s",
-                    metadata_file["Key"],
-                    err,
-                )
-                continue
-            backup = AgentBackup.from_dict(metadata_json)
-            backups[backup.backup_id] = backup
-
-        self._backup_cache = backups
-        self._cache_expiration = time() + CACHE_TTL
-
-        return self._backup_cache

homeassistant/components/aws_s3/config_flow.py

@@ -1,101 +0,0 @@
-"""Config flow for the AWS S3 integration."""
-
-from __future__ import annotations
-
-from typing import Any
-from urllib.parse import urlparse
-
-from aiobotocore.session import AioSession
-from botocore.exceptions import ClientError, ConnectionError, ParamValidationError
-import voluptuous as vol
-
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.selector import (
-    TextSelector,
-    TextSelectorConfig,
-    TextSelectorType,
-)
-
-from .const import (
-    AWS_DOMAIN,
-    CONF_ACCESS_KEY_ID,
-    CONF_BUCKET,
-    CONF_ENDPOINT_URL,
-    CONF_SECRET_ACCESS_KEY,
-    DEFAULT_ENDPOINT_URL,
-    DESCRIPTION_AWS_S3_DOCS_URL,
-    DESCRIPTION_BOTO3_DOCS_URL,
-    DOMAIN,
-)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_ACCESS_KEY_ID): cv.string,
-        vol.Required(CONF_SECRET_ACCESS_KEY): TextSelector(
-            config=TextSelectorConfig(type=TextSelectorType.PASSWORD)
-        ),
-        vol.Required(CONF_BUCKET): cv.string,
-        vol.Required(CONF_ENDPOINT_URL, default=DEFAULT_ENDPOINT_URL): TextSelector(
-            config=TextSelectorConfig(type=TextSelectorType.URL)
-        ),
-    }
-)
-
-
-class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow."""
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle a flow initiated by the user."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            self._async_abort_entries_match(
-                {
-                    CONF_BUCKET: user_input[CONF_BUCKET],
-                    CONF_ENDPOINT_URL: user_input[CONF_ENDPOINT_URL],
-                }
-            )
-
-            if not urlparse(user_input[CONF_ENDPOINT_URL]).hostname.endswith(
-                AWS_DOMAIN
-            ):
-                errors[CONF_ENDPOINT_URL] = "invalid_endpoint_url"
-            else:
-                try:
-                    session = AioSession()
-                    async with session.create_client(
-                        "s3",
-                        endpoint_url=user_input.get(CONF_ENDPOINT_URL),
-                        aws_secret_access_key=user_input[CONF_SECRET_ACCESS_KEY],
-                        aws_access_key_id=user_input[CONF_ACCESS_KEY_ID],
-                    ) as client:
-                        await client.head_bucket(Bucket=user_input[CONF_BUCKET])
-                except ClientError:
-                    errors["base"] = "invalid_credentials"
-                except ParamValidationError as err:
-                    if "Invalid bucket name" in str(err):
-                        errors[CONF_BUCKET] = "invalid_bucket_name"
-                except ValueError:
-                    errors[CONF_ENDPOINT_URL] = "invalid_endpoint_url"
-                except ConnectionError:
-                    errors[CONF_ENDPOINT_URL] = "cannot_connect"
-                else:
-                    return self.async_create_entry(
-                        title=user_input[CONF_BUCKET], data=user_input
-                    )
-
-        return self.async_show_form(
-            step_id="user",
-            data_schema=self.add_suggested_values_to_schema(
-                STEP_USER_DATA_SCHEMA, user_input
-            ),
-            errors=errors,
-            description_placeholders={
-                "aws_s3_docs_url": DESCRIPTION_AWS_S3_DOCS_URL,
-                "boto3_docs_url": DESCRIPTION_BOTO3_DOCS_URL,
-            },
-        )

homeassistant/components/aws_s3/const.py

@@ -1,23 +0,0 @@
-"""Constants for the AWS S3 integration."""
-
-from collections.abc import Callable
-from typing import Final
-
-from homeassistant.util.hass_dict import HassKey
-
-DOMAIN: Final = "aws_s3"
-
-CONF_ACCESS_KEY_ID = "access_key_id"
-CONF_SECRET_ACCESS_KEY = "secret_access_key"
-CONF_ENDPOINT_URL = "endpoint_url"
-CONF_BUCKET = "bucket"
-
-AWS_DOMAIN = "amazonaws.com"
-DEFAULT_ENDPOINT_URL = f"https://s3.eu-central-1.{AWS_DOMAIN}/"
-
-DATA_BACKUP_AGENT_LISTENERS: HassKey[list[Callable[[], None]]] = HassKey(
-    f"{DOMAIN}.backup_agent_listeners"
-)
-
-DESCRIPTION_AWS_S3_DOCS_URL = "https://docs.aws.amazon.com/general/latest/gr/s3.html"
-DESCRIPTION_BOTO3_DOCS_URL = "https://boto3.amazonaws.com/v1/documentation/api/latest/reference/core/session.html"

homeassistant/components/aws_s3/manifest.json

@@ -1,12 +0,0 @@
-{
-  "domain": "aws_s3",
-  "name": "AWS S3",
-  "codeowners": ["@tomasbedrich"],
-  "config_flow": true,
-  "documentation": "https://www.home-assistant.io/integrations/aws_s3",
-  "integration_type": "service",
-  "iot_class": "cloud_push",
-  "loggers": ["aiobotocore"],
-  "quality_scale": "bronze",
-  "requirements": ["aiobotocore==2.21.1"]
-}

homeassistant/components/aws_s3/quality_scale.yaml

@@ -1,112 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: Integration does not register custom actions.
-  appropriate-polling:
-    status: exempt
-    comment: This integration does not poll.
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: This integration does not have any custom actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: Entities of this integration does not explicitly subscribe to events.
-  entity-unique-id:
-    status: exempt
-    comment: This integration does not have entities.
-  has-entity-name:
-    status: exempt
-    comment: This integration does not have entities.
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions:
-    status: exempt
-    comment: Integration does not register custom actions.
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: This integration does not have an options flow.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: exempt
-    comment: This integration does not have entities.
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates:
-    status: exempt
-    comment: This integration does not poll.
-  reauthentication-flow: todo
-  test-coverage: done
-
-  # Gold
-  devices:
-    status: exempt
-    comment: This integration does not have entities.
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: S3 is a cloud service that is not discovered on the network.
-  discovery:
-    status: exempt
-    comment: S3 is a cloud service that is not discovered on the network.
-  docs-data-update:
-    status: exempt
-    comment: This integration does not poll.
-  docs-examples:
-    status: exempt
-    comment: The integration extends core functionality and does not require examples.
-  docs-known-limitations:
-    status: exempt
-    comment: No known limitations.
-  docs-supported-devices:
-    status: exempt
-    comment: This integration does not support physical devices.
-  docs-supported-functions: done
-  docs-troubleshooting:
-    status: exempt
-    comment: There are no more detailed troubleshooting instructions available than what is already included in strings.json.
-  docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: This integration does not have devices.
-  entity-category:
-    status: exempt
-    comment: This integration does not have entities.
-  entity-device-class:
-    status: exempt
-    comment: This integration does not have entities.
-  entity-disabled-by-default:
-    status: exempt
-    comment: This integration does not have entities.
-  entity-translations:
-    status: exempt
-    comment: This integration does not have entities.
-  exception-translations: done
-  icon-translations:
-    status: exempt
-    comment: This integration does not use icons.
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: There are no issues which can be repaired.
-  stale-devices:
-    status: exempt
-    comment: This integration does not have devices.
-
-  # Platinum
-  async-dependency: done
-  inject-websession: todo
-  strict-typing: todo

homeassistant/components/aws_s3/strings.json

@@ -1,41 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "access_key_id": "Access key ID",
-          "secret_access_key": "Secret access key",
-          "bucket": "Bucket name",
-          "endpoint_url": "Endpoint URL"
-        },
-        "data_description": {
-          "access_key_id": "Access key ID to connect to AWS S3 API",
-          "secret_access_key": "Secret access key to connect to AWS S3 API",
-          "bucket": "Bucket must already exist and be writable by the provided credentials.",
-          "endpoint_url": "Endpoint URL provided to [Boto3 Session]({boto3_docs_url}). Region-specific [AWS S3 endpoints]({aws_s3_docs_url}) are available in their docs."
-        },
-        "title": "Add AWS S3 bucket"
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:component::aws_s3::exceptions::cannot_connect::message%]",
-      "invalid_bucket_name": "[%key:component::aws_s3::exceptions::invalid_bucket_name::message%]",
-      "invalid_credentials": "[%key:component::aws_s3::exceptions::invalid_credentials::message%]",
-      "invalid_endpoint_url": "Invalid endpoint URL. Please make sure it's a valid AWS S3 endpoint URL."
-    },
-    "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
-    }
-  },
-  "exceptions": {
-    "cannot_connect": {
-      "message": "Cannot connect to endpoint"
-    },
-    "invalid_bucket_name": {
-      "message": "Invalid bucket name"
-    },
-    "invalid_credentials": {
-      "message": "Bucket cannot be accessed using provided combination of access key ID and secret access key."
-    }
-  }
-}

homeassistant/components/axis/config_flow.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Mapping
 from ipaddress import ip_address
+from types import MappingProxyType
 from typing import Any
 from urllib.parse import urlsplit
 
@@ -47,7 +48,7 @@ from .const import (
     CONF_VIDEO_SOURCE,
     DEFAULT_STREAM_PROFILE,
     DEFAULT_VIDEO_SOURCE,
-    DOMAIN,
+    DOMAIN as AXIS_DOMAIN,
 )
 from .errors import AuthenticationRequired, CannotConnect
 from .hub import AxisHub, get_axis_api
@@ -58,7 +59,7 @@ DEFAULT_PROTOCOL = "https"
 PROTOCOL_CHOICES = ["https", "http"]
 
 
-class AxisFlowHandler(ConfigFlow, domain=DOMAIN):
+class AxisFlowHandler(ConfigFlow, domain=AXIS_DOMAIN):
     """Handle a Axis config flow."""
 
     VERSION = 3
@@ -87,7 +88,7 @@ class AxisFlowHandler(ConfigFlow, domain=DOMAIN):
 
         if user_input is not None:
             try:
-                api = await get_axis_api(self.hass, user_input)
+                api = await get_axis_api(self.hass, MappingProxyType(user_input))
 
             except AuthenticationRequired:
                 errors["base"] = "invalid_auth"
@@ -146,7 +147,7 @@ class AxisFlowHandler(ConfigFlow, domain=DOMAIN):
         model = self.config[CONF_MODEL]
         same_model = [
             entry.data[CONF_NAME]
-            for entry in self.hass.config_entries.async_entries(DOMAIN)
+            for entry in self.hass.config_entries.async_entries(AXIS_DOMAIN)
             if entry.source != SOURCE_IGNORE and entry.data[CONF_MODEL] == model
         ]
 

homeassistant/components/axis/entity.py

@@ -14,7 +14,7 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.dispatcher import async_dispatcher_connect
 from homeassistant.helpers.entity import Entity, EntityDescription
 
-from .const import DOMAIN
+from .const import DOMAIN as AXIS_DOMAIN
 
 if TYPE_CHECKING:
     from .hub import AxisHub
@@ -61,7 +61,7 @@ class AxisEntity(Entity):
         self.hub = hub
 
         self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, hub.unique_id)},
+            identifiers={(AXIS_DOMAIN, hub.unique_id)},
             serial_number=hub.unique_id,
         )
 

homeassistant/components/axis/hub/api.py

@@ -1,7 +1,7 @@
 """Axis network device abstraction."""
 
 from asyncio import timeout
-from collections.abc import Mapping
+from types import MappingProxyType
 from typing import Any
 
 import axis
@@ -23,7 +23,7 @@ from ..errors import AuthenticationRequired, CannotConnect
 
 async def get_axis_api(
     hass: HomeAssistant,
-    config: Mapping[str, Any],
+    config: MappingProxyType[str, Any],
 ) -> axis.AxisDevice:
     """Create a Axis device API."""
     session = get_async_client(hass, verify_ssl=False)

homeassistant/components/azure_event_hub/__init__.py

@@ -3,10 +3,11 @@
 from __future__ import annotations
 
 import asyncio
-from collections.abc import Callable, Mapping
+from collections.abc import Callable
 from datetime import datetime
 import json
 import logging
+from types import MappingProxyType
 from typing import Any
 
 from azure.eventhub import EventData, EventDataBatch
@@ -178,7 +179,7 @@ class AzureEventHub:
         await self.async_send(None)
         await self._queue.join()
 
-    def update_options(self, new_options: Mapping[str, Any]) -> None:
+    def update_options(self, new_options: MappingProxyType[str, Any]) -> None:
         """Update options."""
         self._send_interval = new_options[CONF_SEND_INTERVAL]
 

homeassistant/components/azure_storage/__init__.py

@@ -39,20 +39,11 @@ async def async_setup_entry(
     session = async_create_clientsession(
         hass, timeout=ClientTimeout(connect=10, total=12 * 60 * 60)
     )
-
-    def create_container_client() -> ContainerClient:
-        """Create a ContainerClient."""
-
-        return ContainerClient(
-            account_url=f"https://{entry.data[CONF_ACCOUNT_NAME]}.blob.core.windows.net/",
-            container_name=entry.data[CONF_CONTAINER_NAME],
-            credential=entry.data[CONF_STORAGE_ACCOUNT_KEY],
-            transport=AioHttpTransport(session=session),
-        )
-
-    # has a blocking call to open in cpython
-    container_client: ContainerClient = await hass.async_add_executor_job(
-        create_container_client
+    container_client = ContainerClient(
+        account_url=f"https://{entry.data[CONF_ACCOUNT_NAME]}.blob.core.windows.net/",
+        container_name=entry.data[CONF_CONTAINER_NAME],
+        credential=entry.data[CONF_STORAGE_ACCOUNT_KEY],
+        transport=AioHttpTransport(session=session),
     )
 
     try:

homeassistant/components/azure_storage/backup.py

@@ -175,8 +175,7 @@ class AzureStorageBackupAgent(BackupAgent):
         """Find a blob by backup id."""
         async for blob in self._client.list_blobs(include="metadata"):
             if (
-                blob.metadata is not None
-                and backup_id == blob.metadata.get("backup_id", "")
+                backup_id == blob.metadata.get("backup_id", "")
                 and blob.metadata.get("metadata_version") == METADATA_VERSION
             ):
                 return blob

homeassistant/components/azure_storage/config_flow.py

@@ -27,25 +27,9 @@ _LOGGER = logging.getLogger(__name__)
 class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for azure storage."""
 
-    async def get_container_client(
-        self, account_name: str, container_name: str, storage_account_key: str
-    ) -> ContainerClient:
-        """Get the container client.
-
-        ContainerClient has a blocking call to open in cpython
-        """
-
-        session = async_get_clientsession(self.hass)
-
-        def create_container_client() -> ContainerClient:
-            return ContainerClient(
-                account_url=f"https://{account_name}.blob.core.windows.net/",
-                container_name=container_name,
-                credential=storage_account_key,
-                transport=AioHttpTransport(session=session),
-            )
-
-        return await self.hass.async_add_executor_job(create_container_client)
+    def get_account_url(self, account_name: str) -> str:
+        """Get the account URL."""
+        return f"https://{account_name}.blob.core.windows.net/"
 
     async def validate_config(
         self, container_client: ContainerClient
@@ -74,10 +58,11 @@ class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
             self._async_abort_entries_match(
                 {CONF_ACCOUNT_NAME: user_input[CONF_ACCOUNT_NAME]}
             )
-            container_client = await self.get_container_client(
-                account_name=user_input[CONF_ACCOUNT_NAME],
+            container_client = ContainerClient(
+                account_url=self.get_account_url(user_input[CONF_ACCOUNT_NAME]),
                 container_name=user_input[CONF_CONTAINER_NAME],
-                storage_account_key=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
             )
             errors = await self.validate_config(container_client)
 
@@ -114,12 +99,12 @@ class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
         reauth_entry = self._get_reauth_entry()
 
         if user_input is not None:
-            container_client = await self.get_container_client(
-                account_name=reauth_entry.data[CONF_ACCOUNT_NAME],
+            container_client = ContainerClient(
+                account_url=self.get_account_url(reauth_entry.data[CONF_ACCOUNT_NAME]),
                 container_name=reauth_entry.data[CONF_CONTAINER_NAME],
-                storage_account_key=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
             )
-
             errors = await self.validate_config(container_client)
             if not errors:
                 return self.async_update_reload_and_abort(
@@ -144,10 +129,13 @@ class AzureStorageConfigFlow(ConfigFlow, domain=DOMAIN):
         reconfigure_entry = self._get_reconfigure_entry()
 
         if user_input is not None:
-            container_client = await self.get_container_client(
-                account_name=reconfigure_entry.data[CONF_ACCOUNT_NAME],
+            container_client = ContainerClient(
+                account_url=self.get_account_url(
+                    reconfigure_entry.data[CONF_ACCOUNT_NAME]
+                ),
                 container_name=user_input[CONF_CONTAINER_NAME],
-                storage_account_key=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                credential=user_input[CONF_STORAGE_ACCOUNT_KEY],
+                transport=AioHttpTransport(session=async_get_clientsession(self.hass)),
             )
             errors = await self.validate_config(container_client)
             if not errors:

homeassistant/components/backup/config.py

@@ -2,7 +2,6 @@
 
 from __future__ import annotations
 
-from collections import defaultdict
 from dataclasses import dataclass, field, replace
 import datetime as dt
 from datetime import datetime, timedelta
@@ -88,26 +87,12 @@ class BackupConfigData:
         else:
             time = None
         days = [Day(day) for day in data["schedule"]["days"]]
-        agents = {}
-        for agent_id, agent_data in data["agents"].items():
-            protected = agent_data["protected"]
-            stored_retention = agent_data["retention"]
-            agent_retention: AgentRetentionConfig | None
-            if stored_retention:
-                agent_retention = AgentRetentionConfig(
-                    copies=stored_retention["copies"],
-                    days=stored_retention["days"],
-                )
-            else:
-                agent_retention = None
-            agent_config = AgentConfig(
-                protected=protected,
-                retention=agent_retention,
-            )
-            agents[agent_id] = agent_config
 
         return cls(
-            agents=agents,
+            agents={
+                agent_id: AgentConfig(protected=agent_data["protected"])
+                for agent_id, agent_data in data["agents"].items()
+            },
             automatic_backups_configured=data["automatic_backups_configured"],
             create_backup=CreateBackupConfig(
                 agent_ids=data["create_backup"]["agent_ids"],
@@ -191,36 +176,12 @@ class BackupConfig:
         """Update config."""
         if agents is not UNDEFINED:
             for agent_id, agent_config in agents.items():
-                agent_retention = agent_config.get("retention")
-                if agent_retention is None:
-                    new_agent_retention = None
-                else:
-                    new_agent_retention = AgentRetentionConfig(
-                        copies=agent_retention.get("copies"),
-                        days=agent_retention.get("days"),
-                    )
                 if agent_id not in self.data.agents:
-                    old_agent_retention = None
-                    self.data.agents[agent_id] = AgentConfig(
-                        protected=agent_config.get("protected", True),
-                        retention=new_agent_retention,
-                    )
+                    self.data.agents[agent_id] = AgentConfig(**agent_config)
                 else:
-                    new_agent_config = self.data.agents[agent_id]
-                    old_agent_retention = new_agent_config.retention
-                    if "protected" in agent_config:
-                        new_agent_config = replace(
-                            new_agent_config, protected=agent_config["protected"]
-                        )
-                    if "retention" in agent_config:
-                        new_agent_config = replace(
-                            new_agent_config, retention=new_agent_retention
-                        )
-                    self.data.agents[agent_id] = new_agent_config
-                if new_agent_retention != old_agent_retention:
-                    # There's a single retention application method
-                    # for both global and agent retention settings.
-                    self.data.retention.apply(self._manager)
+                    self.data.agents[agent_id] = replace(
+                        self.data.agents[agent_id], **agent_config
+                    )
         if automatic_backups_configured is not UNDEFINED:
             self.data.automatic_backups_configured = automatic_backups_configured
         if create_backup is not UNDEFINED:
@@ -246,24 +207,11 @@ class AgentConfig:
     """Represent the config for an agent."""
 
     protected: bool
-    """Agent protected configuration.
-
-    If True, the agent backups are password protected.
-    """
-    retention: AgentRetentionConfig | None = None
-    """Agent retention configuration.
-
-    If None, the global retention configuration is used.
-    If not None, the global retention configuration is ignored for this agent.
-    If an agent retention configuration is set and both copies and days are None,
-    backups will be kept forever for that agent.
-    """
 
     def to_dict(self) -> StoredAgentConfig:
         """Convert agent config to a dict."""
         return {
             "protected": self.protected,
-            "retention": self.retention.to_dict() if self.retention else None,
         }
 
 
@@ -271,46 +219,24 @@ class StoredAgentConfig(TypedDict):
     """Represent the stored config for an agent."""
 
     protected: bool
-    retention: StoredRetentionConfig | None
 
 
 class AgentParametersDict(TypedDict, total=False):
     """Represent the parameters for an agent."""
 
     protected: bool
-    retention: RetentionParametersDict | None
 
 
 @dataclass(kw_only=True)
-class BaseRetentionConfig:
-    """Represent the base backup retention configuration."""
+class RetentionConfig:
+    """Represent the backup retention configuration."""
 
     copies: int | None = None
     days: int | None = None
 
-    def to_dict(self) -> StoredRetentionConfig:
-        """Convert backup retention configuration to a dict."""
-        return StoredRetentionConfig(
-            copies=self.copies,
-            days=self.days,
-        )
-
-
-@dataclass(kw_only=True)
-class RetentionConfig(BaseRetentionConfig):
-    """Represent the backup retention configuration."""
-
     def apply(self, manager: BackupManager) -> None:
         """Apply backup retention configuration."""
-        agents_retention = {
-            agent_id: agent_config.retention
-            for agent_id, agent_config in manager.config.data.agents.items()
-        }
-
-        if self.days is not None or any(
-            agent_retention and agent_retention.days is not None
-            for agent_retention in agents_retention.values()
-        ):
+        if self.days is not None:
             LOGGER.debug(
                 "Scheduling next automatic delete of backups older than %s in 1 day",
                 self.days,
@@ -320,6 +246,13 @@ class RetentionConfig(BaseRetentionConfig):
             LOGGER.debug("Unscheduling next automatic delete")
             self._unschedule_next(manager)
 
+    def to_dict(self) -> StoredRetentionConfig:
+        """Convert backup retention configuration to a dict."""
+        return StoredRetentionConfig(
+            copies=self.copies,
+            days=self.days,
+        )
+
     @callback
     def _schedule_next(
         self,
@@ -338,81 +271,16 @@ class RetentionConfig(BaseRetentionConfig):
                 """Return backups older than days to delete."""
                 # we need to check here since we await before
                 # this filter is applied
-                agents_retention = {
-                    agent_id: agent_config.retention
-                    for agent_id, agent_config in manager.config.data.agents.items()
-                }
-                has_agents_retention = any(
-                    agent_retention for agent_retention in agents_retention.values()
-                )
-                has_agents_retention_days = any(
-                    agent_retention and agent_retention.days is not None
-                    for agent_retention in agents_retention.values()
-                )
-                if (global_days := self.days) is None and not has_agents_retention_days:
-                    # No global retention days and no agent retention days
+                if self.days is None:
                     return {}
-
                 now = dt_util.utcnow()
-                if global_days is not None and not has_agents_retention:
-                    # Return early to avoid the longer filtering below.
-                    return {
-                        backup_id: backup
-                        for backup_id, backup in backups.items()
-                        if dt_util.parse_datetime(backup.date, raise_on_error=True)
-                        + timedelta(days=global_days)
-                        < now
-                    }
-
-                # If there are any agent retention settings, we need to check
-                # the retention settings, for every backup and agent combination.
-
-                backups_to_delete = {}
-
-                for backup_id, backup in backups.items():
-                    backup_date = dt_util.parse_datetime(
-                        backup.date, raise_on_error=True
-                    )
-                    delete_from_agents = set(backup.agents)
-                    for agent_id in backup.agents:
-                        agent_retention = agents_retention.get(agent_id)
-                        if agent_retention is None:
-                            # This agent does not have a retention setting,
-                            # so the global retention setting should be used.
-                            if global_days is None:
-                                # This agent does not have a retention setting
-                                # and the global retention days setting is None,
-                                # so this backup should not be deleted.
-                                delete_from_agents.discard(agent_id)
-                                continue
-                            days = global_days
-                        elif (agent_days := agent_retention.days) is None:
-                            # This agent has a retention setting
-                            # where days is set to None,
-                            # so the backup should not be deleted.
-                            delete_from_agents.discard(agent_id)
-                            continue
-                        else:
-                            # This agent has a retention setting
-                            # where days is set to a number,
-                            # so that setting should be used.
-                            days = agent_days
-                        if backup_date + timedelta(days=days) >= now:
-                            # This backup is not older than the retention days,
-                            # so this agent should not be deleted.
-                            delete_from_agents.discard(agent_id)
-
-                    filtered_backup = replace(
-                        backup,
-                        agents={
-                            agent_id: agent_backup_status
-                            for agent_id, agent_backup_status in backup.agents.items()
-                            if agent_id in delete_from_agents
-                        },
-                    )
-                    backups_to_delete[backup_id] = filtered_backup
-
-                return backups_to_delete
+                return {
+                    backup_id: backup
+                    for backup_id, backup in backups.items()
+                    if dt_util.parse_datetime(backup.date, raise_on_error=True)
+                    + timedelta(days=self.days)
+                    < now
+                }
 
             await manager.async_delete_filtered_backups(
                 include_filter=_automatic_backups_filter, delete_filter=_delete_filter
@@ -444,10 +312,6 @@ class RetentionParametersDict(TypedDict, total=False):
     days: int | None
 
 
-class AgentRetentionConfig(BaseRetentionConfig):
-    """Represent an agent retention configuration."""
-
-
 class StoredBackupSchedule(TypedDict):
     """Represent the stored backup schedule configuration."""
 
@@ -690,87 +554,16 @@ async def delete_backups_exceeding_configured_count(manager: BackupManager) -> N
         backups: dict[str, ManagerBackup],
     ) -> dict[str, ManagerBackup]:
         """Return oldest backups more numerous than copies to delete."""
-        agents_retention = {
-            agent_id: agent_config.retention
-            for agent_id, agent_config in manager.config.data.agents.items()
-        }
-        has_agents_retention = any(
-            agent_retention for agent_retention in agents_retention.values()
-        )
-        has_agents_retention_copies = any(
-            agent_retention and agent_retention.copies is not None
-            for agent_retention in agents_retention.values()
-        )
         # we need to check here since we await before
         # this filter is applied
-        if (
-            global_copies := manager.config.data.retention.copies
-        ) is None and not has_agents_retention_copies:
-            # No global retention copies and no agent retention copies
+        if manager.config.data.retention.copies is None:
             return {}
-        if global_copies is not None and not has_agents_retention:
-            # Return early to avoid the longer filtering below.
-            return dict(
-                sorted(
-                    backups.items(),
-                    key=lambda backup_item: backup_item[1].date,
-                )[: max(len(backups) - global_copies, 0)]
-            )
-
-        backups_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(dict)
-        for backup_id, backup in backups.items():
-            for agent_id in backup.agents:
-                backups_by_agent[agent_id][backup_id] = backup
-
-        backups_to_delete_by_agent: dict[str, dict[str, ManagerBackup]] = defaultdict(
-            dict
+        return dict(
+            sorted(
+                backups.items(),
+                key=lambda backup_item: backup_item[1].date,
+            )[: max(len(backups) - manager.config.data.retention.copies, 0)]
         )
-        for agent_id, agent_backups in backups_by_agent.items():
-            agent_retention = agents_retention.get(agent_id)
-            if agent_retention is None:
-                # This agent does not have a retention setting,
-                # so the global retention setting should be used.
-                if global_copies is None:
-                    # This agent does not have a retention setting
-                    # and the global retention copies setting is None,
-                    # so backups should not be deleted.
-                    continue
-                # The global retention setting will be used.
-                copies = global_copies
-            elif (agent_copies := agent_retention.copies) is None:
-                # This agent has a retention setting
-                # where copies is set to None,
-                # so backups should not be deleted.
-                continue
-            else:
-                # This agent retention setting will be used.
-                copies = agent_copies
-
-            backups_to_delete_by_agent[agent_id] = dict(
-                sorted(
-                    agent_backups.items(),
-                    key=lambda backup_item: backup_item[1].date,
-                )[: max(len(agent_backups) - copies, 0)]
-            )
-
-        backup_ids_to_delete: dict[str, set[str]] = defaultdict(set)
-        for agent_id, to_delete in backups_to_delete_by_agent.items():
-            for backup_id in to_delete:
-                backup_ids_to_delete[backup_id].add(agent_id)
-        backups_to_delete: dict[str, ManagerBackup] = {}
-        for backup_id, agent_ids in backup_ids_to_delete.items():
-            backup = backups[backup_id]
-            # filter the backup to only include the agents that should be deleted
-            filtered_backup = replace(
-                backup,
-                agents={
-                    agent_id: agent_backup_status
-                    for agent_id, agent_backup_status in backup.agents.items()
-                    if agent_id in agent_ids
-                },
-            )
-            backups_to_delete[backup_id] = filtered_backup
-        return backups_to_delete
 
     await manager.async_delete_filtered_backups(
         include_filter=_automatic_backups_filter, delete_filter=_delete_filter

homeassistant/components/backup/coordinator.py

@@ -30,7 +30,6 @@ class BackupCoordinatorData:
     """Class to hold backup data."""
 
     backup_manager_state: BackupManagerState
-    last_attempted_automatic_backup: datetime | None
     last_successful_automatic_backup: datetime | None
     next_scheduled_automatic_backup: datetime | None
 
@@ -71,7 +70,6 @@ class BackupDataUpdateCoordinator(DataUpdateCoordinator[BackupCoordinatorData]):
         """Update backup manager data."""
         return BackupCoordinatorData(
             self.backup_manager.state,
-            self.backup_manager.config.data.last_attempted_automatic_backup,
             self.backup_manager.config.data.last_completed_automatic_backup,
             self.backup_manager.config.data.schedule.next_automatic_backup,
         )

homeassistant/components/backup/http.py

@@ -22,7 +22,7 @@ from . import util
 from .agent import BackupAgent
 from .const import DATA_MANAGER
 from .manager import BackupManager
-from .models import AgentBackup, BackupNotFound
+from .models import BackupNotFound
 
 
 @callback
@@ -85,15 +85,7 @@ class DownloadBackupView(HomeAssistantView):
                     request, headers, backup_id, agent_id, agent, manager
                 )
             return await self._send_backup_with_password(
-                hass,
-                backup,
-                request,
-                headers,
-                backup_id,
-                agent_id,
-                password,
-                agent,
-                manager,
+                hass, request, headers, backup_id, agent_id, password, agent, manager
             )
         except BackupNotFound:
             return Response(status=HTTPStatus.NOT_FOUND)
@@ -124,7 +116,6 @@ class DownloadBackupView(HomeAssistantView):
     async def _send_backup_with_password(
         self,
         hass: HomeAssistant,
-        backup: AgentBackup,
         request: Request,
         headers: dict[istr, str],
         backup_id: str,
@@ -153,8 +144,7 @@ class DownloadBackupView(HomeAssistantView):
 
         stream = util.AsyncIteratorWriter(hass)
         worker = threading.Thread(
-            target=util.decrypt_backup,
-            args=[backup, reader, stream, password, on_done, 0, []],
+            target=util.decrypt_backup, args=[reader, stream, password, on_done, 0, []]
         )
         try:
             worker.start()

homeassistant/components/backup/onboarding.py

@@ -1,136 +0,0 @@
-"""Backup onboarding views."""
-
-from __future__ import annotations
-
-from collections.abc import Callable, Coroutine
-from functools import wraps
-from http import HTTPStatus
-from typing import TYPE_CHECKING, Any, Concatenate
-
-from aiohttp import web
-from aiohttp.web_exceptions import HTTPUnauthorized
-import voluptuous as vol
-
-from homeassistant.components.http import KEY_HASS
-from homeassistant.components.http.data_validator import RequestDataValidator
-from homeassistant.components.onboarding import (
-    BaseOnboardingView,
-    NoAuthBaseOnboardingView,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.backup import async_get_manager as async_get_backup_manager
-
-from . import BackupManager, Folder, IncorrectPasswordError, http as backup_http
-
-if TYPE_CHECKING:
-    from homeassistant.components.onboarding import OnboardingStoreData
-
-
-async def async_setup_views(hass: HomeAssistant, data: OnboardingStoreData) -> None:
-    """Set up the backup views."""
-
-    hass.http.register_view(BackupInfoView(data))
-    hass.http.register_view(RestoreBackupView(data))
-    hass.http.register_view(UploadBackupView(data))
-
-
-def with_backup_manager[_ViewT: BaseOnboardingView, **_P](
-    func: Callable[
-        Concatenate[_ViewT, BackupManager, web.Request, _P],
-        Coroutine[Any, Any, web.Response],
-    ],
-) -> Callable[Concatenate[_ViewT, web.Request, _P], Coroutine[Any, Any, web.Response]]:
-    """Home Assistant API decorator to check onboarding and inject manager."""
-
-    @wraps(func)
-    async def with_backup(
-        self: _ViewT,
-        request: web.Request,
-        *args: _P.args,
-        **kwargs: _P.kwargs,
-    ) -> web.Response:
-        """Check admin and call function."""
-        if self._data["done"]:
-            raise HTTPUnauthorized
-
-        manager = await async_get_backup_manager(request.app[KEY_HASS])
-        return await func(self, manager, request, *args, **kwargs)
-
-    return with_backup
-
-
-class BackupInfoView(NoAuthBaseOnboardingView):
-    """Get backup info view."""
-
-    url = "/api/onboarding/backup/info"
-    name = "api:onboarding:backup:info"
-
-    @with_backup_manager
-    async def get(self, manager: BackupManager, request: web.Request) -> web.Response:
-        """Return backup info."""
-        backups, _ = await manager.async_get_backups()
-        return self.json(
-            {
-                "backups": list(backups.values()),
-                "state": manager.state,
-                "last_action_event": manager.last_action_event,
-            }
-        )
-
-
-class RestoreBackupView(NoAuthBaseOnboardingView):
-    """Restore backup view."""
-
-    url = "/api/onboarding/backup/restore"
-    name = "api:onboarding:backup:restore"
-
-    @RequestDataValidator(
-        vol.Schema(
-            {
-                vol.Required("backup_id"): str,
-                vol.Required("agent_id"): str,
-                vol.Optional("password"): str,
-                vol.Optional("restore_addons"): [str],
-                vol.Optional("restore_database", default=True): bool,
-                vol.Optional("restore_folders"): [vol.Coerce(Folder)],
-            }
-        )
-    )
-    @with_backup_manager
-    async def post(
-        self, manager: BackupManager, request: web.Request, data: dict[str, Any]
-    ) -> web.Response:
-        """Restore a backup."""
-        try:
-            await manager.async_restore_backup(
-                data["backup_id"],
-                agent_id=data["agent_id"],
-                password=data.get("password"),
-                restore_addons=data.get("restore_addons"),
-                restore_database=data["restore_database"],
-                restore_folders=data.get("restore_folders"),
-                restore_homeassistant=True,
-            )
-        except IncorrectPasswordError:
-            return self.json(
-                {"code": "incorrect_password"}, status_code=HTTPStatus.BAD_REQUEST
-            )
-        except HomeAssistantError as err:
-            return self.json(
-                {"code": "restore_failed", "message": str(err)},
-                status_code=HTTPStatus.BAD_REQUEST,
-            )
-        return web.Response(status=HTTPStatus.OK)
-
-
-class UploadBackupView(NoAuthBaseOnboardingView, backup_http.UploadBackupView):
-    """Upload backup view."""
-
-    url = "/api/onboarding/backup/upload"
-    name = "api:onboarding:backup:upload"
-
-    @with_backup_manager
-    async def post(self, manager: BackupManager, request: web.Request) -> web.Response:
-        """Upload a backup file."""
-        return await self._post(request)

homeassistant/components/backup/sensor.py

@@ -46,12 +46,6 @@ BACKUP_MANAGER_DESCRIPTIONS = (
         device_class=SensorDeviceClass.TIMESTAMP,
         value_fn=lambda data: data.last_successful_automatic_backup,
     ),
-    BackupSensorEntityDescription(
-        key="last_attempted_automatic_backup",
-        translation_key="last_attempted_automatic_backup",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        value_fn=lambda data: data.last_attempted_automatic_backup,
-    ),
 )
 
 

homeassistant/components/backup/store.py

@@ -16,7 +16,7 @@ if TYPE_CHECKING:
 STORE_DELAY_SAVE = 30
 STORAGE_KEY = DOMAIN
 STORAGE_VERSION = 1
-STORAGE_VERSION_MINOR = 6
+STORAGE_VERSION_MINOR = 5
 
 
 class StoredBackupData(TypedDict):
@@ -72,10 +72,6 @@ class _BackupStore(Store[StoredBackupData]):
                 data["config"]["automatic_backups_configured"] = (
                     data["config"]["create_backup"]["password"] is not None
                 )
-            if old_minor_version < 6:
-                # Version 1.6 adds agent retention settings
-                for agent in data["config"]["agents"]:
-                    data["config"]["agents"][agent]["retention"] = None
 
         # Note: We allow reading data with major version 2.
         # Reject if major version is higher than 2.

homeassistant/components/backup/strings.json

@@ -26,9 +26,9 @@
   "entity": {
     "sensor": {
       "backup_manager_state": {
-        "name": "Backup Manager state",
+        "name": "Backup Manager State",
         "state": {
-          "idle": "[%key:common::state::idle%]",
+          "idle": "Idle",
           "create_backup": "Creating a backup",
           "receive_backup": "Receiving a backup",
           "restore_backup": "Restoring a backup"
@@ -37,9 +37,6 @@
       "next_scheduled_automatic_backup": {
         "name": "Next scheduled automatic backup"
       },
-      "last_attempted_automatic_backup": {
-        "name": "Last attempted automatic backup"
-      },
       "last_successful_automatic_backup": {
         "name": "Last successful automatic backup"
       }

homeassistant/components/backup/util.py

@@ -295,26 +295,13 @@ def validate_password_stream(
     raise BackupEmpty
 
 
-def _get_expected_archives(backup: AgentBackup) -> set[str]:
-    """Get the expected archives in the backup."""
-    expected_archives = set()
-    if backup.homeassistant_included:
-        expected_archives.add("homeassistant")
-    for addon in backup.addons:
-        expected_archives.add(addon.slug)
-    for folder in backup.folders:
-        expected_archives.add(folder.value)
-    return expected_archives
-
-
 def decrypt_backup(
-    backup: AgentBackup,
     input_stream: IO[bytes],
     output_stream: IO[bytes],
     password: str | None,
     on_done: Callable[[Exception | None], None],
     minimum_size: int,
-    nonces: NonceGenerator,
+    nonces: list[bytes],
 ) -> None:
     """Decrypt a backup."""
     error: Exception | None = None
@@ -328,13 +315,10 @@ def decrypt_backup(
                     fileobj=output_stream, mode="w|", bufsize=BUF_SIZE
                 ) as output_tar,
             ):
-                _decrypt_backup(backup, input_tar, output_tar, password)
+                _decrypt_backup(input_tar, output_tar, password)
         except (DecryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error decrypting backup: %s", err)
             error = err
-        except Exception as err:  # noqa: BLE001
-            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
-            error = err
         else:
             # Pad the output stream to the requested minimum size
             padding = max(minimum_size - output_stream.tell(), 0)
@@ -349,18 +333,15 @@ def decrypt_backup(
 
 
 def _decrypt_backup(
-    backup: AgentBackup,
     input_tar: tarfile.TarFile,
     output_tar: tarfile.TarFile,
     password: str | None,
 ) -> None:
     """Decrypt a backup."""
-    expected_archives = _get_expected_archives(backup)
     for obj in input_tar:
         # We compare with PurePath to avoid issues with different path separators,
         # for example when backup.json is added as "./backup.json"
-        object_path = PurePath(obj.name)
-        if object_path == PurePath("backup.json"):
+        if PurePath(obj.name) == PurePath("backup.json"):
             # Rewrite the backup.json file to indicate that the backup is decrypted
             if not (reader := input_tar.extractfile(obj)):
                 raise DecryptError
@@ -371,13 +352,7 @@ def _decrypt_backup(
             metadata_obj.size = len(updated_metadata_b)
             output_tar.addfile(metadata_obj, BytesIO(updated_metadata_b))
             continue
-        prefix, _, suffix = object_path.name.partition(".")
-        if suffix not in ("tar", "tgz", "tar.gz"):
-            LOGGER.debug("Unknown file %s will not be decrypted", obj.name)
-            output_tar.addfile(obj, input_tar.extractfile(obj))
-            continue
-        if prefix not in expected_archives:
-            LOGGER.debug("Unknown inner tar file %s will not be decrypted", obj.name)
+        if not obj.name.endswith((".tar", ".tgz", ".tar.gz")):
             output_tar.addfile(obj, input_tar.extractfile(obj))
             continue
         istf = SecureTarFile(
@@ -396,13 +371,12 @@ def _decrypt_backup(
 
 
 def encrypt_backup(
-    backup: AgentBackup,
     input_stream: IO[bytes],
     output_stream: IO[bytes],
     password: str | None,
     on_done: Callable[[Exception | None], None],
     minimum_size: int,
-    nonces: NonceGenerator,
+    nonces: list[bytes],
 ) -> None:
     """Encrypt a backup."""
     error: Exception | None = None
@@ -416,13 +390,10 @@ def encrypt_backup(
                     fileobj=output_stream, mode="w|", bufsize=BUF_SIZE
                 ) as output_tar,
             ):
-                _encrypt_backup(backup, input_tar, output_tar, password, nonces)
+                _encrypt_backup(input_tar, output_tar, password, nonces)
         except (EncryptError, SecureTarError, tarfile.TarError) as err:
             LOGGER.warning("Error encrypting backup: %s", err)
             error = err
-        except Exception as err:  # noqa: BLE001
-            LOGGER.exception("Unexpected error when decrypting backup: %s", err)
-            error = err
         else:
             # Pad the output stream to the requested minimum size
             padding = max(minimum_size - output_stream.tell(), 0)
@@ -437,20 +408,17 @@ def encrypt_backup(
 
 
 def _encrypt_backup(
-    backup: AgentBackup,
     input_tar: tarfile.TarFile,
     output_tar: tarfile.TarFile,
     password: str | None,
-    nonces: NonceGenerator,
+    nonces: list[bytes],
 ) -> None:
     """Encrypt a backup."""
     inner_tar_idx = 0
-    expected_archives = _get_expected_archives(backup)
     for obj in input_tar:
         # We compare with PurePath to avoid issues with different path separators,
         # for example when backup.json is added as "./backup.json"
-        object_path = PurePath(obj.name)
-        if object_path == PurePath("backup.json"):
+        if PurePath(obj.name) == PurePath("backup.json"):
             # Rewrite the backup.json file to indicate that the backup is encrypted
             if not (reader := input_tar.extractfile(obj)):
                 raise EncryptError
@@ -461,21 +429,16 @@ def _encrypt_backup(
             metadata_obj.size = len(updated_metadata_b)
             output_tar.addfile(metadata_obj, BytesIO(updated_metadata_b))
             continue
-        prefix, _, suffix = object_path.name.partition(".")
-        if suffix not in ("tar", "tgz", "tar.gz"):
-            LOGGER.debug("Unknown file %s will not be encrypted", obj.name)
+        if not obj.name.endswith((".tar", ".tgz", ".tar.gz")):
             output_tar.addfile(obj, input_tar.extractfile(obj))
             continue
-        if prefix not in expected_archives:
-            LOGGER.debug("Unknown inner tar file %s will not be encrypted", obj.name)
-            continue
         istf = SecureTarFile(
             None,  # Not used
             gzip=False,
             key=password_to_key(password) if password is not None else None,
             mode="r",
             fileobj=input_tar.extractfile(obj),
-            nonce=nonces.get(inner_tar_idx),
+            nonce=nonces[inner_tar_idx],
         )
         inner_tar_idx += 1
         with istf.encrypt(obj) as encrypted:
@@ -493,33 +456,17 @@ class _CipherWorkerStatus:
     writer: AsyncIteratorWriter
 
 
-class NonceGenerator:
-    """Generate nonces for encryption."""
-
-    def __init__(self) -> None:
-        """Initialize the generator."""
-        self._nonces: dict[int, bytes] = {}
-
-    def get(self, index: int) -> bytes:
-        """Get a nonce for the given index."""
-        if index not in self._nonces:
-            # Generate a new nonce for the given index
-            self._nonces[index] = os.urandom(16)
-        return self._nonces[index]
-
-
 class _CipherBackupStreamer:
     """Encrypt or decrypt a backup."""
 
     _cipher_func: Callable[
         [
-            AgentBackup,
             IO[bytes],
             IO[bytes],
             str | None,
             Callable[[Exception | None], None],
             int,
-            NonceGenerator,
+            list[bytes],
         ],
         None,
     ]
@@ -537,7 +484,7 @@ class _CipherBackupStreamer:
         self._hass = hass
         self._open_stream = open_stream
         self._password = password
-        self._nonces = NonceGenerator()
+        self._nonces: list[bytes] = []
 
     def size(self) -> int:
         """Return the maximum size of the decrypted or encrypted backup."""
@@ -561,15 +508,7 @@ class _CipherBackupStreamer:
         writer = AsyncIteratorWriter(self._hass)
         worker = threading.Thread(
             target=self._cipher_func,
-            args=[
-                self._backup,
-                reader,
-                writer,
-                self._password,
-                on_done,
-                self.size(),
-                self._nonces,
-            ],
+            args=[reader, writer, self._password, on_done, self.size(), self._nonces],
         )
         worker_status = _CipherWorkerStatus(
             done=asyncio.Event(), reader=reader, thread=worker, writer=writer
@@ -599,6 +538,17 @@ class DecryptedBackupStreamer(_CipherBackupStreamer):
 class EncryptedBackupStreamer(_CipherBackupStreamer):
     """Encrypt a backup."""
 
+    def __init__(
+        self,
+        hass: HomeAssistant,
+        backup: AgentBackup,
+        open_stream: Callable[[], Coroutine[Any, Any, AsyncIterator[bytes]]],
+        password: str | None,
+    ) -> None:
+        """Initialize."""
+        super().__init__(hass, backup, open_stream, password)
+        self._nonces = [os.urandom(16) for _ in range(self._num_tar_files())]
+
     _cipher_func = staticmethod(encrypt_backup)
 
     def backup(self) -> AgentBackup: