Merge branch 'dev' into homewizard-usage

.agent/skills

@@ -1 +0,0 @@
-../.claude/skills/

.claude/skills/github-pr-reviewer/SKILL.md

@@ -1,46 +0,0 @@
----
-name: github-pr-reviewer
-description: Review a GitHub pull request and provide feedback comments. Use when the user says "review the current PR" or asks to review a specific PR.
----
-
-# Review GitHub Pull Request
-
-## Preparation:
-- Check if the local commit matches the last one in the PR. If not, checkout the PR locally using 'gh pr checkout'. 
-- CRITICAL: If 'gh pr checkout' fails for ANY reason, you MUST immediately STOP.
-    - Do NOT attempt any workarounds. 
-    - Do NOT proceed with the review.
-    - ALERT about the failure and WAIT for instructions.
-    - This is a hard requirement - no exceptions.
-
-## Follow these steps:
-1. Use 'gh pr view' to get the PR details and description.
-2. Use 'gh pr diff' to see all the changes in the PR.
-3. Analyze the code changes for:
-   - Code quality and style consistency
-   - Potential bugs or issues
-   - Performance implications
-   - Security concerns
-   - Test coverage
-   - Documentation updates if needed
-4. Ensure any existing review comments have been addressed.
-5. Generate constructive review comments in the CONSOLE. DO NOT POST TO GITHUB YOURSELF.
-
-## IMPORTANT:
-- Just review. DO NOT make any changes
-- Be constructive and specific in your comments
-- Suggest improvements where appropriate
-- Only provide review feedback in the CONSOLE. DO NOT ACT ON GITHUB.
-- No need to run tests or linters, just review the code changes.
-- No need to highlight things that are already good.
-
-## Output format:
-- List specific comments for each file/line that needs attention
-- In the end, summarize with an overall assessment (approve, request changes, or comment) and bullet point list of changes suggested, if any.
-  - Example output:
-    ```
-    Overall assessment: request changes.
-    - [CRITICAL] Memory leak in homeassistant/components/sensor/my_sensor.py:143
-    - [PROBLEM] Inefficient algorithm in homeassistant/helpers/data_processing.py:87
-    - [SUGGESTION] Improve variable naming in homeassistant/helpers/config_validation.py:45
-    ```

.core_files.yaml

