Modify query as template in SQL integration

* Add 100% number test coverage

* review comments

* fix styling

* re-add AsyncMock for chime

.core_files.yaml

@@ -146,6 +146,7 @@ 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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: translations
           path: translations.tar.gz
@@ -197,7 +197,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.03.5
+        uses: home-assistant/builder@2024.08.2
         with:
           args: |
             $BUILD_ARGS \
@@ -263,7 +263,7 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@2024.03.5
+        uses: home-assistant/builder@2024.08.2
         with:
           args: |
             $BUILD_ARGS \
@@ -323,7 +323,7 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Install Cosign
-        uses: sigstore/cosign-installer@v3.5.0
+        uses: sigstore/cosign-installer@v3.6.0
         with:
           cosign-release: "v2.2.3"
 

.github/workflows/ci.yaml

@@ -31,12 +31,16 @@ on:
         description: "Only run mypy"
         default: false
         type: boolean
+      audit-licenses-only:
+        description: "Only run audit licenses"
+        default: false
+        type: boolean
 
 env:
-  CACHE_VERSION: 9
+  CACHE_VERSION: 10
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 8
-  HA_SHORT_VERSION: "2024.8"
+  HA_SHORT_VERSION: "2024.9"
   DEFAULT_PYTHON: "3.12"
   ALL_PYTHON_VERSIONS: "['3.12']"
   # 10.3 is the oldest supported version
@@ -222,6 +226,7 @@ jobs:
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
+      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
     steps:
@@ -343,6 +348,7 @@ 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
@@ -508,8 +514,7 @@ 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
-          uv pip install -r requirements_test.txt
+          uv pip install -r requirements_all_pytest.txt -r requirements_test.txt
           uv pip install -e . --config-settings editable_mode=compat
 
   hassfest:
@@ -518,6 +523,7 @@ jobs:
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
+      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
       - base
@@ -556,6 +562,7 @@ jobs:
     if: |
       github.event.inputs.pylint-only != 'true'
       && github.event.inputs.mypy-only != 'true'
+      && github.event.inputs.audit-licenses-only != 'true'
     needs:
       - info
       - base
@@ -589,7 +596,10 @@ jobs:
       - info
       - base
     if: |
-      needs.info.outputs.requirements == 'true'
+      (github.event.inputs.pylint-only != 'true'
+        && github.event.inputs.mypy-only != 'true'
+        || github.event.inputs.audit-licenses-only == 'true')
+      && needs.info.outputs.requirements == 'true'
     steps:
       - name: Check out code from GitHub
         uses: actions/checkout@v4.1.7
@@ -613,7 +623,7 @@ jobs:
           . venv/bin/activate
           pip-licenses --format=json --output-file=licenses.json
       - name: Upload licenses
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: licenses
           path: licenses.json
@@ -628,6 +638,7 @@ jobs:
     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
@@ -672,7 +683,9 @@ jobs:
     runs-on: ubuntu-24.04
     timeout-minutes: 20
     if: |
-      (github.event.inputs.mypy-only != 'true' || github.event.inputs.pylint-only == 'true')
+      (github.event.inputs.mypy-only != 'true'
+        && github.event.inputs.audit-licenses-only != 'true'
+        || github.event.inputs.pylint-only == 'true')
       && (needs.info.outputs.tests_glob || needs.info.outputs.test_full_suite == 'true')
     needs:
       - info
@@ -703,20 +716,21 @@ jobs:
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y tests
+          pylint tests
       - name: Run pylint (partially)
         if: needs.info.outputs.test_full_suite == 'false'
         shell: bash
         run: |
           . venv/bin/activate
           python --version
-          pylint --ignore-missing-annotations=y tests/components/${{ needs.info.outputs.tests_glob }}
+          pylint tests/components/${{ needs.info.outputs.tests_glob }}
 
   mypy:
     name: Check mypy
     runs-on: ubuntu-24.04
     if: |
       github.event.inputs.pylint-only != 'true'
+      && github.event.inputs.audit-licenses-only != 'true'
       || github.event.inputs.mypy-only == 'true'
     needs:
       - info
@@ -781,6 +795,7 @@ 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.test_full_suite == 'true'
     needs:
       - info
@@ -818,7 +833,7 @@ 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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
@@ -831,6 +846,7 @@ 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.test_full_suite == 'true'
     needs:
       - info
@@ -904,6 +920,7 @@ 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 \
@@ -917,14 +934,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.4
+        uses: actions/upload-artifact@v4.3.6
         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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -950,6 +967,7 @@ 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
@@ -1042,7 +1060,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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1050,7 +1068,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1075,6 +1093,7 @@ 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
@@ -1168,7 +1187,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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1176,7 +1195,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1219,6 +1238,7 @@ 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.tests_glob
       && needs.info.outputs.test_full_suite == 'false'
     needs:
@@ -1309,14 +1329,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.4
+        uses: actions/upload-artifact@v4.3.6
         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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@v4.1.7
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@v3.25.13
+        uses: github/codeql-action/init@v3.26.4
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@v3.25.13
+        uses: github/codeql-action/analyze@v3.26.4
         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.4
+        uses: actions/upload-artifact@v4.3.6
         with:
           name: env_file
           path: ./.env_file
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@v4.3.4
+        uses: actions/upload-artifact@v4.3.6
         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.4
+        uses: actions/upload-artifact@v4.3.6
         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
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
           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
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
           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
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
           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
+          skip-binary: aiohttp;charset-normalizer;grpcio;SQLAlchemy;protobuf;pydantic;pymicro-vad
           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.5.4
+    rev: v0.6.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,pres,ser,ue
+          - --ignore-words-list=astroid,checkin,currenty,hass,iif,incomfort,lookin,nam,NotIn
           - --skip="./.*,*.csv,*.json,*.ambr"
           - --quiet-level=2
         exclude_types: [csv, json, html]

.strict-typing

@@ -95,8 +95,6 @@ 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.*
@@ -120,6 +118,7 @@ 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.*
@@ -167,6 +166,7 @@ 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,7 +196,9 @@ 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.*
@@ -280,6 +282,7 @@ 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.*
@@ -292,6 +295,7 @@ homeassistant.components.lookin.*
 homeassistant.components.luftdaten.*
 homeassistant.components.madvr.*
 homeassistant.components.mailbox.*
+homeassistant.components.manual.*
 homeassistant.components.map.*
 homeassistant.components.mastodon.*
 homeassistant.components.matrix.*

CODEOWNERS

@@ -108,6 +108,8 @@ 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
@@ -197,7 +199,8 @@ 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
+/homeassistant/components/bluesound/ @thrawnarn @LouisChrist
+/tests/components/bluesound/ @thrawnarn @LouisChrist
 /homeassistant/components/bluetooth/ @bdraco
 /tests/components/bluetooth/ @bdraco
 /homeassistant/components/bluetooth_adapters/ @bdraco
@@ -220,6 +223,8 @@ 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
@@ -344,8 +349,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 @frenck
-/tests/components/dsmr/ @Robbie1221 @frenck
+/homeassistant/components/dsmr/ @Robbie1221
+/tests/components/dsmr/ @Robbie1221
 /homeassistant/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duotecno/ @cereal2nd
@@ -373,6 +378,8 @@ 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
@@ -384,6 +391,7 @@ 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
@@ -425,6 +433,7 @@ 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
@@ -490,6 +499,8 @@ 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
@@ -706,6 +717,8 @@ 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
@@ -794,6 +807,8 @@ 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
@@ -813,8 +828,6 @@ 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
@@ -836,7 +849,8 @@ build.json @home-assistant/supervisor
 /tests/components/lyric/ @timmo001
 /homeassistant/components/madvr/ @iloveicedgreentea
 /tests/components/madvr/ @iloveicedgreentea
-/homeassistant/components/mastodon/ @fabaff
+/homeassistant/components/mastodon/ @fabaff @andrew-codechimp
+/tests/components/mastodon/ @fabaff @andrew-codechimp
 /homeassistant/components/matrix/ @PaarthShah
 /tests/components/matrix/ @PaarthShah
 /homeassistant/components/matter/ @home-assistant/matter
@@ -956,6 +970,8 @@ 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
@@ -1042,8 +1058,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
-/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117
+/homeassistant/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
+/tests/components/overkiz/ @imicknl @vlebourl @tetienne @nyroDev @tronix117 @alexfp14
 /homeassistant/components/ovo_energy/ @timmo001
 /tests/components/ovo_energy/ @timmo001
 /homeassistant/components/p1_monitor/ @klaasnicolaas
@@ -1313,6 +1329,8 @@ 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

homeassistant/auth/permissions/events.py

@@ -18,9 +18,12 @@ 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
@@ -41,4 +44,7 @@ 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,6 +8,8 @@ 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
@@ -143,6 +145,78 @@ _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

