Raise in EntityComponent.async_prepare_reload on configuration error

.core_files.yaml

@@ -61,7 +61,6 @@ components: &components
   - homeassistant/components/auth/**
   - homeassistant/components/automation/**
   - homeassistant/components/backup/**
-  - homeassistant/components/blueprint/**
   - homeassistant/components/bluetooth/**
   - homeassistant/components/cloud/**
   - homeassistant/components/config/**
@@ -147,7 +146,6 @@ requirements: &requirements
   - homeassistant/package_constraints.txt
   - requirements*.txt
   - pyproject.toml
-  - script/licenses.py
 
 any:
   - *base_platforms

.github/workflows/builder.yml

@@ -69,7 +69,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: translations
           path: translations.tar.gz
@@ -190,14 +190,14 @@ jobs:
           echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -256,14 +256,14 @@ jobs:
           fi
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.08.2
+        uses: home-assistant/builder@2024.03.5
         with:
           args: |
             $BUILD_ARGS \
@@ -323,20 +323,20 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.6.0
+        uses: sigstore/cosign-installer@v3.5.0
         with:
           cosign-release: "v2.2.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
         if: matrix.registry == 'ghcr.io/home-assistant'
-        uses: docker/login-action@v3.3.0
+        uses: docker/login-action@v3.2.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -482,56 +482,3 @@ jobs:
           export TWINE_PASSWORD="${{ secrets.TWINE_TOKEN }}"
 
           twine upload dist/* --skip-existing
-
-  hassfest-image:
-    name: Build and test hassfest image
-    runs-on: ubuntu-latest
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-    needs: ["init", "build_base"]
-    if: github.repository_owner == 'home-assistant'
-    env:
-      HASSFEST_IMAGE_NAME: ghcr.io/home-assistant/hassfest
-      HASSFEST_IMAGE_TAG: ghcr.io/home-assistant/hassfest:${{ needs.init.outputs.version }}
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
-
-      - name: Login to GitHub Container Registry
-        uses: docker/login-action@9780b0c442fbb1117ed29e0efdff1e18412f7567 # v3.3.0
-        with:
-          registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.GITHUB_TOKEN }}
-
-      - name: Build Docker image
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
-        with:
-          context: ./script/hassfest/docker
-          build-args: BASE_IMAGE=ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}
-          load: true
-          tags: ${{ env.HASSFEST_IMAGE_TAG }}
-
-      - name: Run hassfest against core
-        run: docker run --rm -v ${{ github.workspace }}/homeassistant:/github/workspace/homeassistant ${{ env.HASSFEST_IMAGE_TAG }} --core-integrations-path=/github/workspace/homeassistant/components
-
-      - name: Push Docker image
-        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        id: push
-        uses: docker/build-push-action@5cd11c3a4ced054e52742c5fd54dca954e0edd85 # v6.7.0
-        with:
-          context: ./script/hassfest/docker
-          build-args: BASE_IMAGE=ghcr.io/home-assistant/amd64-homeassistant:${{ needs.init.outputs.version }}
-          push: true
-          tags: ${{ env.HASSFEST_IMAGE_TAG }},${{ env.HASSFEST_IMAGE_NAME }}:latest
-
-      - name: Generate artifact attestation
-        if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@6149ea5740be74af77f260b9db67e633f6b0a9a1 # v1.4.2
-        with:
-          subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
-          subject-digest: ${{ steps.push.outputs.digest }}
-          push-to-registry: true

.github/workflows/ci.yaml

@@ -31,16 +31,12 @@ on:
         description: "Only run mypy"
         default: false
         type: boolean
-      audit-licenses-only:
-        description: "Only run audit licenses"
-        default: false
-        type: boolean
 
 env:
-  CACHE_VERSION: 10
+  CACHE_VERSION: 9
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 8
-  HA_SHORT_VERSION: "2024.9"
+  HA_SHORT_VERSION: "2024.8"
   DEFAULT_PYTHON: "3.12"
   ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
@@ -90,7 +86,7 @@ jobs:
       tests_glob: ${{ steps.info.outputs.tests_glob }}
       tests: ${{ steps.info.outputs.tests }}
       skip_coverage: ${{ steps.info.outputs.skip_coverage }}
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
@@ -222,11 +218,10 @@ jobs:
 
   pre-commit:
     name: Prepare pre-commit base
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
     steps:
@@ -271,7 +266,7 @@ jobs:
 
   lint-ruff-format:
     name: Check ruff-format
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
@@ -311,7 +306,7 @@ jobs:
 
   lint-ruff:
     name: Check ruff
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
@@ -348,10 +343,9 @@ jobs:
           pre-commit run --hook-stage manual ruff --all-files --show-diff-on-failure
         env:
           RUFF_OUTPUT_FORMAT: github
-
   lint-other:
     name: Check other linters
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pre-commit
@@ -443,7 +437,7 @@ jobs:
 
   base:
     name: Prepare dependencies
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs: info
     timeout-minutes: 60
     strategy:
@@ -514,16 +508,16 @@ jobs:
           uv pip install -U "pip>=21.3.1" setuptools wheel
           uv pip install -r requirements.txt
           python -m script.gen_requirements_all ci
-          uv pip install -r requirements_all_pytest.txt -r requirements_test.txt
+          uv pip install -r requirements_all_pytest.txt
+          uv pip install -r requirements_test.txt
           uv pip install -e . --config-settings editable_mode=compat
 
   hassfest:
     name: Check hassfest
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
       - base
@@ -558,11 +552,10 @@ jobs:
 
   gen-requirements-all:
     name: Check all requirements
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
       - base
@@ -591,15 +584,12 @@ jobs:
 
   audit-licenses:
     name: Audit licenses
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - base
     if: |
-      (github.event.inputs.pylint-only != 'true'
-        && github.event.inputs.mypy-only != 'true'
-        || github.event.inputs.audit-licenses-only == 'true')
-      && needs.info.outputs.requirements == 'true'
+      needs.info.outputs.requirements == 'true'
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
@@ -623,7 +613,7 @@ jobs:
           . venv/bin/activate
           pip-licenses --format=json --output-file=licenses.json
       - name: Upload licenses
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: licenses
           path: licenses.json
@@ -634,11 +624,10 @@ jobs:
 
   pylint:
     name: Check pylint
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     if: |
       github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       || github.event.inputs.pylint-only == 'true'
     needs:
       - info
@@ -680,12 +669,10 @@ jobs:
 
   pylint-tests:
     name: Check pylint on tests
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     timeout-minutes: 20
     if: |
-      (github.event.inputs.mypy-only != 'true'
-        && github.event.inputs.audit-licenses-only != 'true'
-        || github.event.inputs.pylint-only == 'true')
+      (github.event.inputs.mypy-only != 'true' || github.event.inputs.pylint-only == 'true')
       && (needs.info.outputs.tests_glob || needs.info.outputs.test_full_suite == 'true')
     needs:
       - info
@@ -716,21 +703,20 @@ jobs:
         run: |
           . venv/bin/activate
           python --version
-          pylint tests
+          pylint --ignore-missing-annotations=y tests
       - name: Run pylint (partially)
         if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           python --version
-          pylint tests/components/${{ needs.info.outputs.tests_glob }}
+          pylint --ignore-missing-annotations=y tests/components/${{ needs.info.outputs.tests_glob }}
 
   mypy:
     name: Check mypy
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       github.event.inputs.pylint-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       || github.event.inputs.mypy-only == 'true'
     needs:
       - info
@@ -789,13 +775,12 @@ jobs:
           mypy homeassistant/components/${{ needs.info.outputs.integrations_glob }}
 
   prepare-pytest-full:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -833,20 +818,19 @@ jobs:
           . venv/bin/activate
           python -m script.split_tests ${{ needs.info.outputs.test_group_count }} tests
       - name: Upload pytest_buckets
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
           overwrite: true
 
   pytest-full:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.test_full_suite == 'true'
     needs:
       - info
@@ -920,7 +904,6 @@ jobs:
             cov_params+=(--cov-report=xml)
           fi
 
-          echo "Test group ${{ matrix.group }}: $(sed -n "${{ matrix.group }},1p" pytest_buckets.txt)"
           python3 -b -X dev -m pytest \
             -qq \
             --timeout=9 \
@@ -934,14 +917,14 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -953,7 +936,7 @@ jobs:
           ./script/check_dirty
 
   pytest-mariadb:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     services:
       mariadb:
         image: ${{ matrix.mariadb-group }}
@@ -967,7 +950,6 @@ jobs:
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.mariadb_groups != '[]'
     needs:
       - info
@@ -1060,7 +1042,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1068,7 +1050,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1093,7 +1075,6 @@ jobs:
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.postgresql_groups != '[]'
     needs:
       - info
@@ -1187,7 +1168,7 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1195,7 +1176,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1208,7 +1189,7 @@ jobs:
   coverage-full:
     name: Upload test coverage to Codecov (full suite)
     if: needs.info.outputs.skip_coverage != 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pytest-full
@@ -1232,13 +1213,12 @@ jobs:
           version: v0.6.0
 
   pytest-partial:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     if: |
       (github.event_name != 'push' || github.event.repository.full_name == 'home-assistant/core')
       && github.event.inputs.lint-only != 'true'
       && github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
-      && github.event.inputs.audit-licenses-only != 'true'
       && needs.info.outputs.tests_glob
       && needs.info.outputs.test_full_suite == 'false'
     needs:
@@ -1329,14 +1309,14 @@ jobs:
               2>&1 | tee pytest-${{ matrix.python-version }}-${{ matrix.group }}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{ matrix.group }}
           path: pytest-*.txt
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1348,7 +1328,7 @@ jobs:
   coverage-partial:
     name: Upload test coverage to Codecov (partial suite)
     if: needs.info.outputs.skip_coverage != 'true'
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-22.04
     needs:
       - info
       - pytest-partial

.github/workflows/codeql.yml

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

.github/workflows/wheels.yml

@@ -82,14 +82,14 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: env_file
           path: ./.env_file
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -101,7 +101,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@v4.3.6
+        uses: actions/upload-artifact@v4.3.4
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -211,7 +211,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_old-cython.txt"
@@ -226,7 +226,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtaa"
@@ -240,7 +240,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtab"
@@ -254,7 +254,7 @@ jobs:
           wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;cups-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;gammu-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm"
-          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
           requirements: "requirements_all.txtac"

.pre-commit-config.yaml

@@ -1,6 +1,6 @@
 repos:
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.6.2
+    rev: v0.5.2
     hooks:
       - id: ruff
         args:
@@ -12,7 +12,7 @@ repos:
     hooks:
       - id: codespell
         args:
-          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn
+          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn,pres,ser,ue
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
         exclude_types: [csv, json, html]

.strict-typing

@@ -95,6 +95,8 @@ homeassistant.components.aruba.*
 homeassistant.components.arwn.*
 homeassistant.components.aseko_pool_live.*
 homeassistant.components.assist_pipeline.*
+homeassistant.components.asterisk_cdr.*
+homeassistant.components.asterisk_mbox.*
 homeassistant.components.asuswrt.*
 homeassistant.components.autarco.*
 homeassistant.components.auth.*
@@ -118,7 +120,6 @@ homeassistant.components.bond.*
 homeassistant.components.braviatv.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
-homeassistant.components.bryant_evolution.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
@@ -166,7 +167,6 @@ homeassistant.components.ecowitt.*
 homeassistant.components.efergy.*
 homeassistant.components.electrasmart.*
 homeassistant.components.electric_kiwi.*
-homeassistant.components.elevenlabs.*
 homeassistant.components.elgato.*
 homeassistant.components.elkm1.*
 homeassistant.components.emulated_hue.*
@@ -196,9 +196,7 @@ homeassistant.components.fritzbox.*
 homeassistant.components.fritzbox_callmonitor.*
 homeassistant.components.fronius.*
 homeassistant.components.frontend.*
-homeassistant.components.fujitsu_fglair.*
 homeassistant.components.fully_kiosk.*
-homeassistant.components.fyta.*
 homeassistant.components.generic_hygrostat.*
 homeassistant.components.generic_thermostat.*
 homeassistant.components.geo_location.*
@@ -257,7 +255,6 @@ homeassistant.components.integration.*
 homeassistant.components.intent.*
 homeassistant.components.intent_script.*
 homeassistant.components.ios.*
-homeassistant.components.iotty.*
 homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
 homeassistant.components.islamic_prayer_times.*
@@ -282,7 +279,6 @@ homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
 homeassistant.components.light.*
 homeassistant.components.linear_garage_door.*
-homeassistant.components.linkplay.*
 homeassistant.components.litejet.*
 homeassistant.components.litterrobot.*
 homeassistant.components.local_ip.*
@@ -294,7 +290,7 @@ homeassistant.components.london_underground.*
 homeassistant.components.lookin.*
 homeassistant.components.luftdaten.*
 homeassistant.components.madvr.*
-homeassistant.components.manual.*
+homeassistant.components.mailbox.*
 homeassistant.components.map.*
 homeassistant.components.mastodon.*
 homeassistant.components.matrix.*

CODEOWNERS

@@ -108,8 +108,6 @@ build.json @home-assistant/supervisor
 /tests/components/anova/ @Lash-L
 /homeassistant/components/anthemav/ @hyralex
 /tests/components/anthemav/ @hyralex
-/homeassistant/components/anthropic/ @Shulyaka
-/tests/components/anthropic/ @Shulyaka
 /homeassistant/components/aosmith/ @bdr99
 /tests/components/aosmith/ @bdr99
 /homeassistant/components/apache_kafka/ @bachya
@@ -199,8 +197,7 @@ build.json @home-assistant/supervisor
 /tests/components/bluemaestro/ @bdraco
 /homeassistant/components/blueprint/ @home-assistant/core
 /tests/components/blueprint/ @home-assistant/core
-/homeassistant/components/bluesound/ @thrawnarn @LouisChrist
-/tests/components/bluesound/ @thrawnarn @LouisChrist
+/homeassistant/components/bluesound/ @thrawnarn
 /homeassistant/components/bluetooth/ @bdraco
 /tests/components/bluetooth/ @bdraco
 /homeassistant/components/bluetooth_adapters/ @bdraco
@@ -223,8 +220,6 @@ build.json @home-assistant/supervisor
 /tests/components/brottsplatskartan/ @gjohansson-ST
 /homeassistant/components/brunt/ @eavanvalkenburg
 /tests/components/brunt/ @eavanvalkenburg
-/homeassistant/components/bryant_evolution/ @danielsmyers
-/tests/components/bryant_evolution/ @danielsmyers
 /homeassistant/components/bsblan/ @liudger
 /tests/components/bsblan/ @liudger
 /homeassistant/components/bt_smarthub/ @typhoon2099
@@ -349,8 +344,8 @@ build.json @home-assistant/supervisor
 /tests/components/dremel_3d_printer/ @tkdrob
 /homeassistant/components/drop_connect/ @ChandlerSystems @pfrazer
 /tests/components/drop_connect/ @ChandlerSystems @pfrazer
-/homeassistant/components/dsmr/ @Robbie1221
-/tests/components/dsmr/ @Robbie1221
+/homeassistant/components/dsmr/ @Robbie1221 @frenck
+/tests/components/dsmr/ @Robbie1221 @frenck
 /homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duotecno/ @cereal2nd
@@ -378,8 +373,6 @@ build.json @home-assistant/supervisor
 /tests/components/electrasmart/ @jafar-atili
 /homeassistant/components/electric_kiwi/ @mikey0000
 /tests/components/electric_kiwi/ @mikey0000
-/homeassistant/components/elevenlabs/ @sorgfresser
-/tests/components/elevenlabs/ @sorgfresser
 /homeassistant/components/elgato/ @frenck
 /tests/components/elgato/ @frenck
 /homeassistant/components/elkm1/ @gwww @bdraco
@@ -391,7 +384,6 @@ build.json @home-assistant/supervisor
 /tests/components/elvia/ @ludeeus
 /homeassistant/components/emby/ @mezz64
 /homeassistant/components/emoncms/ @borpin @alexandrecuer
-/tests/components/emoncms/ @borpin @alexandrecuer
 /homeassistant/components/emonitor/ @bdraco
 /tests/components/emonitor/ @bdraco
 /homeassistant/components/emulated_hue/ @bdraco @Tho85
@@ -433,7 +425,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/evil_genius_labs/ @balloob
 /tests/components/evil_genius_labs/ @balloob
 /homeassistant/components/evohome/ @zxdavb
-/tests/components/evohome/ @zxdavb
 /homeassistant/components/ezviz/ @RenierM26 @baqs
 /tests/components/ezviz/ @RenierM26 @baqs
 /homeassistant/components/faa_delays/ @ntilley905
@@ -499,8 +490,6 @@ build.json @home-assistant/supervisor
 /tests/components/frontend/ @home-assistant/frontend
 /homeassistant/components/frontier_silicon/ @wlcrs
 /tests/components/frontier_silicon/ @wlcrs
-/homeassistant/components/fujitsu_fglair/ @crevetor
-/tests/components/fujitsu_fglair/ @crevetor
 /homeassistant/components/fully_kiosk/ @cgarwood
 /tests/components/fully_kiosk/ @cgarwood
 /homeassistant/components/fyta/ @dontinelli
@@ -516,7 +505,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/generic_hygrostat/ @Shulyaka
 /tests/components/generic_hygrostat/ @Shulyaka
 /homeassistant/components/geniushub/ @manzanotti
-/tests/components/geniushub/ @manzanotti
 /homeassistant/components/geo_json_events/ @exxamalte
 /tests/components/geo_json_events/ @exxamalte
 /homeassistant/components/geo_location/ @home-assistant/core
@@ -707,8 +695,6 @@ build.json @home-assistant/supervisor
 /tests/components/ios/ @robbiet480
 /homeassistant/components/iotawatt/ @gtdiehl @jyavenard
 /tests/components/iotawatt/ @gtdiehl @jyavenard
-/homeassistant/components/iotty/ @pburgio
-/tests/components/iotty/ @pburgio
 /homeassistant/components/iperf3/ @rohankapoorcom
 /homeassistant/components/ipma/ @dgomes
 /tests/components/ipma/ @dgomes
@@ -717,8 +703,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/iqvia/ @bachya
 /tests/components/iqvia/ @bachya
 /homeassistant/components/irish_rail_transport/ @ttroy50
-/homeassistant/components/iron_os/ @tr4nt0r
-/tests/components/iron_os/ @tr4nt0r
 /homeassistant/components/isal/ @bdraco
 /tests/components/isal/ @bdraco
 /homeassistant/components/islamic_prayer_times/ @engrbm87 @cpfair
@@ -807,8 +791,6 @@ build.json @home-assistant/supervisor
 /tests/components/light/ @home-assistant/core
 /homeassistant/components/linear_garage_door/ @IceBotYT
 /tests/components/linear_garage_door/ @IceBotYT
-/homeassistant/components/linkplay/ @Velleman
-/tests/components/linkplay/ @Velleman
 /homeassistant/components/linux_battery/ @fabaff
 /homeassistant/components/litejet/ @joncar
 /tests/components/litejet/ @joncar
@@ -828,6 +810,8 @@ build.json @home-assistant/supervisor
 /tests/components/logbook/ @home-assistant/core
 /homeassistant/components/logger/ @home-assistant/core
 /tests/components/logger/ @home-assistant/core
+/homeassistant/components/logi_circle/ @evanjd
+/tests/components/logi_circle/ @evanjd
 /homeassistant/components/london_underground/ @jpbede
 /tests/components/london_underground/ @jpbede
 /homeassistant/components/lookin/ @ANMalko @bdraco
@@ -849,8 +833,7 @@ build.json @home-assistant/supervisor
 /tests/components/lyric/ @timmo001
 /homeassistant/components/madvr/ @iloveicedgreentea
 /tests/components/madvr/ @iloveicedgreentea
-/homeassistant/components/mastodon/ @fabaff @andrew-codechimp
-/tests/components/mastodon/ @fabaff @andrew-codechimp
+/homeassistant/components/mastodon/ @fabaff
 /homeassistant/components/matrix/ @PaarthShah
 /tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
@@ -970,8 +953,6 @@ build.json @home-assistant/supervisor
 /tests/components/nfandroidtv/ @tkdrob
 /homeassistant/components/nibe_heatpump/ @elupus
 /tests/components/nibe_heatpump/ @elupus
-/homeassistant/components/nice_go/ @IceBotYT
-/tests/components/nice_go/ @IceBotYT
 /homeassistant/components/nightscout/ @marciogranzotto
 /tests/components/nightscout/ @marciogranzotto
 /homeassistant/components/nilu/ @hfurubotten
@@ -1058,8 +1039,8 @@ build.json @home-assistant/supervisor
 /tests/components/otbr/ @home-assistant/core
 /homeassistant/components/ourgroceries/ @OnFreund
 /tests/components/ourgroceries/ @OnFreund
-/homeassistant/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
-/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
+/homeassistant/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117
+/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117
 /homeassistant/components/ovo_energy/ @timmo001
 /tests/components/ovo_energy/ @timmo001
 /homeassistant/components/p1_monitor/ @klaasnicolaas
@@ -1329,8 +1310,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/smarty/ @z0mbieprocess
 /homeassistant/components/smhi/ @gjohansson-ST
 /tests/components/smhi/ @gjohansson-ST
-/homeassistant/components/smlight/ @tl-sl
-/tests/components/smlight/ @tl-sl
 /homeassistant/components/sms/ @ocalvo
 /tests/components/sms/ @ocalvo
 /homeassistant/components/snapcast/ @luar123
@@ -1453,8 +1432,6 @@ build.json @home-assistant/supervisor
 /tests/components/tellduslive/ @fredrike
 /homeassistant/components/template/ @PhracturedBlue @tetienne @home-assistant/core
 /tests/components/template/ @PhracturedBlue @tetienne @home-assistant/core
-/homeassistant/components/tesla_fleet/ @Bre77
-/tests/components/tesla_fleet/ @Bre77
 /homeassistant/components/tesla_wall_connector/ @einarhauks
 /tests/components/tesla_wall_connector/ @einarhauks
 /homeassistant/components/teslemetry/ @Bre77
@@ -1493,8 +1470,6 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/touchline_sl/ @jnsgruk
-/tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696
 /tests/components/tplink/ @rytilahti @bdraco @sdb9696
 /homeassistant/components/tplink_omada/ @MarkGodwin
@@ -1660,8 +1635,6 @@ build.json @home-assistant/supervisor
 /tests/components/xiaomi_miio/ @rytilahti @syssi @starkillerOG
 /homeassistant/components/xiaomi_tv/ @simse
 /homeassistant/components/xmpp/ @fabaff @flowolf
-/homeassistant/components/yale/ @bdraco
-/tests/components/yale/ @bdraco
 /homeassistant/components/yale_smart_alarm/ @gjohansson-ST
 /tests/components/yale_smart_alarm/ @gjohansson-ST
 /homeassistant/components/yalexs_ble/ @bdraco

Dockerfile

@@ -12,7 +12,7 @@ ENV \
 ARG QEMU_CPU
 
 # Install uv
-RUN pip3 install uv==0.2.27
+RUN pip3 install uv==0.2.13
 
 WORKDIR /usr/src
 

Dockerfile.dev

@@ -42,8 +42,7 @@ WORKDIR /usr/src
 
 # Setup hass-release
 RUN git clone --depth 1 https://github.com/home-assistant/hass-release \
-    && uv pip install --system -e hass-release/ \
-    && chown -R vscode /usr/src/hass-release/data
+    && uv pip install --system -e hass-release/
 
 USER vscode
 ENV VIRTUAL_ENV="/home/vscode/.local/ha-venv"

homeassistant/auth/permissions/events.py

@@ -18,12 +18,9 @@ from homeassistant.const import (
     EVENT_THEMES_UPDATED,
 )
 from homeassistant.helpers.area_registry import EVENT_AREA_REGISTRY_UPDATED
-from homeassistant.helpers.category_registry import EVENT_CATEGORY_REGISTRY_UPDATED
 from homeassistant.helpers.device_registry import EVENT_DEVICE_REGISTRY_UPDATED
 from homeassistant.helpers.entity_registry import EVENT_ENTITY_REGISTRY_UPDATED
-from homeassistant.helpers.floor_registry import EVENT_FLOOR_REGISTRY_UPDATED
 from homeassistant.helpers.issue_registry import EVENT_REPAIRS_ISSUE_REGISTRY_UPDATED
-from homeassistant.helpers.label_registry import EVENT_LABEL_REGISTRY_UPDATED
 from homeassistant.util.event_type import EventType
 
 # These are events that do not contain any sensitive data
@@ -44,7 +41,4 @@ SUBSCRIBE_ALLOWLIST: Final[set[EventType[Any] | str]] = {
     EVENT_SHOPPING_LIST_UPDATED,
     EVENT_STATE_CHANGED,
     EVENT_THEMES_UPDATED,
-    EVENT_LABEL_REGISTRY_UPDATED,
-    EVENT_CATEGORY_REGISTRY_UPDATED,
-    EVENT_FLOOR_REGISTRY_UPDATED,
 }

homeassistant/block_async_io.py

@@ -8,8 +8,6 @@ import glob
 from http.client import HTTPConnection
 import importlib
 import os
-from pathlib import Path
-from ssl import SSLContext
 import sys
 import threading
 import time
@@ -145,78 +143,6 @@ _BLOCKING_CALLS: tuple[BlockingCall, ...] = (
         strict_core=False,
         skip_for_tests=True,
     ),
-    BlockingCall(
-        original_func=SSLContext.load_default_certs,
-        object=SSLContext,
-        function="load_default_certs",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=SSLContext.load_verify_locations,
-        object=SSLContext,
-        function="load_verify_locations",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=SSLContext.load_cert_chain,
-        object=SSLContext,
-        function="load_cert_chain",
-        check_allowed=None,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.open,
-        object=Path,
-        function="open",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.read_text,
-        object=Path,
-        function="read_text",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.read_bytes,
-        object=Path,
-        function="read_bytes",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.write_text,
-        object=Path,
-        function="write_text",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
-    BlockingCall(
-        original_func=Path.write_bytes,
-        object=Path,
-        function="write_bytes",
-        check_allowed=_check_file_allowed,
-        strict=False,
-        strict_core=False,
-        skip_for_tests=True,
-    ),
 )
 
 

homeassistant/bootstrap.py

@@ -223,10 +223,8 @@ CRITICAL_INTEGRATIONS = {
 SETUP_ORDER = (
     # Load logging and http deps as soon as possible
     ("logging, http deps", LOGGING_AND_HTTP_DEPS_INTEGRATIONS),
-    # Setup frontend
-    ("frontend", FRONTEND_INTEGRATIONS),
-    # Setup recorder
-    ("recorder", RECORDER_INTEGRATIONS),
+    # Setup frontend and recorder
+    ("frontend, recorder", {*FRONTEND_INTEGRATIONS, *RECORDER_INTEGRATIONS}),
     # Start up debuggers. Start these first in case they want to wait.
     ("debugger", DEBUGGER_INTEGRATIONS),
 )
@@ -586,10 +584,10 @@ async def async_enable_logging(
     logging.getLogger("aiohttp.access").setLevel(logging.WARNING)
     logging.getLogger("httpx").setLevel(logging.WARNING)
 
-    sys.excepthook = lambda *args: logging.getLogger().exception(
+    sys.excepthook = lambda *args: logging.getLogger(None).exception(
         "Uncaught exception", exc_info=args
     )
-    threading.excepthook = lambda args: logging.getLogger().exception(
+    threading.excepthook = lambda args: logging.getLogger(None).exception(
         "Uncaught thread exception",
         exc_info=(  # type: ignore[arg-type]
             args.exc_type,
@@ -616,9 +614,10 @@ async def async_enable_logging(
             _create_log_file, err_log_path, log_rotate_days
         )
 
+        err_handler.setLevel(logging.INFO if verbose else logging.WARNING)
         err_handler.setFormatter(logging.Formatter(fmt, datefmt=FORMAT_DATETIME))
 
-        logger = logging.getLogger()
+        logger = logging.getLogger("")
         logger.addHandler(err_handler)
         logger.setLevel(logging.INFO if verbose else logging.WARNING)
 
@@ -907,13 +906,7 @@ async def _async_resolve_domains_to_setup(
             await asyncio.gather(*resolve_dependencies_tasks)
 
         for itg in integrations_to_process:
-            try:
-                all_deps = itg.all_dependencies
-            except RuntimeError:
-                # Integration.all_dependencies raises RuntimeError if
-                # dependencies could not be resolved
-                continue
-            for dep in all_deps:
+            for dep in itg.all_dependencies:
                 if dep in domains_to_setup:
                     continue
                 domains_to_setup.add(dep)

homeassistant/brands/asterisk.json

@@ -0,0 +1,5 @@
+{
+  "domain": "asterisk",
+  "name": "Asterisk",
+  "integrations": ["asterisk_cdr", "asterisk_mbox"]
+}

homeassistant/brands/fujitsu.json

@@ -1,5 +0,0 @@
-{
-  "domain": "fujitsu",
-  "name": "Fujitsu",
-  "integrations": ["fujitsu_anywair", "fujitsu_fglair"]
-}

homeassistant/brands/logitech.json

@@ -1,5 +1,5 @@
 {
   "domain": "logitech",
   "name": "Logitech",
-  "integrations": ["harmony", "squeezebox"]
+  "integrations": ["harmony", "ue_smart_radio", "squeezebox"]
 }

homeassistant/brands/roth.json

@@ -1,5 +0,0 @@
-{
-  "domain": "roth",
-  "name": "Roth",
-  "integrations": ["touchline", "touchline_sl"]
-}

homeassistant/brands/tesla.json

@@ -1,5 +1,5 @@
 {
   "domain": "tesla",
   "name": "Tesla",
-  "integrations": ["powerwall", "tesla_wall_connector", "tesla_fleet"]
+  "integrations": ["powerwall", "tesla_wall_connector"]
 }

homeassistant/brands/yale.json

@@ -1,11 +1,5 @@
 {
   "domain": "yale",
   "name": "Yale",
-  "integrations": [
-    "august",
-    "yale_smart_alarm",
-    "yalexs_ble",
-    "yale_home",
-    "yale"
-  ]
+  "integrations": ["august", "yale_smart_alarm", "yalexs_ble", "yale_home"]
 }

homeassistant/components/abode/icons.json

@@ -7,14 +7,8 @@
     }
   },
   "services": {
-    "capture_image": {
-      "service": "mdi:camera"
-    },
-    "change_setting": {
-      "service": "mdi:cog"
-    },
-    "trigger_automation": {
-      "service": "mdi:play"
-    }
+    "capture_image": "mdi:camera",
+    "change_setting": "mdi:cog",
+    "trigger_automation": "mdi:play"
   }
 }

homeassistant/components/acer_projector/switch.py

@@ -81,7 +81,7 @@ class AcerSwitch(SwitchEntity):
         write_timeout: int,
     ) -> None:
         """Init of the Acer projector."""
-        self.serial = serial.Serial(
+        self.ser = serial.Serial(
             port=serial_port, timeout=timeout, write_timeout=write_timeout
         )
         self._serial_port = serial_port
@@ -99,16 +99,16 @@ class AcerSwitch(SwitchEntity):
         # was disconnected during runtime.
         # This way the projector can be reconnected and will still work
         try:
-            if not self.serial.is_open:
-                self.serial.open()
-            self.serial.write(msg.encode("utf-8"))
+            if not self.ser.is_open:
+                self.ser.open()
+            self.ser.write(msg.encode("utf-8"))
             # Size is an experience value there is no real limit.
             # AFAIK there is no limit and no end character so we will usually
             # need to wait for timeout
-            ret = self.serial.read_until(size=20).decode("utf-8")
+            ret = self.ser.read_until(size=20).decode("utf-8")
         except serial.SerialException:
             _LOGGER.error("Problem communicating with %s", self._serial_port)
-        self.serial.close()
+        self.ser.close()
         return ret
 
     def _write_read_format(self, msg: str) -> str:

homeassistant/components/adguard/icons.json

@@ -66,20 +66,10 @@
     }
   },
   "services": {
-    "add_url": {
-      "service": "mdi:link-plus"
-    },
-    "remove_url": {
-      "service": "mdi:link-off"
-    },
-    "enable_url": {
-      "service": "mdi:link-variant"
-    },
-    "disable_url": {
-      "service": "mdi:link-variant-off"
-    },
-    "refresh": {
-      "service": "mdi:refresh"
-    }
+    "add_url": "mdi:link-plus",
+    "remove_url": "mdi:link-off",
+    "enable_url": "mdi:link-variant",
+    "disable_url": "mdi:link-variant-off",
+    "refresh": "mdi:refresh"
   }
 }

homeassistant/components/ads/__init__.py

@@ -136,7 +136,7 @@ def setup(hass: HomeAssistant, config: ConfigType) -> bool:
 
 
 # Tuple to hold data needed for notification
-NotificationItem = namedtuple(  # noqa: PYI024
+NotificationItem = namedtuple(
     "NotificationItem", "hnotify huser name plc_datatype callback"
 )
 

homeassistant/components/ads/icons.json

@@ -1,7 +1,5 @@
 {
   "services": {
-    "write_data_by_name": {
-      "service": "mdi:pencil"
-    }
+    "write_data_by_name": "mdi:pencil"
   }
 }

homeassistant/components/advantage_air/climate.py

@@ -206,8 +206,7 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     async def async_set_hvac_mode(self, hvac_mode: HVACMode) -> None:
         """Set the HVAC Mode and State."""
         if hvac_mode == HVACMode.OFF:
-            await self.async_turn_off()
-            return
+            return await self.async_turn_off()
         if hvac_mode == HVACMode.HEAT_COOL and self.preset_mode != ADVANTAGE_AIR_MYAUTO:
             raise ServiceValidationError("Heat/Cool is not supported in this mode")
         await self.async_update_ac(

homeassistant/components/advantage_air/icons.json

@@ -1,7 +1,5 @@
 {
   "services": {
-    "set_time_to": {
-      "service": "mdi:timer-cog"
-    }
+    "set_time_to": "mdi:timer-cog"
   }
 }

homeassistant/components/aemet/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aemet",
   "iot_class": "cloud_polling",
   "loggers": ["aemet_opendata"],
-  "requirements": ["AEMET-OpenData==0.5.4"]
+  "requirements": ["AEMET-OpenData==0.5.2"]
 }

homeassistant/components/aftership/icons.json

@@ -7,11 +7,7 @@
     }
   },
   "services": {
-    "add_tracking": {
-      "service": "mdi:package-variant-plus"
-    },
-    "remove_tracking": {
-      "service": "mdi:package-variant-minus"
-    }
+    "add_tracking": "mdi:package-variant-plus",
+    "remove_tracking": "mdi:package-variant-minus"
   }
 }

homeassistant/components/agent_dvr/camera.py

@@ -59,7 +59,7 @@ async def async_setup_entry(
 
     platform = async_get_current_platform()
     for service, method in CAMERA_SERVICES.items():
-        platform.async_register_entity_service(service, None, method)
+        platform.async_register_entity_service(service, {}, method)
 
 
 class AgentCamera(MjpegCamera):

homeassistant/components/agent_dvr/icons.json

@@ -1,19 +1,9 @@
 {
   "services": {
-    "start_recording": {
-      "service": "mdi:record-rec"
-    },
-    "stop_recording": {
-      "service": "mdi:stop"
-    },
-    "enable_alerts": {
-      "service": "mdi:bell-alert"
-    },
-    "disable_alerts": {
-      "service": "mdi:bell-off"
-    },
-    "snapshot": {
-      "service": "mdi:camera"
-    }
+    "start_recording": "mdi:record-rec",
+    "stop_recording": "mdi:stop",
+    "enable_alerts": "mdi:bell-alert",
+    "disable_alerts": "mdi:bell-off",
+    "snapshot": "mdi:camera"
   }
 }

homeassistant/components/airgradient/__init__.py

@@ -4,7 +4,7 @@ from __future__ import annotations
 
 from dataclasses import dataclass
 
-from airgradient import AirGradientClient, get_model_name
+from airgradient import AirGradientClient
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, Platform
@@ -21,7 +21,6 @@ PLATFORMS: list[Platform] = [
     Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
-    Platform.UPDATE,
 ]
 
 
@@ -36,7 +35,7 @@ class AirGradientData:
 type AirGradientConfigEntry = ConfigEntry[AirGradientData]
 
 
-async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry) -> bool:
+async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Airgradient from a config entry."""
 
     client = AirGradientClient(
@@ -54,8 +53,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry)
         config_entry_id=entry.entry_id,
         identifiers={(DOMAIN, measurement_coordinator.serial_number)},
         manufacturer="AirGradient",
-        model=get_model_name(measurement_coordinator.data.model),
-        model_id=measurement_coordinator.data.model,
+        model=measurement_coordinator.data.model,
         serial_number=measurement_coordinator.data.serial_number,
         sw_version=measurement_coordinator.data.firmware_version,
     )
@@ -70,8 +68,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirGradientConfigEntry)
     return True
 
 
-async def async_unload_entry(
-    hass: HomeAssistant, entry: AirGradientConfigEntry
-) -> 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)

homeassistant/components/airgradient/config_flow.py

@@ -2,13 +2,9 @@
 
 from typing import Any
 
-from airgradient import (
-    AirGradientClient,
-    AirGradientError,
-    AirGradientParseError,
-    ConfigurationControl,
-)
+from airgradient import AirGradientClient, AirGradientError, ConfigurationControl
 from awesomeversion import AwesomeVersion
+from mashumaro import MissingField
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
@@ -87,14 +83,12 @@ class AirGradientConfigFlow(ConfigFlow, domain=DOMAIN):
             self.client = AirGradientClient(user_input[CONF_HOST], session=session)
             try:
                 current_measures = await self.client.get_current_measures()
-            except AirGradientParseError:
-                return self.async_abort(reason="invalid_version")
             except AirGradientError:
                 errors["base"] = "cannot_connect"
+            except MissingField:
+                return self.async_abort(reason="invalid_version")
             else:
-                await self.async_set_unique_id(
-                    current_measures.serial_number, raise_on_progress=False
-                )
+                await self.async_set_unique_id(current_measures.serial_number)
                 self._abort_if_unique_id_configured()
                 await self.set_configuration_source()
                 return self.async_create_entry(

homeassistant/components/airgradient/coordinator.py

@@ -19,6 +19,7 @@ if TYPE_CHECKING:
 class AirGradientCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
     """Class to manage fetching AirGradient data."""
 
+    _update_interval: timedelta
     config_entry: AirGradientConfigEntry
 
     def __init__(self, hass: HomeAssistant, client: AirGradientClient) -> None:
@@ -27,7 +28,7 @@ class AirGradientCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
             hass,
             logger=LOGGER,
             name=f"AirGradient {client.host}",
-            update_interval=timedelta(minutes=1),
+            update_interval=self._update_interval,
         )
         self.client = client
         assert self.config_entry.unique_id
@@ -46,6 +47,8 @@ class AirGradientCoordinator[_DataT](DataUpdateCoordinator[_DataT]):
 class AirGradientMeasurementCoordinator(AirGradientCoordinator[Measures]):
     """Class to manage fetching AirGradient data."""
 
+    _update_interval = timedelta(minutes=1)
+
     async def _update_data(self) -> Measures:
         return await self.client.get_current_measures()
 
@@ -53,5 +56,7 @@ class AirGradientMeasurementCoordinator(AirGradientCoordinator[Measures]):
 class AirGradientConfigCoordinator(AirGradientCoordinator[Config]):
     """Class to manage fetching AirGradient data."""
 
+    _update_interval = timedelta(minutes=5)
+
     async def _update_data(self) -> Config:
         return await self.client.get_config()

homeassistant/components/airgradient/manifest.json

@@ -6,6 +6,6 @@
   "documentation": "https://www.home-assistant.io/integrations/airgradient",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "requirements": ["airgradient==0.8.0"],
+  "requirements": ["airgradient==0.6.1"],
   "zeroconf": ["_airgradient._tcp.local."]
 }

homeassistant/components/airgradient/update.py

@@ -1,55 +0,0 @@
-"""Airgradient Update platform."""
-
-from datetime import timedelta
-from functools import cached_property
-
-from homeassistant.components.update import UpdateDeviceClass, UpdateEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import AirGradientConfigEntry, AirGradientMeasurementCoordinator
-from .entity import AirGradientEntity
-
-SCAN_INTERVAL = timedelta(hours=1)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirGradientConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up Airgradient update platform."""
-
-    data = config_entry.runtime_data
-
-    async_add_entities([AirGradientUpdate(data.measurement)], True)
-
-
-class AirGradientUpdate(AirGradientEntity, UpdateEntity):
-    """Representation of Airgradient Update."""
-
-    _attr_device_class = UpdateDeviceClass.FIRMWARE
-    coordinator: AirGradientMeasurementCoordinator
-
-    def __init__(self, coordinator: AirGradientMeasurementCoordinator) -> None:
-        """Initialize the entity."""
-        super().__init__(coordinator)
-        self._attr_unique_id = f"{coordinator.serial_number}-update"
-
-    @cached_property
-    def should_poll(self) -> bool:
-        """Return True because we need to poll the latest version."""
-        return True
-
-    @property
-    def installed_version(self) -> str:
-        """Return the installed version of the entity."""
-        return self.coordinator.data.firmware_version
-
-    async def async_update(self) -> None:
-        """Update the entity."""
-        self._attr_latest_version = (
-            await self.coordinator.client.get_latest_firmware_version(
-                self.coordinator.serial_number
-            )
-        )

homeassistant/components/airthings_ble/manifest.json

@@ -24,5 +24,5 @@
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
   "iot_class": "local_polling",
-  "requirements": ["airthings-ble==0.9.1"]
+  "requirements": ["airthings-ble==0.9.0"]
 }

homeassistant/components/airtouch4/climate.py

@@ -156,8 +156,7 @@ class AirtouchAC(CoordinatorEntity, ClimateEntity):
             raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
 
         if hvac_mode == HVACMode.OFF:
-            await self.async_turn_off()
-            return
+            return await self.async_turn_off()
         await self._airtouch.SetCoolingModeForAc(
             self._ac_number, HA_STATE_TO_AT[hvac_mode]
         )
@@ -263,8 +262,7 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
             raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
 
         if hvac_mode == HVACMode.OFF:
-            await self.async_turn_off()
-            return
+            return await self.async_turn_off()
         if self.hvac_mode == HVACMode.OFF:
             await self.async_turn_on()
         self._unit = self._airtouch.GetGroups()[self._group_number]

homeassistant/components/airtouch4/config_flow.py

@@ -1,11 +1,9 @@
 """Config flow for AirTouch4."""
 
-from typing import Any
-
 from airtouch4pyapi import AirTouch, AirTouchStatus
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import ConfigFlow
 from homeassistant.const import CONF_HOST
 
 from .const import DOMAIN
@@ -18,9 +16,7 @@ class AirtouchConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
+    async def async_step_user(self, user_input=None):
         """Handle a flow initialized by the user."""
         if user_input is None:
             return self.async_show_form(step_id="user", data_schema=DATA_SCHEMA)

homeassistant/components/airtouch5/__init__.py

@@ -11,7 +11,7 @@ from homeassistant.exceptions import ConfigEntryNotReady
 
 from .const import DOMAIN
 
-PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.COVER]
+PLATFORMS: list[Platform] = [Platform.CLIMATE]
 
 type Airtouch5ConfigEntry = ConfigEntry[Airtouch5SimpleClient]
 

homeassistant/components/airtouch5/climate.py

@@ -121,7 +121,6 @@ class Airtouch5ClimateEntity(ClimateEntity, Airtouch5Entity):
     """Base class for Airtouch5 Climate Entities."""
 
     _attr_temperature_unit = UnitOfTemperature.CELSIUS
-    _attr_translation_key = DOMAIN
     _attr_target_temperature_step = 1
     _attr_name = None
     _enable_turn_on_off_backwards_compatibility = False

homeassistant/components/airtouch5/cover.py

@@ -1,134 +0,0 @@
-"""Representation of the Damper for AirTouch 5 Devices."""
-
-import logging
-from typing import Any
-
-from airtouch5py.airtouch5_simple_client import Airtouch5SimpleClient
-from airtouch5py.packets.zone_control import (
-    ZoneControlZone,
-    ZoneSettingPower,
-    ZoneSettingValue,
-)
-from airtouch5py.packets.zone_name import ZoneName
-from airtouch5py.packets.zone_status import ZoneStatusZone
-
-from homeassistant.components.cover import (
-    ATTR_POSITION,
-    CoverDeviceClass,
-    CoverEntity,
-    CoverEntityFeature,
-)
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import Airtouch5ConfigEntry
-from .const import DOMAIN
-from .entity import Airtouch5Entity
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: Airtouch5ConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the Airtouch 5 Cover entities."""
-    client = config_entry.runtime_data
-
-    # Each zone has a cover for its open percentage
-    async_add_entities(
-        Airtouch5ZoneOpenPercentage(
-            client, zone, client.latest_zone_status[zone.zone_number].has_sensor
-        )
-        for zone in client.zones
-    )
-
-
-class Airtouch5ZoneOpenPercentage(CoverEntity, Airtouch5Entity):
-    """How open the damper is in each zone."""
-
-    _attr_device_class = CoverDeviceClass.DAMPER
-    _attr_translation_key = "damper"
-
-    # Zones with temperature sensors shouldn't be manually controlled.
-    # We allow it but warn the user in the integration documentation.
-    _attr_supported_features = (
-        CoverEntityFeature.SET_POSITION
-        | CoverEntityFeature.OPEN
-        | CoverEntityFeature.CLOSE
-    )
-
-    def __init__(
-        self, client: Airtouch5SimpleClient, zone_name: ZoneName, has_sensor: bool
-    ) -> None:
-        """Initialise the Cover Entity."""
-        super().__init__(client)
-        self._zone_name = zone_name
-
-        self._attr_unique_id = f"zone_{zone_name.zone_number}_open_percentage"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, f"zone_{zone_name.zone_number}")},
-            name=zone_name.zone_name,
-            manufacturer="Polyaire",
-            model="AirTouch 5",
-        )
-
-    @callback
-    def _async_update_attrs(self, data: dict[int, ZoneStatusZone]) -> None:
-        if self._zone_name.zone_number not in data:
-            return
-        status = data[self._zone_name.zone_number]
-
-        self._attr_current_cover_position = int(status.open_percentage * 100)
-        if status.open_percentage == 0:
-            self._attr_is_closed = True
-        else:
-            self._attr_is_closed = False
-        self.async_write_ha_state()
-
-    async def async_added_to_hass(self) -> None:
-        """Add data updated listener after this object has been initialized."""
-        await super().async_added_to_hass()
-        self._client.zone_status_callbacks.append(self._async_update_attrs)
-        self._async_update_attrs(self._client.latest_zone_status)
-
-    async def async_will_remove_from_hass(self) -> None:
-        """Remove data updated listener after this object has been initialized."""
-        await super().async_will_remove_from_hass()
-        self._client.zone_status_callbacks.remove(self._async_update_attrs)
-
-    async def async_open_cover(self, **kwargs: Any) -> None:
-        """Open the damper."""
-        await self._set_cover_position(100)
-
-    async def async_close_cover(self, **kwargs: Any) -> None:
-        """Close damper."""
-        await self._set_cover_position(0)
-
-    async def async_set_cover_position(self, **kwargs: Any) -> None:
-        """Update the damper to a specific position."""
-
-        if (position := kwargs.get(ATTR_POSITION)) is None:
-            _LOGGER.debug("Argument `position` is missing in set_cover_position")
-            return
-        await self._set_cover_position(position)
-
-    async def _set_cover_position(self, position_percent: float) -> None:
-        power: ZoneSettingPower
-
-        if position_percent == 0:
-            power = ZoneSettingPower.SET_TO_OFF
-        else:
-            power = ZoneSettingPower.SET_TO_ON
-
-        zcz = ZoneControlZone(
-            self._zone_name.zone_number,
-            ZoneSettingValue.SET_OPEN_PERCENTAGE,
-            power,
-            position_percent / 100.0,
-        )
-
-        packet = self._client.data_packet_factory.zone_control([zcz])
-        await self._client.send_packet(packet)

homeassistant/components/airtouch5/entity.py

@@ -6,12 +6,15 @@ from airtouch5py.airtouch5_simple_client import Airtouch5SimpleClient
 from homeassistant.core import callback
 from homeassistant.helpers.entity import Entity
 
+from .const import DOMAIN
+
 
 class Airtouch5Entity(Entity):
     """Base class for Airtouch5 entities."""
 
     _attr_should_poll = False
     _attr_has_entity_name = True
+    _attr_translation_key = DOMAIN
 
     def __init__(self, client: Airtouch5SimpleClient) -> None:
         """Initialise the Entity."""

homeassistant/components/airtouch5/strings.json

@@ -27,11 +27,6 @@
           }
         }
       }
-    },
-    "cover": {
-      "damper": {
-        "name": "[%key:component::cover::entity_component::damper::name%]"
-      }
     }
   }
 }

homeassistant/components/airvisual/__init__.py

@@ -31,6 +31,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import (
     aiohttp_client,
+    config_validation as cv,
     device_registry as dr,
     entity_registry as er,
 )
@@ -61,6 +62,8 @@ PLATFORMS = [Platform.SENSOR]
 
 DEFAULT_ATTRIBUTION = "Data provided by AirVisual"
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+
 
 @callback
 def async_get_cloud_api_update_interval(

homeassistant/components/airvisual_pro/config_flow.py

@@ -80,9 +80,11 @@ class AirVisualProFlowHandler(ConfigFlow, domain=DOMAIN):
         """Initialize."""
         self._reauth_entry: ConfigEntry | None = None
 
-    async def async_step_import(self, import_data: dict[str, Any]) -> ConfigFlowResult:
-        """Import a config entry from `airvisual` integration (see #83882)."""
-        return await self.async_step_user(import_data)
+    async def async_step_import(
+        self, import_config: dict[str, Any]
+    ) -> ConfigFlowResult:
+        """Import a config entry from configuration.yaml."""
+        return await self.async_step_user(import_config)
 
     async def async_step_reauth(
         self, entry_data: Mapping[str, Any]

homeassistant/components/airzone/config_flow.py

@@ -114,7 +114,7 @@ class AirZoneConfigFlow(ConfigFlow, domain=DOMAIN):
         )
         try:
             await airzone.get_version()
-        except (AirzoneError, TimeoutError) as err:
+        except AirzoneError as err:
             raise AbortFlow("cannot_connect") from err
 
         return await self.async_step_discovered_connection()

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==0.8.2"]
+  "requirements": ["aioairzone==0.8.0"]
 }

homeassistant/components/airzone/select.py

@@ -2,21 +2,16 @@
 
 from __future__ import annotations
 
-from collections.abc import Callable
 from dataclasses import dataclass
 from typing import Any, Final
 
-from aioairzone.common import GrilleAngle, OperationMode, SleepTimeout
+from aioairzone.common import GrilleAngle, SleepTimeout
 from aioairzone.const import (
     API_COLD_ANGLE,
     API_HEAT_ANGLE,
-    API_MODE,
     API_SLEEP,
     AZD_COLD_ANGLE,
     AZD_HEAT_ANGLE,
-    AZD_MASTER,
-    AZD_MODE,
-    AZD_MODES,
     AZD_SLEEP,
     AZD_ZONES,
 )
@@ -38,9 +33,6 @@ class AirzoneSelectDescription(SelectEntityDescription):
 
     api_param: str
     options_dict: dict[str, int]
-    options_fn: Callable[[dict[str, Any], dict[str, int]], list[str]] = (
-        lambda zone_data, value: list(value)
-    )
 
 
 GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
@@ -50,15 +42,6 @@ GRILLE_ANGLE_DICT: Final[dict[str, int]] = {
     "40deg": GrilleAngle.DEG_40,
 }
 
-MODE_DICT: Final[dict[str, int]] = {
-    "cool": OperationMode.COOLING,
-    "dry": OperationMode.DRY,
-    "fan": OperationMode.FAN,
-    "heat": OperationMode.HEATING,
-    "heat_cool": OperationMode.AUTO,
-    "stop": OperationMode.STOP,
-}
-
 SLEEP_DICT: Final[dict[str, int]] = {
     "off": SleepTimeout.SLEEP_OFF,
     "30m": SleepTimeout.SLEEP_30,
@@ -67,26 +50,6 @@ SLEEP_DICT: Final[dict[str, int]] = {
 }
 
 
-def main_zone_options(
-    zone_data: dict[str, Any],
-    options: dict[str, int],
-) -> list[str]:
-    """Filter available modes."""
-    modes = zone_data.get(AZD_MODES, [])
-    return [k for k, v in options.items() if v in modes]
-
-
-MAIN_ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
-    AirzoneSelectDescription(
-        api_param=API_MODE,
-        key=AZD_MODE,
-        options_dict=MODE_DICT,
-        options_fn=main_zone_options,
-        translation_key="modes",
-    ),
-)
-
-
 ZONE_SELECT_TYPES: Final[tuple[AirzoneSelectDescription, ...]] = (
     AirzoneSelectDescription(
         api_param=API_COLD_ANGLE,
@@ -132,20 +95,7 @@ async def async_setup_entry(
         received_zones = set(zones_data)
         new_zones = received_zones - added_zones
         if new_zones:
-            entities: list[AirzoneZoneSelect] = [
-                AirzoneZoneSelect(
-                    coordinator,
-                    description,
-                    entry,
-                    system_zone_id,
-                    zones_data.get(system_zone_id),
-                )
-                for system_zone_id in new_zones
-                for description in MAIN_ZONE_SELECT_TYPES
-                if description.key in zones_data.get(system_zone_id)
-                and zones_data.get(system_zone_id).get(AZD_MASTER) is True
-            ]
-            entities += [
+            async_add_entities(
                 AirzoneZoneSelect(
                     coordinator,
                     description,
@@ -156,8 +106,7 @@ async def async_setup_entry(
                 for system_zone_id in new_zones
                 for description in ZONE_SELECT_TYPES
                 if description.key in zones_data.get(system_zone_id)
-            ]
-            async_add_entities(entities)
+            )
             added_zones.update(new_zones)
 
     entry.async_on_unload(coordinator.async_add_listener(_async_entity_listener))
@@ -204,11 +153,6 @@ class AirzoneZoneSelect(AirzoneZoneEntity, AirzoneBaseSelect):
             f"{self._attr_unique_id}_{system_zone_id}_{description.key}"
         )
         self.entity_description = description
-
-        self._attr_options = self.entity_description.options_fn(
-            zone_data, description.options_dict
-        )
-
         self.values_dict = {v: k for k, v in description.options_dict.items()}
 
         self._async_update_attrs()

homeassistant/components/airzone/strings.json

@@ -52,17 +52,6 @@
           "40deg": "[%key:component::airzone::entity::select::grille_angles::state::40deg%]"
         }
       },
-      "modes": {
-        "name": "Mode",
-        "state": {
-          "cool": "[%key:component::climate::entity_component::_::state::cool%]",
-          "dry": "[%key:component::climate::entity_component::_::state::dry%]",
-          "fan": "[%key:component::climate::entity_component::_::state::fan_only%]",
-          "heat": "[%key:component::climate::entity_component::_::state::heat%]",
-          "heat_cool": "[%key:component::climate::entity_component::_::state::heat_cool%]",
-          "stop": "Stop"
-        }
-      },
       "sleep_times": {
         "name": "Sleep",
         "state": {

homeassistant/components/airzone_cloud/binary_sensor.py

@@ -14,7 +14,6 @@ from aioairzone_cloud.const import (
     AZD_FLOOR_DEMAND,
     AZD_PROBLEMS,
     AZD_SYSTEMS,
-    AZD_THERMOSTAT_BATTERY_LOW,
     AZD_WARNINGS,
     AZD_ZONES,
 )
@@ -89,10 +88,6 @@ ZONE_BINARY_SENSOR_TYPES: Final[tuple[AirzoneBinarySensorEntityDescription, ...]
         key=AZD_AQ_ACTIVE,
         translation_key="air_quality_active",
     ),
-    AirzoneBinarySensorEntityDescription(
-        device_class=BinarySensorDeviceClass.BATTERY,
-        key=AZD_THERMOSTAT_BATTERY_LOW,
-    ),
     AirzoneBinarySensorEntityDescription(
         device_class=BinarySensorDeviceClass.RUNNING,
         key=AZD_FLOOR_DEMAND,
@@ -161,11 +156,6 @@ class AirzoneBinarySensor(AirzoneEntity, BinarySensorEntity):
 
     entity_description: AirzoneBinarySensorEntityDescription
 
-    @property
-    def available(self) -> bool:
-        """Return Airzone Cloud binary sensor availability."""
-        return super().available and self.is_on is not None
-
     @callback
     def _handle_coordinator_update(self) -> None:
         """Update attributes when the coordinator updates."""

homeassistant/components/airzone_cloud/entity.py

@@ -13,12 +13,9 @@ from aioairzone_cloud.const import (
     AZD_GROUPS,
     AZD_HOT_WATERS,
     AZD_INSTALLATIONS,
-    AZD_MODEL,
     AZD_NAME,
     AZD_SYSTEM_ID,
     AZD_SYSTEMS,
-    AZD_THERMOSTAT_FW,
-    AZD_THERMOSTAT_MODEL,
     AZD_WEBSERVER,
     AZD_WEBSERVERS,
     AZD_ZONES,
@@ -72,7 +69,6 @@ class AirzoneAidooEntity(AirzoneEntity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, aidoo_id)},
             manufacturer=MANUFACTURER,
-            model=aidoo_data[AZD_MODEL],
             name=aidoo_data[AZD_NAME],
             via_device=(DOMAIN, aidoo_data[AZD_WEBSERVER]),
         )
@@ -115,7 +111,6 @@ class AirzoneGroupEntity(AirzoneEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, group_id)},
-            model="Group",
             manufacturer=MANUFACTURER,
             name=group_data[AZD_NAME],
         )
@@ -159,7 +154,6 @@ class AirzoneHotWaterEntity(AirzoneEntity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, dhw_id)},
             manufacturer=MANUFACTURER,
-            model="Hot Water",
             name=dhw_data[AZD_NAME],
             via_device=(DOMAIN, dhw_data[AZD_WEBSERVER]),
         )
@@ -201,7 +195,6 @@ class AirzoneInstallationEntity(AirzoneEntity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, inst_id)},
             manufacturer=MANUFACTURER,
-            model="Installation",
             name=inst_data[AZD_NAME],
         )
 
@@ -247,11 +240,9 @@ class AirzoneSystemEntity(AirzoneEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, system_id)},
-            model=system_data.get(AZD_MODEL),
             manufacturer=MANUFACTURER,
             name=system_data[AZD_NAME],
             via_device=(DOMAIN, system_data[AZD_WEBSERVER]),
-            sw_version=system_data.get(AZD_FIRMWARE),
         )
 
     def get_airzone_value(self, key: str) -> Any:
@@ -279,7 +270,6 @@ class AirzoneWebServerEntity(AirzoneEntity):
         self._attr_device_info = DeviceInfo(
             connections={(dr.CONNECTION_NETWORK_MAC, ws_id)},
             identifiers={(DOMAIN, ws_id)},
-            model="WebServer",
             manufacturer=MANUFACTURER,
             name=ws_data[AZD_NAME],
             sw_version=ws_data[AZD_FIRMWARE],
@@ -310,11 +300,9 @@ class AirzoneZoneEntity(AirzoneEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, zone_id)},
-            model=zone_data.get(AZD_THERMOSTAT_MODEL),
             manufacturer=MANUFACTURER,
             name=zone_data[AZD_NAME],
             via_device=(DOMAIN, self.system_id),
-            sw_version=zone_data.get(AZD_THERMOSTAT_FW),
         )
 
     def get_airzone_value(self, key: str) -> Any:

homeassistant/components/airzone_cloud/icons.json

@@ -1,15 +0,0 @@
-{
-  "entity": {
-    "sensor": {
-      "cpu_usage": {
-        "default": "mdi:cpu-32-bit"
-      },
-      "free_memory": {
-        "default": "mdi:memory"
-      },
-      "thermostat_coverage": {
-        "default": "mdi:signal"
-      }
-    }
-  }
-}

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.2"]
+  "requirements": ["aioairzone-cloud==0.5.4"]
 }

homeassistant/components/airzone_cloud/sensor.py

@@ -10,12 +10,8 @@ from aioairzone_cloud.const import (
     AZD_AQ_PM_1,
     AZD_AQ_PM_2P5,
     AZD_AQ_PM_10,
-    AZD_CPU_USAGE,
     AZD_HUMIDITY,
-    AZD_MEMORY_FREE,
     AZD_TEMP,
-    AZD_THERMOSTAT_BATTERY,
-    AZD_THERMOSTAT_COVERAGE,
     AZD_WEBSERVERS,
     AZD_WIFI_RSSI,
     AZD_ZONES,
@@ -32,7 +28,6 @@ from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
-    UnitOfInformation,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -57,22 +52,6 @@ AIDOO_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
 )
 
 WEBSERVER_SENSOR_TYPES: Final[tuple[SensorEntityDescription, ...]] = (
-    SensorEntityDescription(
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        key=AZD_CPU_USAGE,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="cpu_usage",
-    ),
-    SensorEntityDescription(
-        entity_category=EntityCategory.DIAGNOSTIC,
-        entity_registry_enabled_default=False,
-        key=AZD_MEMORY_FREE,
-        native_unit_of_measurement=UnitOfInformation.BYTES,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="free_memory",
-    ),
     SensorEntityDescription(
         device_class=SensorDeviceClass.SIGNAL_STRENGTH,
         entity_category=EntityCategory.DIAGNOSTIC,
@@ -119,20 +98,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_COVERAGE,
-        native_unit_of_measurement=PERCENTAGE,
-        state_class=SensorStateClass.MEASUREMENT,
-        translation_key="thermostat_coverage",
-    ),
 )
 
 
@@ -189,11 +154,6 @@ async def async_setup_entry(
 class AirzoneSensor(AirzoneEntity, SensorEntity):
     """Define an Airzone Cloud sensor."""
 
-    @property
-    def available(self) -> bool:
-        """Return Airzone Cloud sensor availability."""
-        return super().available and self.native_value is not None
-
     @callback
     def _handle_coordinator_update(self) -> None:
         """Update attributes when the coordinator updates."""

homeassistant/components/airzone_cloud/strings.json

@@ -37,17 +37,6 @@
           "auto": "Auto"
         }
       }
-    },
-    "sensor": {
-      "cpu_usage": {
-        "name": "CPU usage"
-      },
-      "free_memory": {
-        "name": "Free memory"
-      },
-      "thermostat_coverage": {
-        "name": "Signal percentage"
-      }
     }
   }
 }

homeassistant/components/alarm_control_panel/icons.json

@@ -15,26 +15,12 @@
     }
   },
   "services": {
-    "alarm_arm_away": {
-      "service": "mdi:shield-lock"
-    },
-    "alarm_arm_home": {
-      "service": "mdi:shield-home"
-    },
-    "alarm_arm_night": {
-      "service": "mdi:shield-moon"
-    },
-    "alarm_arm_custom_bypass": {
-      "service": "mdi:security"
-    },
-    "alarm_disarm": {
-      "service": "mdi:shield-off"
-    },
-    "alarm_trigger": {
-      "service": "mdi:bell-ring"
-    },
-    "alarm_arm_vacation": {
-      "service": "mdi:shield-airplane"
-    }
+    "alarm_arm_away": "mdi:shield-lock",
+    "alarm_arm_home": "mdi:shield-home",
+    "alarm_arm_night": "mdi:shield-moon",
+    "alarm_arm_custom_bypass": "mdi:security",
+    "alarm_disarm": "mdi:shield-off",
+    "alarm_trigger": "mdi:bell-ring",
+    "alarm_arm_vacation": "mdi:shield-airplane"
   }
 }

homeassistant/components/alarmdecoder/icons.json

@@ -7,11 +7,7 @@
     }
   },
   "services": {
-    "alarm_keypress": {
-      "service": "mdi:dialpad"
-    },
-    "alarm_toggle_chime": {
-      "service": "mdi:abc"
-    }
+    "alarm_keypress": "mdi:dialpad",
+    "alarm_toggle_chime": "mdi:abc"
   }
 }

homeassistant/components/alert/__init__.py

@@ -124,9 +124,9 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
     if not entities:
         return False
 
-    component.async_register_entity_service(SERVICE_TURN_OFF, None, "async_turn_off")
-    component.async_register_entity_service(SERVICE_TURN_ON, None, "async_turn_on")
-    component.async_register_entity_service(SERVICE_TOGGLE, None, "async_toggle")
+    component.async_register_entity_service(SERVICE_TURN_OFF, {}, "async_turn_off")
+    component.async_register_entity_service(SERVICE_TURN_ON, {}, "async_turn_on")
+    component.async_register_entity_service(SERVICE_TOGGLE, {}, "async_toggle")
 
     await component.async_add_entities(entities)
 
@@ -162,8 +162,16 @@ class Alert(Entity):
         self._data = data
 
         self._message_template = message_template
+        if self._message_template is not None:
+            self._message_template.hass = hass
+
         self._done_message_template = done_message_template
+        if self._done_message_template is not None:
+            self._done_message_template.hass = hass
+
         self._title_template = title_template
+        if self._title_template is not None:
+            self._title_template.hass = hass
 
         self._notifiers = notifiers
         self._can_ack = can_ack

homeassistant/components/alert/icons.json

@@ -1,13 +1,7 @@
 {
   "services": {
-    "toggle": {
-      "service": "mdi:bell-ring"
-    },
-    "turn_off": {
-      "service": "mdi:bell-off"
-    },
-    "turn_on": {
-      "service": "mdi:bell-alert"
-    }
+    "toggle": "mdi:bell-ring",
+    "turn_off": "mdi:bell-off",
+    "turn_on": "mdi:bell-alert"
   }
 }

homeassistant/components/alexa/entities.py

@@ -661,12 +661,9 @@ class RemoteCapabilities(AlexaEntity):
     def interfaces(self) -> Generator[AlexaCapability]:
         """Yield the supported interfaces."""
         yield AlexaPowerController(self.entity)
-        supported = self.entity.attributes.get(ATTR_SUPPORTED_FEATURES, 0)
-        activities = self.entity.attributes.get(remote.ATTR_ACTIVITY_LIST) or []
-        if activities and supported & remote.RemoteEntityFeature.ACTIVITY:
-            yield AlexaModeController(
-                self.entity, instance=f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}"
-            )
+        yield AlexaModeController(
+            self.entity, instance=f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}"
+        )
         yield AlexaEndpointHealth(self.hass, self.entity)
         yield Alexa(self.entity)
 

homeassistant/components/alexa/flash_briefings.py

@@ -52,6 +52,7 @@ class AlexaFlashBriefingView(http.HomeAssistantView):
         """Initialize Alexa view."""
         super().__init__()
         self.flash_briefings = flash_briefings
+        template.attach(hass, self.flash_briefings)
 
     @callback
     def get(

homeassistant/components/alexa/handlers.py

@@ -1206,7 +1206,7 @@ async def async_api_set_mode(
             raise AlexaInvalidValueError(msg)
 
     # Remote Activity
-    elif instance == f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}":
+    if instance == f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}":
         activity = mode.split(".")[1]
         activities: list[str] | None = entity.attributes.get(remote.ATTR_ACTIVITY_LIST)
         if activity != PRESET_MODE_NA and activities and activity in activities:

homeassistant/components/alexa/manifest.json

@@ -5,6 +5,5 @@
   "codeowners": ["@home-assistant/cloud", "@ochlocracy", "@jbouwh"],
   "dependencies": ["http"],
   "documentation": "https://www.home-assistant.io/integrations/alexa",
-  "integration_type": "system",
   "iot_class": "cloud_push"
 }

homeassistant/components/alexa/resources.py

@@ -283,7 +283,7 @@ class AlexaPresetResource(AlexaCapabilityResource):
     """Implements Alexa PresetResources.
 
     Use presetResources with RangeController to provide a set of
-    friendlyNames for each RangeController preset.
+    friendlyNamesfor each RangeController preset.
 
     https://developer.amazon.com/docs/device-apis/resources-and-assets.html#presetresources
     """

homeassistant/components/alexa/smart_home.py

@@ -194,7 +194,7 @@ async def async_handle_message(
 
     try:
         if not enabled:
-            raise AlexaBridgeUnreachableError(  # noqa: TRY301
+            raise AlexaBridgeUnreachableError(
                 "Alexa API not enabled in Home Assistant configuration"
             )
 

homeassistant/components/amazon_polly/const.py

@@ -8,23 +8,128 @@ CONF_REGION: Final = "region_name"
 CONF_ACCESS_KEY_ID: Final = "aws_access_key_id"
 CONF_SECRET_ACCESS_KEY: Final = "aws_secret_access_key"
 
+DEFAULT_REGION: Final = "us-east-1"
+SUPPORTED_REGIONS: Final[list[str]] = [
+    "us-east-1",
+    "us-east-2",
+    "us-west-1",
+    "us-west-2",
+    "ca-central-1",
+    "eu-west-1",
+    "eu-central-1",
+    "eu-west-2",
+    "eu-west-3",
+    "ap-southeast-1",
+    "ap-southeast-2",
+    "ap-northeast-2",
+    "ap-northeast-1",
+    "ap-south-1",
+    "sa-east-1",
+]
+
 CONF_ENGINE: Final = "engine"
 CONF_VOICE: Final = "voice"
 CONF_OUTPUT_FORMAT: Final = "output_format"
 CONF_SAMPLE_RATE: Final = "sample_rate"
 CONF_TEXT_TYPE: Final = "text_type"
 
-SUPPORTED_OUTPUT_FORMATS: Final[set[str]] = {"mp3", "ogg_vorbis", "pcm"}
+SUPPORTED_VOICES: Final[list[str]] = [
+    "Aditi",  # Hindi
+    "Amy",  # English (British)
+    "Aria",  # English (New Zealand), Neural
+    "Arlet",  # Catalan, Neural
+    "Arthur",  # English, Neural
+    "Astrid",  # Swedish
+    "Ayanda",  # English (South African), Neural
+    "Bianca",  # Italian
+    "Brian",  # English (British)
+    "Camila",  # Portuguese, Brazilian
+    "Carla",  # Italian
+    "Carmen",  # Romanian
+    "Celine",  # French
+    "Chantal",  # French Canadian
+    "Conchita",  # Spanish (European)
+    "Cristiano",  # Portuguese (European)
+    "Daniel",  # German, Neural
+    "Dora",  # Icelandic
+    "Elin",  # Swedish, Neural
+    "Emma",  # English
+    "Enrique",  # Spanish (European)
+    "Ewa",  # Polish
+    "Filiz",  # Turkish
+    "Gabrielle",  # French (Canadian)
+    "Geraint",  # English Welsh
+    "Giorgio",  # Italian
+    "Gwyneth",  # Welsh
+    "Hala",  # Arabic (Gulf), Neural
+    "Hannah",  # German (Austrian), Neural
+    "Hans",  # German
+    "Hiujin",  # Chinese (Cantonese), Neural
+    "Ida",  # Norwegian, Neural
+    "Ines",  # Portuguese, European  # codespell:ignore ines
+    "Ivy",  # English
+    "Jacek",  # Polish
+    "Jan",  # Polish
+    "Joanna",  # English
+    "Joey",  # English
+    "Justin",  # English
+    "Kajal",  # English (Indian)/Hindi (Bilingual ), Neural
+    "Karl",  # Icelandic
+    "Kendra",  # English
+    "Kevin",  # English, Neural
+    "Kimberly",  # English
+    "Laura",  # Dutch, Neural
+    "Lea",  # French
+    "Liam",  # Canadian French, Neural
+    "Liv",  # Norwegian
+    "Lotte",  # Dutch
+    "Lucia",  # Spanish European
+    "Lupe",  # Spanish US
+    "Mads",  # Danish
+    "Maja",  # Polish
+    "Marlene",  # German
+    "Mathieu",  # French
+    "Matthew",  # English
+    "Maxim",  # Russian
+    "Mia",  # Spanish Mexican
+    "Miguel",  # Spanish US
+    "Mizuki",  # Japanese
+    "Naja",  # Danish
+    "Nicole",  # English Australian
+    "Ola",  # Polish, Neural
+    "Olivia",  # Female, Australian, Neural
+    "Penelope",  # Spanish US
+    "Pedro",  # Spanish US, Neural
+    "Raveena",  # English, Indian
+    "Ricardo",  # Portuguese (Brazilian)
+    "Ruben",  # Dutch
+    "Russell",  # English (Australian)
+    "Ruth",  # English, Neural
+    "Salli",  # English
+    "Seoyeon",  # Korean
+    "Stephen",  # English, Neural
+    "Suvi",  # Finnish
+    "Takumi",  # Japanese
+    "Tatyana",  # Russian
+    "Vicki",  # German
+    "Vitoria",  # Portuguese, Brazilian
+    "Zeina",  # Arabic
+    "Zhiyu",  # Chinese
+]
 
-SUPPORTED_SAMPLE_RATES: Final[set[str]] = {"8000", "16000", "22050", "24000"}
+SUPPORTED_OUTPUT_FORMATS: Final[list[str]] = ["mp3", "ogg_vorbis", "pcm"]
 
-SUPPORTED_SAMPLE_RATES_MAP: Final[dict[str, set[str]]] = {
-    "mp3": {"8000", "16000", "22050", "24000"},
-    "ogg_vorbis": {"8000", "16000", "22050"},
-    "pcm": {"8000", "16000"},
+SUPPORTED_ENGINES: Final[list[str]] = ["neural", "standard"]
+
+SUPPORTED_SAMPLE_RATES: Final[list[str]] = ["8000", "16000", "22050", "24000"]
+
+SUPPORTED_SAMPLE_RATES_MAP: Final[dict[str, list[str]]] = {
+    "mp3": ["8000", "16000", "22050", "24000"],
+    "ogg_vorbis": ["8000", "16000", "22050"],
+    "pcm": ["8000", "16000"],
 }
 
-SUPPORTED_TEXT_TYPES: Final[set[str]] = {"text", "ssml"}
+SUPPORTED_TEXT_TYPES: Final[list[str]] = ["text", "ssml"]
 
 CONTENT_TYPE_EXTENSIONS: Final[dict[str, str]] = {
     "audio/mpeg": "mp3",
@@ -32,8 +137,6 @@ CONTENT_TYPE_EXTENSIONS: Final[dict[str, str]] = {
     "audio/pcm": "pcm",
 }
 
-DEFAULT_REGION: Final = "us-east-1"
-
 DEFAULT_ENGINE: Final = "standard"
 DEFAULT_VOICE: Final = "Joanna"
 DEFAULT_OUTPUT_FORMAT: Final = "mp3"

homeassistant/components/amazon_polly/tts.py

@@ -16,11 +16,6 @@ from homeassistant.components.tts import (
 )
 from homeassistant.const import ATTR_CREDENTIALS, CONF_PROFILE_NAME
 from homeassistant.core import HomeAssistant
-from homeassistant.generated.amazon_polly import (
-    SUPPORTED_ENGINES,
-    SUPPORTED_REGIONS,
-    SUPPORTED_VOICES,
-)
 import homeassistant.helpers.config_validation as cv
 from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
 
@@ -43,10 +38,13 @@ from .const import (
     DEFAULT_SAMPLE_RATES,
     DEFAULT_TEXT_TYPE,
     DEFAULT_VOICE,
+    SUPPORTED_ENGINES,
     SUPPORTED_OUTPUT_FORMATS,
+    SUPPORTED_REGIONS,
     SUPPORTED_SAMPLE_RATES,
     SUPPORTED_SAMPLE_RATES_MAP,
     SUPPORTED_TEXT_TYPES,
+    SUPPORTED_VOICES,
 )
 
 _LOGGER: Final = logging.getLogger(__name__)

homeassistant/components/ambient_network/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aioambient"],
-  "requirements": ["aioambient==2024.08.0"]
+  "requirements": ["aioambient==2024.01.0"]
 }

homeassistant/components/ambient_station/__init__.py

@@ -17,6 +17,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import Event, HomeAssistant, callback
 from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.helpers import config_validation as cv
 import homeassistant.helpers.device_registry as dr
 from homeassistant.helpers.dispatcher import async_dispatcher_send
 import homeassistant.helpers.entity_registry as er
@@ -24,6 +25,7 @@ import homeassistant.helpers.entity_registry as er
 from .const import (
     ATTR_LAST_DATA,
     CONF_APP_KEY,
+    DOMAIN,
     LOGGER,
     TYPE_SOLARRADIATION,
     TYPE_SOLARRADIATION_LX,
@@ -35,6 +37,7 @@ DATA_CONFIG = "config"
 
 DEFAULT_SOCKET_MIN_RETRY = 15
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
 type AmbientStationConfigEntry = ConfigEntry[AmbientStation]
 

homeassistant/components/ambient_station/config_flow.py

@@ -2,8 +2,6 @@
 
 from __future__ import annotations
 
-from typing import Any
-
 from aioambient import API
 from aioambient.errors import AmbientError
 import voluptuous as vol
@@ -34,9 +32,7 @@ class AmbientStationFlowHandler(ConfigFlow, domain=DOMAIN):
             errors=errors if errors else {},
         )
 
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
+    async def async_step_user(self, user_input: dict | None = None) -> ConfigFlowResult:
         """Handle the start of the config flow."""
         if not user_input:
             return await self._show_form()

homeassistant/components/ambient_station/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["aioambient"],
-  "requirements": ["aioambient==2024.08.0"]
+  "requirements": ["aioambient==2024.01.0"]
 }

homeassistant/components/amcrest/camera.py

@@ -8,7 +8,6 @@ from datetime import timedelta
 import logging
 from typing import TYPE_CHECKING, Any
 
-import aiohttp
 from aiohttp import web
 from amcrest import AmcrestError
 from haffmpeg.camera import CameraMjpeg
@@ -245,9 +244,7 @@ class AmcrestCam(Camera):
             websession = async_get_clientsession(self.hass)
             streaming_url = self._api.mjpeg_url(typeno=self._resolution)
             stream_coro = websession.get(
-                streaming_url,
-                auth=self._token,
-                timeout=aiohttp.ClientTimeout(total=CAMERA_WEB_SESSION_TIMEOUT),
+                streaming_url, auth=self._token, timeout=CAMERA_WEB_SESSION_TIMEOUT
             )
 
             return await async_aiohttp_proxy_web(self.hass, request, stream_coro)
@@ -499,7 +496,7 @@ class AmcrestCam(Camera):
                 await getattr(self, f"_async_set_{func}")(value)
                 new_value = await getattr(self, f"_async_get_{func}")()
                 if new_value != value:
-                    raise AmcrestCommandFailed  # noqa: TRY301
+                    raise AmcrestCommandFailed
             except (AmcrestError, AmcrestCommandFailed) as error:
                 if tries == 1:
                     log_update_error(_LOGGER, action, self.name, description, error)

homeassistant/components/amcrest/icons.json

@@ -1,37 +1,15 @@
 {
   "services": {
-    "enable_recording": {
-      "service": "mdi:record-rec"
-    },
-    "disable_recording": {
-      "service": "mdi:stop"
-    },
-    "enable_audio": {
-      "service": "mdi:volume-high"
-    },
-    "disable_audio": {
-      "service": "mdi:volume-off"
-    },
-    "enable_motion_recording": {
-      "service": "mdi:motion-sensor"
-    },
-    "disable_motion_recording": {
-      "service": "mdi:motion-sensor-off"
-    },
-    "goto_preset": {
-      "service": "mdi:pan"
-    },
-    "set_color_bw": {
-      "service": "mdi:palette"
-    },
-    "start_tour": {
-      "service": "mdi:panorama"
-    },
-    "stop_tour": {
-      "service": "mdi:panorama-outline"
-    },
-    "ptz_control": {
-      "service": "mdi:pan"
-    }
+    "enable_recording": "mdi:record-rec",
+    "disable_recording": "mdi:stop",
+    "enable_audio": "mdi:volume-high",
+    "disable_audio": "mdi:volume-off",
+    "enable_motion_recording": "mdi:motion-sensor",
+    "disable_motion_recording": "mdi:motion-sensor-off",
+    "goto_preset": "mdi:pan",
+    "set_color_bw": "mdi:palette",
+    "start_tour": "mdi:panorama",
+    "stop_tour": "mdi:panorama-outline",
+    "ptz_control": "mdi:pan"
   }
 }

homeassistant/components/android_ip_webcam/__init__.py

@@ -14,6 +14,7 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN
 from .coordinator import AndroidIPCamDataUpdateCoordinator
@@ -26,6 +27,9 @@ PLATFORMS: list[Platform] = [
 ]
 
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+
+
 async def async_setup_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
     """Set up Android IP Webcam from a config entry."""
     websession = async_get_clientsession(hass)

homeassistant/components/androidtv/icons.json

@@ -1,16 +1,8 @@
 {
   "services": {
-    "adb_command": {
-      "service": "mdi:console"
-    },
-    "download": {
-      "service": "mdi:download"
-    },
-    "upload": {
-      "service": "mdi:upload"
-    },
-    "learn_sendevent": {
-      "service": "mdi:remote"
-    }
+    "adb_command": "mdi:console",
+    "download": "mdi:download",
+    "upload": "mdi:upload",
+    "learn_sendevent": "mdi:remote"
   }
 }

homeassistant/components/androidtv/media_player.py

@@ -87,7 +87,7 @@ async def async_setup_entry(
         "adb_command",
     )
     platform.async_register_entity_service(
-        SERVICE_LEARN_SENDEVENT, None, "learn_sendevent"
+        SERVICE_LEARN_SENDEVENT, {}, "learn_sendevent"
     )
     platform.async_register_entity_service(
         SERVICE_DOWNLOAD,

homeassistant/components/anthropic/__init__.py

@@ -1,46 +0,0 @@
-"""The Anthropic integration."""
-
-from __future__ import annotations
-
-import anthropic
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_API_KEY, Platform
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
-from homeassistant.helpers import config_validation as cv
-
-from .const import DOMAIN, LOGGER
-
-PLATFORMS = (Platform.CONVERSATION,)
-CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
-
-type AnthropicConfigEntry = ConfigEntry[anthropic.AsyncClient]
-
-
-async def async_setup_entry(hass: HomeAssistant, entry: AnthropicConfigEntry) -> bool:
-    """Set up Anthropic from a config entry."""
-    client = anthropic.AsyncAnthropic(api_key=entry.data[CONF_API_KEY])
-    try:
-        await client.messages.create(
-            model="claude-3-haiku-20240307",
-            max_tokens=1,
-            messages=[{"role": "user", "content": "Hi"}],
-            timeout=10.0,
-        )
-    except anthropic.AuthenticationError as err:
-        LOGGER.error("Invalid API key: %s", err)
-        return False
-    except anthropic.AnthropicError as err:
-        raise ConfigEntryNotReady(err) from err
-
-    entry.runtime_data = client
-
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
-
-    return True
-
-
-async def async_unload_entry(hass: HomeAssistant, entry: ConfigEntry) -> bool:
-    """Unload Anthropic."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)

homeassistant/components/anthropic/config_flow.py

@@ -1,210 +0,0 @@
-"""Config flow for Anthropic integration."""
-
-from __future__ import annotations
-
-import logging
-from types import MappingProxyType
-from typing import Any
-
-import anthropic
-import voluptuous as vol
-
-from homeassistant.config_entries import (
-    ConfigEntry,
-    ConfigFlow,
-    ConfigFlowResult,
-    OptionsFlow,
-)
-from homeassistant.const import CONF_API_KEY, CONF_LLM_HASS_API
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers import llm
-from homeassistant.helpers.selector import (
-    NumberSelector,
-    NumberSelectorConfig,
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-    TemplateSelector,
-)
-
-from .const import (
-    CONF_CHAT_MODEL,
-    CONF_MAX_TOKENS,
-    CONF_PROMPT,
-    CONF_RECOMMENDED,
-    CONF_TEMPERATURE,
-    DOMAIN,
-    RECOMMENDED_CHAT_MODEL,
-    RECOMMENDED_MAX_TOKENS,
-    RECOMMENDED_TEMPERATURE,
-)
-
-_LOGGER = logging.getLogger(__name__)
-
-STEP_USER_DATA_SCHEMA = vol.Schema(
-    {
-        vol.Required(CONF_API_KEY): str,
-    }
-)
-
-RECOMMENDED_OPTIONS = {
-    CONF_RECOMMENDED: True,
-    CONF_LLM_HASS_API: llm.LLM_API_ASSIST,
-    CONF_PROMPT: llm.DEFAULT_INSTRUCTIONS_PROMPT,
-}
-
-
-async def validate_input(hass: HomeAssistant, data: dict[str, Any]) -> None:
-    """Validate the user input allows us to connect.
-
-    Data has the keys from STEP_USER_DATA_SCHEMA with values provided by the user.
-    """
-    client = anthropic.AsyncAnthropic(api_key=data[CONF_API_KEY])
-    await client.messages.create(
-        model="claude-3-haiku-20240307",
-        max_tokens=1,
-        messages=[{"role": "user", "content": "Hi"}],
-        timeout=10.0,
-    )
-
-
-class AnthropicConfigFlow(ConfigFlow, domain=DOMAIN):
-    """Handle a config flow for Anthropic."""
-
-    VERSION = 1
-
-    async def async_step_user(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        errors = {}
-
-        if user_input is not None:
-            try:
-                await validate_input(self.hass, user_input)
-            except anthropic.APITimeoutError:
-                errors["base"] = "timeout_connect"
-            except anthropic.APIConnectionError:
-                errors["base"] = "cannot_connect"
-            except anthropic.APIStatusError as e:
-                if isinstance(e.body, dict):
-                    errors["base"] = e.body.get("error", {}).get("type", "unknown")
-                else:
-                    errors["base"] = "unknown"
-            except Exception:
-                _LOGGER.exception("Unexpected exception")
-                errors["base"] = "unknown"
-            else:
-                return self.async_create_entry(
-                    title="Claude",
-                    data=user_input,
-                    options=RECOMMENDED_OPTIONS,
-                )
-
-        return self.async_show_form(
-            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors or None
-        )
-
-    @staticmethod
-    def async_get_options_flow(
-        config_entry: ConfigEntry,
-    ) -> OptionsFlow:
-        """Create the options flow."""
-        return AnthropicOptionsFlow(config_entry)
-
-
-class AnthropicOptionsFlow(OptionsFlow):
-    """Anthropic config flow options handler."""
-
-    def __init__(self, config_entry: ConfigEntry) -> None:
-        """Initialize options flow."""
-        self.config_entry = config_entry
-        self.last_rendered_recommended = config_entry.options.get(
-            CONF_RECOMMENDED, False
-        )
-
-    async def async_step_init(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Manage the options."""
-        options: dict[str, Any] | MappingProxyType[str, Any] = self.config_entry.options
-
-        if user_input is not None:
-            if user_input[CONF_RECOMMENDED] == self.last_rendered_recommended:
-                if user_input[CONF_LLM_HASS_API] == "none":
-                    user_input.pop(CONF_LLM_HASS_API)
-                return self.async_create_entry(title="", data=user_input)
-
-            # Re-render the options again, now with the recommended options shown/hidden
-            self.last_rendered_recommended = user_input[CONF_RECOMMENDED]
-
-            options = {
-                CONF_RECOMMENDED: user_input[CONF_RECOMMENDED],
-                CONF_PROMPT: user_input[CONF_PROMPT],
-                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
-
-        schema = self.add_suggested_values_to_schema(
-            vol.Schema(anthropic_config_option_schema(self.hass, options)),
-            suggested_values,
-        )
-
-        return self.async_show_form(
-            step_id="init",
-            data_schema=schema,
-        )
-
-
-def anthropic_config_option_schema(
-    hass: HomeAssistant,
-    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, default="none"): SelectSelector(
-            SelectSelectorConfig(options=hass_apis)
-        ),
-        vol.Required(
-            CONF_RECOMMENDED, default=options.get(CONF_RECOMMENDED, False)
-        ): bool,
-    }
-
-    if options.get(CONF_RECOMMENDED):
-        return schema
-
-    schema.update(
-        {
-            vol.Optional(
-                CONF_CHAT_MODEL,
-                default=RECOMMENDED_CHAT_MODEL,
-            ): str,
-            vol.Optional(
-                CONF_MAX_TOKENS,
-                default=RECOMMENDED_MAX_TOKENS,
-            ): int,
-            vol.Optional(
-                CONF_TEMPERATURE,
-                default=RECOMMENDED_TEMPERATURE,
-            ): NumberSelector(NumberSelectorConfig(min=0, max=1, step=0.05)),
-        }
-    )
-    return schema

homeassistant/components/anthropic/const.py

@@ -1,15 +0,0 @@
-"""Constants for the Anthropic integration."""
-
-import logging
-
-DOMAIN = "anthropic"
-LOGGER = logging.getLogger(__package__)
-
-CONF_RECOMMENDED = "recommended"
-CONF_PROMPT = "prompt"
-CONF_CHAT_MODEL = "chat_model"
-RECOMMENDED_CHAT_MODEL = "claude-3-5-sonnet-20240620"
-CONF_MAX_TOKENS = "max_tokens"
-RECOMMENDED_MAX_TOKENS = 1024
-CONF_TEMPERATURE = "temperature"
-RECOMMENDED_TEMPERATURE = 1.0

homeassistant/components/anthropic/conversation.py

@@ -1,316 +0,0 @@
-"""Conversation support for Anthropic."""
-
-from collections.abc import Callable
-import json
-from typing import Any, Literal, cast
-
-import anthropic
-from anthropic._types import NOT_GIVEN
-from anthropic.types import (
-    Message,
-    MessageParam,
-    TextBlock,
-    TextBlockParam,
-    ToolParam,
-    ToolResultBlockParam,
-    ToolUseBlock,
-    ToolUseBlockParam,
-)
-import voluptuous as vol
-from voluptuous_openapi import convert
-
-from homeassistant.components import conversation
-from homeassistant.components.conversation import trace
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_LLM_HASS_API, MATCH_ALL
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError, TemplateError
-from homeassistant.helpers import device_registry as dr, intent, llm, template
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.util import ulid
-
-from . import AnthropicConfigEntry
-from .const import (
-    CONF_CHAT_MODEL,
-    CONF_MAX_TOKENS,
-    CONF_PROMPT,
-    CONF_TEMPERATURE,
-    DOMAIN,
-    LOGGER,
-    RECOMMENDED_CHAT_MODEL,
-    RECOMMENDED_MAX_TOKENS,
-    RECOMMENDED_TEMPERATURE,
-)
-
-# Max number of back and forth with the LLM to generate a response
-MAX_TOOL_ITERATIONS = 10
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AnthropicConfigEntry,
-    async_add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up conversation entities."""
-    agent = AnthropicConversationEntity(config_entry)
-    async_add_entities([agent])
-
-
-def _format_tool(
-    tool: llm.Tool, custom_serializer: Callable[[Any], Any] | None
-) -> ToolParam:
-    """Format tool specification."""
-    return ToolParam(
-        name=tool.name,
-        description=tool.description or "",
-        input_schema=convert(tool.parameters, custom_serializer=custom_serializer),
-    )
-
-
-def _message_convert(
-    message: Message,
-) -> MessageParam:
-    """Convert from class to TypedDict."""
-    param_content: list[TextBlockParam | ToolUseBlockParam] = []
-
-    for message_content in message.content:
-        if isinstance(message_content, TextBlock):
-            param_content.append(TextBlockParam(type="text", text=message_content.text))
-        elif isinstance(message_content, ToolUseBlock):
-            param_content.append(
-                ToolUseBlockParam(
-                    type="tool_use",
-                    id=message_content.id,
-                    name=message_content.name,
-                    input=message_content.input,
-                )
-            )
-
-    return MessageParam(role=message.role, content=param_content)
-
-
-class AnthropicConversationEntity(
-    conversation.ConversationEntity, conversation.AbstractConversationAgent
-):
-    """Anthropic conversation agent."""
-
-    _attr_has_entity_name = True
-    _attr_name = None
-
-    def __init__(self, entry: AnthropicConfigEntry) -> None:
-        """Initialize the agent."""
-        self.entry = entry
-        self.history: dict[str, list[MessageParam]] = {}
-        self._attr_unique_id = entry.entry_id
-        self._attr_device_info = dr.DeviceInfo(
-            identifiers={(DOMAIN, entry.entry_id)},
-            manufacturer="Anthropic",
-            model="Claude",
-            entry_type=dr.DeviceEntryType.SERVICE,
-        )
-        if self.entry.options.get(CONF_LLM_HASS_API):
-            self._attr_supported_features = (
-                conversation.ConversationEntityFeature.CONTROL
-            )
-
-    @property
-    def supported_languages(self) -> list[str] | Literal["*"]:
-        """Return a list of supported languages."""
-        return MATCH_ALL
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to Home Assistant."""
-        await super().async_added_to_hass()
-        self.entry.async_on_unload(
-            self.entry.add_update_listener(self._async_entry_update_listener)
-        )
-
-    async def async_process(
-        self, user_input: conversation.ConversationInput
-    ) -> conversation.ConversationResult:
-        """Process a sentence."""
-        options = self.entry.options
-        intent_response = intent.IntentResponse(language=user_input.language)
-        llm_api: llm.APIInstance | None = None
-        tools: list[ToolParam] | None = None
-        user_name: str | None = None
-        llm_context = llm.LLMContext(
-            platform=DOMAIN,
-            context=user_input.context,
-            user_prompt=user_input.text,
-            language=user_input.language,
-            assistant=conversation.DOMAIN,
-            device_id=user_input.device_id,
-        )
-
-        if options.get(CONF_LLM_HASS_API):
-            try:
-                llm_api = await llm.async_get_api(
-                    self.hass,
-                    options[CONF_LLM_HASS_API],
-                    llm_context,
-                )
-            except HomeAssistantError as err:
-                LOGGER.error("Error getting LLM API: %s", err)
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Error preparing LLM API: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=user_input.conversation_id
-                )
-            tools = [
-                _format_tool(tool, llm_api.custom_serializer) for tool in llm_api.tools
-            ]
-
-        if user_input.conversation_id is None:
-            conversation_id = ulid.ulid_now()
-            messages = []
-
-        elif user_input.conversation_id in self.history:
-            conversation_id = user_input.conversation_id
-            messages = self.history[conversation_id]
-
-        else:
-            # Conversation IDs are ULIDs. We generate a new one if not provided.
-            # If an old OLID is passed in, we will generate a new one to indicate
-            # a new conversation was started. If the user picks their own, they
-            # want to track a conversation and we respect it.
-            try:
-                ulid.ulid_to_bytes(user_input.conversation_id)
-                conversation_id = ulid.ulid_now()
-            except ValueError:
-                conversation_id = user_input.conversation_id
-
-            messages = []
-
-        if (
-            user_input.context
-            and user_input.context.user_id
-            and (
-                user := await self.hass.auth.async_get_user(user_input.context.user_id)
-            )
-        ):
-            user_name = user.name
-
-        try:
-            prompt_parts = [
-                template.Template(
-                    llm.BASE_PROMPT
-                    + options.get(CONF_PROMPT, llm.DEFAULT_INSTRUCTIONS_PROMPT),
-                    self.hass,
-                ).async_render(
-                    {
-                        "ha_name": self.hass.config.location_name,
-                        "user_name": user_name,
-                        "llm_context": llm_context,
-                    },
-                    parse_result=False,
-                )
-            ]
-
-        except TemplateError as err:
-            LOGGER.error("Error rendering prompt: %s", err)
-            intent_response.async_set_error(
-                intent.IntentResponseErrorCode.UNKNOWN,
-                f"Sorry, I had a problem with my template: {err}",
-            )
-            return conversation.ConversationResult(
-                response=intent_response, conversation_id=conversation_id
-            )
-
-        if llm_api:
-            prompt_parts.append(llm_api.api_prompt)
-
-        prompt = "\n".join(prompt_parts)
-
-        # Create a copy of the variable because we attach it to the trace
-        messages = [*messages, MessageParam(role="user", content=user_input.text)]
-
-        LOGGER.debug("Prompt: %s", messages)
-        LOGGER.debug("Tools: %s", tools)
-        trace.async_conversation_trace_append(
-            trace.ConversationTraceEventType.AGENT_DETAIL,
-            {"system": prompt, "messages": messages},
-        )
-
-        client = self.entry.runtime_data
-
-        # To prevent infinite loops, we limit the number of iterations
-        for _iteration in range(MAX_TOOL_ITERATIONS):
-            try:
-                response = await client.messages.create(
-                    model=options.get(CONF_CHAT_MODEL, RECOMMENDED_CHAT_MODEL),
-                    messages=messages,
-                    tools=tools or NOT_GIVEN,
-                    max_tokens=options.get(CONF_MAX_TOKENS, RECOMMENDED_MAX_TOKENS),
-                    system=prompt,
-                    temperature=options.get(CONF_TEMPERATURE, RECOMMENDED_TEMPERATURE),
-                )
-            except anthropic.AnthropicError as err:
-                intent_response.async_set_error(
-                    intent.IntentResponseErrorCode.UNKNOWN,
-                    f"Sorry, I had a problem talking to Anthropic: {err}",
-                )
-                return conversation.ConversationResult(
-                    response=intent_response, conversation_id=conversation_id
-                )
-
-            LOGGER.debug("Response %s", response)
-
-            messages.append(_message_convert(response))
-
-            if response.stop_reason != "tool_use" or not llm_api:
-                break
-
-            tool_results: list[ToolResultBlockParam] = []
-            for tool_call in response.content:
-                if isinstance(tool_call, TextBlock):
-                    LOGGER.info(tool_call.text)
-
-                if not isinstance(tool_call, ToolUseBlock):
-                    continue
-
-                tool_input = llm.ToolInput(
-                    tool_name=tool_call.name,
-                    tool_args=cast(dict[str, Any], tool_call.input),
-                )
-                LOGGER.debug(
-                    "Tool call: %s(%s)", tool_input.tool_name, tool_input.tool_args
-                )
-
-                try:
-                    tool_response = await llm_api.async_call_tool(tool_input)
-                except (HomeAssistantError, vol.Invalid) as e:
-                    tool_response = {"error": type(e).__name__}
-                    if str(e):
-                        tool_response["error_text"] = str(e)
-
-                LOGGER.debug("Tool response: %s", tool_response)
-                tool_results.append(
-                    ToolResultBlockParam(
-                        type="tool_result",
-                        tool_use_id=tool_call.id,
-                        content=json.dumps(tool_response),
-                    )
-                )
-
-            messages.append(MessageParam(role="user", content=tool_results))
-
-        self.history[conversation_id] = messages
-
-        for content in response.content:
-            if isinstance(content, TextBlock):
-                intent_response.async_set_speech(content.text)
-                break
-
-        return conversation.ConversationResult(
-            response=intent_response, conversation_id=conversation_id
-        )
-
-    async def _async_entry_update_listener(
-        self, hass: HomeAssistant, entry: ConfigEntry
-    ) -> None:
-        """Handle options update."""
-        # Reload as we update device info + entity name + supported features
-        await hass.config_entries.async_reload(entry.entry_id)

homeassistant/components/anthropic/manifest.json

@@ -1,12 +0,0 @@
-{
-  "domain": "anthropic",
-  "name": "Anthropic Conversation",
-  "after_dependencies": ["assist_pipeline", "intent"],
-  "codeowners": ["@Shulyaka"],
-  "config_flow": true,
-  "dependencies": ["conversation"],
-  "documentation": "https://www.home-assistant.io/integrations/anthropic",
-  "integration_type": "service",
-  "iot_class": "cloud_polling",
-  "requirements": ["anthropic==0.31.2"]
-}

homeassistant/components/anthropic/strings.json

@@ -1,34 +0,0 @@
-{
-  "config": {
-    "step": {
-      "user": {
-        "data": {
-          "api_key": "[%key:common::config_flow::data::api_key%]"
-        }
-      }
-    },
-    "error": {
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
-      "timeout_connect": "[%key:common::config_flow::error::timeout_connect%]",
-      "authentication_error": "[%key:common::config_flow::error::invalid_auth%]",
-      "unknown": "[%key:common::config_flow::error::unknown%]"
-    }
-  },
-  "options": {
-    "step": {
-      "init": {
-        "data": {
-          "prompt": "Instructions",
-          "chat_model": "[%key:common::generic::model%]",
-          "max_tokens": "Maximum tokens to return in response",
-          "temperature": "Temperature",
-          "llm_hass_api": "[%key:common::config_flow::data::llm_hass_api%]",
-          "recommended": "Recommended model settings"
-        },
-        "data_description": {
-          "prompt": "Instruct how the LLM should respond. This can be a template."
-        }
-      }
-    }
-  }
-}

homeassistant/components/apcupsd/__init__.py

@@ -8,6 +8,7 @@ from typing import Final
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_HOST, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
+import homeassistant.helpers.config_validation as cv
 
 from .const import DOMAIN
 from .coordinator import APCUPSdCoordinator
@@ -16,6 +17,8 @@ _LOGGER = logging.getLogger(__name__)
 
 PLATFORMS: Final = (Platform.BINARY_SENSOR, Platform.SENSOR)
 
+CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
+
 
 async def async_setup_entry(hass: HomeAssistant, config_entry: ConfigEntry) -> bool:
     """Use config values to set up a function enabling status retrieval."""

homeassistant/components/apcupsd/const.py

@@ -4,6 +4,3 @@ from typing import Final
 
 DOMAIN: Final = "apcupsd"
 CONNECTION_TIMEOUT: int = 10
-
-# Field name of last self test retrieved from apcupsd.
-LAST_S_TEST: Final = "laststest"

homeassistant/components/apcupsd/sensor.py

@@ -25,7 +25,7 @@ from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddEntitiesCallback
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
-from .const import DOMAIN, LAST_S_TEST
+from .const import DOMAIN
 from .coordinator import APCUPSdCoordinator
 
 PARALLEL_UPDATES = 0
@@ -156,8 +156,8 @@ SENSORS: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    LAST_S_TEST: SensorEntityDescription(
-        key=LAST_S_TEST,
+    "laststest": SensorEntityDescription(
+        key="laststest",
         translation_key="last_self_test",
     ),
     "lastxfer": SensorEntityDescription(
@@ -417,12 +417,7 @@ async def async_setup_entry(
     available_resources: set[str] = {k.lower() for k, _ in coordinator.data.items()}
 
     entities = []
-
-    # "laststest" is a special sensor that only appears when the APC UPS daemon has done a
-    # periodical (or manual) self test since last daemon restart. It might not be available
-    # when we set up the integration, and we do not know if it would ever be available. Here we
-    # add it anyway and mark it as unknown initially.
-    for resource in available_resources | {LAST_S_TEST}:
+    for resource in available_resources:
         if resource not in SENSORS:
             _LOGGER.warning("Invalid resource from APCUPSd: %s", resource.upper())
             continue
@@ -478,14 +473,6 @@ class APCUPSdSensor(CoordinatorEntity[APCUPSdCoordinator], SensorEntity):
     def _update_attrs(self) -> None:
         """Update sensor attributes based on coordinator data."""
         key = self.entity_description.key.upper()
-        # For most sensors the key will always be available for each refresh. However, some sensors
-        # (e.g., "laststest") will only appear after certain event occurs (e.g., a self test is
-        # performed) and may disappear again after certain event. So we mark the state as "unknown"
-        # when it becomes unknown after such events.
-        if key not in self.coordinator.data:
-            self._attr_native_value = None
-            return
-
         self._attr_native_value, inferred_unit = infer_unit(self.coordinator.data[key])
         if not self.native_unit_of_measurement:
             self._attr_native_unit_of_measurement = inferred_unit

homeassistant/components/api/__init__.py

@@ -45,7 +45,7 @@ from homeassistant.exceptions import (
     TemplateError,
     Unauthorized,
 )
-from homeassistant.helpers import config_validation as cv, recorder, template
+from homeassistant.helpers import config_validation as cv, template
 from homeassistant.helpers.json import json_dumps, json_fragment
 from homeassistant.helpers.service import async_get_all_descriptions
 from homeassistant.helpers.typing import ConfigType
@@ -119,10 +119,7 @@ class APICoreStateView(HomeAssistantView):
         to check if Home Assistant is running.
         """
         hass = request.app[KEY_HASS]
-        migration = recorder.async_migration_in_progress(hass)
-        live = recorder.async_migration_is_live(hass)
-        recorder_state = {"migration_in_progress": migration, "migration_is_live": live}
-        return self.json({"state": hass.state.value, "recorder_state": recorder_state})
+        return self.json({"state": hass.state.value})
 
 
 class APIEventStream(HomeAssistantView):
@@ -390,27 +387,6 @@ class APIDomainServicesView(HomeAssistantView):
             )
 
         context = self.context(request)
-        if not hass.services.has_service(domain, service):
-            raise HTTPBadRequest from ServiceNotFound(domain, service)
-
-        if response_requested := "return_response" in request.query:
-            if (
-                hass.services.supports_response(domain, service)
-                is ha.SupportsResponse.NONE
-            ):
-                return self.json_message(
-                    "Service does not support responses. Remove return_response from request.",
-                    HTTPStatus.BAD_REQUEST,
-                )
-        elif (
-            hass.services.supports_response(domain, service) is ha.SupportsResponse.ONLY
-        ):
-            return self.json_message(
-                "Service call requires responses but caller did not ask for responses. "
-                "Add ?return_response to query parameters.",
-                HTTPStatus.BAD_REQUEST,
-            )
-
         changed_states: list[json_fragment] = []
 
         @ha.callback
@@ -427,14 +403,13 @@ class APIDomainServicesView(HomeAssistantView):
 
         try:
             # shield the service call from cancellation on connection drop
-            response = await shield(
+            await shield(
                 hass.services.async_call(
                     domain,
                     service,
                     data,  # type: ignore[arg-type]
                     blocking=True,
                     context=context,
-                    return_response=response_requested,
                 )
             )
         except (vol.Invalid, ServiceNotFound) as ex:
@@ -442,11 +417,6 @@ class APIDomainServicesView(HomeAssistantView):
         finally:
             cancel_listen()
 
-        if response_requested:
-            return self.json(
-                {"changed_states": changed_states, "service_response": response}
-            )
-
         return self.json(changed_states)
 
 

homeassistant/components/apple_tv/__init__.py

@@ -60,7 +60,6 @@ AUTH_EXCEPTIONS = (
     exceptions.NoCredentialsError,
 )
 CONNECTION_TIMEOUT_EXCEPTIONS = (
-    OSError,
     asyncio.CancelledError,
     TimeoutError,
     exceptions.ConnectionLostError,

homeassistant/components/apple_tv/manifest.json

@@ -7,7 +7,7 @@
   "documentation": "https://www.home-assistant.io/integrations/apple_tv",
   "iot_class": "local_push",
   "loggers": ["pyatv", "srptools"],
-  "requirements": ["pyatv==0.15.0"],
+  "requirements": ["pyatv==0.14.3"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",

homeassistant/components/apsystems/__init__.py

@@ -7,18 +7,12 @@ from dataclasses import dataclass
 from APsystemsEZ1 import APsystemsEZ1M
 
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
+from homeassistant.const import CONF_IP_ADDRESS, Platform
 from homeassistant.core import HomeAssistant
 
-from .const import DEFAULT_PORT
 from .coordinator import ApSystemsDataCoordinator
 
-PLATFORMS: list[Platform] = [
-    Platform.BINARY_SENSOR,
-    Platform.NUMBER,
-    Platform.SENSOR,
-    Platform.SWITCH,
-]
+PLATFORMS: list[Platform] = [Platform.NUMBER, Platform.SENSOR]
 
 
 @dataclass
@@ -34,11 +28,7 @@ type ApSystemsConfigEntry = ConfigEntry[ApSystemsData]
 
 async def async_setup_entry(hass: HomeAssistant, entry: ApSystemsConfigEntry) -> bool:
     """Set up this integration using UI."""
-    api = APsystemsEZ1M(
-        ip_address=entry.data[CONF_IP_ADDRESS],
-        port=entry.data.get(CONF_PORT, DEFAULT_PORT),
-        timeout=8,
-    )
+    api = APsystemsEZ1M(ip_address=entry.data[CONF_IP_ADDRESS], timeout=8)
     coordinator = ApSystemsDataCoordinator(hass, api)
     await coordinator.async_config_entry_first_refresh()
     assert entry.unique_id

homeassistant/components/apsystems/binary_sensor.py

@@ -1,102 +0,0 @@
-"""The read-only binary sensors for APsystems local API integration."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from APsystemsEZ1 import ReturnAlarmInfo
-
-from homeassistant.components.binary_sensor import (
-    BinarySensorDeviceClass,
-    BinarySensorEntity,
-    BinarySensorEntityDescription,
-)
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from . import ApSystemsConfigEntry, ApSystemsData
-from .coordinator import ApSystemsDataCoordinator
-from .entity import ApSystemsEntity
-
-
-@dataclass(frozen=True, kw_only=True)
-class ApsystemsLocalApiBinarySensorDescription(BinarySensorEntityDescription):
-    """Describes Apsystens Inverter binary sensor entity."""
-
-    is_on: Callable[[ReturnAlarmInfo], bool | None]
-
-
-BINARY_SENSORS: tuple[ApsystemsLocalApiBinarySensorDescription, ...] = (
-    ApsystemsLocalApiBinarySensorDescription(
-        key="off_grid_status",
-        translation_key="off_grid_status",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on=lambda c: c.offgrid,
-    ),
-    ApsystemsLocalApiBinarySensorDescription(
-        key="dc_1_short_circuit_error_status",
-        translation_key="dc_1_short_circuit_error_status",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on=lambda c: c.shortcircuit_1,
-    ),
-    ApsystemsLocalApiBinarySensorDescription(
-        key="dc_2_short_circuit_error_status",
-        translation_key="dc_2_short_circuit_error_status",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on=lambda c: c.shortcircuit_2,
-    ),
-    ApsystemsLocalApiBinarySensorDescription(
-        key="output_fault_status",
-        translation_key="output_fault_status",
-        device_class=BinarySensorDeviceClass.PROBLEM,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        is_on=lambda c: not c.operating,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the binary sensor platform."""
-    config = config_entry.runtime_data
-
-    add_entities(
-        ApSystemsBinarySensorWithDescription(
-            data=config,
-            entity_description=desc,
-        )
-        for desc in BINARY_SENSORS
-    )
-
-
-class ApSystemsBinarySensorWithDescription(
-    CoordinatorEntity[ApSystemsDataCoordinator], ApSystemsEntity, BinarySensorEntity
-):
-    """Base binary sensor to be used with description."""
-
-    entity_description: ApsystemsLocalApiBinarySensorDescription
-
-    def __init__(
-        self,
-        data: ApSystemsData,
-        entity_description: ApsystemsLocalApiBinarySensorDescription,
-    ) -> None:
-        """Initialize the sensor."""
-        super().__init__(data.coordinator)
-        ApSystemsEntity.__init__(self, data)
-        self.entity_description = entity_description
-        self._attr_unique_id = f"{data.device_id}_{entity_description.key}"
-
-    @property
-    def is_on(self) -> bool | None:
-        """Return value of sensor."""
-        return self.entity_description.is_on(self.coordinator.data.alarm_info)

homeassistant/components/apsystems/config_flow.py

@@ -7,16 +7,14 @@ from APsystemsEZ1 import APsystemsEZ1M
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
-from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT
+from homeassistant.const import CONF_IP_ADDRESS
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-import homeassistant.helpers.config_validation as cv
 
-from .const import DEFAULT_PORT, DOMAIN
+from .const import DOMAIN
 
 DATA_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_IP_ADDRESS): cv.string,
-        vol.Optional(CONF_PORT): cv.port,
+        vol.Required(CONF_IP_ADDRESS): str,
     }
 )
 
@@ -34,11 +32,7 @@ class APsystemsLocalAPIFlow(ConfigFlow, domain=DOMAIN):
 
         if user_input is not None:
             session = async_get_clientsession(self.hass, False)
-            api = APsystemsEZ1M(
-                ip_address=user_input[CONF_IP_ADDRESS],
-                port=user_input.get(CONF_PORT, DEFAULT_PORT),
-                session=session,
-            )
+            api = APsystemsEZ1M(user_input[CONF_IP_ADDRESS], session=session)
             try:
                 device_info = await api.get_device_info()
             except (TimeoutError, ClientConnectionError):

homeassistant/components/apsystems/const.py

@@ -4,4 +4,3 @@ from logging import Logger, getLogger
 
 LOGGER: Logger = getLogger(__package__)
 DOMAIN = "apsystems"
-DEFAULT_PORT = 8050

homeassistant/components/apsystems/coordinator.py

@@ -2,26 +2,17 @@
 
 from __future__ import annotations
 
-from dataclasses import dataclass
 from datetime import timedelta
 
-from APsystemsEZ1 import APsystemsEZ1M, ReturnAlarmInfo, ReturnOutputData
+from APsystemsEZ1 import APsystemsEZ1M, ReturnOutputData
 
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 from .const import LOGGER
 
 
-@dataclass
-class ApSystemsSensorData:
-    """Representing different Apsystems sensor data."""
-
-    output_data: ReturnOutputData
-    alarm_info: ReturnAlarmInfo
-
-
-class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
+class ApSystemsDataCoordinator(DataUpdateCoordinator[ReturnOutputData]):
     """Coordinator used for all sensors."""
 
     def __init__(self, hass: HomeAssistant, api: APsystemsEZ1M) -> None:
@@ -34,14 +25,5 @@ class ApSystemsDataCoordinator(DataUpdateCoordinator[ApSystemsSensorData]):
         )
         self.api = api
 
-    async def _async_setup(self) -> None:
-        try:
-            max_power = (await self.api.get_device_info()).maxPower
-        except (ConnectionError, TimeoutError):
-            raise UpdateFailed from None
-        self.api.max_power = max_power
-
-    async def _async_update_data(self) -> ApSystemsSensorData:
-        output_data = await self.api.get_output_data()
-        alarm_info = await self.api.get_alarm_info()
-        return ApSystemsSensorData(output_data=output_data, alarm_info=alarm_info)
+    async def _async_update_data(self) -> ReturnOutputData:
+        return await self.api.get_output_data()

homeassistant/components/apsystems/manifest.json

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

homeassistant/components/apsystems/number.py

@@ -26,6 +26,7 @@ async def async_setup_entry(
 class ApSystemsMaxOutputNumber(ApSystemsEntity, NumberEntity):
     """Base sensor to be used with description."""
 
+    _attr_native_max_value = 800
     _attr_native_min_value = 30
     _attr_native_step = 1
     _attr_device_class = NumberDeviceClass.POWER
@@ -41,7 +42,6 @@ class ApSystemsMaxOutputNumber(ApSystemsEntity, NumberEntity):
         super().__init__(data)
         self._api = data.coordinator.api
         self._attr_unique_id = f"{data.device_id}_output_limit"
-        self._attr_native_max_value = data.coordinator.api.max_power
 
     async def async_update(self) -> None:
         """Set the state with the value fetched from the inverter."""

homeassistant/components/apsystems/sensor.py

@@ -148,4 +148,4 @@ class ApSystemsSensorWithDescription(
     @property
     def native_value(self) -> StateType:
         """Return value of sensor."""
-        return self.entity_description.value_fn(self.coordinator.data.output_data)
+        return self.entity_description.value_fn(self.coordinator.data)

homeassistant/components/apsystems/strings.json

@@ -3,11 +3,7 @@
     "step": {
       "user": {
         "data": {
-          "ip_address": "[%key:common::config_flow::data::ip%]",
-          "port": "[%key:common::config_flow::data::port%]"
-        },
-        "data_description": {
-          "port": "The integration will default to 8050, if not set, which should be suitable for most installs"
+          "ip_address": "[%key:common::config_flow::data::ip%]"
         }
       }
     },
@@ -19,58 +15,19 @@
     }
   },
   "entity": {
-    "binary_sensor": {
-      "off_grid_status": {
-        "name": "Off grid status"
-      },
-      "dc_1_short_circuit_error_status": {
-        "name": "DC 1 short circuit error status"
-      },
-      "dc_2_short_circuit_error_status": {
-        "name": "DC 2 short circuit error status"
-      },
-      "output_fault_status": {
-        "name": "Output fault status"
-      }
-    },
     "sensor": {
-      "total_power": {
-        "name": "Total power"
-      },
-      "total_power_p1": {
-        "name": "Power of P1"
-      },
-      "total_power_p2": {
-        "name": "Power of P2"
-      },
-      "lifetime_production": {
-        "name": "Total lifetime production"
-      },
-      "lifetime_production_p1": {
-        "name": "Lifetime production of P1"
-      },
-      "lifetime_production_p2": {
-        "name": "Lifetime production of P2"
-      },
-      "today_production": {
-        "name": "Production of today"
-      },
-      "today_production_p1": {
-        "name": "Production of today from P1"
-      },
-      "today_production_p2": {
-        "name": "Production of today from P2"
-      }
+      "total_power": { "name": "Total power" },
+      "total_power_p1": { "name": "Power of P1" },
+      "total_power_p2": { "name": "Power of P2" },
+      "lifetime_production": { "name": "Total lifetime production" },
+      "lifetime_production_p1": { "name": "Lifetime production of P1" },
+      "lifetime_production_p2": { "name": "Lifetime production of P2" },
+      "today_production": { "name": "Production of today" },
+      "today_production_p1": { "name": "Production of today from P1" },
+      "today_production_p2": { "name": "Production of today from P2" }
     },
     "number": {
-      "max_output": {
-        "name": "Max output"
-      }
-    },
-    "switch": {
-      "inverter_status": {
-        "name": "Inverter status"
-      }
+      "max_output": { "name": "Max output" }
     }
   }
 }

homeassistant/components/apsystems/switch.py

@@ -1,55 +0,0 @@
-"""The power switch which can be toggled via the APsystems local API integration."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from aiohttp.client_exceptions import ClientConnectionError
-
-from homeassistant.components.switch import SwitchDeviceClass, SwitchEntity
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddEntitiesCallback
-
-from . import ApSystemsConfigEntry, ApSystemsData
-from .entity import ApSystemsEntity
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: ApSystemsConfigEntry,
-    add_entities: AddEntitiesCallback,
-) -> None:
-    """Set up the switch platform."""
-
-    add_entities([ApSystemsInverterSwitch(config_entry.runtime_data)], True)
-
-
-class ApSystemsInverterSwitch(ApSystemsEntity, SwitchEntity):
-    """The switch class for APSystems switches."""
-
-    _attr_device_class = SwitchDeviceClass.SWITCH
-    _attr_translation_key = "inverter_status"
-
-    def __init__(self, data: ApSystemsData) -> None:
-        """Initialize the switch."""
-        super().__init__(data)
-        self._api = data.coordinator.api
-        self._attr_unique_id = f"{data.device_id}_inverter_status"
-
-    async def async_update(self) -> None:
-        """Update switch status and availability."""
-        try:
-            status = await self._api.get_device_power_status()
-        except (TimeoutError, ClientConnectionError):
-            self._attr_available = False
-        else:
-            self._attr_available = True
-            self._attr_is_on = status
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self._api.set_device_power_status(True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self._api.set_device_power_status(False)

homeassistant/components/aquacell/__init__.py

@@ -3,14 +3,12 @@
 from __future__ import annotations
 
 from aioaquacell import AquacellApi
-from aioaquacell.const import Brand
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import CONF_BRAND
 from .coordinator import AquacellCoordinator
 
 PLATFORMS = [Platform.SENSOR]
@@ -22,9 +20,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AquacellConfigEntry) ->
     """Set up Aquacell from a config entry."""
     session = async_get_clientsession(hass)
 
-    brand = entry.data.get(CONF_BRAND, Brand.AQUACELL)
-
-    aquacell_api = AquacellApi(session, brand)
+    aquacell_api = AquacellApi(session)
 
     coordinator = AquacellCoordinator(hass, aquacell_api)
 

homeassistant/components/aquacell/config_flow.py

@@ -7,27 +7,18 @@ import logging
 from typing import Any
 
 from aioaquacell import ApiException, AquacellApi, AuthenticationFailed
-from aioaquacell.const import SUPPORTED_BRANDS, Brand
 import voluptuous as vol
 
 from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_EMAIL, CONF_PASSWORD
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
-from .const import (
-    CONF_BRAND,
-    CONF_REFRESH_TOKEN,
-    CONF_REFRESH_TOKEN_CREATION_TIME,
-    DOMAIN,
-)
+from .const import CONF_REFRESH_TOKEN, CONF_REFRESH_TOKEN_CREATION_TIME, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
 DATA_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_BRAND, default=Brand.AQUACELL): vol.In(
-            {key: brand.name for key, brand in SUPPORTED_BRANDS.items()}
-        ),
         vol.Required(CONF_EMAIL): str,
         vol.Required(CONF_PASSWORD): str,
     }
@@ -42,7 +33,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the cloud logon step."""
+        """Handle the initial step."""
         errors: dict[str, str] = {}
         if user_input is not None:
             await self.async_set_unique_id(
@@ -51,7 +42,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
             self._abort_if_unique_id_configured()
 
             session = async_get_clientsession(self.hass)
-            api = AquacellApi(session, user_input[CONF_BRAND])
+            api = AquacellApi(session)
             try:
                 refresh_token = await api.authenticate(
                     user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
@@ -68,7 +59,6 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
                     title=user_input[CONF_EMAIL],
                     data={
                         **user_input,
-                        CONF_BRAND: user_input[CONF_BRAND],
                         CONF_REFRESH_TOKEN: refresh_token,
                         CONF_REFRESH_TOKEN_CREATION_TIME: datetime.now().timestamp(),
                     },