@@ -34,7 +34,6 @@ base_platforms: &base_platforms
   - homeassistant/components/humidifier/**
   - homeassistant/components/image/**
   - homeassistant/components/image_processing/**
-  - homeassistant/components/infrared/**
   - homeassistant/components/lawn_mower/**
   - homeassistant/components/light/**
   - homeassistant/components/lock/**

.gemini/skills

@@ -1 +0,0 @@
-../.claude/skills

.github/workflows/builder.yml

@@ -10,6 +10,7 @@ on:
 
 env:
   BUILD_TYPE: core
+  DEFAULT_PYTHON: "3.14.2"
   PIP_TIMEOUT: 60
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
@@ -41,10 +42,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Get information
         id: info
@@ -79,7 +80,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: translations
           path: translations.tar.gz
@@ -111,7 +112,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -122,7 +123,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@2536c51d3d126276eb39f74d6bc9c72ac6ef30d3 # v16
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: OHF-Voice/intents-package
@@ -131,11 +132,11 @@ jobs:
           workflow_conclusion: success
           name: package
 
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         if: needs.init.outputs.channel == 'dev'
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Adjust nightly version
         if: needs.init.outputs.channel == 'dev'
@@ -181,7 +182,7 @@ jobs:
           fi
 
       - name: Download translations
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 
@@ -271,7 +272,7 @@ jobs:
     name: Build ${{ matrix.machine }} machine core image
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_base"]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
     permissions:
       contents: read # To check out the repository
       packages: write # To push to GHCR
@@ -293,21 +294,6 @@ jobs:
           - raspberrypi5-64
           - yellow
           - green
-        include:
-          # Default: aarch64 on native ARM runner
-          - arch: aarch64
-            runs-on: ubuntu-24.04-arm
-          # Overrides for amd64 machines
-          - machine: generic-x86-64
-            arch: amd64
-            runs-on: ubuntu-24.04
-          - machine: qemux86-64
-            arch: amd64
-            runs-on: ubuntu-24.04
-          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
-          - machine: intel-nuc
-            arch: amd64
-            runs-on: ubuntu-24.04
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -335,9 +321,8 @@ jobs:
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build base image
-        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
+        uses: home-assistant/builder@21bc64d76dad7a5184c67826aab41c6b6f89023a # 2025.11.0
         with:
-          image: ${{ matrix.arch }}
           args: |
             $BUILD_ARGS \
             --target /data/machine \
@@ -537,13 +522,13 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 
@@ -614,7 +599,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@a2bbfa25375fe432b6a289bc6b6cd05ecd0c4c32 # v4.1.0
+        uses: actions/attest-build-provenance@96278af6caaf10aea03fd8d33a09a777ca52d62f # v3.2.0
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/ci.yaml

@@ -37,11 +37,12 @@ on:
         type: boolean
 
 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 2
   UV_CACHE_VERSION: 1
   MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.4"
-  ADDITIONAL_PYTHON_VERSIONS: "[]"
+  HA_SHORT_VERSION: "2026.3"
+  DEFAULT_PYTHON: "3.14.2"
+  ALL_PYTHON_VERSIONS: "['3.14.2']"
   # 10.3 is the oldest supported version
   # - 10.3.32 is the version currently shipped with Synology (as of 17 Feb 2022)
   # 10.6 is the current long-term-support
@@ -165,11 +166,6 @@ jobs:
           tests_glob=""
           lint_only=""
           skip_coverage=""
-          default_python=$(cat .python-version)
-          all_python_versions=$(jq -cn \
-            --arg default_python "${default_python}" \
-            --argjson additional_python_versions "${ADDITIONAL_PYTHON_VERSIONS}" \
-            '[$default_python] + $additional_python_versions')
 
           if [[ "${INTEGRATION_CHANGES}" != "[]" ]];
           then
@@ -239,8 +235,8 @@ jobs:
           echo "mariadb_groups=${mariadb_groups}" >> $GITHUB_OUTPUT
           echo "postgresql_groups: ${postgresql_groups}"
           echo "postgresql_groups=${postgresql_groups}" >> $GITHUB_OUTPUT
-          echo "python_versions: ${all_python_versions}"
-          echo "python_versions=${all_python_versions}" >> $GITHUB_OUTPUT
+          echo "python_versions: ${ALL_PYTHON_VERSIONS}"
+          echo "python_versions=${ALL_PYTHON_VERSIONS}" >> $GITHUB_OUTPUT
           echo "test_full_suite: ${test_full_suite}"
           echo "test_full_suite=${test_full_suite}" >> $GITHUB_OUTPUT
           echo "integrations_glob: ${integrations_glob}"
@@ -456,7 +452,7 @@ jobs:
           python --version
           uv pip freeze >> pip_freeze.txt
       - name: Upload pip_freeze artifact
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: pip-freeze-${{ matrix.python-version }}
           path: pip_freeze.txt
@@ -507,13 +503,13 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -544,13 +540,13 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -580,11 +576,11 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Run gen_copilot_instructions.py
         run: |
@@ -609,7 +605,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Dependency review
-        uses: actions/dependency-review-action@05fe4576374b728f0c523d6a13d64c25081e0803 # v4.8.3
+        uses: actions/dependency-review-action@3c4e3dcb1aa7874d2c16be7d79418e9b7efd6261 # v4.8.2
         with:
           license-check: false # We use our own license audit checks
 
@@ -657,7 +653,7 @@ jobs:
           . venv/bin/activate
           python -m script.licenses extract --output-file=licenses-${PYTHON_VERSION}.json
       - name: Upload licenses
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: licenses-${{ github.run_number }}-${{ matrix.python-version }}
           path: licenses-${{ matrix.python-version }}.json
@@ -686,13 +682,13 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -739,13 +735,13 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -790,11 +786,11 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
       - name: Generate partial mypy restore key
         id: generate-mypy-key
@@ -802,7 +798,7 @@ jobs:
           mypy_version=$(cat requirements_test.txt | grep 'mypy.*=' | cut -d '=' -f 3)
           echo "version=${mypy_version}" >> $GITHUB_OUTPUT
           echo "key=mypy-${MYPY_CACHE_VERSION}-${mypy_version}-${HA_SHORT_VERSION}-$(date -u '+%Y-%m-%dT%H:%M:%s')" >> $GITHUB_OUTPUT
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -883,13 +879,13 @@ jobs:
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
-      - name: Restore full Python virtual environment
+      - name: Restore full Python ${{ env.DEFAULT_PYTHON }} virtual environment
         id: cache-venv
         uses: actions/cache/restore@cdf6c1fa76f9f475f3d7449005a359c84ca0f306 # v5.0.3
         with:
@@ -905,7 +901,7 @@ jobs:
           . venv/bin/activate
           python -m script.split_tests ${TEST_GROUP_COUNT} tests
       - name: Upload pytest_buckets
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: pytest_buckets
           path: pytest_buckets.txt
@@ -982,7 +978,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: pytest_buckets
       - name: Compile English translations
@@ -1024,14 +1020,14 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-full.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1044,7 +1040,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: test-results-full-${{ matrix.python-version }}-${{ matrix.group }}
           path: junit.xml
@@ -1181,7 +1177,7 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${mariadb}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1189,7 +1185,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1203,7 +1199,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: test-results-mariadb-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.mariadb }}
@@ -1342,7 +1338,7 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${postgresql}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: pytest-${{ github.run_number }}-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1350,7 +1346,7 @@ jobs:
           overwrite: true
       - name: Upload coverage artifact
         if: needs.info.outputs.skip_coverage != 'true'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: coverage-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1364,7 +1360,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: test-results-postgres-${{ matrix.python-version }}-${{
             steps.pytest-partial.outputs.postgresql }}
@@ -1391,7 +1387,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1518,14 +1514,14 @@ jobs:
               2>&1 | tee pytest-${PYTHON_VERSION}-${TEST_GROUP}.txt
       - name: Upload pytest output
         if: success() || failure() && steps.pytest-partial.conclusion == 'failure'
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         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@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: coverage-${{ matrix.python-version }}-${{ matrix.group }}
           path: coverage.xml
@@ -1538,7 +1534,7 @@ jobs:
           mv "junit.xml-tmp" "junit.xml"
       - name: Upload test results artifact
         if: needs.info.outputs.skip_coverage != 'true' && !cancelled()
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: test-results-partial-${{ matrix.python-version }}-${{ matrix.group }}
           path: junit.xml
@@ -1562,7 +1558,7 @@ jobs:
         with:
           persist-credentials: false
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: coverage-*
       - name: Upload coverage to Codecov
@@ -1591,7 +1587,7 @@ jobs:
       && needs.info.outputs.skip_coverage != 'true' && !cancelled()
     steps:
       - name: Download all coverage artifacts
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           pattern: test-results-*
       - name: Upload test results to Codecov

.github/workflows/codeql.yml

@@ -28,11 +28,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/init@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@89a39a4e59826350b863aa6b6252a07ad50cf83e # v4.32.4
+        uses: github/codeql-action/analyze@9e907b5e64f6b83e7804b09294d44122997950d6 # v4.32.3
         with:
           category: "/language:python"

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

@@ -236,7 +236,7 @@ jobs:
       - name: Detect duplicates using AI
         id: ai_detection
         if: steps.extract.outputs.should_continue == 'true' && steps.fetch_similar.outputs.has_similar == 'true'
-        uses: actions/ai-inference@e09e65981758de8b2fdab13c2bfb7c7d5493b0b6 # v2.0.7
+        uses: actions/ai-inference@a380166897b5408b8fb7dddd148142794cb5624a # v2.0.6
         with:
           model: openai/gpt-4o
           system-prompt: |

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

@@ -62,7 +62,7 @@ jobs:
       - name: Detect language using AI
         id: ai_language_detection
         if: steps.detect_language.outputs.should_continue == 'true'
-        uses: actions/ai-inference@e09e65981758de8b2fdab13c2bfb7c7d5493b0b6 # v2.0.7
+        uses: actions/ai-inference@a380166897b5408b8fb7dddd148142794cb5624a # v2.0.6
         with:
           model: openai/gpt-4o-mini
           system-prompt: |

.github/workflows/stale.yml

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

.github/workflows/translations.yml

@@ -15,6 +15,9 @@ concurrency:
   group: ${{ github.workflow }}
   cancel-in-progress: true
 
+env:
+  DEFAULT_PYTHON: "3.14.2"
+
 jobs:
   upload:
     name: Upload
@@ -26,10 +29,10 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Upload Translations
         env:

.github/workflows/wheels.yml

@@ -16,6 +16,9 @@ on:
       - "requirements.txt"
       - "script/gen_requirements_all.py"
 
+env:
+  DEFAULT_PYTHON: "3.14.2"
+
 permissions: {}
 
 concurrency:
@@ -33,11 +36,11 @@ jobs:
         with:
           persist-credentials: false
 
-      - name: Set up Python
+      - name: Set up Python ${{ env.DEFAULT_PYTHON }}
         id: python
         uses: actions/setup-python@a309ff8b426b58ec0e2a45f0f869d46889d02405 # v6.2.0
         with:
-          python-version-file: ".python-version"
+          python-version: ${{ env.DEFAULT_PYTHON }}
           check-latest: true
 
       - name: Create Python virtual environment
@@ -74,7 +77,7 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: env_file
           path: ./.env_file
@@ -82,7 +85,7 @@ jobs:
           overwrite: true
 
       - name: Upload requirements_diff
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: requirements_diff
           path: ./requirements_diff.txt
@@ -94,7 +97,7 @@ jobs:
           python -m script.gen_requirements_all ci
 
       - name: Upload requirements_all_wheels
-        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
+        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
         with:
           name: requirements_all_wheels
           path: ./requirements_all_wheels_*.txt
@@ -107,7 +110,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
         arch: ["amd64", "aarch64"]
         include:
           - arch: amd64
@@ -121,12 +124,12 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
@@ -158,7 +161,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
         arch: ["amd64", "aarch64"]
         include:
           - arch: amd64
@@ -172,17 +175,17 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@70fc10c6e5e1ce46ad2ea6f2b72d43f7d47b13c3 # v8.0.0
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_all_wheels
 
@@ -206,4 +209,4 @@ jobs:
           skip-binary: aiohttp;charset-normalizer;grpcio;multidict;SQLAlchemy;propcache;protobuf;pymicro-vad;yarl
           constraints: "homeassistant/package_constraints.txt"
           requirements-diff: "requirements_diff.txt"
-          requirements: "requirements_all_wheels_${{ matrix.arch }}.txt"
+          requirements: "requirements_all.txt"

.python-version

@@ -1 +1 @@
-3.14.2
+3.14

.strict-typing

@@ -49,7 +49,6 @@ homeassistant.components.actiontec.*
 homeassistant.components.adax.*
 homeassistant.components.adguard.*
 homeassistant.components.aftership.*
-homeassistant.components.ai_task.*
 homeassistant.components.air_quality.*
 homeassistant.components.airgradient.*
 homeassistant.components.airly.*
@@ -131,7 +130,6 @@ homeassistant.components.bring.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
 homeassistant.components.bryant_evolution.*
-homeassistant.components.bsblan.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
@@ -211,7 +209,6 @@ homeassistant.components.firefly_iii.*
 homeassistant.components.fitbit.*
 homeassistant.components.flexit_bacnet.*
 homeassistant.components.flux_led.*
-homeassistant.components.folder_watcher.*
 homeassistant.components.forecast_solar.*
 homeassistant.components.fritz.*
 homeassistant.components.fritzbox.*
@@ -278,7 +275,6 @@ homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
-homeassistant.components.hypontech.*
 homeassistant.components.ibeacon.*
 homeassistant.components.idasen_desk.*
 homeassistant.components.image.*
@@ -289,7 +285,6 @@ homeassistant.components.imgw_pib.*
 homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.inels.*
-homeassistant.components.infrared.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -302,7 +297,6 @@ homeassistant.components.iotty.*
 homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
 homeassistant.components.iron_os.*
-homeassistant.components.isal.*
 homeassistant.components.islamic_prayer_times.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
@@ -313,7 +307,6 @@ homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
 homeassistant.components.kulersky.*
-homeassistant.components.labs.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -373,7 +366,6 @@ homeassistant.components.my.*
 homeassistant.components.mysensors.*
 homeassistant.components.myuplink.*
 homeassistant.components.nam.*
-homeassistant.components.namecheapdns.*
 homeassistant.components.nasweb.*
 homeassistant.components.neato.*
 homeassistant.components.nest.*
@@ -409,7 +401,6 @@ homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
-homeassistant.components.otp.*
 homeassistant.components.overkiz.*
 homeassistant.components.overseerr.*
 homeassistant.components.p1_monitor.*
@@ -426,7 +417,6 @@ homeassistant.components.plugwise.*
 homeassistant.components.pooldose.*
 homeassistant.components.portainer.*
 homeassistant.components.powerfox.*
-homeassistant.components.powerfox_local.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -445,12 +435,10 @@ homeassistant.components.radarr.*
 homeassistant.components.radio_browser.*
 homeassistant.components.rainforest_raven.*
 homeassistant.components.rainmachine.*
-homeassistant.components.random.*
 homeassistant.components.raspberry_pi.*
 homeassistant.components.rdw.*
 homeassistant.components.recollect_waste.*
 homeassistant.components.recorder.*
-homeassistant.components.recovery_mode.*
 homeassistant.components.redgtech.*
 homeassistant.components.remember_the_milk.*
 homeassistant.components.remote.*
@@ -482,7 +470,6 @@ homeassistant.components.schlage.*
 homeassistant.components.scrape.*
 homeassistant.components.script.*
 homeassistant.components.search.*
-homeassistant.components.season.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
@@ -509,7 +496,6 @@ homeassistant.components.smtp.*
 homeassistant.components.snooz.*
 homeassistant.components.solarlog.*
 homeassistant.components.sonarr.*
-homeassistant.components.spaceapi.*
 homeassistant.components.speedtestdotnet.*
 homeassistant.components.spotify.*
 homeassistant.components.sql.*
@@ -534,7 +520,6 @@ homeassistant.components.synology_dsm.*
 homeassistant.components.system_health.*
 homeassistant.components.system_log.*
 homeassistant.components.systemmonitor.*
-homeassistant.components.systemnexa2.*
 homeassistant.components.tag.*
 homeassistant.components.tailscale.*
 homeassistant.components.tailwind.*
@@ -545,7 +530,6 @@ homeassistant.components.tcp.*
 homeassistant.components.technove.*
 homeassistant.components.tedee.*
 homeassistant.components.telegram_bot.*
-homeassistant.components.teslemetry.*
 homeassistant.components.text.*
 homeassistant.components.thethingsnetwork.*
 homeassistant.components.threshold.*
@@ -578,14 +562,12 @@ homeassistant.components.update.*
 homeassistant.components.uptime.*
 homeassistant.components.uptime_kuma.*
 homeassistant.components.uptimerobot.*
-homeassistant.components.usage_prediction.*
 homeassistant.components.usb.*
 homeassistant.components.uvc.*
 homeassistant.components.vacuum.*
 homeassistant.components.vallox.*
 homeassistant.components.valve.*
 homeassistant.components.velbus.*
-homeassistant.components.velux.*
 homeassistant.components.vivotek.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*
@@ -598,7 +580,6 @@ homeassistant.components.water_heater.*
 homeassistant.components.watts.*
 homeassistant.components.watttime.*
 homeassistant.components.weather.*
-homeassistant.components.web_rtc.*
 homeassistant.components.webhook.*
 homeassistant.components.webostv.*
 homeassistant.components.websocket_api.*
@@ -615,7 +596,6 @@ homeassistant.components.yale_smart_alarm.*
 homeassistant.components.yalexs_ble.*
 homeassistant.components.youtube.*
 homeassistant.components.zeroconf.*
-homeassistant.components.zinvolt.*
 homeassistant.components.zodiac.*
 homeassistant.components.zone.*
 homeassistant.components.zwave_js.*

AGENTS.md

@@ -4,17 +4,325 @@ This repository contains the core of Home Assistant, a Python 3 based home autom
 
 ## Code Review Guidelines
 
+**When reviewing code, do NOT comment on:**
+- **Missing imports** - We use static analysis tooling to catch that
+- **Code formatting** - We have ruff as a formatting tool that will catch those if needed (unless specifically instructed otherwise in these instructions)
+
 **Git commit practices during review:**
 - **Do NOT amend, squash, or rebase commits after review has started** - Reviewers need to see what changed since their last review
 
+## Python Requirements
+
+- **Compatibility**: Python 3.13+
+- **Language Features**: Use the newest features when possible:
+  - Pattern matching
+  - Type hints
+  - f-strings (preferred over `%` or `.format()`)
+  - Dataclasses
+  - Walrus operator
+
+### Strict Typing (Platinum)
+- **Comprehensive Type Hints**: Add type hints to all functions, methods, and variables
+- **Custom Config Entry Types**: When using runtime_data:
+  ```python
+  type MyIntegrationConfigEntry = ConfigEntry[MyClient]
+  ```
+- **Library Requirements**: Include `py.typed` file for PEP-561 compliance
+
+## Code Quality Standards
+
+- **Formatting**: Ruff
+- **Linting**: PyLint and Ruff
+- **Type Checking**: MyPy
+- **Lint/Type/Format Fixes**: Always prefer addressing the underlying issue (e.g., import the typed source, update shared stubs, align with Ruff expectations, or correct formatting at the source) before disabling a rule, adding `# type: ignore`, or skipping a formatter. Treat suppressions and `noqa` comments as a last resort once no compliant fix exists
+- **Testing**: pytest with plain functions and fixtures
+- **Language**: American English for all code, comments, and documentation (use sentence case, including titles)
+
+### Writing Style Guidelines
+- **Tone**: Friendly and informative
+- **Perspective**: Use second-person ("you" and "your") for user-facing messages
+- **Inclusivity**: Use objective, non-discriminatory language
+- **Clarity**: Write for non-native English speakers
+- **Formatting in Messages**:
+  - Use backticks for: file paths, filenames, variable names, field entries
+  - Use sentence case for titles and messages (capitalize only the first word and proper nouns)
+  - Avoid abbreviations when possible
+
+### Documentation Standards
+- **File Headers**: Short and concise
+  ```python
+  """Integration for Peblar EV chargers."""
+  ```
+- **Method/Function Docstrings**: Required for all
+  ```python
+  async def async_setup_entry(hass: HomeAssistant, entry: PeblarConfigEntry) -> bool:
+      """Set up Peblar from a config entry."""
+  ```
+- **Comment Style**:
+  - Use clear, descriptive comments
+  - Explain the "why" not just the "what"
+  - Keep code block lines under 80 characters when possible
+  - Use progressive disclosure (simple explanation first, complex details later)
+
+## Async Programming
+
+- All external I/O operations must be async
+- **Best Practices**:
+  - Avoid sleeping in loops
+  - Avoid awaiting in loops - use `gather` instead
+  - No blocking calls
+  - Group executor jobs when possible - switching between event loop and executor is expensive
+
+### Blocking Operations
+- **Use Executor**: For blocking I/O operations
+  ```python
+  result = await hass.async_add_executor_job(blocking_function, args)
+  ```
+- **Never Block Event Loop**: Avoid file operations, `time.sleep()`, blocking HTTP calls
+- **Replace with Async**: Use `asyncio.sleep()` instead of `time.sleep()`
+
+### Thread Safety
+- **@callback Decorator**: For event loop safe functions
+  ```python
+  @callback
+  def async_update_callback(self, event):
+      """Safe to run in event loop."""
+      self.async_write_ha_state()
+  ```
+- **Sync APIs from Threads**: Use sync versions when calling from non-event loop threads
+- **Registry Changes**: Must be done in event loop thread
+
+### Error Handling
+- **Exception Types**: Choose most specific exception available
+  - `ServiceValidationError`: User input errors (preferred over `ValueError`)
+  - `HomeAssistantError`: Device communication failures
+  - `ConfigEntryNotReady`: Temporary setup issues (device offline)
+  - `ConfigEntryAuthFailed`: Authentication problems
+  - `ConfigEntryError`: Permanent setup issues
+- **Try/Catch Best Practices**:
+  - Only wrap code that can throw exceptions
+  - Keep try blocks minimal - process data after the try/catch
+  - **Avoid bare exceptions** except in specific cases:
+    - ❌ Generally not allowed: `except:` or `except Exception:`
+    - ✅ Allowed in config flows to ensure robustness
+    - ✅ Allowed in functions/methods that run in background tasks
+  - Bad pattern:
+    ```python
+    try:
+        data = await device.get_data()  # Can throw
+        # ❌ Don't process data inside try block
+        processed = data.get("value", 0) * 100
+        self._attr_native_value = processed
+    except DeviceError:
+        _LOGGER.error("Failed to get data")
+    ```
+  - Good pattern:
+    ```python
+    try:
+        data = await device.get_data()  # Can throw
+    except DeviceError:
+        _LOGGER.error("Failed to get data")
+        return
+
+    # ✅ Process data outside try block
+    processed = data.get("value", 0) * 100
+    self._attr_native_value = processed
+    ```
+- **Bare Exception Usage**:
+  ```python
+  # ❌ Not allowed in regular code
+  try:
+      data = await device.get_data()
+  except Exception:  # Too broad
+      _LOGGER.error("Failed")
+
+  # ✅ Allowed in config flow for robustness
+  async def async_step_user(self, user_input=None):
+      try:
+          await self._test_connection(user_input)
+      except Exception:  # Allowed here
+          errors["base"] = "unknown"
+
+  # ✅ Allowed in background tasks
+  async def _background_refresh():
+      try:
+          await coordinator.async_refresh()
+      except Exception:  # Allowed in task
+          _LOGGER.exception("Unexpected error in background task")
+  ```
+- **Setup Failure Patterns**:
+  ```python
+  try:
+      await device.async_setup()
+  except (asyncio.TimeoutError, TimeoutException) as ex:
+      raise ConfigEntryNotReady(f"Timeout connecting to {device.host}") from ex
+  except AuthFailed as ex:
+      raise ConfigEntryAuthFailed(f"Credentials expired for {device.name}") from ex
+  ```
+
+### Logging
+- **Format Guidelines**:
+  - No periods at end of messages
+  - No integration names/domains (added automatically)
+  - No sensitive data (keys, tokens, passwords)
+- Use debug level for non-user-facing messages
+- **Use Lazy Logging**:
+  ```python
+  _LOGGER.debug("This is a log message with %s", variable)
+  ```
+
+### Unavailability Logging
+- **Log Once**: When device/service becomes unavailable (info level)
+- **Log Recovery**: When device/service comes back online
+- **Implementation Pattern**:
+  ```python
+  _unavailable_logged: bool = False
+
+  if not self._unavailable_logged:
+      _LOGGER.info("The sensor is unavailable: %s", ex)
+      self._unavailable_logged = True
+  # On recovery:
+  if self._unavailable_logged:
+      _LOGGER.info("The sensor is back online")
+      self._unavailable_logged = False
+  ```
+
 ## Development Commands
 
-.vscode/tasks.json contains useful commands used for development.
+### Environment
+- **Local development (non-container)**: Activate the project venv before running commands: `source .venv/bin/activate`
+- **Dev container**: No activation needed, the environment is pre-configured
 
-## Python Syntax Notes
+### Code Quality & Linting
+- **Run all linters on all files**: `prek run --all-files`
+- **Run linters on staged files only**: `prek run`
+- **PyLint on everything** (slow): `pylint homeassistant`
+- **PyLint on specific folder**: `pylint homeassistant/components/my_integration`
+- **MyPy type checking (whole project)**: `mypy homeassistant/`
+- **MyPy on specific integration**: `mypy homeassistant/components/my_integration`
 
-- Python 3.14 explicitly allows `except TypeA, TypeB:` without parentheses.
+### Testing
+- **Quick test of changed files**: `pytest --timeout=10 --picked`
+- **Update test snapshots**: Add `--snapshot-update` to pytest command
+  - ⚠️ Omit test results after using `--snapshot-update`
+  - Always run tests again without the flag to verify snapshots
+- **Full test suite** (AVOID - very slow): `pytest ./tests`
 
-## Good practices
+### Dependencies & Requirements
+- **Update generated files after dependency changes**: `python -m script.gen_requirements_all`
+- **Install all Python requirements**:
+  ```bash
+  uv pip install -r requirements_all.txt -r requirements.txt -r requirements_test.txt
+  ```
+- **Install test requirements only**:
+  ```bash
+  uv pip install -r requirements_test_all.txt -r requirements.txt
+  ```
 
-Integrations with Platinum or Gold level in the Integration Quality Scale reflect a high standard of code quality and maintainability. When looking for examples of something, these are good places to start. The level is indicated in the manifest.json of the integration.
+### Translations
+- **Update translations after strings.json changes**:
+  ```bash
+  python -m script.translations develop --all
+  ```
+
+### Project Validation
+- **Run hassfest** (checks project structure and updates generated files):
+  ```bash
+  python -m script.hassfest
+  ```
+
+## Common Anti-Patterns & Best Practices
+
+### ❌ **Avoid These Patterns**
+```python
+# Blocking operations in event loop
+data = requests.get(url)  # ❌ Blocks event loop
+time.sleep(5)  # ❌ Blocks event loop
+
+# Reusing BleakClient instances
+self.client = BleakClient(address)
+await self.client.connect()
+# Later...
+await self.client.connect()  # ❌ Don't reuse
+
+# Hardcoded strings in code
+self._attr_name = "Temperature Sensor"  # ❌ Not translatable
+
+# Missing error handling
+data = await self.api.get_data()  # ❌ No exception handling
+
+# Storing sensitive data in diagnostics
+return {"api_key": entry.data[CONF_API_KEY]}  # ❌ Exposes secrets
+
+# Accessing hass.data directly in tests
+coordinator = hass.data[DOMAIN][entry.entry_id]  # ❌ Don't access hass.data
+
+# User-configurable polling intervals
+# In config flow
+vol.Optional("scan_interval", default=60): cv.positive_int  # ❌ Not allowed
+# In coordinator
+update_interval = timedelta(minutes=entry.data.get("scan_interval", 1))  # ❌ Not allowed
+
+# User-configurable config entry names (non-helper integrations)
+vol.Optional("name", default="My Device"): cv.string  # ❌ Not allowed in regular integrations
+
+# Too much code in try block
+try:
+    response = await client.get_data()  # Can throw
+    # ❌ Data processing should be outside try block
+    temperature = response["temperature"] / 10
+    humidity = response["humidity"]
+    self._attr_native_value = temperature
+except ClientError:
+    _LOGGER.error("Failed to fetch data")
+
+# Bare exceptions in regular code
+try:
+    value = await sensor.read_value()
+except Exception:  # ❌ Too broad - catch specific exceptions
+    _LOGGER.error("Failed to read sensor")
+```
+
+### ✅ **Use These Patterns Instead**
+```python
+# Async operations with executor
+data = await hass.async_add_executor_job(requests.get, url)
+await asyncio.sleep(5)  # ✅ Non-blocking
+
+# Fresh BleakClient instances
+client = BleakClient(address)  # ✅ New instance each time
+await client.connect()
+
+# Translatable entity names
+_attr_translation_key = "temperature_sensor"  # ✅ Translatable
+
+# Proper error handling
+try:
+    data = await self.api.get_data()
+except ApiException as err:
+    raise UpdateFailed(f"API error: {err}") from err
+
+# Redacted diagnostics data
+return async_redact_data(data, {"api_key", "password"})  # ✅ Safe
+
+# Test through proper integration setup and fixtures
+@pytest.fixture
+async def init_integration(hass, mock_config_entry, mock_api):
+    mock_config_entry.add_to_hass(hass)
+    await hass.config_entries.async_setup(mock_config_entry.entry_id)  # ✅ Proper setup
+
+# Integration-determined polling intervals (not user-configurable)
+SCAN_INTERVAL = timedelta(minutes=5)  # ✅ Common pattern: constant in const.py
+
+class MyCoordinator(DataUpdateCoordinator[MyData]):
+    def __init__(self, hass: HomeAssistant, client: MyClient, config_entry: ConfigEntry) -> None:
+        # ✅ Integration determines interval based on device capabilities, connection type, etc.
+        interval = timedelta(minutes=1) if client.is_local else SCAN_INTERVAL
+        super().__init__(
+            hass,
+            logger=LOGGER,
+            name=DOMAIN,
+            update_interval=interval,
+            config_entry=config_entry,  # ✅ Pass config_entry - it's accepted and recommended
+        )
+```

CODEOWNERS

@@ -242,8 +242,6 @@ build.json @home-assistant/supervisor
 /tests/components/bosch_alarm/ @mag1024 @sanjay900
 /homeassistant/components/bosch_shc/ @tschamm
 /tests/components/bosch_shc/ @tschamm
-/homeassistant/components/brands/ @home-assistant/core
-/tests/components/brands/ @home-assistant/core
 /homeassistant/components/braviatv/ @bieniu @Drafteed
 /tests/components/braviatv/ @bieniu @Drafteed
 /homeassistant/components/bring/ @miaucl @tr4nt0r
@@ -281,8 +279,6 @@ build.json @home-assistant/supervisor
 /tests/components/cert_expiry/ @jjlawren
 /homeassistant/components/chacon_dio/ @cnico
 /tests/components/chacon_dio/ @cnico
-/homeassistant/components/chess_com/ @joostlek
-/tests/components/chess_com/ @joostlek
 /homeassistant/components/cisco_ios/ @fbradyirl
 /homeassistant/components/cisco_mobility_express/ @fbradyirl
 /homeassistant/components/cisco_webex_teams/ @fbradyirl
@@ -403,10 +399,12 @@ build.json @home-assistant/supervisor
 /tests/components/dsmr_reader/ @sorted-bits @glodenox @erwindouna
 /homeassistant/components/duckdns/ @tr4nt0r
 /tests/components/duckdns/ @tr4nt0r
+/homeassistant/components/duke_energy/ @hunterjm
+/tests/components/duke_energy/ @hunterjm
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
-/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
-/tests/components/dwd_weather_warnings/ @runningman84 @stephan192
+/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
+/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -557,6 +555,8 @@ build.json @home-assistant/supervisor
 /tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
 /tests/components/fritzbox/ @mib1185 @flabbamann
+/homeassistant/components/fritzbox_callmonitor/ @cdce8p
+/tests/components/fritzbox_callmonitor/ @cdce8p
 /homeassistant/components/fronius/ @farmio
 /tests/components/fronius/ @farmio
 /homeassistant/components/frontend/ @home-assistant/frontend
@@ -719,8 +719,8 @@ build.json @home-assistant/supervisor
 /tests/components/homematic/ @pvizeli
 /homeassistant/components/homematicip_cloud/ @hahn-th @lackas
 /tests/components/homematicip_cloud/ @hahn-th @lackas
-/homeassistant/components/homevolt/ @danielhiversen @liudger
-/tests/components/homevolt/ @danielhiversen @liudger
+/homeassistant/components/homevolt/ @danielhiversen
+/tests/components/homevolt/ @danielhiversen
 /homeassistant/components/homewizard/ @DCSBL
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
@@ -753,8 +753,6 @@ build.json @home-assistant/supervisor
 /tests/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
-/homeassistant/components/hypontech/ @jcisio
-/tests/components/hypontech/ @jcisio
 /homeassistant/components/ialarm/ @RyuzakiKK
 /tests/components/ialarm/ @RyuzakiKK
 /homeassistant/components/iammeter/ @lewei50
@@ -788,14 +786,10 @@ build.json @home-assistant/supervisor
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
 /tests/components/incomfort/ @jbouwh
-/homeassistant/components/indevolt/ @xirtnl
-/tests/components/indevolt/ @xirtnl
 /homeassistant/components/inels/ @epdevlab
 /tests/components/inels/ @epdevlab
-/homeassistant/components/influxdb/ @mdegat01 @Robbie1221
-/tests/components/influxdb/ @mdegat01 @Robbie1221
-/homeassistant/components/infrared/ @home-assistant/core
-/tests/components/infrared/ @home-assistant/core
+/homeassistant/components/influxdb/ @mdegat01
+/tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
 /tests/components/inkbird/ @bdraco
 /homeassistant/components/input_boolean/ @home-assistant/core
@@ -1084,8 +1078,6 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
-/homeassistant/components/myneomitis/ @l-pr
-/tests/components/myneomitis/ @l-pr
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
@@ -1102,8 +1094,8 @@ build.json @home-assistant/supervisor
 /tests/components/nasweb/ @nasWebio
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
 /tests/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
-/homeassistant/components/ness_alarm/ @nickw444 @poshy163
-/tests/components/ness_alarm/ @nickw444 @poshy163
+/homeassistant/components/ness_alarm/ @nickw444
+/tests/components/ness_alarm/ @nickw444
 /homeassistant/components/nest/ @allenporter
 /tests/components/nest/ @allenporter
 /homeassistant/components/netatmo/ @cgtobi
@@ -1202,8 +1194,6 @@ build.json @home-assistant/supervisor
 /tests/components/open_meteo/ @frenck
 /homeassistant/components/open_router/ @joostlek
 /tests/components/open_router/ @joostlek
-/homeassistant/components/opendisplay/ @g4bri3lDev
-/tests/components/opendisplay/ @g4bri3lDev
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
 /homeassistant/components/openevse/ @c00w @firstof9
@@ -1289,8 +1279,6 @@ build.json @home-assistant/supervisor
 /tests/components/portainer/ @erwindouna
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
-/homeassistant/components/powerfox_local/ @klaasnicolaas
-/tests/components/powerfox_local/ @klaasnicolaas
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
 /tests/components/powerwall/ @bdraco @jrester @daniel-simpson
 /homeassistant/components/prana/ @prana-dev-official
@@ -1309,8 +1297,8 @@ build.json @home-assistant/supervisor
 /tests/components/prosegur/ @dgomes
 /homeassistant/components/proximity/ @mib1185
 /tests/components/proximity/ @mib1185
-/homeassistant/components/proxmoxve/ @Corbeno @erwindouna @CoMPaTech
-/tests/components/proxmoxve/ @Corbeno @erwindouna @CoMPaTech
+/homeassistant/components/proxmoxve/ @jhollowe @Corbeno @erwindouna
+/tests/components/proxmoxve/ @jhollowe @Corbeno @erwindouna
 /homeassistant/components/ps4/ @ktnrg45
 /tests/components/ps4/ @ktnrg45
 /homeassistant/components/pterodactyl/ @elmurato
@@ -1654,8 +1642,6 @@ build.json @home-assistant/supervisor
 /tests/components/system_bridge/ @timmo001
 /homeassistant/components/systemmonitor/ @gjohansson-ST
 /tests/components/systemmonitor/ @gjohansson-ST
-/homeassistant/components/systemnexa2/ @konsulten
-/tests/components/systemnexa2/ @konsulten
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
 /homeassistant/components/tag/ @home-assistant/core
@@ -1681,8 +1667,6 @@ build.json @home-assistant/supervisor
 /tests/components/telegram_bot/ @hanwg
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/teltonika/ @karlbeecken
-/tests/components/teltonika/ @karlbeecken
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1695,6 +1679,7 @@ build.json @home-assistant/supervisor
 /tests/components/tessie/ @Bre77
 /homeassistant/components/text/ @home-assistant/core
 /tests/components/text/ @home-assistant/core
+/homeassistant/components/tfiac/ @fredrike @mellado
 /homeassistant/components/thermobeacon/ @bdraco
 /tests/components/thermobeacon/ @bdraco
 /homeassistant/components/thermopro/ @bdraco @h3ss
@@ -1748,8 +1733,6 @@ build.json @home-assistant/supervisor
 /tests/components/trafikverket_train/ @gjohansson-ST
 /homeassistant/components/trafikverket_weatherstation/ @gjohansson-ST
 /tests/components/trafikverket_weatherstation/ @gjohansson-ST
-/homeassistant/components/trane/ @bdraco
-/tests/components/trane/ @bdraco
 /homeassistant/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /tests/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /homeassistant/components/trend/ @jpbede
@@ -1885,8 +1868,8 @@ build.json @home-assistant/supervisor
 /tests/components/webostv/ @thecode
 /homeassistant/components/websocket_api/ @home-assistant/core
 /tests/components/websocket_api/ @home-assistant/core
-/homeassistant/components/weheat/ @barryvdh
-/tests/components/weheat/ @barryvdh
+/homeassistant/components/weheat/ @jesperraemaekers
+/tests/components/weheat/ @jesperraemaekers
 /homeassistant/components/wemo/ @esev
 /tests/components/wemo/ @esev
 /homeassistant/components/whirlpool/ @abmantis @mkmer
@@ -1902,8 +1885,8 @@ build.json @home-assistant/supervisor
 /tests/components/withings/ @joostlek
 /homeassistant/components/wiz/ @sbidy @arturpragacz
 /tests/components/wiz/ @sbidy @arturpragacz
-/homeassistant/components/wled/ @frenck @mik-laj
-/tests/components/wled/ @frenck @mik-laj
+/homeassistant/components/wled/ @frenck
+/tests/components/wled/ @frenck
 /homeassistant/components/wmspro/ @mback2k
 /tests/components/wmspro/ @mback2k
 /homeassistant/components/wolflink/ @adamkrol93 @mtielen
@@ -1964,14 +1947,11 @@ build.json @home-assistant/supervisor
 /tests/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
 /homeassistant/components/zimi/ @markhannon
 /tests/components/zimi/ @markhannon
-/homeassistant/components/zinvolt/ @joostlek
-/tests/components/zinvolt/ @joostlek
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core
 /tests/components/zone/ @home-assistant/core
 /homeassistant/components/zoneminder/ @rohankapoorcom @nabbi
-/tests/components/zoneminder/ @rohankapoorcom @nabbi
 /homeassistant/components/zwave_js/ @home-assistant/z-wave
 /tests/components/zwave_js/ @home-assistant/z-wave
 /homeassistant/components/zwave_me/ @lawfulchaos @Z-Wave-Me @PoltoS

Dockerfile

@@ -30,7 +30,7 @@ RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.10.6
+    && pip3 install uv==0.9.26
 
 WORKDIR /usr/src
 

codecov.yml

@@ -10,7 +10,6 @@ coverage:
         target: auto
         threshold: 1
         paths:
-          - homeassistant/components/*/backup.py
           - homeassistant/components/*/config_flow.py
           - homeassistant/components/*/device_action.py
           - homeassistant/components/*/device_condition.py
@@ -29,7 +28,6 @@ coverage:
         target: 100
         threshold: 0
         paths:
-          - homeassistant/components/*/backup.py
           - homeassistant/components/*/config_flow.py
           - homeassistant/components/*/device_action.py
           - homeassistant/components/*/device_condition.py

homeassistant/backup_restore.py

@@ -4,6 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Iterable
 from dataclasses import dataclass
+import hashlib
 import json
 import logging
 from pathlib import Path
@@ -39,6 +40,17 @@ class RestoreBackupFileContent:
     restore_homeassistant: bool
 
 
+def password_to_key(password: str) -> bytes:
+    """Generate a AES Key from password.
+
+    Matches the implementation in supervisor.backups.utils.password_to_key.
+    """
+    key: bytes = password.encode()
+    for _ in range(100):
+        key = hashlib.sha256(key).digest()
+    return key[:16]
+
+
 def restore_backup_file_content(config_dir: Path) -> RestoreBackupFileContent | None:
     """Return the contents of the restore backup file."""
     instruction_path = config_dir.joinpath(RESTORE_BACKUP_FILE)
@@ -84,14 +96,15 @@ def _extract_backup(
     """Extract the backup file to the config directory."""
     with (
         TemporaryDirectory() as tempdir,
-        securetar.SecureTarArchive(
+        securetar.SecureTarFile(
             restore_content.backup_file_path,
+            gzip=False,
             mode="r",
         ) as ostf,
     ):
-        ostf.tar.extractall(
+        ostf.extractall(
             path=Path(tempdir, "extracted"),
-            members=securetar.secure_path(ostf.tar),
+            members=securetar.secure_path(ostf),
             filter="fully_trusted",
         )
         backup_meta_file = Path(tempdir, "extracted", "backup.json")
@@ -113,7 +126,10 @@ def _extract_backup(
                 f"homeassistant.tar{'.gz' if backup_meta['compressed'] else ''}",
             ),
             gzip=backup_meta["compressed"],
-            password=restore_content.password,
+            key=password_to_key(restore_content.password)
+            if restore_content.password is not None
+            else None,
+            mode="r",
         ) as istf:
             istf.extractall(
                 path=Path(tempdir, "homeassistant"),

homeassistant/bootstrap.py

@@ -70,7 +70,7 @@ from .const import (
     SIGNAL_BOOTSTRAP_INTEGRATIONS,
 )
 from .core_config import async_process_ha_core_config
-from .exceptions import HomeAssistantError, UnsupportedStorageVersionError
+from .exceptions import HomeAssistantError
 from .helpers import (
     area_registry,
     category_registry,
@@ -210,7 +210,6 @@ DEFAULT_INTEGRATIONS = {
     "analytics",  # Needed for onboarding
     "application_credentials",
     "backup",
-    "brands",
     "frontend",
     "hardware",
     "labs",
@@ -236,14 +235,9 @@ DEFAULT_INTEGRATIONS = {
     "input_text",
     "schedule",
     "timer",
-    #
-    # Base platforms:
-    *BASE_PLATFORMS,
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {
     # These integrations are set up if recovery mode is activated.
-    "backup",
-    "cloud",
     "frontend",
 }
 DEFAULT_INTEGRATIONS_SUPERVISOR = {
@@ -438,56 +432,32 @@ def _init_blocking_io_modules_in_executor() -> None:
     is_docker_env()
 
 
-async def async_load_base_functionality(hass: core.HomeAssistant) -> bool:
-    """Load the registries and modules that will do blocking I/O.
-
-    Return whether loading succeeded.
-    """
+async def async_load_base_functionality(hass: core.HomeAssistant) -> None:
+    """Load the registries and modules that will do blocking I/O."""
     if DATA_REGISTRIES_LOADED in hass.data:
-        return True
-
+        return
     hass.data[DATA_REGISTRIES_LOADED] = None
     entity.async_setup(hass)
     frame.async_setup(hass)
     template.async_setup(hass)
     translation.async_setup(hass)
-
-    recovery = hass.config.recovery_mode
-    try:
-        await asyncio.gather(
-            create_eager_task(get_internal_store_manager(hass).async_initialize()),
-            create_eager_task(area_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(category_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(device_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(entity_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(floor_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(issue_registry.async_load(hass, load_empty=recovery)),
-            create_eager_task(label_registry.async_load(hass, load_empty=recovery)),
-            hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
-            create_eager_task(template.async_load_custom_templates(hass)),
-            create_eager_task(restore_state.async_load(hass, load_empty=recovery)),
-            create_eager_task(hass.config_entries.async_initialize()),
-            create_eager_task(async_get_system_info(hass)),
-            create_eager_task(condition.async_setup(hass)),
-            create_eager_task(trigger.async_setup(hass)),
-        )
-    except UnsupportedStorageVersionError as err:
-        # If we're already in recovery mode, we don't want to handle the exception
-        # and activate recovery mode again, as that would lead to an infinite loop.
-        if recovery:
-            raise
-
-        _LOGGER.error(
-            "Storage file %s was created by a newer version of Home Assistant"
-            " (storage version %s > %s); activating recovery mode; on-disk data"
-            " is preserved; upgrade Home Assistant or restore from a backup",
-            err.storage_key,
-            err.found_version,
-            err.max_supported_version,
-        )
-        return False
-
-    return True
+    await asyncio.gather(
+        create_eager_task(get_internal_store_manager(hass).async_initialize()),
+        create_eager_task(area_registry.async_load(hass)),
+        create_eager_task(category_registry.async_load(hass)),
+        create_eager_task(device_registry.async_load(hass)),
+        create_eager_task(entity_registry.async_load(hass)),
+        create_eager_task(floor_registry.async_load(hass)),
+        create_eager_task(issue_registry.async_load(hass)),
+        create_eager_task(label_registry.async_load(hass)),
+        hass.async_add_executor_job(_init_blocking_io_modules_in_executor),
+        create_eager_task(template.async_load_custom_templates(hass)),
+        create_eager_task(restore_state.async_load(hass)),
+        create_eager_task(hass.config_entries.async_initialize()),
+        create_eager_task(async_get_system_info(hass)),
+        create_eager_task(condition.async_setup(hass)),
+        create_eager_task(trigger.async_setup(hass)),
+    )
 
 
 async def async_from_config_dict(
@@ -504,9 +474,7 @@ async def async_from_config_dict(
     # Prime custom component cache early so we know if registry entries are tied
     # to a custom integration
     await loader.async_get_custom_components(hass)
-
-    if not await async_load_base_functionality(hass):
-        return None
+    await async_load_base_functionality(hass)
 
     # Set up core.
     _LOGGER.debug("Setting up %s", CORE_INTEGRATIONS)

homeassistant/brands/american_standard.json

@@ -1,5 +0,0 @@
-{
-  "domain": "american_standard",
-  "name": "American Standard",
-  "integrations": ["nexia", "trane"]
-}

homeassistant/brands/powerfox.json

@@ -1,5 +0,0 @@
-{
-  "domain": "powerfox",
-  "name": "Powerfox",
-  "integrations": ["powerfox", "powerfox_local"]
-}

homeassistant/brands/trane.json

@@ -1,5 +0,0 @@
-{
-  "domain": "trane",
-  "name": "Trane",
-  "integrations": ["nexia", "trane"]
-}

homeassistant/brands/ubisys.json

@@ -1,5 +0,0 @@
-{
-  "domain": "ubisys",
-  "name": "Ubisys",
-  "iot_standards": ["zigbee"]
-}

homeassistant/components/abode/services.py

@@ -12,6 +12,10 @@ from homeassistant.helpers.dispatcher import dispatcher_send
 
 from .const import DOMAIN, DOMAIN_DATA, LOGGER
 
+SERVICE_SETTINGS = "change_setting"
+SERVICE_CAPTURE_IMAGE = "capture_image"
+SERVICE_TRIGGER_AUTOMATION = "trigger_automation"
+
 ATTR_SETTING = "setting"
 ATTR_VALUE = "value"
 
@@ -71,13 +75,16 @@ def async_setup_services(hass: HomeAssistant) -> None:
     """Home Assistant services."""
 
     hass.services.async_register(
-        DOMAIN, "change_setting", _change_setting, schema=CHANGE_SETTING_SCHEMA
+        DOMAIN, SERVICE_SETTINGS, _change_setting, schema=CHANGE_SETTING_SCHEMA
     )
 
     hass.services.async_register(
-        DOMAIN, "capture_image", _capture_image, schema=CAPTURE_IMAGE_SCHEMA
+        DOMAIN, SERVICE_CAPTURE_IMAGE, _capture_image, schema=CAPTURE_IMAGE_SCHEMA
     )
 
     hass.services.async_register(
-        DOMAIN, "trigger_automation", _trigger_automation, schema=AUTOMATION_SCHEMA
+        DOMAIN,
+        SERVICE_TRIGGER_AUTOMATION,
+        _trigger_automation,
+        schema=AUTOMATION_SCHEMA,
     )

homeassistant/components/accuweather/__init__.py

@@ -7,7 +7,7 @@ import logging
 
 from accuweather import AccuWeather
 
-from homeassistant.components.sensor import DOMAIN as SENSOR_DOMAIN
+from homeassistant.components.sensor import DOMAIN as SENSOR_PLATFORM
 from homeassistant.const import CONF_API_KEY, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import entity_registry as er
@@ -72,7 +72,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: AccuWeatherConfigEntry)
     ent_reg = er.async_get(hass)
     for day in range(5):
         unique_id = f"{location_key}-ozone-{day}"
-        if entity_id := ent_reg.async_get_entity_id(SENSOR_DOMAIN, DOMAIN, unique_id):
+        if entity_id := ent_reg.async_get_entity_id(SENSOR_PLATFORM, DOMAIN, unique_id):
             _LOGGER.debug("Removing ozone sensor entity %s", entity_id)
             ent_reg.async_remove(entity_id)
 

homeassistant/components/accuweather/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["accuweather"],
-  "requirements": ["accuweather==5.1.0"]
+  "requirements": ["accuweather==5.0.0"]
 }

homeassistant/components/accuweather/system_health.py

@@ -30,8 +30,6 @@ async def system_health_info(hass: HomeAssistant) -> dict[str, Any]:
     )
 
     return {
-        "can_reach_server": system_health.async_check_can_reach_url(
-            hass, str(ENDPOINT)
-        ),
+        "can_reach_server": system_health.async_check_can_reach_url(hass, ENDPOINT),
         "remaining_requests": remaining_requests,
     }

homeassistant/components/accuweather/weather.py

@@ -191,7 +191,7 @@ class AccuWeatherEntity(
             {
                 ATTR_FORECAST_TIME: utc_from_timestamp(item["EpochDate"]).isoformat(),
                 ATTR_FORECAST_CLOUD_COVERAGE: item["CloudCoverDay"],
-                ATTR_FORECAST_HUMIDITY: item["RelativeHumidityDay"].get("Average"),
+                ATTR_FORECAST_HUMIDITY: item["RelativeHumidityDay"]["Average"],
                 ATTR_FORECAST_NATIVE_TEMP: item["TemperatureMax"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_TEMP_LOW: item["TemperatureMin"][ATTR_VALUE],
                 ATTR_FORECAST_NATIVE_APPARENT_TEMP: item["RealFeelTemperatureMax"][

homeassistant/components/ads/light.py

@@ -9,13 +9,9 @@ import voluptuous as vol
 
 from homeassistant.components.light import (
     ATTR_BRIGHTNESS,
-    ATTR_COLOR_TEMP_KELVIN,
-    DEFAULT_MAX_KELVIN,
-    DEFAULT_MIN_KELVIN,
     PLATFORM_SCHEMA as LIGHT_PLATFORM_SCHEMA,
     ColorMode,
     LightEntity,
-    filter_supported_color_modes,
 )
 from homeassistant.const import CONF_NAME
 from homeassistant.core import HomeAssistant
@@ -28,20 +24,13 @@ from .entity import AdsEntity
 from .hub import AdsHub
 
 CONF_ADS_VAR_BRIGHTNESS = "adsvar_brightness"
-CONF_ADS_VAR_COLOR_TEMP_KELVIN = "adsvar_color_temp_kelvin"
-CONF_MIN_COLOR_TEMP_KELVIN = "min_color_temp_kelvin"
-CONF_MAX_COLOR_TEMP_KELVIN = "max_color_temp_kelvin"
 STATE_KEY_BRIGHTNESS = "brightness"
-STATE_KEY_COLOR_TEMP_KELVIN = "color_temp_kelvin"
 
 DEFAULT_NAME = "ADS Light"
 PLATFORM_SCHEMA = LIGHT_PLATFORM_SCHEMA.extend(
     {
         vol.Required(CONF_ADS_VAR): cv.string,
         vol.Optional(CONF_ADS_VAR_BRIGHTNESS): cv.string,
-        vol.Optional(CONF_ADS_VAR_COLOR_TEMP_KELVIN): cv.string,
-        vol.Optional(CONF_MIN_COLOR_TEMP_KELVIN): cv.positive_int,
-        vol.Optional(CONF_MAX_COLOR_TEMP_KELVIN): cv.positive_int,
         vol.Optional(CONF_NAME, default=DEFAULT_NAME): cv.string,
     }
 )
@@ -58,24 +47,9 @@ def setup_platform(
 
     ads_var_enable: str = config[CONF_ADS_VAR]
     ads_var_brightness: str | None = config.get(CONF_ADS_VAR_BRIGHTNESS)
-    ads_var_color_temp_kelvin: str | None = config.get(CONF_ADS_VAR_COLOR_TEMP_KELVIN)
-    min_color_temp_kelvin: int | None = config.get(CONF_MIN_COLOR_TEMP_KELVIN)
-    max_color_temp_kelvin: int | None = config.get(CONF_MAX_COLOR_TEMP_KELVIN)
     name: str = config[CONF_NAME]
 
-    add_entities(
-        [
-            AdsLight(
-                ads_hub,
-                ads_var_enable,
-                ads_var_brightness,
-                ads_var_color_temp_kelvin,
-                min_color_temp_kelvin,
-                max_color_temp_kelvin,
-                name,
-            )
-        ]
-    )
+    add_entities([AdsLight(ads_hub, ads_var_enable, ads_var_brightness, name)])
 
 
 class AdsLight(AdsEntity, LightEntity):
@@ -86,40 +60,18 @@ class AdsLight(AdsEntity, LightEntity):
         ads_hub: AdsHub,
         ads_var_enable: str,
         ads_var_brightness: str | None,
-        ads_var_color_temp_kelvin: str | None,
-        min_color_temp_kelvin: int | None,
-        max_color_temp_kelvin: int | None,
         name: str,
     ) -> None:
         """Initialize AdsLight entity."""
         super().__init__(ads_hub, name, ads_var_enable)
         self._state_dict[STATE_KEY_BRIGHTNESS] = None
-        self._state_dict[STATE_KEY_COLOR_TEMP_KELVIN] = None
         self._ads_var_brightness = ads_var_brightness
-        self._ads_var_color_temp_kelvin = ads_var_color_temp_kelvin
-
-        # Determine supported color modes
-        color_modes = {ColorMode.ONOFF}
         if ads_var_brightness is not None:
-            color_modes.add(ColorMode.BRIGHTNESS)
-        if ads_var_color_temp_kelvin is not None:
-            color_modes.add(ColorMode.COLOR_TEMP)
-
-        self._attr_supported_color_modes = filter_supported_color_modes(color_modes)
-        self._attr_color_mode = next(iter(self._attr_supported_color_modes))
-
-        # Set color temperature range (static config values take precedence over defaults)
-        if ads_var_color_temp_kelvin is not None:
-            self._attr_min_color_temp_kelvin = (
-                min_color_temp_kelvin
-                if min_color_temp_kelvin is not None
-                else DEFAULT_MIN_KELVIN
-            )
-            self._attr_max_color_temp_kelvin = (
-                max_color_temp_kelvin
-                if max_color_temp_kelvin is not None
-                else DEFAULT_MAX_KELVIN
-            )
+            self._attr_color_mode = ColorMode.BRIGHTNESS
+            self._attr_supported_color_modes = {ColorMode.BRIGHTNESS}
+        else:
+            self._attr_color_mode = ColorMode.ONOFF
+            self._attr_supported_color_modes = {ColorMode.ONOFF}
 
     async def async_added_to_hass(self) -> None:
         """Register device notification."""
@@ -132,23 +84,11 @@ class AdsLight(AdsEntity, LightEntity):
                 STATE_KEY_BRIGHTNESS,
             )
 
-        if self._ads_var_color_temp_kelvin is not None:
-            await self.async_initialize_device(
-                self._ads_var_color_temp_kelvin,
-                pyads.PLCTYPE_UINT,
-                STATE_KEY_COLOR_TEMP_KELVIN,
-            )
-
     @property
     def brightness(self) -> int | None:
         """Return the brightness of the light (0..255)."""
         return self._state_dict[STATE_KEY_BRIGHTNESS]
 
-    @property
-    def color_temp_kelvin(self) -> int | None:
-        """Return the color temperature in Kelvin."""
-        return self._state_dict[STATE_KEY_COLOR_TEMP_KELVIN]
-
     @property
     def is_on(self) -> bool:
         """Return True if the entity is on."""
@@ -157,8 +97,6 @@ class AdsLight(AdsEntity, LightEntity):
     def turn_on(self, **kwargs: Any) -> None:
         """Turn the light on or set a specific dimmer value."""
         brightness = kwargs.get(ATTR_BRIGHTNESS)
-        color_temp = kwargs.get(ATTR_COLOR_TEMP_KELVIN)
-
         self._ads_hub.write_by_name(self._ads_var, True, pyads.PLCTYPE_BOOL)
 
         if self._ads_var_brightness is not None and brightness is not None:
@@ -166,11 +104,6 @@ class AdsLight(AdsEntity, LightEntity):
                 self._ads_var_brightness, brightness, pyads.PLCTYPE_UINT
             )
 
-        if self._ads_var_color_temp_kelvin is not None and color_temp is not None:
-            self._ads_hub.write_by_name(
-                self._ads_var_color_temp_kelvin, color_temp, pyads.PLCTYPE_UINT
-            )
-
     def turn_off(self, **kwargs: Any) -> None:
         """Turn the light off."""
         self._ads_hub.write_by_name(self._ads_var, False, pyads.PLCTYPE_BOOL)

homeassistant/components/advantage_air/__init__.py

@@ -1,17 +1,26 @@
 """Advantage Air climate integration."""
 
-from advantage_air import advantage_air
+from datetime import timedelta
+import logging
 
+from advantage_air import ApiError, advantage_air
+
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import CONF_IP_ADDRESS, CONF_PORT, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
+from homeassistant.helpers.debounce import Debouncer
 from homeassistant.helpers.typing import ConfigType
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import ADVANTAGE_AIR_RETRY, DOMAIN
-from .coordinator import AdvantageAirCoordinator, AdvantageAirDataConfigEntry
+from .models import AdvantageAirData
 from .services import async_setup_services
 
+type AdvantageAirDataConfigEntry = ConfigEntry[AdvantageAirData]
+
+ADVANTAGE_AIR_SYNC_INTERVAL = 15
 PLATFORMS = [
     Platform.BINARY_SENSOR,
     Platform.CLIMATE,
@@ -23,6 +32,9 @@ PLATFORMS = [
     Platform.UPDATE,
 ]
 
+_LOGGER = logging.getLogger(__name__)
+REQUEST_REFRESH_DELAY = 0.5
+
 CONFIG_SCHEMA = cv.config_entry_only_config_schema(DOMAIN)
 
 
@@ -45,10 +57,27 @@ async def async_setup_entry(
         retry=ADVANTAGE_AIR_RETRY,
     )
 
-    coordinator = AdvantageAirCoordinator(hass, entry, api)
+    async def async_get():
+        try:
+            return await api.async_get()
+        except ApiError as err:
+            raise UpdateFailed(err) from err
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        _LOGGER,
+        config_entry=entry,
+        name="Advantage Air",
+        update_method=async_get,
+        update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
+        request_refresh_debouncer=Debouncer(
+            hass, _LOGGER, cooldown=REQUEST_REFRESH_DELAY, immediate=False
+        ),
+    )
+
     await coordinator.async_config_entry_first_refresh()
 
-    entry.runtime_data = coordinator
+    entry.runtime_data = AdvantageAirData(coordinator, api)
 
     await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
 

homeassistant/components/advantage_air/binary_sensor.py

@@ -11,8 +11,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 PARALLEL_UPDATES = 0
 
@@ -24,23 +24,19 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir Binary Sensor platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[BinarySensorEntity] = []
-    if aircons := coordinator.data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirFilter(coordinator, ac_key))
+            entities.append(AdvantageAirFilter(instance, ac_key))
             for zone_key, zone in ac_device["zones"].items():
                 # Only add motion sensor when motion is enabled
                 if zone["motionConfig"] >= 2:
-                    entities.append(
-                        AdvantageAirZoneMotion(coordinator, ac_key, zone_key)
-                    )
+                    entities.append(AdvantageAirZoneMotion(instance, ac_key, zone_key))
                 # Only add MyZone if it is available
                 if zone["type"] != 0:
-                    entities.append(
-                        AdvantageAirZoneMyZone(coordinator, ac_key, zone_key)
-                    )
+                    entities.append(AdvantageAirZoneMyZone(instance, ac_key, zone_key))
     async_add_entities(entities)
 
 
@@ -51,9 +47,9 @@ class AdvantageAirFilter(AdvantageAirAcEntity, BinarySensorEntity):
     _attr_entity_category = EntityCategory.DIAGNOSTIC
     _attr_name = "Filter"
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air Filter sensor."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self._attr_unique_id += "-filter"
 
     @property
@@ -67,11 +63,9 @@ class AdvantageAirZoneMotion(AdvantageAirZoneEntity, BinarySensorEntity):
 
     _attr_device_class = BinarySensorDeviceClass.MOTION
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Motion sensor."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = f"{self._zone['name']} motion"
         self._attr_unique_id += "-motion"
 
@@ -87,11 +81,9 @@ class AdvantageAirZoneMyZone(AdvantageAirZoneEntity, BinarySensorEntity):
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone MyZone sensor."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = f"{self._zone['name']} myZone"
         self._attr_unique_id += "-myzone"
 

homeassistant/components/advantage_air/climate.py

@@ -31,8 +31,8 @@ from .const import (
     ADVANTAGE_AIR_STATE_ON,
     ADVANTAGE_AIR_STATE_OPEN,
 )
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_HVAC_MODES = {
     "heat": HVACMode.HEAT,
@@ -90,16 +90,16 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir climate platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[ClimateEntity] = []
-    if aircons := coordinator.data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirAC(coordinator, ac_key))
+            entities.append(AdvantageAirAC(instance, ac_key))
             for zone_key, zone in ac_device["zones"].items():
                 # Only add zone climate control when zone is in temperature control
                 if zone["type"] > 0:
-                    entities.append(AdvantageAirZone(coordinator, ac_key, zone_key))
+                    entities.append(AdvantageAirZone(instance, ac_key, zone_key))
     async_add_entities(entities)
 
 
@@ -114,9 +114,9 @@ class AdvantageAirAC(AdvantageAirAcEntity, ClimateEntity):
     _attr_name = None
     _support_preset = ClimateEntityFeature(0)
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an AdvantageAir AC unit."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
 
         self._attr_preset_modes = [ADVANTAGE_AIR_MYZONE]
 
@@ -282,11 +282,9 @@ class AdvantageAirZone(AdvantageAirZoneEntity, ClimateEntity):
     _attr_max_temp = 32
     _attr_min_temp = 16
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an AdvantageAir Zone control."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = self._zone["name"]
 
     @property

homeassistant/components/advantage_air/coordinator.py

@@ -1,59 +0,0 @@
-"""Coordinator for the Advantage Air integration."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-import logging
-from typing import Any
-
-from advantage_air import ApiError, advantage_air
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.debounce import Debouncer
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import DOMAIN
-
-ADVANTAGE_AIR_SYNC_INTERVAL = 15
-REQUEST_REFRESH_DELAY = 0.5
-
-_LOGGER = logging.getLogger(__name__)
-
-type AdvantageAirDataConfigEntry = ConfigEntry[AdvantageAirCoordinator]
-
-
-class AdvantageAirCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """Advantage Air coordinator."""
-
-    config_entry: AdvantageAirDataConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: AdvantageAirDataConfigEntry,
-        api: advantage_air,
-    ) -> None:
-        """Initialize the coordinator."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=config_entry,
-            name="Advantage Air",
-            update_interval=timedelta(seconds=ADVANTAGE_AIR_SYNC_INTERVAL),
-            request_refresh_debouncer=Debouncer(
-                hass, _LOGGER, cooldown=REQUEST_REFRESH_DELAY, immediate=False
-            ),
-        )
-        self.api = api
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Fetch data from the API."""
-        try:
-            return await self.api.async_get()
-        except ApiError as err:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="update_failed",
-                translation_placeholders={"error": str(err)},
-            ) from err

homeassistant/components/advantage_air/cover.py

@@ -13,8 +13,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_CLOSE, ADVANTAGE_AIR_STATE_OPEN
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirThingEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 PARALLEL_UPDATES = 0
 
@@ -26,24 +26,24 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir cover platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[CoverEntity] = []
-    if aircons := coordinator.data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             for zone_key, zone in ac_device["zones"].items():
                 # Only add zone vent controls when zone in vent control mode.
                 if zone["type"] == 0:
-                    entities.append(AdvantageAirZoneVent(coordinator, ac_key, zone_key))
-    if things := coordinator.data.get("myThings"):
+                    entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
+    if things := instance.coordinator.data.get("myThings"):
         for thing in things["things"].values():
             if thing["channelDipState"] in [1, 2]:  # 1 = "Blind", 2 = "Blind 2"
                 entities.append(
-                    AdvantageAirThingCover(coordinator, thing, CoverDeviceClass.BLIND)
+                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.BLIND)
                 )
             elif thing["channelDipState"] in [3, 10]:  # 3 & 10 = "Garage door"
                 entities.append(
-                    AdvantageAirThingCover(coordinator, thing, CoverDeviceClass.GARAGE)
+                    AdvantageAirThingCover(instance, thing, CoverDeviceClass.GARAGE)
                 )
     async_add_entities(entities)
 
@@ -58,11 +58,9 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, CoverEntity):
         | CoverEntityFeature.SET_POSITION
     )
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Vent."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = self._zone["name"]
 
     @property
@@ -108,12 +106,12 @@ class AdvantageAirThingCover(AdvantageAirThingEntity, CoverEntity):
 
     def __init__(
         self,
-        coordinator: AdvantageAirCoordinator,
+        instance: AdvantageAirData,
         thing: dict[str, Any],
         device_class: CoverDeviceClass,
     ) -> None:
         """Initialize an Advantage Air Things Cover."""
-        super().__init__(coordinator, thing)
+        super().__init__(instance, thing)
         self._attr_device_class = device_class
 
     @property

homeassistant/components/advantage_air/diagnostics.py

@@ -27,7 +27,7 @@ async def async_get_config_entry_diagnostics(
     hass: HomeAssistant, config_entry: AdvantageAirDataConfigEntry
 ) -> dict[str, Any]:
     """Return diagnostics for a config entry."""
-    data = config_entry.runtime_data.data
+    data = config_entry.runtime_data.coordinator.data
 
     # Return only the relevant children
     return {

homeassistant/components/advantage_air/entity.py

@@ -9,17 +9,17 @@ from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.update_coordinator import CoordinatorEntity
 
 from .const import DOMAIN
-from .coordinator import AdvantageAirCoordinator
+from .models import AdvantageAirData
 
 
-class AdvantageAirEntity(CoordinatorEntity[AdvantageAirCoordinator]):
+class AdvantageAirEntity(CoordinatorEntity):
     """Parent class for Advantage Air Entities."""
 
     _attr_has_entity_name = True
 
-    def __init__(self, coordinator: AdvantageAirCoordinator) -> None:
+    def __init__(self, instance: AdvantageAirData) -> None:
         """Initialize common aspects of an Advantage Air entity."""
-        super().__init__(coordinator)
+        super().__init__(instance.coordinator)
         self._attr_unique_id: str = self.coordinator.data["system"]["rid"]
 
     def update_handle_factory(self, func, *keys):
@@ -41,9 +41,9 @@ class AdvantageAirEntity(CoordinatorEntity[AdvantageAirCoordinator]):
 class AdvantageAirAcEntity(AdvantageAirEntity):
     """Parent class for Advantage Air AC Entities."""
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize common aspects of an Advantage Air ac entity."""
-        super().__init__(coordinator)
+        super().__init__(instance)
 
         self.ac_key: str = ac_key
         self._attr_unique_id += f"-{ac_key}"
@@ -56,7 +56,7 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
             name=self.coordinator.data["aircons"][self.ac_key]["info"]["name"],
         )
         self.async_update_ac = self.update_handle_factory(
-            coordinator.api.aircon.async_update_ac, self.ac_key
+            instance.api.aircon.async_update_ac, self.ac_key
         )
 
     @property
@@ -73,16 +73,14 @@ class AdvantageAirAcEntity(AdvantageAirEntity):
 class AdvantageAirZoneEntity(AdvantageAirAcEntity):
     """Parent class for Advantage Air Zone Entities."""
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize common aspects of an Advantage Air zone entity."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
 
         self.zone_key: str = zone_key
         self._attr_unique_id += f"-{zone_key}"
         self.async_update_zone = self.update_handle_factory(
-            coordinator.api.aircon.async_update_zone, self.ac_key, self.zone_key
+            instance.api.aircon.async_update_zone, self.ac_key, self.zone_key
         )
 
     @property
@@ -95,11 +93,9 @@ class AdvantageAirThingEntity(AdvantageAirEntity):
 
     _attr_name = None
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, thing: dict[str, Any]
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, thing: dict[str, Any]) -> None:
         """Initialize common aspects of an Advantage Air Things entity."""
-        super().__init__(coordinator)
+        super().__init__(instance)
 
         self._id = thing["id"]
         self._attr_unique_id += f"-{self._id}"
@@ -112,7 +108,7 @@ class AdvantageAirThingEntity(AdvantageAirEntity):
             name=thing["name"],
         )
         self.async_update_value = self.update_handle_factory(
-            coordinator.api.things.async_update_value, self._id
+            instance.api.things.async_update_value, self._id
         )
 
     @property
@@ -121,7 +117,7 @@ class AdvantageAirThingEntity(AdvantageAirEntity):
         return self.coordinator.data["myThings"]["things"][self._id]
 
     @property
-    def is_on(self) -> bool:
+    def is_on(self):
         """Return if the thing is considered on."""
         return self._data["value"] > 0
 

homeassistant/components/advantage_air/light.py

@@ -9,8 +9,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_ON, DOMAIN
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirEntity, AdvantageAirThingEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -20,21 +20,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir light platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[LightEntity] = []
-    if my_lights := coordinator.data.get("myLights"):
+    if my_lights := instance.coordinator.data.get("myLights"):
         for light in my_lights["lights"].values():
             if light.get("relay"):
-                entities.append(AdvantageAirLight(coordinator, light))
+                entities.append(AdvantageAirLight(instance, light))
             else:
-                entities.append(AdvantageAirLightDimmable(coordinator, light))
-    if things := coordinator.data.get("myThings"):
+                entities.append(AdvantageAirLightDimmable(instance, light))
+    if things := instance.coordinator.data.get("myThings"):
         for thing in things["things"].values():
             if thing["channelDipState"] == 4:  # 4 = "Light (on/off)""
-                entities.append(AdvantageAirThingLight(coordinator, thing))
+                entities.append(AdvantageAirThingLight(instance, thing))
             elif thing["channelDipState"] == 5:  # 5 = "Light (Dimmable)""
-                entities.append(AdvantageAirThingLightDimmable(coordinator, thing))
+                entities.append(AdvantageAirThingLightDimmable(instance, thing))
     async_add_entities(entities)
 
 
@@ -45,11 +45,9 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
     _attr_supported_color_modes = {ColorMode.ONOFF}
     _attr_name = None
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, light: dict[str, Any]
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
         """Initialize an Advantage Air Light."""
-        super().__init__(coordinator)
+        super().__init__(instance)
 
         self._id: str = light["id"]
         self._attr_unique_id += f"-{self._id}"
@@ -61,7 +59,7 @@ class AdvantageAirLight(AdvantageAirEntity, LightEntity):
             name=light["name"],
         )
         self.async_update_state = self.update_handle_factory(
-            coordinator.api.lights.async_update_state, self._id
+            instance.api.lights.async_update_state, self._id
         )
 
     @property
@@ -89,13 +87,11 @@ class AdvantageAirLightDimmable(AdvantageAirLight):
     _attr_color_mode = ColorMode.BRIGHTNESS
     _attr_supported_color_modes = {ColorMode.BRIGHTNESS}
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, light: dict[str, Any]
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, light: dict[str, Any]) -> None:
         """Initialize an Advantage Air Dimmable Light."""
-        super().__init__(coordinator, light)
+        super().__init__(instance, light)
         self.async_update_value = self.update_handle_factory(
-            coordinator.api.lights.async_update_value, self._id
+            instance.api.lights.async_update_value, self._id
         )
 
     @property

homeassistant/components/advantage_air/models.py

@@ -0,0 +1,17 @@
+"""The Advantage Air integration models."""
+
+from __future__ import annotations
+
+from dataclasses import dataclass
+
+from advantage_air import advantage_air
+
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
+
+
+@dataclass
+class AdvantageAirData:
+    """Data for the Advantage Air integration."""
+
+    coordinator: DataUpdateCoordinator
+    api: advantage_air

homeassistant/components/advantage_air/quality_scale.yaml

@@ -1,9 +1,16 @@
 rules:
   # Bronze
-  action-setup: done
+  action-setup:
+    status: todo
+    comment: https://developers.home-assistant.io/blog/2025/09/25/entity-services-api-changes/
   appropriate-polling: done
   brands: done
-  common-modules: done
+  common-modules:
+    status: todo
+    comment: |
+      Move coordinator from __init__.py to coordinator.py.
+      Consider using entity descriptions for binary_sensor and switch.
+      Consider simplifying climate supported features flow.
   config-flow-test-coverage:
     status: todo
     comment: |
@@ -26,7 +33,9 @@ rules:
     comment: Entities do not explicitly subscribe to events.
   entity-unique-id: done
   has-entity-name: done
-  runtime-data: done
+  runtime-data:
+    status: done
+    comment: Consider extending coordinator to access API via coordinator and remove extra dataclass.
   test-before-configure: done
   test-before-setup: done
   unique-config-entry: done
@@ -83,7 +92,7 @@ rules:
   entity-translations: todo
   exception-translations:
     status: todo
-    comment: HomeAssistantError in entity.py and ServiceValidationError in climate.py
+    comment: UpdateFailed in the coordinator
   icon-translations: todo
   reconfiguration-flow: todo
   repair-issues:

homeassistant/components/advantage_air/select.py

@@ -5,8 +5,8 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_INACTIVE = "Inactive"
 
@@ -18,12 +18,10 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir select platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
-    if aircons := coordinator.data.get("aircons"):
-        async_add_entities(
-            AdvantageAirMyZone(coordinator, ac_key) for ac_key in aircons
-        )
+    if aircons := instance.coordinator.data.get("aircons"):
+        async_add_entities(AdvantageAirMyZone(instance, ac_key) for ac_key in aircons)
 
 
 class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
@@ -32,16 +30,16 @@ class AdvantageAirMyZone(AdvantageAirAcEntity, SelectEntity):
     _attr_icon = "mdi:home-thermometer"
     _attr_name = "MyZone"
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air MyZone control."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self._attr_unique_id += "-myzone"
         self._attr_options = [ADVANTAGE_AIR_INACTIVE]
         self._number_to_name = {0: ADVANTAGE_AIR_INACTIVE}
         self._name_to_number = {ADVANTAGE_AIR_INACTIVE: 0}
 
-        if "aircons" in coordinator.data:
-            for zone in coordinator.data["aircons"][ac_key]["zones"].values():
+        if "aircons" in instance.coordinator.data:
+            for zone in instance.coordinator.data["aircons"][ac_key]["zones"].values():
                 if zone["type"] > 0:
                     self._name_to_number[zone["name"]] = zone["number"]
                     self._number_to_name[zone["number"]] = zone["name"]

homeassistant/components/advantage_air/sensor.py

@@ -16,8 +16,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import ADVANTAGE_AIR_STATE_OPEN
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirZoneEntity
+from .models import AdvantageAirData
 
 ADVANTAGE_AIR_SET_COUNTDOWN_VALUE = "minutes"
 ADVANTAGE_AIR_SET_COUNTDOWN_UNIT = "min"
@@ -32,23 +32,21 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir sensor platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[SensorEntity] = []
-    if aircons := coordinator.data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
-            entities.append(AdvantageAirTimeTo(coordinator, ac_key, "On"))
-            entities.append(AdvantageAirTimeTo(coordinator, ac_key, "Off"))
+            entities.append(AdvantageAirTimeTo(instance, ac_key, "On"))
+            entities.append(AdvantageAirTimeTo(instance, ac_key, "Off"))
             for zone_key, zone in ac_device["zones"].items():
                 # Only show damper and temp sensors when zone is in temperature control
                 if zone["type"] != 0:
-                    entities.append(AdvantageAirZoneVent(coordinator, ac_key, zone_key))
-                    entities.append(AdvantageAirZoneTemp(coordinator, ac_key, zone_key))
+                    entities.append(AdvantageAirZoneVent(instance, ac_key, zone_key))
+                    entities.append(AdvantageAirZoneTemp(instance, ac_key, zone_key))
                 # Only show wireless signal strength sensors when using wireless sensors
                 if zone["rssi"] > 0:
-                    entities.append(
-                        AdvantageAirZoneSignal(coordinator, ac_key, zone_key)
-                    )
+                    entities.append(AdvantageAirZoneSignal(instance, ac_key, zone_key))
     async_add_entities(entities)
 
 
@@ -58,11 +56,9 @@ class AdvantageAirTimeTo(AdvantageAirAcEntity, SensorEntity):
     _attr_native_unit_of_measurement = ADVANTAGE_AIR_SET_COUNTDOWN_UNIT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, action: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, action: str) -> None:
         """Initialize the Advantage Air timer control."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self.action = action
         self._time_key = f"countDownTo{action}"
         self._attr_name = f"Time to {action}"
@@ -93,11 +89,9 @@ class AdvantageAirZoneVent(AdvantageAirZoneEntity, SensorEntity):
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Vent Sensor."""
-        super().__init__(coordinator, ac_key, zone_key=zone_key)
+        super().__init__(instance, ac_key, zone_key=zone_key)
         self._attr_name = f"{self._zone['name']} vent"
         self._attr_unique_id += "-vent"
 
@@ -123,11 +117,9 @@ class AdvantageAirZoneSignal(AdvantageAirZoneEntity, SensorEntity):
     _attr_state_class = SensorStateClass.MEASUREMENT
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone wireless signal sensor."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = f"{self._zone['name']} signal"
         self._attr_unique_id += "-signal"
 
@@ -159,11 +151,9 @@ class AdvantageAirZoneTemp(AdvantageAirZoneEntity, SensorEntity):
     _attr_entity_registry_enabled_default = False
     _attr_entity_category = EntityCategory.DIAGNOSTIC
 
-    def __init__(
-        self, coordinator: AdvantageAirCoordinator, ac_key: str, zone_key: str
-    ) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str, zone_key: str) -> None:
         """Initialize an Advantage Air Zone Temp Sensor."""
-        super().__init__(coordinator, ac_key, zone_key)
+        super().__init__(instance, ac_key, zone_key)
         self._attr_name = f"{self._zone['name']} temperature"
         self._attr_unique_id += "-temp"
 

homeassistant/components/advantage_air/services.py

@@ -10,6 +10,8 @@ from homeassistant.helpers import config_validation as cv, service
 
 from .const import DOMAIN
 
+ADVANTAGE_AIR_SERVICE_SET_TIME_TO = "set_time_to"
+
 
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -18,7 +20,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "set_time_to",
+        ADVANTAGE_AIR_SERVICE_SET_TIME_TO,
         entity_domain=SENSOR_DOMAIN,
         schema={vol.Required("minutes"): cv.positive_int},
         func="set_time_to",

homeassistant/components/advantage_air/strings.json

@@ -17,11 +17,6 @@
       }
     }
   },
-  "exceptions": {
-    "update_failed": {
-      "message": "An error occurred while updating from the Advantage Air API: {error}"
-    }
-  },
   "services": {
     "set_time_to": {
       "description": "Controls timers to turn the system on or off after a set number of minutes.",

homeassistant/components/advantage_air/switch.py

@@ -13,8 +13,8 @@ from .const import (
     ADVANTAGE_AIR_STATE_OFF,
     ADVANTAGE_AIR_STATE_ON,
 )
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirAcEntity, AdvantageAirThingEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -24,20 +24,20 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir switch platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
     entities: list[SwitchEntity] = []
-    if aircons := coordinator.data.get("aircons"):
+    if aircons := instance.coordinator.data.get("aircons"):
         for ac_key, ac_device in aircons.items():
             if ac_device["info"]["freshAirStatus"] != "none":
-                entities.append(AdvantageAirFreshAir(coordinator, ac_key))
+                entities.append(AdvantageAirFreshAir(instance, ac_key))
             if ADVANTAGE_AIR_AUTOFAN_ENABLED in ac_device["info"]:
-                entities.append(AdvantageAirMyFan(coordinator, ac_key))
+                entities.append(AdvantageAirMyFan(instance, ac_key))
             if ADVANTAGE_AIR_NIGHT_MODE_ENABLED in ac_device["info"]:
-                entities.append(AdvantageAirNightMode(coordinator, ac_key))
-    if things := coordinator.data.get("myThings"):
+                entities.append(AdvantageAirNightMode(instance, ac_key))
+    if things := instance.coordinator.data.get("myThings"):
         entities.extend(
-            AdvantageAirRelay(coordinator, thing)
+            AdvantageAirRelay(instance, thing)
             for thing in things["things"].values()
             if thing["channelDipState"] == 8  # 8 = Other relay
         )
@@ -51,9 +51,9 @@ class AdvantageAirFreshAir(AdvantageAirAcEntity, SwitchEntity):
     _attr_name = "Fresh air"
     _attr_device_class = SwitchDeviceClass.SWITCH
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air fresh air control."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self._attr_unique_id += "-freshair"
 
     @property
@@ -77,9 +77,9 @@ class AdvantageAirMyFan(AdvantageAirAcEntity, SwitchEntity):
     _attr_name = "MyFan"
     _attr_device_class = SwitchDeviceClass.SWITCH
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air MyFan control."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self._attr_unique_id += "-myfan"
 
     @property
@@ -103,9 +103,9 @@ class AdvantageAirNightMode(AdvantageAirAcEntity, SwitchEntity):
     _attr_name = "MySleep$aver"
     _attr_device_class = SwitchDeviceClass.SWITCH
 
-    def __init__(self, coordinator: AdvantageAirCoordinator, ac_key: str) -> None:
+    def __init__(self, instance: AdvantageAirData, ac_key: str) -> None:
         """Initialize an Advantage Air Night Mode control."""
-        super().__init__(coordinator, ac_key)
+        super().__init__(instance, ac_key)
         self._attr_unique_id += "-nightmode"
 
     @property

homeassistant/components/advantage_air/update.py

@@ -7,8 +7,8 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
 from . import AdvantageAirDataConfigEntry
 from .const import DOMAIN
-from .coordinator import AdvantageAirCoordinator
 from .entity import AdvantageAirEntity
+from .models import AdvantageAirData
 
 
 async def async_setup_entry(
@@ -18,9 +18,9 @@ async def async_setup_entry(
 ) -> None:
     """Set up AdvantageAir update platform."""
 
-    coordinator = config_entry.runtime_data
+    instance = config_entry.runtime_data
 
-    async_add_entities([AdvantageAirApp(coordinator)])
+    async_add_entities([AdvantageAirApp(instance)])
 
 
 class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
@@ -28,9 +28,9 @@ class AdvantageAirApp(AdvantageAirEntity, UpdateEntity):
 
     _attr_name = "App"
 
-    def __init__(self, coordinator: AdvantageAirCoordinator) -> None:
+    def __init__(self, instance: AdvantageAirData) -> None:
         """Initialize the Advantage Air App."""
-        super().__init__(coordinator)
+        super().__init__(instance)
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, self.coordinator.data["system"]["rid"])},
             manufacturer="Advantage Air",

homeassistant/components/aemet/weather.py

@@ -74,7 +74,7 @@ class AemetWeather(
         self._attr_unique_id = unique_id
 
     @property
-    def condition(self) -> str | None:
+    def condition(self):
         """Return the current condition."""
         cond = self.get_aemet_value([AOD_WEATHER, AOD_CONDITION])
         return CONDITIONS_MAP.get(cond)
@@ -90,31 +90,31 @@ class AemetWeather(
         return self.get_aemet_forecast(AOD_FORECAST_HOURLY)
 
     @property
-    def humidity(self) -> float | None:
+    def humidity(self):
         """Return the humidity."""
         return self.get_aemet_value([AOD_WEATHER, AOD_HUMIDITY])
 
     @property
-    def native_pressure(self) -> float | None:
+    def native_pressure(self):
         """Return the pressure."""
         return self.get_aemet_value([AOD_WEATHER, AOD_PRESSURE])
 
     @property
-    def native_temperature(self) -> float | None:
+    def native_temperature(self):
         """Return the temperature."""
         return self.get_aemet_value([AOD_WEATHER, AOD_TEMP])
 
     @property
-    def wind_bearing(self) -> float | None:
+    def wind_bearing(self):
         """Return the wind bearing."""
         return self.get_aemet_value([AOD_WEATHER, AOD_WIND_DIRECTION])
 
     @property
-    def native_wind_gust_speed(self) -> float | None:
+    def native_wind_gust_speed(self):
         """Return the wind gust speed in native units."""
         return self.get_aemet_value([AOD_WEATHER, AOD_WIND_SPEED_MAX])
 
     @property
-    def native_wind_speed(self) -> float | None:
+    def native_wind_speed(self):
         """Return the wind speed."""
         return self.get_aemet_value([AOD_WEATHER, AOD_WIND_SPEED])

homeassistant/components/agent_dvr/services.py

@@ -8,12 +8,18 @@ from homeassistant.helpers import service
 
 from .const import DOMAIN
 
+_DEV_EN_ALT = "enable_alerts"
+_DEV_DS_ALT = "disable_alerts"
+_DEV_EN_REC = "start_recording"
+_DEV_DS_REC = "stop_recording"
+_DEV_SNAP = "snapshot"
+
 CAMERA_SERVICES = {
-    "enable_alerts": "async_enable_alerts",
-    "disable_alerts": "async_disable_alerts",
-    "start_recording": "async_start_recording",
-    "stop_recording": "async_stop_recording",
-    "snapshot": "async_snapshot",
+    _DEV_EN_ALT: "async_enable_alerts",
+    _DEV_DS_ALT: "async_disable_alerts",
+    _DEV_EN_REC: "async_start_recording",
+    _DEV_DS_REC: "async_stop_recording",
+    _DEV_SNAP: "async_snapshot",
 }
 
 

homeassistant/components/airly/__init__.py

@@ -5,7 +5,7 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_DOMAIN
+from homeassistant.components.air_quality import DOMAIN as AIR_QUALITY_PLATFORM
 from homeassistant.const import CONF_API_KEY, CONF_LATITUDE, CONF_LONGITUDE, Platform
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers import device_registry as dr, entity_registry as er
@@ -75,7 +75,9 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirlyConfigEntry) -> boo
     # Remove air_quality entities from registry if they exist
     ent_reg = er.async_get(hass)
     unique_id = f"{coordinator.latitude}-{coordinator.longitude}"
-    if entity_id := ent_reg.async_get_entity_id(AIR_QUALITY_DOMAIN, DOMAIN, unique_id):
+    if entity_id := ent_reg.async_get_entity_id(
+        AIR_QUALITY_PLATFORM, DOMAIN, unique_id
+    ):
         _LOGGER.debug("Removing deprecated air_quality entity %s", entity_id)
         ent_reg.async_remove(entity_id)
 

homeassistant/components/airobot/number.py

@@ -93,6 +93,7 @@ class AirobotNumber(AirobotEntity, NumberEntity):
             raise ServiceValidationError(
                 translation_domain=DOMAIN,
                 translation_key="set_value_failed",
+                translation_placeholders={"error": str(err)},
             ) from err
         else:
             await self.coordinator.async_request_refresh()

homeassistant/components/airobot/strings.json

@@ -112,7 +112,7 @@
       "message": "Failed to set temperature to {temperature}."
     },
     "set_value_failed": {
-      "message": "Failed to set value."
+      "message": "Failed to set value: {error}"
     },
     "switch_turn_off_failed": {
       "message": "Failed to turn off {switch}."

homeassistant/components/airos/__init__.py

@@ -4,16 +4,7 @@ from __future__ import annotations
 
 import logging
 
-from airos.airos6 import AirOS6
 from airos.airos8 import AirOS8
-from airos.exceptions import (
-    AirOSConnectionAuthenticationError,
-    AirOSConnectionSetupError,
-    AirOSDataMissingError,
-    AirOSDeviceConnectionError,
-    AirOSKeyDataMissingError,
-)
-from airos.helpers import DetectDeviceData, async_get_firmware_data
 
 from homeassistant.const import (
     CONF_HOST,
@@ -24,11 +15,6 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
-from homeassistant.exceptions import (
-    ConfigEntryAuthFailed,
-    ConfigEntryError,
-    ConfigEntryNotReady,
-)
 from homeassistant.helpers import device_registry as dr, entity_registry as er
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
 
@@ -37,7 +23,6 @@ from .coordinator import AirOSConfigEntry, AirOSDataUpdateCoordinator
 
 _PLATFORMS: list[Platform] = [
     Platform.BINARY_SENSOR,
-    Platform.BUTTON,
     Platform.SENSOR,
 ]
 
@@ -53,40 +38,15 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirOSConfigEntry) -> boo
         hass, verify_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL]
     )
 
-    conn_data = {
-        CONF_HOST: entry.data[CONF_HOST],
-        CONF_USERNAME: entry.data[CONF_USERNAME],
-        CONF_PASSWORD: entry.data[CONF_PASSWORD],
-        "use_ssl": entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
-        "session": session,
-    }
-
-    # Determine firmware version before creating the device instance
-    try:
-        device_data: DetectDeviceData = await async_get_firmware_data(**conn_data)
-    except (
-        AirOSConnectionSetupError,
-        AirOSDeviceConnectionError,
-        TimeoutError,
-    ) as err:
-        raise ConfigEntryNotReady from err
-    except (
-        AirOSConnectionAuthenticationError,
-        AirOSDataMissingError,
-    ) as err:
-        raise ConfigEntryAuthFailed from err
-    except AirOSKeyDataMissingError as err:
-        raise ConfigEntryError("key_data_missing") from err
-    except Exception as err:
-        raise ConfigEntryError("unknown") from err
-
-    airos_class: type[AirOS8 | AirOS6] = (
-        AirOS8 if device_data["fw_major"] == 8 else AirOS6
+    airos_device = AirOS8(
+        host=entry.data[CONF_HOST],
+        username=entry.data[CONF_USERNAME],
+        password=entry.data[CONF_PASSWORD],
+        session=session,
+        use_ssl=entry.data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
     )
 
-    airos_device = airos_class(**conn_data)
-
-    coordinator = AirOSDataUpdateCoordinator(hass, entry, device_data, airos_device)
+    coordinator = AirOSDataUpdateCoordinator(hass, entry, airos_device)
     await coordinator.async_config_entry_first_refresh()
 
     entry.runtime_data = coordinator

homeassistant/components/airos/binary_sensor.py

@@ -4,9 +4,7 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from typing import Generic, TypeVar
-
-from airos.data import AirOSDataBaseClass
+import logging
 
 from homeassistant.components.binary_sensor import (
     BinarySensorDeviceClass,
@@ -20,24 +18,25 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AirOS8Data, AirOSConfigEntry, AirOSDataUpdateCoordinator
 from .entity import AirOSEntity
 
-PARALLEL_UPDATES = 0
+_LOGGER = logging.getLogger(__name__)
 
-AirOSDataModel = TypeVar("AirOSDataModel", bound=AirOSDataBaseClass)
+PARALLEL_UPDATES = 0
 
 
 @dataclass(frozen=True, kw_only=True)
-class AirOSBinarySensorEntityDescription(
-    BinarySensorEntityDescription,
-    Generic[AirOSDataModel],
-):
+class AirOSBinarySensorEntityDescription(BinarySensorEntityDescription):
     """Describe an AirOS binary sensor."""
 
-    value_fn: Callable[[AirOSDataModel], bool]
+    value_fn: Callable[[AirOS8Data], bool]
 
 
-AirOS8BinarySensorEntityDescription = AirOSBinarySensorEntityDescription[AirOS8Data]
-
-COMMON_BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
+BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
+    AirOSBinarySensorEntityDescription(
+        key="portfw",
+        translation_key="port_forwarding",
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.portfw,
+    ),
     AirOSBinarySensorEntityDescription(
         key="dhcp_client",
         translation_key="dhcp_client",
@@ -54,23 +53,6 @@ COMMON_BINARY_SENSORS: tuple[AirOSBinarySensorEntityDescription, ...] = (
         entity_registry_enabled_default=False,
     ),
     AirOSBinarySensorEntityDescription(
-        key="pppoe",
-        translation_key="pppoe",
-        device_class=BinarySensorDeviceClass.CONNECTIVITY,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.services.pppoe,
-        entity_registry_enabled_default=False,
-    ),
-)
-
-AIROS8_BINARY_SENSORS: tuple[AirOS8BinarySensorEntityDescription, ...] = (
-    AirOS8BinarySensorEntityDescription(
-        key="portfw",
-        translation_key="port_forwarding",
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.portfw,
-    ),
-    AirOS8BinarySensorEntityDescription(
         key="dhcp6_server",
         translation_key="dhcp6_server",
         device_class=BinarySensorDeviceClass.RUNNING,
@@ -78,6 +60,14 @@ AIROS8_BINARY_SENSORS: tuple[AirOS8BinarySensorEntityDescription, ...] = (
         value_fn=lambda data: data.services.dhcp6d_stateful,
         entity_registry_enabled_default=False,
     ),
+    AirOSBinarySensorEntityDescription(
+        key="pppoe",
+        translation_key="pppoe",
+        device_class=BinarySensorDeviceClass.CONNECTIVITY,
+        entity_category=EntityCategory.DIAGNOSTIC,
+        value_fn=lambda data: data.services.pppoe,
+        entity_registry_enabled_default=False,
+    ),
 )
 
 
@@ -89,18 +79,9 @@ async def async_setup_entry(
     """Set up the AirOS binary sensors from a config entry."""
     coordinator = config_entry.runtime_data
 
-    entities = [
-        AirOSBinarySensor(coordinator, description)
-        for description in COMMON_BINARY_SENSORS
-    ]
-
-    if coordinator.device_data["fw_major"] == 8:
-        entities.extend(
-            AirOSBinarySensor(coordinator, description)
-            for description in AIROS8_BINARY_SENSORS
-        )
-
-    async_add_entities(entities)
+    async_add_entities(
+        AirOSBinarySensor(coordinator, description) for description in BINARY_SENSORS
+    )
 
 
 class AirOSBinarySensor(AirOSEntity, BinarySensorEntity):

homeassistant/components/airos/button.py

@@ -1,69 +0,0 @@
-"""AirOS button component for Home Assistant."""
-
-from __future__ import annotations
-
-from airos.exceptions import AirOSException
-
-from homeassistant.components.button import (
-    ButtonDeviceClass,
-    ButtonEntity,
-    ButtonEntityDescription,
-)
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from .coordinator import DOMAIN, AirOSConfigEntry, AirOSDataUpdateCoordinator
-from .entity import AirOSEntity
-
-PARALLEL_UPDATES = 0
-
-REBOOT_BUTTON = ButtonEntityDescription(
-    key="reboot",
-    device_class=ButtonDeviceClass.RESTART,
-    entity_registry_enabled_default=False,
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirOSConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up the AirOS button from a config entry."""
-    async_add_entities([AirOSRebootButton(config_entry.runtime_data, REBOOT_BUTTON)])
-
-
-class AirOSRebootButton(AirOSEntity, ButtonEntity):
-    """Button to reboot device."""
-
-    entity_description: ButtonEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirOSDataUpdateCoordinator,
-        description: ButtonEntityDescription,
-    ) -> None:
-        """Initialize the AirOS client button."""
-        super().__init__(coordinator)
-
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.data.derived.mac}_{description.key}"
-
-    async def async_press(self) -> None:
-        """Handle the button press to reboot the device."""
-        try:
-            await self.coordinator.airos_device.login()
-            result = await self.coordinator.airos_device.reboot()
-
-        except AirOSException as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="cannot_connect",
-            ) from err
-
-        if not result:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="reboot_failed",
-            ) from None

homeassistant/components/airos/config_flow.py

@@ -2,24 +2,17 @@
 
 from __future__ import annotations
 
-import asyncio
 from collections.abc import Mapping
 import logging
 from typing import Any
 
-from airos.airos6 import AirOS6
-from airos.airos8 import AirOS8
-from airos.discovery import airos_discover_devices
 from airos.exceptions import (
     AirOSConnectionAuthenticationError,
     AirOSConnectionSetupError,
     AirOSDataMissingError,
     AirOSDeviceConnectionError,
-    AirOSEndpointError,
     AirOSKeyDataMissingError,
-    AirOSListenerError,
 )
-from airos.helpers import DetectDeviceData, async_get_firmware_data
 import voluptuous as vol
 
 from homeassistant.config_entries import (
@@ -37,36 +30,21 @@ from homeassistant.const import (
 )
 from homeassistant.data_entry_flow import section
 from homeassistant.helpers.aiohttp_client import async_get_clientsession
-from homeassistant.helpers.device_registry import format_mac
 from homeassistant.helpers.selector import (
     TextSelector,
     TextSelectorConfig,
     TextSelectorType,
 )
-from homeassistant.helpers.service_info.dhcp import DhcpServiceInfo
 
-from .const import (
-    DEFAULT_SSL,
-    DEFAULT_USERNAME,
-    DEFAULT_VERIFY_SSL,
-    DEVICE_NAME,
-    DOMAIN,
-    HOSTNAME,
-    IP_ADDRESS,
-    MAC_ADDRESS,
-    SECTION_ADVANCED_SETTINGS,
-)
+from .const import DEFAULT_SSL, DEFAULT_VERIFY_SSL, DOMAIN, SECTION_ADVANCED_SETTINGS
+from .coordinator import AirOS8
 
 _LOGGER = logging.getLogger(__name__)
 
-AirOSDeviceDetect = AirOS8 | AirOS6
-
-# Discovery duration in seconds, airOS announces every 20 seconds
-DISCOVER_INTERVAL: int = 30
-
-STEP_DISCOVERY_DATA_SCHEMA = vol.Schema(
+STEP_USER_DATA_SCHEMA = vol.Schema(
     {
-        vol.Required(CONF_USERNAME, default=DEFAULT_USERNAME): str,
+        vol.Required(CONF_HOST): str,
+        vol.Required(CONF_USERNAME, default="ubnt"): str,
         vol.Required(CONF_PASSWORD): str,
         vol.Required(SECTION_ADVANCED_SETTINGS): section(
             vol.Schema(
@@ -80,10 +58,6 @@ STEP_DISCOVERY_DATA_SCHEMA = vol.Schema(
     }
 )
 
-STEP_MANUAL_DATA_SCHEMA = STEP_DISCOVERY_DATA_SCHEMA.extend(
-    {vol.Required(CONF_HOST): str}
-)
-
 
 class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
     """Handle a config flow for Ubiquiti airOS."""
@@ -91,29 +65,14 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
     VERSION = 2
     MINOR_VERSION = 1
 
-    _discovery_task: asyncio.Task | None = None
-
     def __init__(self) -> None:
         """Initialize the config flow."""
         super().__init__()
-        self.airos_device: AirOSDeviceDetect
+        self.airos_device: AirOS8
         self.errors: dict[str, str] = {}
-        self.discovered_devices: dict[str, dict[str, Any]] = {}
-        self.discovery_abort_reason: str | None = None
-        self.selected_device_info: dict[str, Any] = {}
 
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle the initial step."""
-        self.errors = {}
-
-        return self.async_show_menu(
-            step_id="user", menu_options=["discovery", "manual"]
-        )
-
-    async def async_step_manual(
-        self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle the manual input of host and credentials."""
         self.errors = {}
@@ -125,7 +84,7 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
                     data=validated_info["data"],
                 )
         return self.async_show_form(
-            step_id="manual", data_schema=STEP_MANUAL_DATA_SCHEMA, errors=self.errors
+            step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=self.errors
         )
 
     async def _validate_and_get_device_info(
@@ -139,14 +98,16 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
             verify_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_VERIFY_SSL],
         )
 
+        airos_device = AirOS8(
+            host=config_data[CONF_HOST],
+            username=config_data[CONF_USERNAME],
+            password=config_data[CONF_PASSWORD],
+            session=session,
+            use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
+        )
         try:
-            device_data: DetectDeviceData = await async_get_firmware_data(
-                host=config_data[CONF_HOST],
-                username=config_data[CONF_USERNAME],
-                password=config_data[CONF_PASSWORD],
-                session=session,
-                use_ssl=config_data[SECTION_ADVANCED_SETTINGS][CONF_SSL],
-            )
+            await airos_device.login()
+            airos_data = await airos_device.status()
 
         except (
             AirOSConnectionSetupError,
@@ -161,14 +122,14 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.exception("Unexpected exception during credential validation")
             self.errors["base"] = "unknown"
         else:
-            await self.async_set_unique_id(device_data["mac"])
+            await self.async_set_unique_id(airos_data.derived.mac)
 
             if self.source in [SOURCE_REAUTH, SOURCE_RECONFIGURE]:
                 self._abort_if_unique_id_mismatch()
             else:
                 self._abort_if_unique_id_configured()
 
-            return {"title": device_data["hostname"], "data": config_data}
+            return {"title": airos_data.host.hostname, "data": config_data}
 
         return None
 
@@ -259,175 +220,3 @@ class AirOSConfigFlow(ConfigFlow, domain=DOMAIN):
             ),
             errors=self.errors,
         )
-
-    async def async_step_discovery(
-        self,
-        discovery_info: dict[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Start the discovery process."""
-        if self._discovery_task and self._discovery_task.done():
-            self._discovery_task = None
-
-            # Handle appropriate 'errors' as abort through progress_done
-            if self.discovery_abort_reason:
-                return self.async_show_progress_done(
-                    next_step_id=self.discovery_abort_reason
-                )
-
-            # Abort through progress_done if no devices were found
-            if not self.discovered_devices:
-                _LOGGER.debug(
-                    "No (new or unconfigured) airOS devices found during discovery"
-                )
-                return self.async_show_progress_done(
-                    next_step_id="discovery_no_devices"
-                )
-
-            # Skip selecting a device if only one new/unconfigured device was found
-            if len(self.discovered_devices) == 1:
-                self.selected_device_info = list(self.discovered_devices.values())[0]
-                return self.async_show_progress_done(next_step_id="configure_device")
-
-            return self.async_show_progress_done(next_step_id="select_device")
-
-        if not self._discovery_task:
-            self.discovered_devices = {}
-            self._discovery_task = self.hass.async_create_task(
-                self._async_run_discovery_with_progress()
-            )
-
-        # Show the progress bar and wait for discovery to complete
-        return self.async_show_progress(
-            step_id="discovery",
-            progress_action="discovering",
-            progress_task=self._discovery_task,
-            description_placeholders={"seconds": str(DISCOVER_INTERVAL)},
-        )
-
-    async def async_step_select_device(
-        self,
-        discovery_info: dict[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Select a discovered device."""
-        if discovery_info is not None:
-            selected_mac = discovery_info[MAC_ADDRESS]
-            self.selected_device_info = self.discovered_devices[selected_mac]
-            return await self.async_step_configure_device()
-
-        list_options = {
-            mac: f"{device.get(HOSTNAME, mac)} ({device.get(IP_ADDRESS, DEVICE_NAME)})"
-            for mac, device in self.discovered_devices.items()
-        }
-
-        return self.async_show_form(
-            step_id="select_device",
-            data_schema=vol.Schema({vol.Required(MAC_ADDRESS): vol.In(list_options)}),
-        )
-
-    async def async_step_configure_device(
-        self,
-        user_input: dict[str, Any] | None = None,
-    ) -> ConfigFlowResult:
-        """Configure the selected device."""
-        self.errors = {}
-
-        if user_input is not None:
-            config_data = {
-                **user_input,
-                CONF_HOST: self.selected_device_info[IP_ADDRESS],
-            }
-            validated_info = await self._validate_and_get_device_info(config_data)
-
-            if validated_info:
-                return self.async_create_entry(
-                    title=validated_info["title"],
-                    data=validated_info["data"],
-                )
-
-        device_name = self.selected_device_info.get(
-            HOSTNAME, self.selected_device_info.get(IP_ADDRESS, DEVICE_NAME)
-        )
-        return self.async_show_form(
-            step_id="configure_device",
-            data_schema=STEP_DISCOVERY_DATA_SCHEMA,
-            errors=self.errors,
-            description_placeholders={"device_name": device_name},
-        )
-
-    async def _async_run_discovery_with_progress(self) -> None:
-        """Run discovery with an embedded progress update loop."""
-        progress_bar = self.hass.async_create_task(self._async_update_progress_bar())
-
-        known_mac_addresses = {
-            entry.unique_id.lower()
-            for entry in self.hass.config_entries.async_entries(DOMAIN)
-            if entry.unique_id
-        }
-
-        try:
-            devices = await airos_discover_devices(DISCOVER_INTERVAL)
-        except AirOSEndpointError:
-            self.discovery_abort_reason = "discovery_detect_error"
-        except AirOSListenerError:
-            self.discovery_abort_reason = "discovery_listen_error"
-        except Exception:
-            self.discovery_abort_reason = "discovery_failed"
-            _LOGGER.exception("An error occurred during discovery")
-        else:
-            self.discovered_devices = {
-                mac_addr: info
-                for mac_addr, info in devices.items()
-                if mac_addr.lower() not in known_mac_addresses
-            }
-            _LOGGER.debug(
-                "Discovery task finished. Found %s new devices",
-                len(self.discovered_devices),
-            )
-        finally:
-            progress_bar.cancel()
-
-    async def _async_update_progress_bar(self) -> None:
-        """Update progress bar every second."""
-        try:
-            for i in range(DISCOVER_INTERVAL):
-                progress = (i + 1) / DISCOVER_INTERVAL
-                self.async_update_progress(progress)
-                await asyncio.sleep(1)
-        except asyncio.CancelledError:
-            pass
-
-    async def async_step_dhcp(
-        self, discovery_info: DhcpServiceInfo
-    ) -> ConfigFlowResult:
-        """Automatically handle a DHCP discovered IP change."""
-        ip_address = discovery_info.ip
-        # python-airos defaults to upper for derived mac_address
-        normalized_mac = format_mac(discovery_info.macaddress).upper()
-        await self.async_set_unique_id(normalized_mac)
-
-        self._abort_if_unique_id_configured(updates={CONF_HOST: ip_address})
-        return self.async_abort(reason="unreachable")
-
-    async def async_step_discovery_no_devices(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Abort if discovery finds no (unconfigured) devices."""
-        return self.async_abort(reason="no_devices_found")
-
-    async def async_step_discovery_listen_error(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Abort if discovery is unable to listen on the port."""
-        return self.async_abort(reason="listen_error")
-
-    async def async_step_discovery_detect_error(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Abort if discovery receives incorrect broadcasts."""
-        return self.async_abort(reason="detect_error")
-
-    async def async_step_discovery_failed(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Abort if discovery fails for other reasons."""
-        return self.async_abort(reason="discovery_failed")

homeassistant/components/airos/const.py

@@ -12,10 +12,3 @@ DEFAULT_VERIFY_SSL = False
 DEFAULT_SSL = True
 
 SECTION_ADVANCED_SETTINGS = "advanced_settings"
-
-# Discovery related
-DEFAULT_USERNAME = "ubnt"
-HOSTNAME = "hostname"
-IP_ADDRESS = "ip_address"
-MAC_ADDRESS = "mac_address"
-DEVICE_NAME = "airOS device"

homeassistant/components/airos/coordinator.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 import logging
 
-from airos.airos6 import AirOS6, AirOS6Data
 from airos.airos8 import AirOS8, AirOS8Data
 from airos.exceptions import (
     AirOSConnectionAuthenticationError,
@@ -12,7 +11,6 @@ from airos.exceptions import (
     AirOSDataMissingError,
     AirOSDeviceConnectionError,
 )
-from airos.helpers import DetectDeviceData
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
@@ -23,28 +21,19 @@ from .const import DOMAIN, SCAN_INTERVAL
 
 _LOGGER = logging.getLogger(__name__)
 
-AirOSDeviceDetect = AirOS8 | AirOS6
-AirOSDataDetect = AirOS8Data | AirOS6Data
-
 type AirOSConfigEntry = ConfigEntry[AirOSDataUpdateCoordinator]
 
 
-class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSDataDetect]):
+class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOS8Data]):
     """Class to manage fetching AirOS data from single endpoint."""
 
-    airos_device: AirOSDeviceDetect
     config_entry: AirOSConfigEntry
 
     def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: AirOSConfigEntry,
-        device_data: DetectDeviceData,
-        airos_device: AirOSDeviceDetect,
+        self, hass: HomeAssistant, config_entry: AirOSConfigEntry, airos_device: AirOS8
     ) -> None:
         """Initialize the coordinator."""
         self.airos_device = airos_device
-        self.device_data = device_data
         super().__init__(
             hass,
             _LOGGER,
@@ -53,7 +42,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSDataDetect]):
             update_interval=SCAN_INTERVAL,
         )
 
-    async def _async_update_data(self) -> AirOSDataDetect:
+    async def _async_update_data(self) -> AirOS8Data:
         """Fetch data from AirOS."""
         try:
             await self.airos_device.login()
@@ -73,7 +62,7 @@ class AirOSDataUpdateCoordinator(DataUpdateCoordinator[AirOSDataDetect]):
                 translation_domain=DOMAIN,
                 translation_key="cannot_connect",
             ) from err
-        except AirOSDataMissingError as err:
+        except (AirOSDataMissingError,) as err:
             _LOGGER.error("Expected data not returned by airOS device: %s", err)
             raise UpdateFailed(
                 translation_domain=DOMAIN,

homeassistant/components/airos/manifest.json

@@ -3,10 +3,9 @@
   "name": "Ubiquiti airOS",
   "codeowners": ["@CoMPaTech"],
   "config_flow": true,
-  "dhcp": [{ "registered_devices": true }],
   "documentation": "https://www.home-assistant.io/integrations/airos",
   "integration_type": "device",
   "iot_class": "local_polling",
-  "quality_scale": "platinum",
-  "requirements": ["airos==0.6.4"]
+  "quality_scale": "silver",
+  "requirements": ["airos==0.6.3"]
 }

homeassistant/components/airos/quality_scale.yaml

@@ -42,20 +42,16 @@ rules:
   # Gold
   devices: done
   diagnostics: done
-  discovery-update-info: done
-  discovery:
-    status: exempt
-    comment: No way to detect device on the network
+  discovery-update-info: todo
+  discovery: todo
   docs-data-update: done
-  docs-examples: done
+  docs-examples: todo
   docs-known-limitations: done
   docs-supported-devices: done
   docs-supported-functions: done
   docs-troubleshooting: done
   docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: single airOS device per config entry; peer/remote endpoints are not modeled as child devices/entities at this time
+  dynamic-devices: todo
   entity-category: done
   entity-device-class: done
   entity-disabled-by-default: done
@@ -65,10 +61,8 @@ rules:
     status: exempt
     comment: no (custom) icons used or envisioned
   reconfiguration-flow: done
-  repair-issues: done
-  stale-devices:
-    status: exempt
-    comment: single airOS device per config entry; peer/remote endpoints are not modeled as child devices/entities at this time
+  repair-issues: todo
+  stale-devices: todo
 
   # Platinum
   async-dependency: done

homeassistant/components/airos/sensor.py

@@ -5,14 +5,8 @@ from __future__ import annotations
 from collections.abc import Callable
 from dataclasses import dataclass
 import logging
-from typing import Generic, TypeVar
 
-from airos.data import (
-    AirOSDataBaseClass,
-    DerivedWirelessMode,
-    DerivedWirelessRole,
-    NetRole,
-)
+from airos.data import DerivedWirelessMode, DerivedWirelessRole, NetRole
 
 from homeassistant.components.sensor import (
     SensorDeviceClass,
@@ -43,19 +37,15 @@ WIRELESS_ROLE_OPTIONS = [mode.value for mode in DerivedWirelessRole]
 
 PARALLEL_UPDATES = 0
 
-AirOSDataModel = TypeVar("AirOSDataModel", bound=AirOSDataBaseClass)
-
 
 @dataclass(frozen=True, kw_only=True)
-class AirOSSensorEntityDescription(SensorEntityDescription, Generic[AirOSDataModel]):
+class AirOSSensorEntityDescription(SensorEntityDescription):
     """Describe an AirOS sensor."""
 
-    value_fn: Callable[[AirOSDataModel], StateType]
+    value_fn: Callable[[AirOS8Data], StateType]
 
 
-AirOS8SensorEntityDescription = AirOSSensorEntityDescription[AirOS8Data]
-
-COMMON_SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
+SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
     AirOSSensorEntityDescription(
         key="host_cpuload",
         translation_key="host_cpuload",
@@ -85,6 +75,54 @@ COMMON_SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
         translation_key="wireless_essid",
         value_fn=lambda data: data.wireless.essid,
     ),
+    AirOSSensorEntityDescription(
+        key="wireless_antenna_gain",
+        translation_key="wireless_antenna_gain",
+        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
+        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
+        state_class=SensorStateClass.MEASUREMENT,
+        value_fn=lambda data: data.wireless.antenna_gain,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_throughput_tx",
+        translation_key="wireless_throughput_tx",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.throughput.tx,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_throughput_rx",
+        translation_key="wireless_throughput_rx",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.throughput.rx,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_polling_dl_capacity",
+        translation_key="wireless_polling_dl_capacity",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.polling.dl_capacity,
+    ),
+    AirOSSensorEntityDescription(
+        key="wireless_polling_ul_capacity",
+        translation_key="wireless_polling_ul_capacity",
+        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
+        device_class=SensorDeviceClass.DATA_RATE,
+        state_class=SensorStateClass.MEASUREMENT,
+        suggested_display_precision=0,
+        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
+        value_fn=lambda data: data.wireless.polling.ul_capacity,
+    ),
     AirOSSensorEntityDescription(
         key="host_uptime",
         translation_key="host_uptime",
@@ -120,57 +158,6 @@ COMMON_SENSORS: tuple[AirOSSensorEntityDescription, ...] = (
         options=WIRELESS_ROLE_OPTIONS,
         entity_registry_enabled_default=False,
     ),
-    AirOSSensorEntityDescription(
-        key="wireless_antenna_gain",
-        translation_key="wireless_antenna_gain",
-        native_unit_of_measurement=SIGNAL_STRENGTH_DECIBELS,
-        device_class=SensorDeviceClass.SIGNAL_STRENGTH,
-        state_class=SensorStateClass.MEASUREMENT,
-        value_fn=lambda data: data.wireless.antenna_gain,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_dl_capacity",
-        translation_key="wireless_polling_dl_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.polling.dl_capacity,
-    ),
-    AirOSSensorEntityDescription(
-        key="wireless_polling_ul_capacity",
-        translation_key="wireless_polling_ul_capacity",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.polling.ul_capacity,
-    ),
-)
-
-AIROS8_SENSORS: tuple[AirOS8SensorEntityDescription, ...] = (
-    AirOS8SensorEntityDescription(
-        key="wireless_throughput_tx",
-        translation_key="wireless_throughput_tx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.throughput.tx,
-    ),
-    AirOS8SensorEntityDescription(
-        key="wireless_throughput_rx",
-        translation_key="wireless_throughput_rx",
-        native_unit_of_measurement=UnitOfDataRate.KILOBITS_PER_SECOND,
-        device_class=SensorDeviceClass.DATA_RATE,
-        state_class=SensorStateClass.MEASUREMENT,
-        suggested_display_precision=0,
-        suggested_unit_of_measurement=UnitOfDataRate.MEGABITS_PER_SECOND,
-        value_fn=lambda data: data.wireless.throughput.rx,
-    ),
 )
 
 
@@ -182,14 +169,7 @@ async def async_setup_entry(
     """Set up the AirOS sensors from a config entry."""
     coordinator = config_entry.runtime_data
 
-    entities = [AirOSSensor(coordinator, description) for description in COMMON_SENSORS]
-
-    if coordinator.device_data["fw_major"] == 8:
-        entities.extend(
-            AirOSSensor(coordinator, description) for description in AIROS8_SENSORS
-        )
-
-    async_add_entities(entities)
+    async_add_entities(AirOSSensor(coordinator, description) for description in SENSORS)
 
 
 class AirOSSensor(AirOSEntity, SensorEntity):

homeassistant/components/airos/strings.json

@@ -2,10 +2,6 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "detect_error": "Unable to process discovered devices data, check the documentation for supported devices",
-      "discovery_failed": "Unable to start discovery, check logs for details",
-      "listen_error": "Unable to start listening for devices",
-      "no_devices_found": "[%key:common::config_flow::abort::no_devices_found%]",
       "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
       "reconfigure_successful": "[%key:common::config_flow::abort::reconfigure_successful%]",
       "unique_id_mismatch": "Re-authentication should be used for the same device not a new one"
@@ -17,36 +13,37 @@
       "unknown": "[%key:common::config_flow::error::unknown%]"
     },
     "flow_title": "Ubiquiti airOS device",
-    "progress": {
-      "connecting": "Connecting to the airOS device",
-      "discovering": "Listening for any airOS devices for {seconds} seconds"
-    },
     "step": {
-      "configure_device": {
+      "reauth_confirm": {
         "data": {
-          "password": "[%key:common::config_flow::data::password%]",
-          "username": "[%key:common::config_flow::data::username%]"
+          "password": "[%key:common::config_flow::data::password%]"
         },
         "data_description": {
-          "password": "[%key:component::airos::config::step::manual::data_description::password%]",
-          "username": "[%key:component::airos::config::step::manual::data_description::username%]"
+          "password": "[%key:component::airos::config::step::user::data_description::password%]"
+        }
+      },
+      "reconfigure": {
+        "data": {
+          "password": "[%key:common::config_flow::data::password%]"
+        },
+        "data_description": {
+          "password": "[%key:component::airos::config::step::user::data_description::password%]"
         },
-        "description": "Enter the username and password for {device_name}",
         "sections": {
           "advanced_settings": {
             "data": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
+              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data::ssl%]",
               "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
             },
             "data_description": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
+              "ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::ssl%]",
+              "verify_ssl": "[%key:component::airos::config::step::user::sections::advanced_settings::data_description::verify_ssl%]"
             },
-            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
+            "name": "[%key:component::airos::config::step::user::sections::advanced_settings::name%]"
           }
         }
       },
-      "manual": {
+      "user": {
         "data": {
           "host": "[%key:common::config_flow::data::host%]",
           "password": "[%key:common::config_flow::data::password%]",
@@ -70,49 +67,6 @@
             "name": "Advanced settings"
           }
         }
-      },
-      "reauth_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airos::config::step::manual::data_description::password%]"
-        }
-      },
-      "reconfigure": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "data_description": {
-          "password": "[%key:component::airos::config::step::manual::data_description::password%]"
-        },
-        "sections": {
-          "advanced_settings": {
-            "data": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data::ssl%]",
-              "verify_ssl": "[%key:common::config_flow::data::verify_ssl%]"
-            },
-            "data_description": {
-              "ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::ssl%]",
-              "verify_ssl": "[%key:component::airos::config::step::manual::sections::advanced_settings::data_description::verify_ssl%]"
-            },
-            "name": "[%key:component::airos::config::step::manual::sections::advanced_settings::name%]"
-          }
-        }
-      },
-      "select_device": {
-        "data": {
-          "mac_address": "Select the device to configure"
-        },
-        "data_description": {
-          "mac_address": "Select the device MAC address"
-        }
-      },
-      "user": {
-        "menu_options": {
-          "discovery": "Listen for airOS devices on the network",
-          "manual": "Manually configure airOS device"
-        }
       }
     }
   },
@@ -203,9 +157,6 @@
     },
     "key_data_missing": {
       "message": "Key data not returned from device"
-    },
-    "reboot_failed": {
-      "message": "The device did not accept the reboot request. Try again, or check your device web interface for errors."
     }
   }
 }

homeassistant/components/airq/config_flow.py

@@ -18,10 +18,6 @@ from homeassistant.helpers.schema_config_entry_flow import (
     SchemaOptionsFlowHandler,
 )
 from homeassistant.helpers.selector import BooleanSelector
-from homeassistant.helpers.service_info.zeroconf import (
-    ATTR_PROPERTIES_ID,
-    ZeroconfServiceInfo,
-)
 
 from .const import CONF_CLIP_NEGATIVE, CONF_RETURN_AVERAGE, DOMAIN
 
@@ -50,9 +46,6 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    _discovered_host: str
-    _discovered_name: str
-
     async def async_step_user(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
@@ -97,58 +90,6 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             step_id="user", data_schema=STEP_USER_DATA_SCHEMA, errors=errors
         )
 
-    async def async_step_zeroconf(
-        self, discovery_info: ZeroconfServiceInfo
-    ) -> ConfigFlowResult:
-        """Handle zeroconf discovery of an air-Q device."""
-        self._discovered_host = discovery_info.host
-        self._discovered_name = discovery_info.properties.get("devicename", "air-Q")
-        device_id = discovery_info.properties.get(ATTR_PROPERTIES_ID)
-
-        if not device_id:
-            return self.async_abort(reason="incomplete_discovery")
-
-        await self.async_set_unique_id(device_id)
-        self._abort_if_unique_id_configured(
-            updates={CONF_IP_ADDRESS: self._discovered_host},
-            reload_on_update=True,
-        )
-
-        self.context["title_placeholders"] = {"name": self._discovered_name}
-
-        return await self.async_step_discovery_confirm()
-
-    async def async_step_discovery_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Handle user confirmation of a discovered air-Q device."""
-        errors: dict[str, str] = {}
-
-        if user_input is not None:
-            session = async_get_clientsession(self.hass)
-            airq = AirQ(self._discovered_host, user_input[CONF_PASSWORD], session)
-            try:
-                await airq.validate()
-            except ClientConnectionError:
-                errors["base"] = "cannot_connect"
-            except InvalidAuth:
-                errors["base"] = "invalid_auth"
-            else:
-                return self.async_create_entry(
-                    title=self._discovered_name,
-                    data={
-                        CONF_IP_ADDRESS: self._discovered_host,
-                        CONF_PASSWORD: user_input[CONF_PASSWORD],
-                    },
-                )
-
-        return self.async_show_form(
-            step_id="discovery_confirm",
-            data_schema=vol.Schema({vol.Required(CONF_PASSWORD): str}),
-            description_placeholders={"name": self._discovered_name},
-            errors=errors,
-        )
-
     @staticmethod
     @callback
     def async_get_options_flow(

homeassistant/components/airq/manifest.json

@@ -7,13 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioairq"],
-  "requirements": ["aioairq==0.4.7"],
-  "zeroconf": [
-    {
-      "properties": {
-        "device": "air-q"
-      },
-      "type": "_http._tcp.local."
-    }
-  ]
+  "requirements": ["aioairq==0.4.7"]
 }

homeassistant/components/airq/strings.json

@@ -1,23 +1,14 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
+      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]"
     },
     "error": {
       "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "invalid_auth": "[%key:common::config_flow::error::invalid_auth%]",
       "invalid_input": "[%key:common::config_flow::error::invalid_host%]"
     },
-    "flow_title": "{name}",
     "step": {
-      "discovery_confirm": {
-        "data": {
-          "password": "[%key:common::config_flow::data::password%]"
-        },
-        "description": "Do you want to set up **{name}**?",
-        "title": "Set up air-Q"
-      },
       "user": {
         "data": {
           "ip_address": "[%key:common::config_flow::data::ip%]",

homeassistant/components/airtouch4/climate.py

@@ -117,23 +117,23 @@ class AirtouchAC(CoordinatorEntity, ClimateEntity):
         return super()._handle_coordinator_update()
 
     @property
-    def current_temperature(self) -> int:
+    def current_temperature(self):
         """Return the current temperature."""
         return self._unit.Temperature
 
     @property
-    def fan_mode(self) -> str:
+    def fan_mode(self):
         """Return fan mode of the AC this group belongs to."""
         return AT_TO_HA_FAN_SPEED[self._airtouch.acs[self._ac_number].AcFanSpeed]
 
     @property
-    def fan_modes(self) -> list[str]:
+    def fan_modes(self):
         """Return the list of available fan modes."""
         airtouch_fan_speeds = self._airtouch.GetSupportedFanSpeedsForAc(self._ac_number)
         return [AT_TO_HA_FAN_SPEED[speed] for speed in airtouch_fan_speeds]
 
     @property
-    def hvac_mode(self) -> HVACMode:
+    def hvac_mode(self):
         """Return hvac target hvac state."""
         is_off = self._unit.PowerState == "Off"
         if is_off:
@@ -236,17 +236,17 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
         return self._airtouch.acs[self._unit.BelongsToAc].MaxSetpoint
 
     @property
-    def current_temperature(self) -> int:
+    def current_temperature(self):
         """Return the current temperature."""
         return self._unit.Temperature
 
     @property
-    def target_temperature(self) -> int:
+    def target_temperature(self):
         """Return the temperature we are trying to reach."""
         return self._unit.TargetSetpoint
 
     @property
-    def hvac_mode(self) -> HVACMode:
+    def hvac_mode(self):
         """Return hvac target hvac state."""
         # there are other power states that aren't 'on' but still count as on (eg. 'Turbo')
         is_off = self._unit.PowerState == "Off"
@@ -272,12 +272,12 @@ class AirtouchGroup(CoordinatorEntity, ClimateEntity):
         self.async_write_ha_state()
 
     @property
-    def fan_mode(self) -> str:
+    def fan_mode(self):
         """Return fan mode of the AC this group belongs to."""
         return AT_TO_HA_FAN_SPEED[self._airtouch.acs[self._unit.BelongsToAc].AcFanSpeed]
 
     @property
-    def fan_modes(self) -> list[str]:
+    def fan_modes(self):
         """Return the list of available fan modes."""
         airtouch_fan_speeds = self._airtouch.GetSupportedFanSpeedsByGroup(
             self._group_number

homeassistant/components/airvisual/__init__.py

@@ -7,7 +7,13 @@ from datetime import timedelta
 from math import ceil
 from typing import Any
 
-from pyairvisual.cloud_api import CloudAPI
+from pyairvisual.cloud_api import (
+    CloudAPI,
+    InvalidKeyError,
+    KeyExpiredError,
+    UnauthorizedError,
+)
+from pyairvisual.errors import AirVisualError
 
 from homeassistant.components import automation
 from homeassistant.config_entries import SOURCE_IMPORT, ConfigEntry
@@ -22,12 +28,14 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import HomeAssistant, callback
+from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers import (
     aiohttp_client,
     device_registry as dr,
     entity_registry as er,
 )
 from homeassistant.helpers.issue_registry import IssueSeverity, async_create_issue
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
 from .const import (
     CONF_CITY,
@@ -39,7 +47,8 @@ from .const import (
     INTEGRATION_TYPE_NODE_PRO,
     LOGGER,
 )
-from .coordinator import AirVisualConfigEntry, AirVisualDataUpdateCoordinator
+
+type AirVisualConfigEntry = ConfigEntry[DataUpdateCoordinator]
 
 # We use a raw string for the airvisual_pro domain (instead of importing the actual
 # constant) so that we can avoid listing it as a dependency:
@@ -76,8 +85,8 @@ def async_get_cloud_api_update_interval(
 @callback
 def async_get_cloud_coordinators_by_api_key(
     hass: HomeAssistant, api_key: str
-) -> list[AirVisualDataUpdateCoordinator]:
-    """Get all AirVisualDataUpdateCoordinator objects related to a particular API key."""
+) -> list[DataUpdateCoordinator]:
+    """Get all DataUpdateCoordinator objects related to a particular API key."""
     return [
         entry.runtime_data
         for entry in hass.config_entries.async_entries(DOMAIN)
@@ -171,11 +180,38 @@ async def async_setup_entry(hass: HomeAssistant, entry: AirVisualConfigEntry) ->
     websession = aiohttp_client.async_get_clientsession(hass)
     cloud_api = CloudAPI(entry.data[CONF_API_KEY], session=websession)
 
-    coordinator = AirVisualDataUpdateCoordinator(
+    async def async_update_data() -> dict[str, Any]:
+        """Get new data from the API."""
+        if CONF_CITY in entry.data:
+            api_coro = cloud_api.air_quality.city(
+                entry.data[CONF_CITY],
+                entry.data[CONF_STATE],
+                entry.data[CONF_COUNTRY],
+            )
+        else:
+            api_coro = cloud_api.air_quality.nearest_city(
+                entry.data[CONF_LATITUDE],
+                entry.data[CONF_LONGITUDE],
+            )
+
+        try:
+            return await api_coro
+        except (InvalidKeyError, KeyExpiredError, UnauthorizedError) as ex:
+            raise ConfigEntryAuthFailed from ex
+        except AirVisualError as err:
+            raise UpdateFailed(f"Error while retrieving data: {err}") from err
+
+    coordinator = DataUpdateCoordinator(
         hass,
-        entry,
-        cloud_api,
+        LOGGER,
+        config_entry=entry,
         name=async_get_geography_id(entry.data),
+        # We give a placeholder update interval in order to create the coordinator;
+        # then, below, we use the coordinator's presence (along with any other
+        # coordinators using the same API key) to calculate an actual, leveled
+        # update interval:
+        update_interval=timedelta(minutes=5),
+        update_method=async_update_data,
     )
 
     entry.async_on_unload(entry.add_update_listener(async_reload_entry))

homeassistant/components/airvisual/coordinator.py

@@ -1,72 +0,0 @@
-"""Define an AirVisual data coordinator."""
-
-from __future__ import annotations
-
-from datetime import timedelta
-from typing import Any
-
-from pyairvisual.cloud_api import (
-    CloudAPI,
-    InvalidKeyError,
-    KeyExpiredError,
-    UnauthorizedError,
-)
-from pyairvisual.errors import AirVisualError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import CONF_COUNTRY, CONF_LATITUDE, CONF_LONGITUDE, CONF_STATE
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import CONF_CITY, LOGGER
-
-type AirVisualConfigEntry = ConfigEntry[AirVisualDataUpdateCoordinator]
-
-
-class AirVisualDataUpdateCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """Class to manage fetching AirVisual data."""
-
-    config_entry: AirVisualConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        entry: AirVisualConfigEntry,
-        cloud_api: CloudAPI,
-        name: str,
-    ) -> None:
-        """Initialize the coordinator."""
-        self._cloud_api = cloud_api
-        super().__init__(
-            hass,
-            LOGGER,
-            config_entry=entry,
-            name=name,
-            # We give a placeholder update interval in order to create the coordinator;
-            # then, in async_setup_entry, we use the coordinator's presence (along with
-            # any other coordinators using the same API key) to calculate an actual,
-            # leveled update interval:
-            update_interval=timedelta(minutes=5),
-        )
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Get new data from the API."""
-        if CONF_CITY in self.config_entry.data:
-            api_coro = self._cloud_api.air_quality.city(
-                self.config_entry.data[CONF_CITY],
-                self.config_entry.data[CONF_STATE],
-                self.config_entry.data[CONF_COUNTRY],
-            )
-        else:
-            api_coro = self._cloud_api.air_quality.nearest_city(
-                self.config_entry.data[CONF_LATITUDE],
-                self.config_entry.data[CONF_LONGITUDE],
-            )
-
-        try:
-            return await api_coro
-        except (InvalidKeyError, KeyExpiredError, UnauthorizedError) as ex:
-            raise ConfigEntryAuthFailed from ex
-        except AirVisualError as err:
-            raise UpdateFailed(f"Error while retrieving data: {err}") from err

homeassistant/components/airvisual/diagnostics.py

@@ -15,8 +15,8 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant
 
+from . import AirVisualConfigEntry
 from .const import CONF_CITY
-from .coordinator import AirVisualConfigEntry
 
 CONF_COORDINATES = "coordinates"
 CONF_TITLE = "title"

homeassistant/components/airvisual/entity.py

@@ -2,25 +2,29 @@
 
 from __future__ import annotations
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import callback
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .coordinator import AirVisualDataUpdateCoordinator
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 
-class AirVisualEntity(CoordinatorEntity[AirVisualDataUpdateCoordinator]):
+class AirVisualEntity(CoordinatorEntity):
     """Define a generic AirVisual entity."""
 
     def __init__(
         self,
-        coordinator: AirVisualDataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator,
+        entry: ConfigEntry,
         description: EntityDescription,
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)
 
         self._attr_extra_state_attributes = {}
+        self._entry = entry
         self.entity_description = description
 
     async def async_added_to_hass(self) -> None:

homeassistant/components/airvisual/sensor.py

@@ -8,6 +8,7 @@ from homeassistant.components.sensor import (
     SensorEntityDescription,
     SensorStateClass,
 )
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     ATTR_LATITUDE,
     ATTR_LONGITUDE,
@@ -23,9 +24,10 @@ from homeassistant.const import (
 )
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
+from . import AirVisualConfigEntry
 from .const import CONF_CITY
-from .coordinator import AirVisualConfigEntry, AirVisualDataUpdateCoordinator
 from .entity import AirVisualEntity
 
 ATTR_CITY = "city"
@@ -111,7 +113,7 @@ async def async_setup_entry(
     """Set up AirVisual sensors based on a config entry."""
     coordinator = entry.runtime_data
     async_add_entities(
-        AirVisualGeographySensor(coordinator, description, locale)
+        AirVisualGeographySensor(coordinator, entry, description, locale)
         for locale in GEOGRAPHY_SENSOR_LOCALES
         for description in GEOGRAPHY_SENSOR_DESCRIPTIONS
     )
@@ -122,14 +124,14 @@ class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
 
     def __init__(
         self,
-        coordinator: AirVisualDataUpdateCoordinator,
+        coordinator: DataUpdateCoordinator,
+        entry: ConfigEntry,
         description: SensorEntityDescription,
         locale: str,
     ) -> None:
         """Initialize."""
-        super().__init__(coordinator, description)
+        super().__init__(coordinator, entry, description)
 
-        entry = coordinator.config_entry
         self._attr_extra_state_attributes.update(
             {
                 ATTR_CITY: entry.data.get(CONF_CITY),
@@ -180,16 +182,16 @@ class AirVisualGeographySensor(AirVisualEntity, SensorEntity):
         #
         # We use any coordinates in the config entry and, in the case of a geography by
         # name, we fall back to the latitude longitude provided in the coordinator data:
-        latitude = self.coordinator.config_entry.data.get(
+        latitude = self._entry.data.get(
             CONF_LATITUDE,
             self.coordinator.data["location"]["coordinates"][1],
         )
-        longitude = self.coordinator.config_entry.data.get(
+        longitude = self._entry.data.get(
             CONF_LONGITUDE,
             self.coordinator.data["location"]["coordinates"][0],
         )
 
-        if self.coordinator.config_entry.options[CONF_SHOW_ON_MAP]:
+        if self._entry.options[CONF_SHOW_ON_MAP]:
             self._attr_extra_state_attributes[ATTR_LATITUDE] = latitude
             self._attr_extra_state_attributes[ATTR_LONGITUDE] = longitude
             self._attr_extra_state_attributes.pop("lati", None)

homeassistant/components/airvisual_pro/__init__.py

@@ -4,9 +4,18 @@ from __future__ import annotations
 
 import asyncio
 from contextlib import suppress
+from dataclasses import dataclass
+from datetime import timedelta
+from typing import Any
 
-from pyairvisual.node import NodeProError, NodeSamba
+from pyairvisual.node import (
+    InvalidAuthenticationError,
+    NodeConnectionError,
+    NodeProError,
+    NodeSamba,
+)
 
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.const import (
     CONF_IP_ADDRESS,
     CONF_PASSWORD,
@@ -14,16 +23,25 @@ from homeassistant.const import (
     Platform,
 )
 from homeassistant.core import Event, HomeAssistant
-from homeassistant.exceptions import ConfigEntryNotReady
+from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
 
-from .coordinator import (
-    AirVisualProConfigEntry,
-    AirVisualProCoordinator,
-    AirVisualProData,
-)
+from .const import LOGGER
 
 PLATFORMS = [Platform.SENSOR]
 
+UPDATE_INTERVAL = timedelta(minutes=1)
+
+type AirVisualProConfigEntry = ConfigEntry[AirVisualProData]
+
+
+@dataclass
+class AirVisualProData:
+    """Define a data class."""
+
+    coordinator: DataUpdateCoordinator
+    node: NodeSamba
+
 
 async def async_setup_entry(
     hass: HomeAssistant, entry: AirVisualProConfigEntry
@@ -36,15 +54,48 @@ async def async_setup_entry(
     except NodeProError as err:
         raise ConfigEntryNotReady from err
 
-    coordinator = AirVisualProCoordinator(hass, entry, node)
+    reload_task: asyncio.Task | None = None
+
+    async def async_get_data() -> dict[str, Any]:
+        """Get data from the device."""
+        try:
+            data = await node.async_get_latest_measurements()
+            data["history"] = {}
+            if data["settings"].get("follow_mode") == "device":
+                history = await node.async_get_history(include_trends=False)
+                data["history"] = history.get("measurements", [])[-1]
+        except InvalidAuthenticationError as err:
+            raise ConfigEntryAuthFailed("Invalid Samba password") from err
+        except NodeConnectionError as err:
+            nonlocal reload_task
+            if not reload_task:
+                reload_task = hass.async_create_task(
+                    hass.config_entries.async_reload(entry.entry_id)
+                )
+            raise UpdateFailed(f"Connection to Pro unit lost: {err}") from err
+        except NodeProError as err:
+            raise UpdateFailed(f"Error while retrieving data: {err}") from err
+
+        return data
+
+    coordinator = DataUpdateCoordinator(
+        hass,
+        LOGGER,
+        config_entry=entry,
+        name="Node/Pro data",
+        update_interval=UPDATE_INTERVAL,
+        update_method=async_get_data,
+    )
+
     await coordinator.async_config_entry_first_refresh()
     entry.runtime_data = AirVisualProData(coordinator=coordinator, node=node)
 
     async def async_shutdown(_: Event) -> None:
         """Define an event handler to disconnect from the websocket."""
-        if coordinator.reload_task:
+        nonlocal reload_task
+        if reload_task:
             with suppress(asyncio.CancelledError):
-                coordinator.reload_task.cancel()
+                reload_task.cancel()
         await node.async_disconnect()
 
     entry.async_on_unload(

homeassistant/components/airvisual_pro/coordinator.py

@@ -1,79 +0,0 @@
-"""DataUpdateCoordinator for the AirVisual Pro integration."""
-
-from __future__ import annotations
-
-import asyncio
-from dataclasses import dataclass
-from datetime import timedelta
-from typing import Any
-
-from pyairvisual.node import (
-    InvalidAuthenticationError,
-    NodeConnectionError,
-    NodeProError,
-    NodeSamba,
-)
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import LOGGER
-
-UPDATE_INTERVAL = timedelta(minutes=1)
-
-
-@dataclass
-class AirVisualProData:
-    """Define a data class."""
-
-    coordinator: AirVisualProCoordinator
-    node: NodeSamba
-
-
-type AirVisualProConfigEntry = ConfigEntry[AirVisualProData]
-
-
-class AirVisualProCoordinator(DataUpdateCoordinator[dict[str, Any]]):
-    """Coordinator for AirVisual Pro data."""
-
-    config_entry: AirVisualProConfigEntry
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        config_entry: AirVisualProConfigEntry,
-        node: NodeSamba,
-    ) -> None:
-        """Initialize."""
-        super().__init__(
-            hass,
-            LOGGER,
-            config_entry=config_entry,
-            name="Node/Pro data",
-            update_interval=UPDATE_INTERVAL,
-        )
-        self._node = node
-        self.reload_task: asyncio.Task[bool] | None = None
-
-    async def _async_update_data(self) -> dict[str, Any]:
-        """Get data from the device."""
-        try:
-            data = await self._node.async_get_latest_measurements()
-            data["history"] = {}
-            if data["settings"].get("follow_mode") == "device":
-                history = await self._node.async_get_history(include_trends=False)
-                data["history"] = history.get("measurements", [])[-1]
-        except InvalidAuthenticationError as err:
-            raise ConfigEntryAuthFailed("Invalid Samba password") from err
-        except NodeConnectionError as err:
-            if self.reload_task is None:
-                self.reload_task = self.hass.async_create_task(
-                    self.hass.config_entries.async_reload(self.config_entry.entry_id)
-                )
-            raise UpdateFailed(f"Connection to Pro unit lost: {err}") from err
-        except NodeProError as err:
-            raise UpdateFailed(f"Error while retrieving data: {err}") from err
-
-        return data

homeassistant/components/airvisual_pro/diagnostics.py

@@ -8,7 +8,7 @@ from homeassistant.components.diagnostics import async_redact_data
 from homeassistant.const import CONF_PASSWORD
 from homeassistant.core import HomeAssistant
 
-from .coordinator import AirVisualProConfigEntry
+from . import AirVisualProConfigEntry
 
 CONF_MAC_ADDRESS = "mac_address"
 CONF_SERIAL_NUMBER = "serial_number"

homeassistant/components/airvisual_pro/entity.py

@@ -4,17 +4,19 @@ from __future__ import annotations
 
 from homeassistant.helpers.device_registry import DeviceInfo
 from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
+from homeassistant.helpers.update_coordinator import (
+    CoordinatorEntity,
+    DataUpdateCoordinator,
+)
 
 from .const import DOMAIN
-from .coordinator import AirVisualProCoordinator
 
 
-class AirVisualProEntity(CoordinatorEntity[AirVisualProCoordinator]):
+class AirVisualProEntity(CoordinatorEntity):
     """Define a generic AirVisual Pro entity."""
 
     def __init__(
-        self, coordinator: AirVisualProCoordinator, description: EntityDescription
+        self, coordinator: DataUpdateCoordinator, description: EntityDescription
     ) -> None:
         """Initialize."""
         super().__init__(coordinator)

homeassistant/components/airvisual_pro/sensor.py

@@ -22,7 +22,7 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .coordinator import AirVisualProConfigEntry
+from . import AirVisualProConfigEntry
 from .entity import AirVisualProEntity
 
 

homeassistant/components/aladdin_connect/__init__.py

@@ -2,12 +2,10 @@
 
 from __future__ import annotations
 
-import aiohttp
 from genie_partner_sdk.client import AladdinConnectClient
 
 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import (
     aiohttp_client,
     config_entry_oauth2_flow,
@@ -33,27 +31,11 @@ async def async_setup_entry(
 
     session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)
 
-    try:
-        await session.async_ensure_token_valid()
-    except aiohttp.ClientResponseError as err:
-        if 400 <= err.status < 500:
-            raise ConfigEntryAuthFailed(err) from err
-        raise ConfigEntryNotReady from err
-    except aiohttp.ClientError as err:
-        raise ConfigEntryNotReady from err
-
     client = AladdinConnectClient(
         api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
     )
 
-    try:
-        doors = await client.get_doors()
-    except aiohttp.ClientResponseError as err:
-        if 400 <= err.status < 500:
-            raise ConfigEntryAuthFailed(err) from err
-        raise ConfigEntryNotReady from err
-    except aiohttp.ClientError as err:
-        raise ConfigEntryNotReady from err
+    doors = await client.get_doors()
 
     entry.runtime_data = {
         door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)

homeassistant/components/aladdin_connect/api.py

@@ -11,18 +11,6 @@ API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
 API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"
 
 
-class AsyncConfigFlowAuth(Auth):
-    """Provide Aladdin Connect Genie authentication for config flow validation."""
-
-    def __init__(self, websession: ClientSession, access_token: str) -> None:
-        """Initialize Aladdin Connect Genie auth."""
-        super().__init__(websession, API_URL, access_token, API_KEY)
-
-    async def async_get_access_token(self) -> str:
-        """Return the access token."""
-        return self.access_token
-
-
 class AsyncConfigEntryAuth(Auth):
     """Provide Aladdin Connect Genie authentication tied to an OAuth2 based config entry."""
 

homeassistant/components/aladdin_connect/config_flow.py

@@ -4,14 +4,12 @@ from collections.abc import Mapping
 import logging
 from typing import Any
 
-from genie_partner_sdk.client import AladdinConnectClient
 import jwt
 import voluptuous as vol
 
 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_oauth2_flow
 
-from .api import AsyncConfigFlowAuth
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN
 
 
@@ -54,25 +52,11 @@ class OAuth2FlowHandler(
 
     async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
         """Create an oauth config entry or update existing entry for reauth."""
-        try:
-            token = jwt.decode(
-                data["token"]["access_token"], options={"verify_signature": False}
-            )
-            user_id = token["sub"]
-        except jwt.DecodeError, KeyError:
-            return self.async_abort(reason="oauth_error")
-
-        client = AladdinConnectClient(
-            AsyncConfigFlowAuth(
-                aiohttp_client.async_get_clientsession(self.hass),
-                data["token"]["access_token"],
-            )
+        # Extract the user ID from the JWT token's 'sub' field
+        token = jwt.decode(
+            data["token"]["access_token"], options={"verify_signature": False}
         )
-        try:
-            await client.get_doors()
-        except Exception:  # noqa: BLE001
-            return self.async_abort(reason="cannot_connect")
-
+        user_id = token["sub"]
         await self.async_set_unique_id(user_id)
 
         if self.source == SOURCE_REAUTH:

homeassistant/components/aladdin_connect/coordinator.py

@@ -5,13 +5,12 @@ from __future__ import annotations
 from datetime import timedelta
 import logging
 
-import aiohttp
 from genie_partner_sdk.client import AladdinConnectClient
 from genie_partner_sdk.model import GarageDoor
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 
 _LOGGER = logging.getLogger(__name__)
 type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
@@ -41,10 +40,7 @@ class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):
 
     async def _async_update_data(self) -> GarageDoor:
         """Fetch data from the Aladdin Connect API."""
-        try:
-            await self.client.update_door(self.data.device_id, self.data.door_number)
-        except aiohttp.ClientError as err:
-            raise UpdateFailed(f"Error communicating with API: {err}") from err
+        await self.client.update_door(self.data.device_id, self.data.door_number)
         self.data.status = self.client.get_door_status(
             self.data.device_id, self.data.door_number
         )

homeassistant/components/aladdin_connect/cover.py

@@ -4,19 +4,14 @@ from __future__ import annotations
 
 from typing import Any
 
-import aiohttp
-
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 
-from .const import DOMAIN, SUPPORTED_FEATURES
+from .const import SUPPORTED_FEATURES
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity
 
-PARALLEL_UPDATES = 1
-
 
 async def async_setup_entry(
     hass: HomeAssistant,
@@ -45,23 +40,11 @@ class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):
 
     async def async_open_cover(self, **kwargs: Any) -> None:
         """Issue open command to cover."""
-        try:
-            await self.client.open_door(self._device_id, self._number)
-        except aiohttp.ClientError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="open_door_failed",
-            ) from err
+        await self.client.open_door(self._device_id, self._number)
 
     async def async_close_cover(self, **kwargs: Any) -> None:
         """Issue close command to cover."""
-        try:
-            await self.client.close_door(self._device_id, self._number)
-        except aiohttp.ClientError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="close_door_failed",
-            ) from err
+        await self.client.close_door(self._device_id, self._number)
 
     @property
     def is_closed(self) -> bool | None:

homeassistant/components/aladdin_connect/diagnostics.py

@@ -1,32 +0,0 @@
-"""Diagnostics support for Aladdin Connect."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AladdinConnectConfigEntry
-
-TO_REDACT = {"access_token", "refresh_token"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    return {
-        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
-        "doors": {
-            uid: {
-                "device_id": coordinator.data.device_id,
-                "door_number": coordinator.data.door_number,
-                "name": coordinator.data.name,
-                "status": coordinator.data.status,
-                "link_status": coordinator.data.link_status,
-                "battery_level": coordinator.data.battery_level,
-            }
-            for uid, coordinator in config_entry.runtime_data.items()
-        },
-    }

homeassistant/components/aladdin_connect/quality_scale.yaml

@@ -7,56 +7,74 @@ rules:
   brands: done
   common-modules: done
   config-flow: done
-  config-flow-test-coverage: done
+  config-flow-test-coverage: todo
   dependency-transparency: done
   docs-actions:
     status: exempt
     comment: Integration does not register any service actions.
   docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
+  docs-installation-instructions:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-removal-instructions:
+    status: todo
+    comment: Documentation needs to be created.
   entity-event-setup:
     status: exempt
     comment: Integration does not subscribe to external events.
   entity-unique-id: done
   has-entity-name: done
   runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
+  test-before-configure:
+    status: todo
+    comment: Config flow does not currently test connection during setup.
+  test-before-setup: todo
   unique-config-entry: done
 
   # Silver
-  action-exceptions: done
+  action-exceptions: todo
   config-entry-unloading: done
   docs-configuration-parameters:
-    status: exempt
-    comment: Integration does not have an options flow.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: done
-    comment: Handled by the coordinator.
+    status: todo
+    comment: Documentation needs to be created.
+  docs-installation-parameters:
+    status: todo
+    comment: Documentation needs to be created.
+  entity-unavailable: todo
   integration-owner: done
-  log-when-unavailable:
-    status: done
-    comment: Handled by the coordinator.
-  parallel-updates: done
+  log-when-unavailable: todo
+  parallel-updates: todo
   reauthentication-flow: done
-  test-coverage: done
+  test-coverage:
+    status: todo
+    comment: Platform tests for cover and sensor need to be implemented to reach 95% coverage.
 
   # Gold
   devices: done
-  diagnostics: done
-  discovery: done
-  discovery-update-info:
-    status: exempt
-    comment: Integration connects via the cloud and not locally.
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: done
+  diagnostics: todo
+  discovery: todo
+  discovery-update-info: todo
+  docs-data-update:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-examples:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-known-limitations:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-supported-devices:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-supported-functions:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-troubleshooting:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-use-cases:
+    status: todo
+    comment: Documentation needs to be created.
   dynamic-devices: todo
   entity-category: done
   entity-device-class: done
@@ -66,7 +84,9 @@ rules:
   icon-translations: todo
   reconfiguration-flow: todo
   repair-issues: todo
-  stale-devices: done
+  stale-devices:
+    status: todo
+    comment: Stale devices can be done dynamically
 
   # Platinum
   async-dependency: todo

homeassistant/components/aladdin_connect/sensor.py

@@ -20,8 +20,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity
 
-PARALLEL_UPDATES = 0
-
 
 @dataclass(frozen=True, kw_only=True)
 class AladdinConnectSensorEntityDescription(SensorEntityDescription):

homeassistant/components/aladdin_connect/strings.json

@@ -4,7 +4,6 @@
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
       "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
       "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
       "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml.",
       "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
       "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
@@ -32,13 +31,5 @@
         "title": "[%key:common::config_flow::title::reauth%]"
       }
     }
-  },
-  "exceptions": {
-    "close_door_failed": {
-      "message": "Failed to close the garage door"
-    },
-    "open_door_failed": {
-      "message": "Failed to open the garage door"
-    }
   }
 }

homeassistant/components/alarm_control_panel/trigger.py

@@ -44,7 +44,7 @@ def make_entity_state_trigger_required_features(
     class CustomTrigger(EntityStateTriggerRequiredFeatures):
         """Trigger for entity state changes."""
 
-        _domains = {domain}
+        _domain = domain
         _to_states = {to_state}
         _required_features = required_features
 

homeassistant/components/alarmdecoder/services.py

@@ -13,6 +13,9 @@ from homeassistant.helpers import config_validation as cv, service
 
 from .const import DOMAIN
 
+SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
+
+SERVICE_ALARM_KEYPRESS = "alarm_keypress"
 ATTR_KEYPRESS = "keypress"
 
 
@@ -23,7 +26,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "alarm_toggle_chime",
+        SERVICE_ALARM_TOGGLE_CHIME,
         entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
         schema={
             vol.Required(ATTR_CODE): cv.string,
@@ -34,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "alarm_keypress",
+        SERVICE_ALARM_KEYPRESS,
         entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
         schema={
             vol.Required(ATTR_KEYPRESS): cv.string,

homeassistant/components/alert/entity.py

@@ -13,7 +13,7 @@ from homeassistant.components.notify import (
     ATTR_DATA,
     ATTR_MESSAGE,
     ATTR_TITLE,
-    DOMAIN as NOTIFY_DOMAIN,
+    DOMAIN as DOMAIN_NOTIFY,
 )
 from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_ON
 from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
@@ -185,7 +185,7 @@ class AlertEntity(Entity):
         for target in self._notifiers:
             try:
                 await self.hass.services.async_call(
-                    NOTIFY_DOMAIN, target, msg_payload, context=self._context
+                    DOMAIN_NOTIFY, target, msg_payload, context=self._context
                 )
             except ServiceNotFound:
                 LOGGER.error(

homeassistant/components/alexa_devices/entity.py

@@ -1,6 +1,6 @@
 """Defines a base Alexa Devices entity."""
 
-from aioamazondevices.const.devices import SPEAKER_GROUP_DEVICE_TYPE
+from aioamazondevices.const.devices import SPEAKER_GROUP_MODEL
 from aioamazondevices.structures import AmazonDevice
 
 from homeassistant.helpers.device_registry import DeviceInfo
@@ -25,20 +25,19 @@ class AmazonEntity(CoordinatorEntity[AmazonDevicesCoordinator]):
         """Initialize the entity."""
         super().__init__(coordinator)
         self._serial_num = serial_num
-        model = self.device.model
+        model_details = coordinator.api.get_model_details(self.device) or {}
+        model = model_details.get("model")
         self._attr_device_info = DeviceInfo(
             identifiers={(DOMAIN, serial_num)},
             name=self.device.account_name,
             model=model,
             model_id=self.device.device_type,
-            manufacturer=self.device.manufacturer or "Amazon",
-            hw_version=self.device.hardware_version,
+            manufacturer=model_details.get("manufacturer", "Amazon"),
+            hw_version=model_details.get("hw_version"),
             sw_version=(
-                self.device.software_version
-                if model != SPEAKER_GROUP_DEVICE_TYPE
-                else None
+                self.device.software_version if model != SPEAKER_GROUP_MODEL else None
             ),
-            serial_number=serial_num if model != SPEAKER_GROUP_DEVICE_TYPE else None,
+            serial_number=serial_num if model != SPEAKER_GROUP_MODEL else None,
         )
         self.entity_description = description
         self._attr_unique_id = f"{serial_num}-{description.key}"

homeassistant/components/alexa_devices/manifest.json

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

homeassistant/components/alexa_devices/services.py

@@ -16,6 +16,9 @@ from .coordinator import AmazonConfigEntry
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
 ATTR_INFO_SKILL = "info_skill"
+SERVICE_TEXT_COMMAND = "send_text_command"
+SERVICE_SOUND_NOTIFICATION = "send_sound"
+SERVICE_INFO_SKILL = "send_info_skill"
 
 SCHEMA_SOUND_SERVICE = vol.Schema(
     {
@@ -125,17 +128,17 @@ def async_setup_services(hass: HomeAssistant) -> None:
     """Set up the services for the Amazon Devices integration."""
     for service_name, method, schema in (
         (
-            "send_sound",
+            SERVICE_SOUND_NOTIFICATION,
             async_send_sound_notification,
             SCHEMA_SOUND_SERVICE,
         ),
         (
-            "send_text_command",
+            SERVICE_TEXT_COMMAND,
             async_send_text_command,
             SCHEMA_CUSTOM_COMMAND,
         ),
         (
-            "send_info_skill",
+            SERVICE_INFO_SKILL,
             async_send_info_skill,
             SCHEMA_INFO_SKILL,
         ),

homeassistant/components/amberelectric/const.py

@@ -16,6 +16,8 @@ ATTRIBUTION = "Data provided by Amber Electric"
 LOGGER = logging.getLogger(__package__)
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]
 
+SERVICE_GET_FORECASTS = "get_forecasts"
+
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"

homeassistant/components/amberelectric/services.py

@@ -22,6 +22,7 @@ from .const import (
     DOMAIN,
     FEED_IN_CHANNEL,
     GENERAL_CHANNEL,
+    SERVICE_GET_FORECASTS,
 )
 from .coordinator import AmberConfigEntry
 from .helpers import format_cents_to_dollars, normalize_descriptor
@@ -100,7 +101,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
 
     hass.services.async_register(
         DOMAIN,
-        "get_forecasts",
+        SERVICE_GET_FORECASTS,
         handle_get_forecasts,
         GET_FORECASTS_SCHEMA,
         supports_response=SupportsResponse.ONLY,

homeassistant/components/amcrest/camera.py

@@ -49,6 +49,18 @@ SCAN_INTERVAL = timedelta(seconds=15)
 
 STREAM_SOURCE_LIST = ["snapshot", "mjpeg", "rtsp"]
 
+_SRV_EN_REC = "enable_recording"
+_SRV_DS_REC = "disable_recording"
+_SRV_EN_AUD = "enable_audio"
+_SRV_DS_AUD = "disable_audio"
+_SRV_EN_MOT_REC = "enable_motion_recording"
+_SRV_DS_MOT_REC = "disable_motion_recording"
+_SRV_GOTO = "goto_preset"
+_SRV_CBW = "set_color_bw"
+_SRV_TOUR_ON = "start_tour"
+_SRV_TOUR_OFF = "stop_tour"
+
+_SRV_PTZ_CTRL = "ptz_control"
 _ATTR_PTZ_TT = "travel_time"
 _ATTR_PTZ_MOV = "movement"
 _MOV = [
@@ -91,17 +103,17 @@ _SRV_PTZ_SCHEMA = _SRV_SCHEMA.extend(
 )
 
 CAMERA_SERVICES = {
-    "enable_recording": (_SRV_SCHEMA, "async_enable_recording", ()),
-    "disable_recording": (_SRV_SCHEMA, "async_disable_recording", ()),
-    "enable_audio": (_SRV_SCHEMA, "async_enable_audio", ()),
-    "disable_audio": (_SRV_SCHEMA, "async_disable_audio", ()),
-    "enable_motion_recording": (_SRV_SCHEMA, "async_enable_motion_recording", ()),
-    "disable_motion_recording": (_SRV_SCHEMA, "async_disable_motion_recording", ()),
-    "goto_preset": (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
-    "set_color_bw": (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
-    "start_tour": (_SRV_SCHEMA, "async_start_tour", ()),
-    "stop_tour": (_SRV_SCHEMA, "async_stop_tour", ()),
-    "ptz_control": (
+    _SRV_EN_REC: (_SRV_SCHEMA, "async_enable_recording", ()),
+    _SRV_DS_REC: (_SRV_SCHEMA, "async_disable_recording", ()),
+    _SRV_EN_AUD: (_SRV_SCHEMA, "async_enable_audio", ()),
+    _SRV_DS_AUD: (_SRV_SCHEMA, "async_disable_audio", ()),
+    _SRV_EN_MOT_REC: (_SRV_SCHEMA, "async_enable_motion_recording", ()),
+    _SRV_DS_MOT_REC: (_SRV_SCHEMA, "async_disable_motion_recording", ()),
+    _SRV_GOTO: (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
+    _SRV_CBW: (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
+    _SRV_TOUR_ON: (_SRV_SCHEMA, "async_start_tour", ()),
+    _SRV_TOUR_OFF: (_SRV_SCHEMA, "async_stop_tour", ()),
+    _SRV_PTZ_CTRL: (
         _SRV_PTZ_SCHEMA,
         "async_ptz_control",
         (_ATTR_PTZ_MOV, _ATTR_PTZ_TT),

homeassistant/components/amcrest/strings.json

@@ -75,7 +75,7 @@
       "name": "Go to preset"
     },
     "ptz_control": {
-      "description": "Moves (pan/tilt) and/or zooms a PTZ camera.",
+      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
       "fields": {
         "entity_id": {
           "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",

homeassistant/components/analytics/analytics.py

@@ -534,10 +534,6 @@ class Analytics:
 
         payload = await _async_snapshot_payload(self._hass)
 
-        if not payload:
-            LOGGER.info("Skipping snapshot submission, no data to send")
-            return
-
         headers = {
             "Content-Type": "application/json",
             "User-Agent": f"home-assistant/{HA_VERSION}",

homeassistant/components/analytics_insights/sensor.py

@@ -38,6 +38,7 @@ def get_app_entity_description(
         translation_key="apps",
         name=name_slug,
         state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
         value_fn=lambda data: data.apps.get(name_slug),
     )
 
@@ -51,6 +52,7 @@ def get_core_integration_entity_description(
         translation_key="core_integrations",
         name=name,
         state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
         value_fn=lambda data: data.core_integrations.get(domain),
     )
 
@@ -64,6 +66,7 @@ def get_custom_integration_entity_description(
         translation_key="custom_integrations",
         translation_placeholders={"custom_integration_domain": domain},
         state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
         value_fn=lambda data: data.custom_integrations.get(domain),
     )
 
@@ -74,6 +77,7 @@ GENERAL_SENSORS = [
         translation_key="total_active_installations",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
         value_fn=lambda data: data.active_installations,
     ),
     AnalyticsSensorEntityDescription(
@@ -81,6 +85,7 @@ GENERAL_SENSORS = [
         translation_key="total_reports_integrations",
         entity_registry_enabled_default=False,
         state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
         value_fn=lambda data: data.reports_integrations,
     ),
 ]

homeassistant/components/analytics_insights/strings.json

@@ -24,23 +24,14 @@
   },
   "entity": {
     "sensor": {
-      "apps": {
-        "unit_of_measurement": "active installations"
-      },
-      "core_integrations": {
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
-      },
       "custom_integrations": {
-        "name": "{custom_integration_domain} (custom)",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "{custom_integration_domain} (custom)"
       },
       "total_active_installations": {
-        "name": "Total active installations",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "Total active installations"
       },
       "total_reports_integrations": {
-        "name": "Total reported integrations",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "Total reported integrations"
       }
     }
   },

homeassistant/components/androidtv/media_player.py

@@ -36,7 +36,7 @@ from .const import (
     SIGNAL_CONFIG_ENTITY,
 )
 from .entity import AndroidTVEntity, adb_decorator
-from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT
+from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT, SERVICE_LEARN_SENDEVENT
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -271,7 +271,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
             self.async_write_ha_state()
 
             msg = (
-                f"Output from service 'learn_sendevent' from"
+                f"Output from service '{SERVICE_LEARN_SENDEVENT}' from"
                 f" {self.entity_id}: '{output}'"
             )
             persistent_notification.async_create(

homeassistant/components/androidtv/services.py

@@ -16,6 +16,11 @@ ATTR_DEVICE_PATH = "device_path"
 ATTR_HDMI_INPUT = "hdmi_input"
 ATTR_LOCAL_PATH = "local_path"
 
+SERVICE_ADB_COMMAND = "adb_command"
+SERVICE_DOWNLOAD = "download"
+SERVICE_LEARN_SENDEVENT = "learn_sendevent"
+SERVICE_UPLOAD = "upload"
+
 
 @callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -24,7 +29,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "adb_command",
+        SERVICE_ADB_COMMAND,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={vol.Required(ATTR_COMMAND): cv.string},
         func="adb_command",
@@ -32,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "learn_sendevent",
+        SERVICE_LEARN_SENDEVENT,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema=None,
         func="learn_sendevent",
@@ -40,7 +45,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "download",
+        SERVICE_DOWNLOAD,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={
             vol.Required(ATTR_DEVICE_PATH): cv.string,
@@ -51,7 +56,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
     service.async_register_platform_entity_service(
         hass,
         DOMAIN,
-        "upload",
+        SERVICE_UPLOAD,
         entity_domain=MEDIA_PLAYER_DOMAIN,
         schema={
             vol.Required(ATTR_DEVICE_PATH): cv.string,