@@ -586,10 +586,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(None).exception(
+    sys.excepthook = lambda *args: logging.getLogger().exception(
         "Uncaught exception", exc_info=args
     )
-    threading.excepthook = lambda args: logging.getLogger(None).exception(
+    threading.excepthook = lambda args: logging.getLogger().exception(
         "Uncaught thread exception",
         exc_info=(  # type: ignore[arg-type]
             args.exc_type,
@@ -616,10 +616,9 @@ 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)
 

homeassistant/brands/asterisk.json

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

homeassistant/brands/fujitsu.json

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

homeassistant/brands/logitech.json

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

homeassistant/components/acer_projector/switch.py

@@ -81,7 +81,7 @@ class AcerSwitch(SwitchEntity):
         write_timeout: int,
     ) -> None:
         """Init of the Acer projector."""
-        self.ser = serial.Serial(
+        self.serial = 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.ser.is_open:
-                self.ser.open()
-            self.ser.write(msg.encode("utf-8"))
+            if not self.serial.is_open:
+                self.serial.open()
+            self.serial.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.ser.read_until(size=20).decode("utf-8")
+            ret = self.serial.read_until(size=20).decode("utf-8")
         except serial.SerialException:
             _LOGGER.error("Problem communicating with %s", self._serial_port)
-        self.ser.close()
+        self.serial.close()
         return ret
 
     def _write_read_format(self, msg: str) -> str:

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(
+NotificationItem = namedtuple(  # noqa: PYI024
     "NotificationItem", "hnotify huser name plc_datatype callback"
 )
 

homeassistant/components/advantage_air/climate.py

@@ -206,7 +206,8 @@ 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:
-            return await self.async_turn_off()
+            await self.async_turn_off()
+            return
         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/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.3"]
+  "requirements": ["AEMET-OpenData==0.5.4"]
 }

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, {}, method)
+        platform.async_register_entity_service(service, None, method)
 
 
 class AgentCamera(MjpegCamera):

homeassistant/components/airgradient/__init__.py

@@ -21,6 +21,7 @@ PLATFORMS: list[Platform] = [
     Platform.SELECT,
     Platform.SENSOR,
     Platform.SWITCH,
+    Platform.UPDATE,
 ]
 
 

homeassistant/components/airgradient/config_flow.py

@@ -2,9 +2,13 @@
 
 from typing import Any
 
-from airgradient import AirGradientClient, AirGradientError, ConfigurationControl
+from airgradient import (
+    AirGradientClient,
+    AirGradientError,
+    AirGradientParseError,
+    ConfigurationControl,
+)
 from awesomeversion import AwesomeVersion
-from mashumaro import MissingField
 import voluptuous as vol
 
 from homeassistant.components import zeroconf
@@ -83,10 +87,10 @@ 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)
                 self._abort_if_unique_id_configured()

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.7.0"],
+  "requirements": ["airgradient==0.8.0"],
   "zeroconf": ["_airgradient._tcp.local."]
 }

homeassistant/components/airgradient/update.py

@@ -0,0 +1,55 @@
+"""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/airtouch4/climate.py

@@ -156,7 +156,8 @@ class AirtouchAC(CoordinatorEntity, ClimateEntity):
             raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
 
         if hvac_mode == HVACMode.OFF:
-            return await self.async_turn_off()
+            await self.async_turn_off()
+            return
         await self._airtouch.SetCoolingModeForAc(
             self._ac_number, HA_STATE_TO_AT[hvac_mode]
         )
@@ -262,7 +263,8 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
             raise ValueError(f"Unsupported HVAC mode: {hvac_mode}")
 
         if hvac_mode == HVACMode.OFF:
-            return await self.async_turn_off()
+            await self.async_turn_off()
+            return
         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,9 +1,11 @@
 """Config flow for AirTouch4."""
 
+from typing import Any
+
 from airtouch4pyapi import AirTouch, AirTouchStatus
 import voluptuous as vol
 
-from homeassistant.config_entries import ConfigFlow
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST
 
 from .const import DOMAIN
@@ -16,7 +18,9 @@ class AirtouchConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    async def async_step_user(self, user_input=None):
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """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]
+PLATFORMS: list[Platform] = [Platform.CLIMATE, Platform.COVER]
 
 type Airtouch5ConfigEntry = ConfigEntry[Airtouch5SimpleClient]
 

homeassistant/components/airtouch5/climate.py

@@ -121,6 +121,7 @@ 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

@@ -0,0 +1,134 @@
+"""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,15 +6,12 @@ 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,6 +27,11 @@
           }
         }
       }
+    },
+    "cover": {
+      "damper": {
+        "name": "[%key:component::cover::entity_component::damper::name%]"
+      }
     }
   }
 }

homeassistant/components/airvisual/__init__.py

@@ -31,7 +31,6 @@ 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,
 )
@@ -62,8 +61,6 @@ 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/airzone/config_flow.py

@@ -114,7 +114,7 @@ class AirZoneConfigFlow(ConfigFlow, domain=DOMAIN):
         )
         try:
             await airzone.get_version()
-        except AirzoneError as err:
+        except (AirzoneError, TimeoutError) 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.1"]
+  "requirements": ["aioairzone==0.8.2"]
 }

homeassistant/components/airzone_cloud/binary_sensor.py

@@ -14,6 +14,7 @@ from aioairzone_cloud.const import (
     AZD_FLOOR_DEMAND,
     AZD_PROBLEMS,
     AZD_SYSTEMS,
+    AZD_THERMOSTAT_BATTERY_LOW,
     AZD_WARNINGS,
     AZD_ZONES,
 )
@@ -88,6 +89,10 @@ 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,
@@ -156,6 +161,11 @@ 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,9 +13,12 @@ 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,
@@ -69,6 +72,7 @@ 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]),
         )
@@ -111,6 +115,7 @@ class AirzoneGroupEntity(AirzoneEntity):
 
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, group_id)},
+            model="Group",
             manufacturer=MANUFACTURER,
             name=group_data[AZD_NAME],
         )
@@ -154,6 +159,7 @@ 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]),
         )
@@ -195,6 +201,7 @@ class AirzoneInstallationEntity(AirzoneEntity):
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, inst_id)},
             manufacturer=MANUFACTURER,
+            model="Installation",
             name=inst_data[AZD_NAME],
         )
 
@@ -240,9 +247,11 @@ 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:
@@ -270,6 +279,7 @@ 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],
@@ -300,9 +310,11 @@ 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

@@ -0,0 +1,15 @@
+{
+  "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.5.5"]
+  "requirements": ["aioairzone-cloud==0.6.2"]
 }

homeassistant/components/airzone_cloud/sensor.py

@@ -10,8 +10,12 @@ 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,
@@ -28,6 +32,7 @@ from homeassistant.const import (
     PERCENTAGE,
     SIGNAL_STRENGTH_DECIBELS_MILLIWATT,
     EntityCategory,
+    UnitOfInformation,
     UnitOfTemperature,
 )
 from homeassistant.core import HomeAssistant, callback
@@ -52,6 +57,22 @@ 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,
@@ -98,6 +119,20 @@ 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",
+    ),
 )
 
 
@@ -154,6 +189,11 @@ 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,6 +37,17 @@
           "auto": "Auto"
         }
       }
+    },
+    "sensor": {
+      "cpu_usage": {
+        "name": "CPU usage"
+      },
+      "free_memory": {
+        "name": "Free memory"
+      },
+      "thermostat_coverage": {
+        "name": "Signal percentage"
+      }
     }
   }
 }

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, {}, "async_turn_off")
-    component.async_register_entity_service(SERVICE_TURN_ON, {}, "async_turn_on")
-    component.async_register_entity_service(SERVICE_TOGGLE, {}, "async_toggle")
+    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")
 
     await component.async_add_entities(entities)
 
@@ -162,16 +162,8 @@ 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/alexa/flash_briefings.py

@@ -52,7 +52,6 @@ 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
-    if instance == f"{remote.DOMAIN}.{remote.ATTR_ACTIVITY}":
+    elif 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,5 +5,6 @@
   "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
-    friendlyNamesfor each RangeController preset.
+    friendlyNames for 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(
+            raise AlexaBridgeUnreachableError(  # noqa: TRY301
                 "Alexa API not enabled in Home Assistant configuration"
             )
 

homeassistant/components/amazon_polly/const.py

@@ -8,128 +8,23 @@ 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_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_OUTPUT_FORMATS: Final[set[str]] = {"mp3", "ogg_vorbis", "pcm"}
 
-SUPPORTED_OUTPUT_FORMATS: Final[list[str]] = ["mp3", "ogg_vorbis", "pcm"]
+SUPPORTED_SAMPLE_RATES: Final[set[str]] = {"8000", "16000", "22050", "24000"}
 
-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_SAMPLE_RATES_MAP: Final[dict[str, set[str]]] = {
+    "mp3": {"8000", "16000", "22050", "24000"},
+    "ogg_vorbis": {"8000", "16000", "22050"},
+    "pcm": {"8000", "16000"},
 }
 
-SUPPORTED_TEXT_TYPES: Final[list[str]] = ["text", "ssml"]
+SUPPORTED_TEXT_TYPES: Final[set[str]] = {"text", "ssml"}
 
 CONTENT_TYPE_EXTENSIONS: Final[dict[str, str]] = {
     "audio/mpeg": "mp3",
@@ -137,6 +32,8 @@ 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,6 +16,11 @@ 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
 
@@ -38,13 +43,10 @@ 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_station/__init__.py

@@ -17,7 +17,6 @@ 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
@@ -25,7 +24,6 @@ import homeassistant.helpers.entity_registry as er
 from .const import (
     ATTR_LAST_DATA,
     CONF_APP_KEY,
-    DOMAIN,
     LOGGER,
     TYPE_SOLARRADIATION,
     TYPE_SOLARRADIATION_LX,
@@ -37,7 +35,6 @@ 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,6 +2,8 @@
 
 from __future__ import annotations
 
+from typing import Any
+
 from aioambient import API
 from aioambient.errors import AmbientError
 import voluptuous as vol
@@ -32,7 +34,9 @@ class AmbientStationFlowHandler(ConfigFlow, domain=DOMAIN):
             errors=errors if errors else {},
         )
 
-    async def async_step_user(self, user_input: dict | None = None) -> ConfigFlowResult:
+    async def async_step_user(
+        self, user_input: dict[str, Any] | None = None
+    ) -> ConfigFlowResult:
         """Handle the start of the config flow."""
         if not user_input:
             return await self._show_form()

homeassistant/components/amcrest/camera.py

@@ -499,7 +499,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
+                    raise AmcrestCommandFailed  # noqa: TRY301
             except (AmcrestError, AmcrestCommandFailed) as error:
                 if tries == 1:
                     log_update_error(_LOGGER, action, self.name, description, error)

homeassistant/components/android_ip_webcam/__init__.py

@@ -14,7 +14,6 @@ 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
@@ -27,9 +26,6 @@ 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/media_player.py

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

homeassistant/components/anthropic/__init__.py

@@ -0,0 +1,46 @@
+"""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

@@ -0,0 +1,210 @@
+"""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

@@ -0,0 +1,15 @@
+"""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

@@ -0,0 +1,316 @@
+"""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

@@ -0,0 +1,12 @@
+{
+  "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

@@ -0,0 +1,34 @@
+{
+  "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,7 +8,6 @@ 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
@@ -17,8 +16,6 @@ _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,3 +4,6 @@ from typing import Final
 
 DOMAIN: Final = "apcupsd"
 CONNECTION_TIMEOUT: int = 10
+
+# Field name of last self test retrieved from apcupsd.
+LASTSTEST: Final = "laststest"

homeassistant/components/apcupsd/sensor.py

@@ -13,6 +13,7 @@ from homeassistant.components.sensor import (
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     PERCENTAGE,
+    STATE_UNKNOWN,
     UnitOfApparentPower,
     UnitOfElectricCurrent,
     UnitOfElectricPotential,
@@ -25,7 +26,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
+from .const import DOMAIN, LASTSTEST
 from .coordinator import APCUPSdCoordinator
 
 PARALLEL_UPDATES = 0
@@ -156,8 +157,8 @@ SENSORS: dict[str, SensorEntityDescription] = {
         device_class=SensorDeviceClass.TEMPERATURE,
         state_class=SensorStateClass.MEASUREMENT,
     ),
-    "laststest": SensorEntityDescription(
-        key="laststest",
+    LASTSTEST: SensorEntityDescription(
+        key=LASTSTEST,
         translation_key="last_self_test",
     ),
     "lastxfer": SensorEntityDescription(
@@ -417,7 +418,12 @@ async def async_setup_entry(
     available_resources: set[str] = {k.lower() for k, _ in coordinator.data.items()}
 
     entities = []
-    for resource in available_resources:
+
+    # "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 | {LASTSTEST}:
         if resource not in SENSORS:
             _LOGGER.warning("Invalid resource from APCUPSd: %s", resource.upper())
             continue
@@ -473,6 +479,14 @@ 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 = STATE_UNKNOWN
+            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

@@ -118,7 +118,7 @@ class APICoreStateView(HomeAssistantView):
         Home Assistant core is running. Its primary use case is for supervisor
         to check if Home Assistant is running.
         """
-        hass: HomeAssistant = request.app[KEY_HASS]
+        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}
@@ -390,6 +390,27 @@ 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
@@ -406,13 +427,14 @@ class APIDomainServicesView(HomeAssistantView):
 
         try:
             # shield the service call from cancellation on connection drop
-            await shield(
+            response = 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:
@@ -420,6 +442,11 @@ 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,6 +60,7 @@ 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.14.3"],
+  "requirements": ["pyatv==0.15.0"],
   "zeroconf": [
     "_mediaremotetv._tcp.local.",
     "_companion-link._tcp.local.",

homeassistant/components/apsystems/__init__.py

@@ -13,7 +13,12 @@ from homeassistant.core import HomeAssistant
 from .const import DEFAULT_PORT
 from .coordinator import ApSystemsDataCoordinator
 
-PLATFORMS: list[Platform] = [Platform.NUMBER, Platform.SENSOR]
+PLATFORMS: list[Platform] = [
+    Platform.BINARY_SENSOR,
+    Platform.NUMBER,
+    Platform.SENSOR,
+    Platform.SWITCH,
+]
 
 
 @dataclass

homeassistant/components/apsystems/binary_sensor.py

@@ -0,0 +1,102 @@
+"""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/coordinator.py

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

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==1.3.3"]
+  "requirements": ["apsystems-ez1==2.2.1"]
 }

homeassistant/components/apsystems/number.py

@@ -26,7 +26,6 @@ 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
@@ -42,6 +41,7 @@ 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)
+        return self.entity_description.value_fn(self.coordinator.data.output_data)

homeassistant/components/apsystems/strings.json

@@ -19,19 +19,58 @@
     }
   },
   "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" }
+      "max_output": {
+        "name": "Max output"
+      }
+    },
+    "switch": {
+      "inverter_status": {
+        "name": "Inverter status"
+      }
     }
   }
 }

homeassistant/components/apsystems/switch.py

@@ -0,0 +1,55 @@
+"""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,12 +3,14 @@
 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]
@@ -20,7 +22,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: AquacellConfigEntry) ->
     """Set up Aquacell from a config entry."""
     session = async_get_clientsession(hass)
 
-    aquacell_api = AquacellApi(session)
+    brand = entry.data.get(CONF_BRAND, Brand.AQUACELL)
+
+    aquacell_api = AquacellApi(session, brand)
 
     coordinator = AquacellCoordinator(hass, aquacell_api)
 

homeassistant/components/aquacell/config_flow.py

@@ -7,18 +7,27 @@ 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_REFRESH_TOKEN, CONF_REFRESH_TOKEN_CREATION_TIME, DOMAIN
+from .const import (
+    CONF_BRAND,
+    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,
     }
@@ -33,7 +42,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
-        """Handle the initial step."""
+        """Handle the cloud logon step."""
         errors: dict[str, str] = {}
         if user_input is not None:
             await self.async_set_unique_id(
@@ -42,7 +51,7 @@ class AquaCellConfigFlow(ConfigFlow, domain=DOMAIN):
             self._abort_if_unique_id_configured()
 
             session = async_get_clientsession(self.hass)
-            api = AquacellApi(session)
+            api = AquacellApi(session, user_input[CONF_BRAND])
             try:
                 refresh_token = await api.authenticate(
                     user_input[CONF_EMAIL], user_input[CONF_PASSWORD]
@@ -59,6 +68,7 @@ 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(),
                     },

homeassistant/components/aquacell/const.py

@@ -5,6 +5,7 @@ from datetime import timedelta
 DOMAIN = "aquacell"
 DATA_AQUACELL = "DATA_AQUACELL"
 
+CONF_BRAND = "brand"
 CONF_REFRESH_TOKEN = "refresh_token"
 CONF_REFRESH_TOKEN_CREATION_TIME = "refresh_token_creation_time"
 

homeassistant/components/aquacell/manifest.json

@@ -1,6 +1,6 @@
 {
   "domain": "aquacell",
-  "name": "Aquacell",
+  "name": "AquaCell",
   "codeowners": ["@Jordi1990"],
   "config_flow": true,
   "dependencies": ["http", "network"],

homeassistant/components/aquacell/strings.json

@@ -2,8 +2,9 @@
   "config": {
     "step": {
       "user": {
-        "description": "Fill in your Aquacell mobile app credentials",
+        "description": "Select the brand of the softener and fill in your softener mobile app credentials",
         "data": {
+          "brand": "Brand",
           "email": "[%key:common::config_flow::data::email%]",
           "password": "[%key:common::config_flow::data::password%]"
         }

homeassistant/components/aranet/icons.json

@@ -6,6 +6,9 @@
       },
       "radiation_rate": {
         "default": "mdi:radioactive"
+      },
+      "radon_concentration": {
+        "default": "mdi:radioactive"
       }
     }
   }

homeassistant/components/aranet/manifest.json

@@ -19,5 +19,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aranet",
   "integration_type": "device",
   "iot_class": "local_push",
-  "requirements": ["aranet4==2.3.4"]
+  "requirements": ["aranet4==2.4.0"]
 }

homeassistant/components/aranet/sensor.py

@@ -99,6 +99,13 @@ SENSOR_DESCRIPTIONS = {
         suggested_display_precision=4,
         scale=0.000001,
     ),
+    "radon_concentration": AranetSensorEntityDescription(
+        key="radon_concentration",
+        translation_key="radon_concentration",
+        name="Radon Concentration",
+        native_unit_of_measurement="Bq/m³",
+        state_class=SensorStateClass.MEASUREMENT,
+    ),
     "battery": AranetSensorEntityDescription(
         key="battery",
         name="Battery",

homeassistant/components/arcam_fmj/__init__.py

@@ -11,12 +11,10 @@ from arcam.fmj.client import Client
 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 homeassistant.helpers.dispatcher import async_dispatcher_send
 
 from .const import (
     DEFAULT_SCAN_INTERVAL,
-    DOMAIN,
     SIGNAL_CLIENT_DATA,
     SIGNAL_CLIENT_STARTED,
     SIGNAL_CLIENT_STOPPED,
@@ -26,7 +24,6 @@ type ArcamFmjConfigEntry = ConfigEntry[Client]
 
 _LOGGER = logging.getLogger(__name__)
 
-CONFIG_SCHEMA = cv.removed(DOMAIN, raise_if_present=False)
 
 PLATFORMS = [Platform.MEDIA_PLAYER]
 

homeassistant/components/arest/sensor.py

@@ -87,8 +87,6 @@ def setup_platform(
         if value_template is None:
             return lambda value: value
 
-        value_template.hass = hass
-
         def _render(value):
             try:
                 return value_template.async_render({"value": value}, parse_result=False)

homeassistant/components/artsound/__init__.py

@@ -0,0 +1 @@
+"""Virtual integration: ArtSound."""

homeassistant/components/artsound/manifest.json

@@ -0,0 +1,6 @@
+{
+  "domain": "artsound",
+  "name": "ArtSound",
+  "integration_type": "virtual",
+  "supported_by": "linkplay"
+}

homeassistant/components/aseko_pool_live/entity.py

@@ -19,7 +19,10 @@ class AsekoEntity(CoordinatorEntity[AsekoDataUpdateCoordinator]):
         super().__init__(coordinator)
         self._unit = unit
 
-        self._device_model = f"ASIN AQUA {self._unit.type}"
+        if self._unit.type == "Remote":
+            self._device_model = "ASIN Pool"
+        else:
+            self._device_model = f"ASIN AQUA {self._unit.type}"
         self._device_name = self._unit.name if self._unit.name else self._device_model
 
         self._attr_device_info = DeviceInfo(

homeassistant/components/aseko_pool_live/manifest.json

@@ -6,5 +6,5 @@
   "documentation": "https://www.home-assistant.io/integrations/aseko_pool_live",
   "iot_class": "cloud_polling",
   "loggers": ["aioaseko"],
-  "requirements": ["aioaseko==0.1.1"]
+  "requirements": ["aioaseko==0.2.0"]
 }

homeassistant/components/assist_pipeline/__init__.py

@@ -16,6 +16,10 @@ from .const import (
     DATA_LAST_WAKE_UP,
     DOMAIN,
     EVENT_RECORDING,
+    SAMPLE_CHANNELS,
+    SAMPLE_RATE,
+    SAMPLE_WIDTH,
+    SAMPLES_PER_CHUNK,
 )
 from .error import PipelineNotFound
 from .pipeline import (
@@ -53,6 +57,10 @@ __all__ = (
     "PipelineNotFound",
     "WakeWordSettings",
     "EVENT_RECORDING",
+    "SAMPLES_PER_CHUNK",
+    "SAMPLE_RATE",
+    "SAMPLE_WIDTH",
+    "SAMPLE_CHANNELS",
 )
 
 CONFIG_SCHEMA = vol.Schema(

homeassistant/components/assist_pipeline/audio_enhancer.py

@@ -0,0 +1,72 @@
+"""Audio enhancement for Assist."""
+
+from abc import ABC, abstractmethod
+from dataclasses import dataclass
+import logging
+
+from pymicro_vad import MicroVad
+
+from .const import BYTES_PER_CHUNK
+
+_LOGGER = logging.getLogger(__name__)
+
+
+@dataclass(frozen=True, slots=True)
+class EnhancedAudioChunk:
+    """Enhanced audio chunk and metadata."""
+
+    audio: bytes
+    """Raw PCM audio @ 16Khz with 16-bit mono samples"""
+
+    timestamp_ms: int
+    """Timestamp relative to start of audio stream (milliseconds)"""
+
+    is_speech: bool | None
+    """True if audio chunk likely contains speech, False if not, None if unknown"""
+
+
+class AudioEnhancer(ABC):
+    """Base class for audio enhancement."""
+
+    def __init__(
+        self, auto_gain: int, noise_suppression: int, is_vad_enabled: bool
+    ) -> None:
+        """Initialize audio enhancer."""
+        self.auto_gain = auto_gain
+        self.noise_suppression = noise_suppression
+        self.is_vad_enabled = is_vad_enabled
+
+    @abstractmethod
+    def enhance_chunk(self, audio: bytes, timestamp_ms: int) -> EnhancedAudioChunk:
+        """Enhance chunk of PCM audio @ 16Khz with 16-bit mono samples."""
+
+
+class MicroVadEnhancer(AudioEnhancer):
+    """Audio enhancer that just runs microVAD."""
+
+    def __init__(
+        self, auto_gain: int, noise_suppression: int, is_vad_enabled: bool
+    ) -> None:
+        """Initialize audio enhancer."""
+        super().__init__(auto_gain, noise_suppression, is_vad_enabled)
+
+        self.vad: MicroVad | None = None
+        self.threshold = 0.5
+
+        if self.is_vad_enabled:
+            self.vad = MicroVad()
+            _LOGGER.debug("Initialized microVAD with threshold=%s", self.threshold)
+
+    def enhance_chunk(self, audio: bytes, timestamp_ms: int) -> EnhancedAudioChunk:
+        """Enhance 10ms chunk of PCM audio @ 16Khz with 16-bit mono samples."""
+        is_speech: bool | None = None
+
+        if self.vad is not None:
+            # Run VAD
+            assert len(audio) == BYTES_PER_CHUNK
+            speech_prob = self.vad.Process10ms(audio)
+            is_speech = speech_prob > self.threshold
+
+        return EnhancedAudioChunk(
+            audio=audio, timestamp_ms=timestamp_ms, is_speech=is_speech
+        )

homeassistant/components/assist_pipeline/const.py

@@ -15,3 +15,10 @@ DATA_LAST_WAKE_UP = f"{DOMAIN}.last_wake_up"
 WAKE_WORD_COOLDOWN = 2  # seconds
 
 EVENT_RECORDING = f"{DOMAIN}_recording"
+
+SAMPLE_RATE = 16000  # hertz
+SAMPLE_WIDTH = 2  # bytes
+SAMPLE_CHANNELS = 1  # mono
+MS_PER_CHUNK = 10
+SAMPLES_PER_CHUNK = SAMPLE_RATE // (1000 // MS_PER_CHUNK)  # 10 ms @ 16Khz
+BYTES_PER_CHUNK = SAMPLES_PER_CHUNK * SAMPLE_WIDTH * SAMPLE_CHANNELS  # 16-bit

homeassistant/components/assist_pipeline/manifest.json

@@ -4,7 +4,8 @@
   "codeowners": ["@balloob", "@synesthesiam"],
   "dependencies": ["conversation", "stt", "tts", "wake_word"],
   "documentation": "https://www.home-assistant.io/integrations/assist_pipeline",
+  "integration_type": "system",
   "iot_class": "local_push",
   "quality_scale": "internal",
-  "requirements": ["webrtc-noise-gain==1.2.3"]
+  "requirements": ["pymicro-vad==1.0.1"]
 }

homeassistant/components/assist_pipeline/pipeline.py

@@ -13,14 +13,11 @@ from pathlib import Path
 from queue import Empty, Queue
 from threading import Thread
 import time
-from typing import TYPE_CHECKING, Any, Final, Literal, cast
+from typing import Any, Literal, cast
 import wave
 
 import voluptuous as vol
 
-if TYPE_CHECKING:
-    from webrtc_noise_gain import AudioProcessor
-
 from homeassistant.components import (
     conversation,
     media_source,
@@ -52,12 +49,19 @@ from homeassistant.util import (
 )
 from homeassistant.util.limited_size_dict import LimitedSizeDict
 
+from .audio_enhancer import AudioEnhancer, EnhancedAudioChunk, MicroVadEnhancer
 from .const import (
+    BYTES_PER_CHUNK,
     CONF_DEBUG_RECORDING_DIR,
     DATA_CONFIG,
     DATA_LAST_WAKE_UP,
     DATA_MIGRATIONS,
     DOMAIN,
+    MS_PER_CHUNK,
+    SAMPLE_CHANNELS,
+    SAMPLE_RATE,
+    SAMPLE_WIDTH,
+    SAMPLES_PER_CHUNK,
     WAKE_WORD_COOLDOWN,
 )
 from .error import (
@@ -111,9 +115,6 @@ STORED_PIPELINE_RUNS = 10
 
 SAVE_DELAY = 10
 
-AUDIO_PROCESSOR_SAMPLES: Final = 160  # 10 ms @ 16 Khz
-AUDIO_PROCESSOR_BYTES: Final = AUDIO_PROCESSOR_SAMPLES * 2  # 16-bit samples
-
 
 @callback
 def _async_resolve_default_pipeline_settings(
@@ -503,8 +504,8 @@ class AudioSettings:
     is_vad_enabled: bool = True
     """True if VAD is used to determine the end of the voice command."""
 
-    is_chunking_enabled: bool = True
-    """True if audio is automatically split into 10 ms chunks (required for VAD, etc.)"""
+    silence_seconds: float = 0.5
+    """Seconds of silence after voice command has ended."""
 
     def __post_init__(self) -> None:
         """Verify settings post-initialization."""
@@ -514,9 +515,6 @@ class AudioSettings:
         if (self.auto_gain_dbfs < 0) or (self.auto_gain_dbfs > 31):
             raise ValueError("auto_gain_dbfs must be in [0, 31]")
 
-        if self.needs_processor and (not self.is_chunking_enabled):
-            raise ValueError("Chunking must be enabled for audio processing")
-
     @property
     def needs_processor(self) -> bool:
         """True if an audio processor is needed."""
@@ -527,20 +525,6 @@ class AudioSettings:
         )
 
 
-@dataclass(frozen=True, slots=True)
-class ProcessedAudioChunk:
-    """Processed audio chunk and metadata."""
-
-    audio: bytes
-    """Raw PCM audio @ 16Khz with 16-bit mono samples"""
-
-    timestamp_ms: int
-    """Timestamp relative to start of audio stream (milliseconds)"""
-
-    is_speech: bool | None
-    """True if audio chunk likely contains speech, False if not, None if unknown"""
-
-
 @dataclass
 class PipelineRun:
     """Running context for a pipeline."""
@@ -573,10 +557,12 @@ class PipelineRun:
     debug_recording_queue: Queue[str | bytes | None] | None = None
     """Queue to communicate with debug recording thread"""
 
-    audio_processor: AudioProcessor | None = None
+    audio_enhancer: AudioEnhancer | None = None
     """VAD/noise suppression/auto gain"""
 
-    audio_processor_buffer: AudioBuffer = field(init=False, repr=False)
+    audio_chunking_buffer: AudioBuffer = field(
+        default_factory=lambda: AudioBuffer(BYTES_PER_CHUNK)
+    )
     """Buffer used when splitting audio into chunks for audio processing"""
 
     _device_id: str | None = None
@@ -601,17 +587,12 @@ class PipelineRun:
         pipeline_data.pipeline_runs.add_run(self)
 
         # Initialize with audio settings
-        self.audio_processor_buffer = AudioBuffer(AUDIO_PROCESSOR_BYTES)
-        if self.audio_settings.needs_processor:
-            # Delay import of webrtc so HA start up is not crashing
-            # on older architectures (armhf).
-            #
-            # pylint: disable=import-outside-toplevel
-            from webrtc_noise_gain import AudioProcessor
-
-            self.audio_processor = AudioProcessor(
+        if self.audio_settings.needs_processor and (self.audio_enhancer is None):
+            # Default audio enhancer
+            self.audio_enhancer = MicroVadEnhancer(
                 self.audio_settings.auto_gain_dbfs,
                 self.audio_settings.noise_suppression_level,
+                self.audio_settings.is_vad_enabled,
             )
 
     def __eq__(self, other: object) -> bool:
@@ -688,8 +669,8 @@ class PipelineRun:
 
     async def wake_word_detection(
         self,
-        stream: AsyncIterable[ProcessedAudioChunk],
-        audio_chunks_for_stt: list[ProcessedAudioChunk],
+        stream: AsyncIterable[EnhancedAudioChunk],
+        audio_chunks_for_stt: list[EnhancedAudioChunk],
     ) -> wake_word.DetectionResult | None:
         """Run wake-word-detection portion of pipeline. Returns detection result."""
         metadata_dict = asdict(
@@ -732,10 +713,11 @@ class PipelineRun:
         # Audio chunk buffer. This audio will be forwarded to speech-to-text
         # after wake-word-detection.
         num_audio_chunks_to_buffer = int(
-            (wake_word_settings.audio_seconds_to_buffer * 16000)
-            / AUDIO_PROCESSOR_SAMPLES
+            (wake_word_settings.audio_seconds_to_buffer * SAMPLE_RATE)
+            / SAMPLES_PER_CHUNK
         )
-        stt_audio_buffer: deque[ProcessedAudioChunk] | None = None
+
+        stt_audio_buffer: deque[EnhancedAudioChunk] | None = None
         if num_audio_chunks_to_buffer > 0:
             stt_audio_buffer = deque(maxlen=num_audio_chunks_to_buffer)
 
@@ -797,7 +779,7 @@ class PipelineRun:
                 # speech-to-text so the user does not have to pause before
                 # speaking the voice command.
                 audio_chunks_for_stt.extend(
-                    ProcessedAudioChunk(
+                    EnhancedAudioChunk(
                         audio=chunk_ts[0], timestamp_ms=chunk_ts[1], is_speech=False
                     )
                     for chunk_ts in result.queued_audio
@@ -819,18 +801,17 @@ class PipelineRun:
 
     async def _wake_word_audio_stream(
         self,
-        audio_stream: AsyncIterable[ProcessedAudioChunk],
-        stt_audio_buffer: deque[ProcessedAudioChunk] | None,
+        audio_stream: AsyncIterable[EnhancedAudioChunk],
+        stt_audio_buffer: deque[EnhancedAudioChunk] | None,
         wake_word_vad: VoiceActivityTimeout | None,
-        sample_rate: int = 16000,
-        sample_width: int = 2,
+        sample_rate: int = SAMPLE_RATE,
+        sample_width: int = SAMPLE_WIDTH,
     ) -> AsyncIterable[tuple[bytes, int]]:
         """Yield audio chunks with timestamps (milliseconds since start of stream).
 
         Adds audio to a ring buffer that will be forwarded to speech-to-text after
         detection. Times out if VAD detects enough silence.
         """
-        chunk_seconds = AUDIO_PROCESSOR_SAMPLES / sample_rate
         async for chunk in audio_stream:
             if self.abort_wake_word_detection:
                 raise WakeWordDetectionAborted
@@ -845,6 +826,7 @@ class PipelineRun:
                 stt_audio_buffer.append(chunk)
 
             if wake_word_vad is not None:
+                chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
                 if not wake_word_vad.process(chunk_seconds, chunk.is_speech):
                     raise WakeWordTimeoutError(
                         code="wake-word-timeout", message="Wake word was not detected"
@@ -881,7 +863,7 @@ class PipelineRun:
     async def speech_to_text(
         self,
         metadata: stt.SpeechMetadata,
-        stream: AsyncIterable[ProcessedAudioChunk],
+        stream: AsyncIterable[EnhancedAudioChunk],
     ) -> str:
         """Run speech-to-text portion of pipeline. Returns the spoken text."""
         # Create a background task to prepare the conversation agent
@@ -916,7 +898,9 @@ class PipelineRun:
             # Transcribe audio stream
             stt_vad: VoiceCommandSegmenter | None = None
             if self.audio_settings.is_vad_enabled:
-                stt_vad = VoiceCommandSegmenter()
+                stt_vad = VoiceCommandSegmenter(
+                    silence_seconds=self.audio_settings.silence_seconds
+                )
 
             result = await self.stt_provider.async_process_audio_stream(
                 metadata,
@@ -957,18 +941,18 @@ class PipelineRun:
 
     async def _speech_to_text_stream(
         self,
-        audio_stream: AsyncIterable[ProcessedAudioChunk],
+        audio_stream: AsyncIterable[EnhancedAudioChunk],
         stt_vad: VoiceCommandSegmenter | None,
-        sample_rate: int = 16000,
-        sample_width: int = 2,
+        sample_rate: int = SAMPLE_RATE,
+        sample_width: int = SAMPLE_WIDTH,
     ) -> AsyncGenerator[bytes]:
         """Yield audio chunks until VAD detects silence or speech-to-text completes."""
-        chunk_seconds = AUDIO_PROCESSOR_SAMPLES / sample_rate
         sent_vad_start = False
         async for chunk in audio_stream:
             self._capture_chunk(chunk.audio)
 
             if stt_vad is not None:
+                chunk_seconds = (len(chunk.audio) // sample_width) / sample_rate
                 if not stt_vad.process(chunk_seconds, chunk.is_speech):
                     # Silence detected at the end of voice command
                     self.process_event(
@@ -1072,8 +1056,8 @@ class PipelineRun:
             tts_options[tts.ATTR_PREFERRED_FORMAT] = self.tts_audio_output
             if self.tts_audio_output == "wav":
                 # 16 Khz, 16-bit mono
-                tts_options[tts.ATTR_PREFERRED_SAMPLE_RATE] = 16000
-                tts_options[tts.ATTR_PREFERRED_SAMPLE_CHANNELS] = 1
+                tts_options[tts.ATTR_PREFERRED_SAMPLE_RATE] = SAMPLE_RATE
+                tts_options[tts.ATTR_PREFERRED_SAMPLE_CHANNELS] = SAMPLE_CHANNELS
 
         try:
             options_supported = await tts.async_support_options(
@@ -1218,53 +1202,31 @@ class PipelineRun:
         self.debug_recording_thread = None
 
     async def process_volume_only(
-        self,
-        audio_stream: AsyncIterable[bytes],
-        sample_rate: int = 16000,
-        sample_width: int = 2,
-    ) -> AsyncGenerator[ProcessedAudioChunk]:
+        self, audio_stream: AsyncIterable[bytes]
+    ) -> AsyncGenerator[EnhancedAudioChunk]:
         """Apply volume transformation only (no VAD/audio enhancements) with optional chunking."""
-        ms_per_sample = sample_rate // 1000
-        ms_per_chunk = (AUDIO_PROCESSOR_SAMPLES // sample_width) // ms_per_sample
         timestamp_ms = 0
-
         async for chunk in audio_stream:
             if self.audio_settings.volume_multiplier != 1.0:
                 chunk = _multiply_volume(chunk, self.audio_settings.volume_multiplier)
 
-            if self.audio_settings.is_chunking_enabled:
-                # 10 ms chunking
-                for chunk_10ms in chunk_samples(
-                    chunk, AUDIO_PROCESSOR_BYTES, self.audio_processor_buffer
-                ):
-                    yield ProcessedAudioChunk(
-                        audio=chunk_10ms,
-                        timestamp_ms=timestamp_ms,
-                        is_speech=None,  # no VAD
-                    )
-                    timestamp_ms += ms_per_chunk
-            else:
-                # No chunking
-                yield ProcessedAudioChunk(
-                    audio=chunk,
+            for sub_chunk in chunk_samples(
+                chunk, BYTES_PER_CHUNK, self.audio_chunking_buffer
+            ):
+                yield EnhancedAudioChunk(
+                    audio=sub_chunk,
                     timestamp_ms=timestamp_ms,
                     is_speech=None,  # no VAD
                 )
-                timestamp_ms += (len(chunk) // sample_width) // ms_per_sample
+                timestamp_ms += MS_PER_CHUNK
 
     async def process_enhance_audio(
-        self,
-        audio_stream: AsyncIterable[bytes],
-        sample_rate: int = 16000,
-        sample_width: int = 2,
-    ) -> AsyncGenerator[ProcessedAudioChunk]:
-        """Split audio into 10 ms chunks and apply VAD/noise suppression/auto gain/volume transformation."""
-        assert self.audio_processor is not None
+        self, audio_stream: AsyncIterable[bytes]
+    ) -> AsyncGenerator[EnhancedAudioChunk]:
+        """Split audio into chunks and apply VAD/noise suppression/auto gain/volume transformation."""
+        assert self.audio_enhancer is not None
 
-        ms_per_sample = sample_rate // 1000
-        ms_per_chunk = (AUDIO_PROCESSOR_SAMPLES // sample_width) // ms_per_sample
         timestamp_ms = 0
-
         async for dirty_samples in audio_stream:
             if self.audio_settings.volume_multiplier != 1.0:
                 # Static gain
@@ -1272,18 +1234,12 @@ class PipelineRun:
                     dirty_samples, self.audio_settings.volume_multiplier
                 )
 
-            # Split into 10ms chunks for audio enhancements/VAD
-            for dirty_10ms_chunk in chunk_samples(
-                dirty_samples, AUDIO_PROCESSOR_BYTES, self.audio_processor_buffer
+            # Split into chunks for audio enhancements/VAD
+            for dirty_chunk in chunk_samples(
+                dirty_samples, BYTES_PER_CHUNK, self.audio_chunking_buffer
             ):
-                ap_result = self.audio_processor.Process10ms(dirty_10ms_chunk)
-                yield ProcessedAudioChunk(
-                    audio=ap_result.audio,
-                    timestamp_ms=timestamp_ms,
-                    is_speech=ap_result.is_speech,
-                )
-
-                timestamp_ms += ms_per_chunk
+                yield self.audio_enhancer.enhance_chunk(dirty_chunk, timestamp_ms)
+                timestamp_ms += MS_PER_CHUNK
 
 
 def _multiply_volume(chunk: bytes, volume_multiplier: float) -> bytes:
@@ -1323,9 +1279,9 @@ def _pipeline_debug_recording_thread_proc(
 
                 wav_path = run_recording_dir / f"{message}.wav"
                 wav_writer = wave.open(str(wav_path), "wb")
-                wav_writer.setframerate(16000)
-                wav_writer.setsampwidth(2)
-                wav_writer.setnchannels(1)
+                wav_writer.setframerate(SAMPLE_RATE)
+                wav_writer.setsampwidth(SAMPLE_WIDTH)
+                wav_writer.setnchannels(SAMPLE_CHANNELS)
             elif isinstance(message, bytes):
                 # Chunk of 16-bit mono audio at 16Khz
                 if wav_writer is not None:
@@ -1368,8 +1324,8 @@ class PipelineInput:
         """Run pipeline."""
         self.run.start(device_id=self.device_id)
         current_stage: PipelineStage | None = self.run.start_stage
-        stt_audio_buffer: list[ProcessedAudioChunk] = []
-        stt_processed_stream: AsyncIterable[ProcessedAudioChunk] | None = None
+        stt_audio_buffer: list[EnhancedAudioChunk] = []
+        stt_processed_stream: AsyncIterable[EnhancedAudioChunk] | None = None
 
         if self.stt_stream is not None:
             if self.run.audio_settings.needs_processor:
@@ -1423,7 +1379,7 @@ class PipelineInput:
                     # Send audio in the buffer first to speech-to-text, then move on to stt_stream.
                     # This is basically an async itertools.chain.
                     async def buffer_then_audio_stream() -> (
-                        AsyncGenerator[ProcessedAudioChunk]
+                        AsyncGenerator[EnhancedAudioChunk]
                     ):
                         # Buffered audio
                         for chunk in stt_audio_buffer:

homeassistant/components/assist_pipeline/vad.py

@@ -2,18 +2,15 @@
 
 from __future__ import annotations
 
-from abc import ABC, abstractmethod
-from collections.abc import Iterable
+from collections.abc import Callable, Iterable
 from dataclasses import dataclass
 from enum import StrEnum
 import logging
-from typing import Final, cast
+
+from .const import SAMPLE_CHANNELS, SAMPLE_RATE, SAMPLE_WIDTH
 
 _LOGGER = logging.getLogger(__name__)
 
-_SAMPLE_RATE: Final = 16000  # Hz
-_SAMPLE_WIDTH: Final = 2  # bytes
-
 
 class VadSensitivity(StrEnum):
     """How quickly the end of a voice command is detected."""
@@ -27,50 +24,12 @@ class VadSensitivity(StrEnum):
         """Return seconds of silence for sensitivity level."""
         sensitivity = VadSensitivity(sensitivity)
         if sensitivity == VadSensitivity.RELAXED:
-            return 2.0
+            return 1.25
 
         if sensitivity == VadSensitivity.AGGRESSIVE:
-            return 0.5
+            return 0.25
 
-        return 1.0
-
-
-class VoiceActivityDetector(ABC):
-    """Base class for voice activity detectors (VAD)."""
-
-    @abstractmethod
-    def is_speech(self, chunk: bytes) -> bool:
-        """Return True if audio chunk contains speech."""
-
-    @property
-    @abstractmethod
-    def samples_per_chunk(self) -> int | None:
-        """Return number of samples per chunk or None if chunking is not required."""
-
-
-class WebRtcVad(VoiceActivityDetector):
-    """Voice activity detector based on webrtc."""
-
-    def __init__(self) -> None:
-        """Initialize webrtcvad."""
-        # Delay import of webrtc so HA start up is not crashing
-        # on older architectures (armhf).
-        #
-        # pylint: disable=import-outside-toplevel
-        from webrtc_noise_gain import AudioProcessor
-
-        # Just VAD: no noise suppression or auto gain
-        self._audio_processor = AudioProcessor(0, 0)
-
-    def is_speech(self, chunk: bytes) -> bool:
-        """Return True if audio chunk contains speech."""
-        result = self._audio_processor.Process10ms(chunk)
-        return cast(bool, result.is_speech)
-
-    @property
-    def samples_per_chunk(self) -> int | None:
-        """Return 10 ms."""
-        return int(0.01 * _SAMPLE_RATE)  # 10 ms
+        return 0.7
 
 
 class AudioBuffer:
@@ -119,7 +78,7 @@ class VoiceCommandSegmenter:
     speech_seconds: float = 0.3
     """Seconds of speech before voice command has started."""
 
-    silence_seconds: float = 0.5
+    silence_seconds: float = 0.7
     """Seconds of silence after voice command has ended."""
 
     timeout_seconds: float = 15.0
@@ -131,6 +90,9 @@ class VoiceCommandSegmenter:
     in_command: bool = False
     """True if inside voice command."""
 
+    timed_out: bool = False
+    """True a timeout occurred during voice command."""
+
     _speech_seconds_left: float = 0.0
     """Seconds left before considering voice command as started."""
 
@@ -160,6 +122,9 @@ class VoiceCommandSegmenter:
 
         Returns False when command is done.
         """
+        if self.timed_out:
+            self.timed_out = False
+
         self._timeout_seconds_left -= chunk_seconds
         if self._timeout_seconds_left <= 0:
             _LOGGER.warning(
@@ -167,6 +132,7 @@ class VoiceCommandSegmenter:
                 self.timeout_seconds,
             )
             self.reset()
+            self.timed_out = True
             return False
 
         if not self.in_command:
@@ -176,29 +142,38 @@ class VoiceCommandSegmenter:
                 if self._speech_seconds_left <= 0:
                     # Inside voice command
                     self.in_command = True
+                    self._silence_seconds_left = self.silence_seconds
+                    _LOGGER.debug("Voice command started")
             else:
                 # Reset if enough silence
                 self._reset_seconds_left -= chunk_seconds
                 if self._reset_seconds_left <= 0:
                     self._speech_seconds_left = self.speech_seconds
+                    self._reset_seconds_left = self.reset_seconds
         elif not is_speech:
+            # Silence in command
             self._reset_seconds_left = self.reset_seconds
             self._silence_seconds_left -= chunk_seconds
             if self._silence_seconds_left <= 0:
+                # Command finished successfully
                 self.reset()
+                _LOGGER.debug("Voice command finished")
                 return False
         else:
-            # Reset if enough speech
+            # Speech in command.
+            # Reset silence counter if enough speech.
             self._reset_seconds_left -= chunk_seconds
             if self._reset_seconds_left <= 0:
                 self._silence_seconds_left = self.silence_seconds
+                self._reset_seconds_left = self.reset_seconds
 
         return True
 
     def process_with_vad(
         self,
         chunk: bytes,
-        vad: VoiceActivityDetector,
+        vad_samples_per_chunk: int | None,
+        vad_is_speech: Callable[[bytes], bool],
         leftover_chunk_buffer: AudioBuffer | None,
     ) -> bool:
         """Process an audio chunk using an external VAD.
@@ -207,20 +182,22 @@ class VoiceCommandSegmenter:
 
         Returns False when voice command is finished.
         """
-        if vad.samples_per_chunk is None:
+        if vad_samples_per_chunk is None:
             # No chunking
-            chunk_seconds = (len(chunk) // _SAMPLE_WIDTH) / _SAMPLE_RATE
-            is_speech = vad.is_speech(chunk)
+            chunk_seconds = (
+                len(chunk) // (SAMPLE_WIDTH * SAMPLE_CHANNELS)
+            ) / SAMPLE_RATE
+            is_speech = vad_is_speech(chunk)
             return self.process(chunk_seconds, is_speech)
 
         if leftover_chunk_buffer is None:
             raise ValueError("leftover_chunk_buffer is required when vad uses chunking")
 
         # With chunking
-        seconds_per_chunk = vad.samples_per_chunk / _SAMPLE_RATE
-        bytes_per_chunk = vad.samples_per_chunk * _SAMPLE_WIDTH
+        seconds_per_chunk = vad_samples_per_chunk / SAMPLE_RATE
+        bytes_per_chunk = vad_samples_per_chunk * (SAMPLE_WIDTH * SAMPLE_CHANNELS)
         for vad_chunk in chunk_samples(chunk, bytes_per_chunk, leftover_chunk_buffer):
-            is_speech = vad.is_speech(vad_chunk)
+            is_speech = vad_is_speech(vad_chunk)
             if not self.process(seconds_per_chunk, is_speech):
                 return False
 

homeassistant/components/assist_pipeline/websocket_api.py

@@ -24,6 +24,9 @@ from .const import (
     DEFAULT_WAKE_WORD_TIMEOUT,
     DOMAIN,
     EVENT_RECORDING,
+    SAMPLE_CHANNELS,
+    SAMPLE_RATE,
+    SAMPLE_WIDTH,
 )
 from .error import PipelineNotFound
 from .pipeline import (
@@ -92,7 +95,6 @@ def async_register_websocket_api(hass: HomeAssistant) -> None:
                             vol.Optional("volume_multiplier"): float,
                             # Advanced use cases/testing
                             vol.Optional("no_vad"): bool,
-                            vol.Optional("no_chunking"): bool,
                         }
                     },
                     extra=vol.ALLOW_EXTRA,
@@ -170,9 +172,14 @@ async def websocket_run(
 
             # Yield until we receive an empty chunk
             while chunk := await audio_queue.get():
-                if incoming_sample_rate != 16000:
+                if incoming_sample_rate != SAMPLE_RATE:
                     chunk, state = audioop.ratecv(
-                        chunk, 2, 1, incoming_sample_rate, 16000, state
+                        chunk,
+                        SAMPLE_WIDTH,
+                        SAMPLE_CHANNELS,
+                        incoming_sample_rate,
+                        SAMPLE_RATE,
+                        state,
                     )
                 yield chunk
 
@@ -206,7 +213,6 @@ async def websocket_run(
             auto_gain_dbfs=msg_input.get("auto_gain_dbfs", 0),
             volume_multiplier=msg_input.get("volume_multiplier", 1.0),
             is_vad_enabled=not msg_input.get("no_vad", False),
-            is_chunking_enabled=not msg_input.get("no_chunking", False),
         )
     elif start_stage == PipelineStage.INTENT:
         # Input to conversation agent
@@ -424,9 +430,9 @@ def websocket_list_languages(
     connection.send_result(
         msg["id"],
         {
-            "languages": sorted(pipeline_languages)
-            if pipeline_languages
-            else pipeline_languages
+            "languages": (
+                sorted(pipeline_languages) if pipeline_languages else pipeline_languages
+            )
         },
     )
 

homeassistant/components/asterisk_cdr/__init__.py

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

homeassistant/components/asterisk_cdr/mailbox.py

@@ -1,70 +0,0 @@
-"""Support for the Asterisk CDR interface."""
-
-from __future__ import annotations
-
-import datetime
-import hashlib
-from typing import Any
-
-from homeassistant.components.asterisk_mbox import (
-    DOMAIN as ASTERISK_DOMAIN,
-    SIGNAL_CDR_UPDATE,
-)
-from homeassistant.components.mailbox import Mailbox
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-MAILBOX_NAME = "asterisk_cdr"
-
-
-async def async_get_handler(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> Mailbox:
-    """Set up the Asterix CDR platform."""
-    return AsteriskCDR(hass, MAILBOX_NAME)
-
-
-class AsteriskCDR(Mailbox):
-    """Asterisk VM Call Data Record mailbox."""
-
-    def __init__(self, hass: HomeAssistant, name: str) -> None:
-        """Initialize Asterisk CDR."""
-        super().__init__(hass, name)
-        self.cdr: list[dict[str, Any]] = []
-        async_dispatcher_connect(self.hass, SIGNAL_CDR_UPDATE, self._update_callback)
-
-    @callback
-    def _update_callback(self, msg: list[dict[str, Any]]) -> Any:
-        """Update the message count in HA, if needed."""
-        self._build_message()
-        self.async_update()
-
-    def _build_message(self) -> None:
-        """Build message structure."""
-        cdr: list[dict[str, Any]] = []
-        for entry in self.hass.data[ASTERISK_DOMAIN].cdr:
-            timestamp = datetime.datetime.strptime(
-                entry["time"], "%Y-%m-%d %H:%M:%S"
-            ).timestamp()
-            info = {
-                "origtime": timestamp,
-                "callerid": entry["callerid"],
-                "duration": entry["duration"],
-            }
-            sha = hashlib.sha256(str(entry).encode("utf-8")).hexdigest()
-            msg = (
-                f"Destination: {entry['dest']}\n"
-                f"Application: {entry['application']}\n "
-                f"Context: {entry['context']}"
-            )
-            cdr.append({"info": info, "sha": sha, "text": msg})
-        self.cdr = cdr
-
-    async def async_get_messages(self) -> list[dict[str, Any]]:
-        """Return a list of the current messages."""
-        if not self.cdr:
-            self._build_message()
-        return self.cdr

homeassistant/components/asterisk_cdr/manifest.json

@@ -1,8 +0,0 @@
-{
-  "domain": "asterisk_cdr",
-  "name": "Asterisk Call Detail Records",
-  "codeowners": [],
-  "dependencies": ["asterisk_mbox"],
-  "documentation": "https://www.home-assistant.io/integrations/asterisk_cdr",
-  "iot_class": "local_polling"
-}

homeassistant/components/asterisk_mbox/__init__.py

@@ -1,153 +0,0 @@
-"""Support for Asterisk Voicemail interface."""
-
-import logging
-from typing import Any, cast
-
-from asterisk_mbox import Client as asteriskClient
-from asterisk_mbox.commands import (
-    CMD_MESSAGE_CDR,
-    CMD_MESSAGE_CDR_AVAILABLE,
-    CMD_MESSAGE_LIST,
-)
-import voluptuous as vol
-
-from homeassistant.const import CONF_HOST, CONF_PASSWORD, CONF_PORT
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers import discovery
-import homeassistant.helpers.config_validation as cv
-from homeassistant.helpers.dispatcher import async_dispatcher_send, dispatcher_connect
-from homeassistant.helpers.issue_registry import IssueSeverity, create_issue
-from homeassistant.helpers.typing import ConfigType
-
-_LOGGER = logging.getLogger(__name__)
-
-DOMAIN = "asterisk_mbox"
-
-SIGNAL_DISCOVER_PLATFORM = "asterisk_mbox.discover_platform"
-SIGNAL_MESSAGE_REQUEST = "asterisk_mbox.message_request"
-SIGNAL_MESSAGE_UPDATE = "asterisk_mbox.message_updated"
-SIGNAL_CDR_UPDATE = "asterisk_mbox.message_updated"
-SIGNAL_CDR_REQUEST = "asterisk_mbox.message_request"
-
-CONFIG_SCHEMA = vol.Schema(
-    {
-        DOMAIN: vol.Schema(
-            {
-                vol.Required(CONF_HOST): cv.string,
-                vol.Required(CONF_PASSWORD): cv.string,
-                vol.Required(CONF_PORT): cv.port,
-            }
-        )
-    },
-    extra=vol.ALLOW_EXTRA,
-)
-
-
-def setup(hass: HomeAssistant, config: ConfigType) -> bool:
-    """Set up for the Asterisk Voicemail box."""
-    conf: dict[str, Any] = config[DOMAIN]
-
-    host: str = conf[CONF_HOST]
-    port: int = conf[CONF_PORT]
-    password: str = conf[CONF_PASSWORD]
-
-    hass.data[DOMAIN] = AsteriskData(hass, host, port, password, config)
-    create_issue(
-        hass,
-        DOMAIN,
-        "deprecated_integration",
-        breaks_in_ha_version="2024.9.0",
-        is_fixable=False,
-        issue_domain=DOMAIN,
-        severity=IssueSeverity.WARNING,
-        translation_key="deprecated_integration",
-        translation_placeholders={
-            "domain": DOMAIN,
-            "integration_title": "Asterisk Voicemail",
-            "mailbox": "mailbox",
-        },
-    )
-
-    return True
-
-
-class AsteriskData:
-    """Store Asterisk mailbox data."""
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        host: str,
-        port: int,
-        password: str,
-        config: dict[str, Any],
-    ) -> None:
-        """Init the Asterisk data object."""
-
-        self.hass = hass
-        self.config = config
-        self.messages: list[dict[str, Any]] | None = None
-        self.cdr: list[dict[str, Any]] | None = None
-
-        dispatcher_connect(self.hass, SIGNAL_MESSAGE_REQUEST, self._request_messages)
-        dispatcher_connect(self.hass, SIGNAL_CDR_REQUEST, self._request_cdr)
-        dispatcher_connect(self.hass, SIGNAL_DISCOVER_PLATFORM, self._discover_platform)
-        # Only connect after signal connection to ensure we don't miss any
-        self.client = asteriskClient(host, port, password, self.handle_data)
-
-    @callback
-    def _discover_platform(self, component: str) -> None:
-        _LOGGER.debug("Adding mailbox %s", component)
-        self.hass.async_create_task(
-            discovery.async_load_platform(
-                self.hass, "mailbox", component, {}, self.config
-            )
-        )
-
-    @callback
-    def handle_data(
-        self, command: int, msg: list[dict[str, Any]] | dict[str, Any]
-    ) -> None:
-        """Handle changes to the mailbox."""
-
-        if command == CMD_MESSAGE_LIST:
-            msg = cast(list[dict[str, Any]], msg)
-            _LOGGER.debug("AsteriskVM sent updated message list: Len %d", len(msg))
-            old_messages = self.messages
-            self.messages = sorted(
-                msg, key=lambda item: item["info"]["origtime"], reverse=True
-            )
-            if not isinstance(old_messages, list):
-                async_dispatcher_send(self.hass, SIGNAL_DISCOVER_PLATFORM, DOMAIN)
-            async_dispatcher_send(self.hass, SIGNAL_MESSAGE_UPDATE, self.messages)
-        elif command == CMD_MESSAGE_CDR:
-            msg = cast(dict[str, Any], msg)
-            _LOGGER.debug(
-                "AsteriskVM sent updated CDR list: Len %d", len(msg.get("entries", []))
-            )
-            self.cdr = msg["entries"]
-            async_dispatcher_send(self.hass, SIGNAL_CDR_UPDATE, self.cdr)
-        elif command == CMD_MESSAGE_CDR_AVAILABLE:
-            if not isinstance(self.cdr, list):
-                _LOGGER.debug("AsteriskVM adding CDR platform")
-                self.cdr = []
-                async_dispatcher_send(
-                    self.hass, SIGNAL_DISCOVER_PLATFORM, "asterisk_cdr"
-                )
-            async_dispatcher_send(self.hass, SIGNAL_CDR_REQUEST)
-        else:
-            _LOGGER.debug(
-                "AsteriskVM sent unknown message '%d' len: %d", command, len(msg)
-            )
-
-    @callback
-    def _request_messages(self) -> None:
-        """Handle changes to the mailbox."""
-        _LOGGER.debug("Requesting message list")
-        self.client.messages()
-
-    @callback
-    def _request_cdr(self) -> None:
-        """Handle changes to the CDR."""
-        _LOGGER.debug("Requesting CDR list")
-        self.client.get_cdr()

homeassistant/components/asterisk_mbox/mailbox.py

@@ -1,86 +0,0 @@
-"""Support for the Asterisk Voicemail interface."""
-
-from __future__ import annotations
-
-from functools import partial
-import logging
-from typing import Any
-
-from asterisk_mbox import ServerError
-
-from homeassistant.components.mailbox import CONTENT_TYPE_MPEG, Mailbox, StreamError
-from homeassistant.core import HomeAssistant, callback
-from homeassistant.helpers.dispatcher import async_dispatcher_connect
-from homeassistant.helpers.typing import ConfigType, DiscoveryInfoType
-
-from . import DOMAIN as ASTERISK_DOMAIN, AsteriskData
-
-_LOGGER = logging.getLogger(__name__)
-
-SIGNAL_MESSAGE_REQUEST = "asterisk_mbox.message_request"
-SIGNAL_MESSAGE_UPDATE = "asterisk_mbox.message_updated"
-
-
-async def async_get_handler(
-    hass: HomeAssistant,
-    config: ConfigType,
-    discovery_info: DiscoveryInfoType | None = None,
-) -> Mailbox:
-    """Set up the Asterix VM platform."""
-    return AsteriskMailbox(hass, ASTERISK_DOMAIN)
-
-
-class AsteriskMailbox(Mailbox):
-    """Asterisk VM Sensor."""
-
-    def __init__(self, hass: HomeAssistant, name: str) -> None:
-        """Initialize Asterisk mailbox."""
-        super().__init__(hass, name)
-        async_dispatcher_connect(
-            self.hass, SIGNAL_MESSAGE_UPDATE, self._update_callback
-        )
-
-    @callback
-    def _update_callback(self, msg: str) -> None:
-        """Update the message count in HA, if needed."""
-        self.async_update()
-
-    @property
-    def media_type(self) -> str:
-        """Return the supported media type."""
-        return CONTENT_TYPE_MPEG
-
-    @property
-    def can_delete(self) -> bool:
-        """Return if messages can be deleted."""
-        return True
-
-    @property
-    def has_media(self) -> bool:
-        """Return if messages have attached media files."""
-        return True
-
-    async def async_get_media(self, msgid: str) -> bytes:
-        """Return the media blob for the msgid."""
-
-        data: AsteriskData = self.hass.data[ASTERISK_DOMAIN]
-        client = data.client
-        try:
-            return await self.hass.async_add_executor_job(
-                partial(client.mp3, msgid, sync=True)
-            )
-        except ServerError as err:
-            raise StreamError(err) from err
-
-    async def async_get_messages(self) -> list[dict[str, Any]]:
-        """Return a list of the current messages."""
-        data: AsteriskData = self.hass.data[ASTERISK_DOMAIN]
-        return data.messages or []
-
-    async def async_delete(self, msgid: str) -> bool:
-        """Delete the specified messages."""
-        data: AsteriskData = self.hass.data[ASTERISK_DOMAIN]
-        client = data.client
-        _LOGGER.info("Deleting: %s", msgid)
-        await self.hass.async_add_executor_job(client.delete, msgid)
-        return True

homeassistant/components/asterisk_mbox/manifest.json

@@ -1,9 +0,0 @@
-{
-  "domain": "asterisk_mbox",
-  "name": "Asterisk Voicemail",
-  "codeowners": [],
-  "documentation": "https://www.home-assistant.io/integrations/asterisk_mbox",
-  "iot_class": "local_push",
-  "loggers": ["asterisk_mbox"],
-  "requirements": ["asterisk_mbox==0.5.0"]
-}

homeassistant/components/asterisk_mbox/strings.json

@@ -1,8 +0,0 @@
-{
-  "issues": {
-    "deprecated_integration": {
-      "title": "The {integration_title} is being removed",
-      "description": "{integration_title} is being removed as the `{mailbox}` platform is being removed and {integration_title} supports no other platforms. Remove the `{domain}` configuration from your configuration.yaml file and restart Home Assistant to fix this issue."
-    }
-  }
-}