tibber refactor

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

.agent/skills

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

.claude/agents/raise-pull-request.md

@@ -1,228 +0,0 @@
----
-name: raise-pull-request
-description: |
-  Use this agent when creating a pull request for the Home Assistant core repository after completing implementation work. This agent automates the PR creation process including running tests, formatting checks, and proper checkbox handling.
-model: inherit
-color: green
-tools: Read, Bash, Grep, Glob
----
-
-You are an expert at creating pull requests for the Home Assistant core repository. You will automate the PR creation process with proper verification, formatting, testing, and checkbox handling.
-
-**Execute each step in order. Do not skip steps.**
-
-## Step 1: Gather Information
-
-Run these commands in parallel to analyze the changes:
-
-```bash
-# Get current branch and remote
-git branch --show-current
-git remote -v | grep push
-
-# Determine the best available dev reference
-if git rev-parse --verify --quiet upstream/dev >/dev/null; then
-  BASE_REF="upstream/dev"
-elif git rev-parse --verify --quiet origin/dev >/dev/null; then
-  BASE_REF="origin/dev"
-elif git rev-parse --verify --quiet dev >/dev/null; then
-  BASE_REF="dev"
-else
-  echo "Could not find upstream/dev, origin/dev, or local dev"
-  exit 1
-fi
-
-BASE_SHA="$(git merge-base "$BASE_REF" HEAD)"
-echo "BASE_REF=$BASE_REF"
-echo "BASE_SHA=$BASE_SHA"
-
-# Get commit info for this branch vs dev
-git log "${BASE_SHA}..HEAD" --oneline
-
-# Check what files changed
-git diff "${BASE_SHA}..HEAD" --name-only
-
-# Check if test files were added/modified
-git diff "${BASE_SHA}..HEAD" --name-only | grep -E "^tests/.*\.py$" || echo "NO_TESTS_CHANGED"
-
-# Check if manifest.json changed
-git diff "${BASE_SHA}..HEAD" --name-only | grep "manifest.json" || echo "NO_MANIFEST_CHANGED"
-```
-
-From the file paths, extract the **integration domain** from `homeassistant/components/{integration}/` or `tests/components/{integration}/`.
-
-**Track results:**
-- `BASE_REF`: the dev reference used for comparison
-- `BASE_SHA`: the merge-base commit used for diff-based checks
-- `TESTS_CHANGED`: true if test files were added or modified
-- `MANIFEST_CHANGED`: true if manifest.json was modified
-
-**If no suitable dev reference is available, STOP and tell the user to fetch `upstream/dev`, `origin/dev`, or a local `dev` branch before continuing.**
-
-## Step 2: Run Code Quality Checks
-
-Run `prek` to perform code quality checks (formatting, linting, hassfest, etc.) on the files changed since `BASE_SHA`:
-
-```bash
-prek run --from-ref "$BASE_SHA" --to-ref HEAD
-```
-
-**Track results:**
-- `PREK_PASSED`: true if `prek run` exits with code 0
-
-**If `prek` fails or is not available, STOP and report the failure to the user. Do not proceed with PR creation. If the failure appears to be an environment setup issue (e.g., missing tools, command not found, venv not activated), also point the user to https://developers.home-assistant.io/docs/development_environment.**
-
-## Step 3: Stage Any Changes from Checks
-
-If `prek` made any formatting or generated file changes, stage and commit them as a separate commit:
-
-```bash
-git status --porcelain
-# If changes exist:
-git add -A
-git commit -m "Apply prek formatting and generated file updates"
-```
-
-## Step 4: Run Tests
-
-Run pytest for the specific integration:
-
-```bash
-pytest tests/components/{integration} \
-  --timeout=60 \
-  --durations-min=1 \
-  --durations=0 \
-  -q
-```
-
-**Track results:**
-- `TESTS_PASSED`: true if pytest exits with code 0
-
-**If tests fail, STOP and report the failures to the user. Do not proceed with PR creation.**
-
-## Step 5: Identify PR Metadata
-
-Write a release-note-style PR title summarizing the change. The title becomes the release notes entry, so it should be a complete sentence fragment describing what changed in imperative mood.
-
-**PR Title Examples by Type:**
-| Type | Example titles |
-|------|----------------|
-| Bugfix | `Fix Hikvision NVR binary sensors not being detected` |
-| | `Fix JSON serialization of time objects in anthropic tool results` |
-| | `Fix config flow bug in Tesla Fleet` |
-| Dependency | `Bump eheimdigital to 1.5.0` |
-| | `Bump python-otbr-api to 2.7.1` |
-| New feature | `Add asyncio-level timeout to Backblaze B2 uploads` |
-| | `Add Nettleie optimization option` |
-| Code quality | `Add exception translations to Teslemetry` |
-| | `Improve test coverage of Tesla Fleet` |
-| | `Refactor adguard tests to use proper fixtures for mocking` |
-| | `Simplify entity init in Proxmox` |
-
-## Step 6: Verify Development Checklist
-
-Check each item from the [development checklist](https://developers.home-assistant.io/docs/development_checklist/):
-
-| Item | How to verify |
-|------|---------------|
-| External libraries on PyPI | Check manifest.json requirements - all should be PyPI packages |
-| Dependencies in requirements_all.txt | Only if dependency declarations changed (the `requirements` field in `manifest.json` or `requirements_all.txt`), run `python -m script.gen_requirements_all` |
-| Codeowners updated | If this is a new integration, ensure its `manifest.json` includes a `codeowners` field with one or more GitHub usernames |
-| No commented out code | Visually scan the diff for blocks of commented-out code |
-
-**Track results:**
-- `NO_COMMENTED_CODE`: true if no blocks of commented-out code found in the diff
-- `DEPENDENCIES_CHANGED`: true if the diff changes the `requirements` field in `manifest.json` or changes `requirements_all.txt`
-- `REQUIREMENTS_UPDATED`: true if `DEPENDENCIES_CHANGED` is true and requirements_all.txt was regenerated successfully; not applicable if `DEPENDENCIES_CHANGED` is false
-- `CHECKLIST_PASSED`: true if all items above pass
-
-## Step 7: Determine Type of Change
-
-Select exactly ONE based on the changes. Mark the selected type with `[x]` and all others with `[ ]` (space):
-
-| Type | Condition |
-|------|-----------|
-| Dependency upgrade | Only manifest.json/requirements changes |
-| Bugfix | Fixes broken behavior, no new features |
-| New integration | New folder in components/ |
-| New feature | Adds capability to existing integration |
-| Deprecation | Adds deprecation warnings for future breaking change |
-| Breaking change | Removes or changes existing functionality |
-| Code quality | Only refactoring or test additions, no functional change |
-
-**Track results:**
-- `CHANGE_TYPE`: the selected type (e.g., "Bugfix", "New feature", "Code quality", etc.)
-
-**Important:** All seven type options must remain in the PR body. Only the selected type gets `[x]`, all others get `[ ]`.
-
-## Step 8: Determine Checkbox States
-
-Based on the verification steps above, determine checkbox states:
-
-| Checkbox | Condition to tick |
-|----------|-------------------|
-| The code change is tested and works locally | Leave unchecked for the contributor to verify manually (this refers to manual testing, not unit tests) |
-| Local tests pass | Tick only if `TESTS_PASSED` is true |
-| I understand the code I am submitting and can explain how it works | Leave unchecked for the contributor to review and set manually |
-| There is no commented out code | Tick only if `NO_COMMENTED_CODE` is true |
-| Development checklist | Tick only if `CHECKLIST_PASSED` is true |
-| Perfect PR recommendations | Tick only if the PR affects a single integration or closely related modules, represents one primary type of change, and has a clear, self-contained scope |
-| Formatted using Ruff | Tick only if `PREK_PASSED` is true |
-| Tests have been added | Tick only if `TESTS_CHANGED` is true AND the changes exercise new or changed functionality (not only cosmetic test changes) |
-| Documentation added/updated | Tick if documentation PR created (or not applicable) |
-| Manifest file fields filled out | Tick if `PREK_PASSED` is true (or not applicable) |
-| Dependencies in requirements_all.txt | Tick only if `DEPENDENCIES_CHANGED` is false, or if `DEPENDENCIES_CHANGED` is true and `REQUIREMENTS_UPDATED` is true |
-| Dependency changelog linked | Tick if dependency changelog linked in PR description (or not applicable) |
-| Any generated code has been carefully reviewed | Leave unchecked for the contributor to review and set manually |
-
-## Step 9: Breaking Change Section
-
-**If `CHANGE_TYPE` is NOT "Breaking change" or "Deprecation": REMOVE the entire "## Breaking change" section from the PR body (including the heading).**
-
-If `CHANGE_TYPE` IS "Breaking change" or "Deprecation", keep the `## Breaking change` section and describe:
-- What breaks
-- How users can fix it
-- Why it was necessary
-
-## Step 10: Push Branch and Create PR
-
-```bash
-# Get branch name and GitHub username
-BRANCH=$(git branch --show-current)
-PUSH_REMOTE=$(git config "branch.$BRANCH.remote" 2>/dev/null || git remote | head -1)
-GITHUB_USER=$(gh api user --jq .login 2>/dev/null || git remote get-url "$PUSH_REMOTE" | sed -E 's#.*[:/]([^/]+)/([^/]+)(\.git)?$#\1#')
-
-# Create PR (gh pr create pushes the branch automatically)
-gh pr create --repo home-assistant/core --base dev \
-  --head "$GITHUB_USER:$BRANCH" \
-  --title "TITLE_HERE" \
-  --body "$(cat <<'EOF'
-BODY_HERE
-EOF
-)"
-```
-
-### PR Body Template
-
-Read the PR template from `.github/PULL_REQUEST_TEMPLATE.md` and use it as the basis for the PR body. **Do not hardcode the template — always read it from the file to stay in sync with upstream changes.**
-
-Use any HTML comments (`<!-- ... -->`) in the template as guidance to understand what to fill in. For the final PR body sent to GitHub, keep the template text intact — do not delete any text from the template unless it explicitly instructs removal (e.g., the breaking change section when not applicable). Then fill in the sections:
-
-1. **Breaking change section**: If the type is NOT "Breaking change" or "Deprecation", remove the entire `## Breaking change` section (heading and body). Otherwise, describe what breaks, how users can fix it, and why.
-2. **Proposed change section**: Fill in a description of the change extracted from commit messages.
-3. **Type of change**: Check exactly ONE checkbox matching the determined type from Step 7. Leave all others unchecked.
-4. **Additional information**: Fill in any related issue numbers if known.
-5. **Checklist**: Check boxes based on the conditions in Step 8. Leave manual-verification boxes unchecked for the contributor.
-
-**Important:** Preserve all template structure, options, and link references exactly as they appear in the file — only modify checkbox states and fill in content sections.
-
-## Step 11: Report Result
-
-Provide the user with:
-1. **PR URL** - The created pull request link
-2. **Verification Summary** - Which checks passed/failed
-3. **Unchecked Items** - List any checkboxes left unchecked and why
-4. **User Action Required** - Remind user to:
-   - Review and set manual-verification checkboxes ("I understand the code..." and "Any generated code...") as applicable
-   - Consider reviewing two other open PRs
-   - Add any related issue numbers if applicable

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

@@ -1,38 +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
-
-## 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
-    ```

.claude/skills/integrations/SKILL.md

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

.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

.gitattributes

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

.github/dependabot.yml

@@ -9,5 +9,3 @@ updates:
     labels:
       - dependency
       - github_actions
-    cooldown:
-      default-days: 7

.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"
@@ -17,48 +18,39 @@ env:
   BASE_IMAGE_VERSION: "2026.01.0"
   ARCHITECTURES: '["amd64", "aarch64"]'
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.ref }}
-  cancel-in-progress: true
-
 jobs:
   init:
     name: Initialize build
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
-    permissions:
-      contents: read # To check out the repository
     outputs:
       version: ${{ steps.version.outputs.version }}
       channel: ${{ steps.version.outputs.channel }}
       publish: ${{ steps.version.outputs.publish }}
       architectures: ${{ env.ARCHITECTURES }}
-      base_image_version: ${{ env.BASE_IMAGE_VERSION }}
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         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
-        uses: home-assistant/actions/helpers/info@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/info@master
 
       - name: Get version
         id: version
-        uses: home-assistant/actions/helpers/version@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/version@master
         with:
           type: ${{ env.BUILD_TYPE }}
 
       - name: Verify version
-        uses: home-assistant/actions/helpers/verify-version@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/verify-version@master
         with:
           ignore-dev: true
 
@@ -73,14 +65,14 @@ jobs:
       - name: Download Translations
         run: python3 -m script.translations download
         env:
-          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} # zizmor: ignore[secrets-outside-env]
+          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }}
 
       - name: Archive translations
         shell: bash
         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
@@ -92,16 +84,16 @@ jobs:
     needs: init
     runs-on: ${{ matrix.os }}
     permissions:
-      contents: read # To check out the repository
-      packages: write # To push to GHCR
-      id-token: write # For cosign signing
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       fail-fast: false
       matrix:
         arch: ${{ fromJson(needs.init.outputs.architectures) }}
         include:
           - arch: amd64
-            os: ubuntu-24.04
+            os: ubuntu-latest
           - arch: aarch64
             os: ubuntu-24.04-arm
     steps:
@@ -112,7 +104,7 @@ jobs:
 
       - name: Download nightly wheels of frontend
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: home-assistant/frontend
@@ -123,7 +115,7 @@ jobs:
 
       - name: Download nightly wheels of intents
         if: needs.init.outputs.channel == 'dev'
-        uses: dawidd6/action-download-artifact@8a338493df3d275e4a7a63bcff3b8fe97e51a927 # v19
+        uses: dawidd6/action-download-artifact@5c98f0b039f36ef966fdb7dfa9779262785ecb05 # v14
         with:
           github_token: ${{secrets.GITHUB_TOKEN}}
           repo: OHF-Voice/intents-package
@@ -132,23 +124,22 @@ 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'
         shell: bash
         env:
           UV_PRERELEASE: allow
-          VERSION: ${{ needs.init.outputs.version }}
         run: |
           python3 -m pip install "$(grep '^uv' < requirements.txt)"
           uv pip install packaging tomli
           uv pip install .
-          python3 script/version_bump.py nightly --set-nightly-version "${VERSION}"
+          python3 script/version_bump.py nightly --set-nightly-version "${{ needs.init.outputs.version }}"
 
           if [[ "$(ls home_assistant_frontend*.whl)" =~ ^home_assistant_frontend-(.*)-py3-none-any.whl$ ]]; then
             echo "Found frontend wheel, setting version to: ${BASH_REMATCH[1]}"
@@ -182,7 +173,7 @@ jobs:
           fi
 
       - name: Download translations
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 
@@ -194,36 +185,84 @@ jobs:
       - name: Write meta info file
         shell: bash
         run: |
-          echo "${GITHUB_SHA};${GITHUB_REF};${GITHUB_EVENT_NAME};${GITHUB_ACTOR}" > rootfs/OFFICIAL_IMAGE
+          echo "${{ github.sha }};${{ github.ref }};${{ github.event_name }};${{ github.actor }}" > rootfs/OFFICIAL_IMAGE
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Install Cosign
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
+        with:
+          cosign-release: "v2.5.3"
+
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.12.0
+
+      - name: Build variables
+        id: vars
+        shell: bash
+        run: |
+          echo "base_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ env.BASE_IMAGE_VERSION }}" >> "$GITHUB_OUTPUT"
+          echo "cache_image=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:latest" >> "$GITHUB_OUTPUT"
+          echo "created=$(date --rfc-3339=seconds --utc)" >> "$GITHUB_OUTPUT"
+
+      - name: Verify base image signature
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/docker/.*" \
+            "${{ steps.vars.outputs.base_image }}"
+
+      - name: Verify cache image signature
+        id: cache
+        continue-on-error: true
+        run: |
+          cosign verify \
+            --certificate-oidc-issuer https://token.actions.githubusercontent.com \
+            --certificate-identity-regexp "https://github.com/home-assistant/core/.*" \
+            "${{ steps.vars.outputs.cache_image }}"
 
       - name: Build base image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+        id: build
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          cosign-base-identity: "https://github.com/home-assistant/docker/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant-base:${{ needs.init.outputs.base_image_version }}
-          image: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant
-          image-tags: ${{ needs.init.outputs.version }}
+          context: .
+          file: ./Dockerfile
+          platforms: ${{ steps.vars.outputs.platform }}
           push: true
-          version: ${{ needs.init.outputs.version }}
+          cache-from: ${{ steps.cache.outcome == 'success' && steps.vars.outputs.cache_image || '' }}
+          build-args: |
+            BUILD_FROM=${{ steps.vars.outputs.base_image }}
+          tags: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
+          outputs: type=image,push=true,compression=zstd,compression-level=9,force-compression=true,oci-mediatypes=true
+          labels: |
+            io.hass.arch=${{ matrix.arch }}
+            io.hass.version=${{ needs.init.outputs.version }}
+            org.opencontainers.image.created=${{ steps.vars.outputs.created }}
+            org.opencontainers.image.version=${{ needs.init.outputs.version }}
+
+      - name: Sign image
+        run: |
+          cosign sign --yes "ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}@${{ steps.build.outputs.digest }}"
 
   build_machine:
     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
-      id-token: write # For cosign signing
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       matrix:
         machine:
           - generic-x86-64
+          - intel-nuc
           - khadas-vim3
           - odroid-c2
           - odroid-c4
@@ -236,55 +275,39 @@ 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
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
         with:
           persist-credentials: false
 
-      - name: Compute extra tags
-        id: tags
-        shell: bash
-        env:
-          VERSION: ${{ needs.init.outputs.version }}
+      - name: Set build additional args
         run: |
-          if [[ "${VERSION}" =~ d ]]; then
-            echo "extra_tags=dev" >> "$GITHUB_OUTPUT"
-          elif [[ "${VERSION}" =~ b ]]; then
-            echo "extra_tags=beta" >> "$GITHUB_OUTPUT"
+          # Create general tags
+          if [[ "${{ needs.init.outputs.version }}" =~ d ]]; then
+            echo "BUILD_ARGS=--additional-tag dev" >> $GITHUB_ENV
+          elif [[ "${{ needs.init.outputs.version }}" =~ b ]]; then
+            echo "BUILD_ARGS=--additional-tag beta" >> $GITHUB_ENV
           else
-            echo "extra_tags=stable" >> "$GITHUB_OUTPUT"
+            echo "BUILD_ARGS=--additional-tag stable" >> $GITHUB_ENV
           fi
 
-      - name: Build machine image
-        uses: home-assistant/builder/actions/build-image@62a1597b84b3461abad9816d9cd92862a2b542c3 # 2026.03.2
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
-          arch: ${{ matrix.arch }}
-          build-args: |
-            BUILD_FROM=ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          cache-gha: false
-          container-registry-password: ${{ secrets.GITHUB_TOKEN }}
-          context: machine/
-          cosign-base-identity: "https://github.com/home-assistant/core/.*"
-          cosign-base-verify: ghcr.io/home-assistant/${{ matrix.arch }}-homeassistant:${{ needs.init.outputs.version }}
-          file: machine/${{ matrix.machine }}
-          image: ghcr.io/home-assistant/${{ matrix.machine }}-homeassistant
-          image-tags: |
-            ${{ needs.init.outputs.version }}
-            ${{ steps.tags.outputs.extra_tags }}
-          push: true
-          version: ${{ needs.init.outputs.version }}
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      # home-assistant/builder doesn't support sha pinning
+      - name: Build base image
+        uses: home-assistant/builder@2025.11.0
+        with:
+          args: |
+            $BUILD_ARGS \
+            --target /data/machine \
+            --cosign \
+            --machine "${{ needs.init.outputs.version }}=${{ matrix.machine }}"
 
   publish_ha:
     name: Publish version files
@@ -292,8 +315,6 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     needs: ["init", "build_machine"]
     runs-on: ubuntu-latest
-    permissions:
-      contents: read
     steps:
       - name: Checkout the repository
         uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -301,14 +322,14 @@ jobs:
           persist-credentials: false
 
       - name: Initialize git
-        uses: home-assistant/actions/helpers/git-init@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/git-init@master
         with:
           name: ${{ secrets.GIT_NAME }}
           email: ${{ secrets.GIT_EMAIL }}
           token: ${{ secrets.GIT_TOKEN }}
 
       - name: Update version file
-        uses: home-assistant/actions/helpers/version-push@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/version-push@master
         with:
           key: "homeassistant[]"
           key-description: "Home Assistant Core"
@@ -318,7 +339,7 @@ jobs:
 
       - name: Update version file (stable -> beta)
         if: needs.init.outputs.channel == 'stable'
-        uses: home-assistant/actions/helpers/version-push@master # zizmor: ignore[unpinned-uses]
+        uses: home-assistant/actions/helpers/version-push@master
         with:
           key: "homeassistant[]"
           key-description: "Home Assistant Core"
@@ -333,28 +354,28 @@ jobs:
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
     permissions:
-      contents: read # To check out the repository
-      packages: write # To push to GHCR
-      id-token: write # For cosign signing
+      contents: read
+      packages: write
+      id-token: write
     strategy:
       fail-fast: false
       matrix:
         registry: ["ghcr.io/home-assistant", "docker.io/homeassistant"]
     steps:
       - name: Install Cosign
-        uses: sigstore/cosign-installer@ba7bc0a3fef59531c69a25acd34668d6d3fe6f22 # v4.1.0
+        uses: sigstore/cosign-installer@faadad0cce49287aee09b3a48701e75088a2c6ad # v4.0.0
         with:
           cosign-release: "v2.5.3"
 
       - name: Login to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_TOKEN }}
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
@@ -362,17 +383,14 @@ jobs:
 
       - name: Verify architecture image signatures
         shell: bash
-        env:
-          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
-          VERSION: ${{ needs.init.outputs.version }}
         run: |
-          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
+          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
           for arch in $ARCHS; do
             echo "Verifying ${arch} image signature..."
             cosign verify \
               --certificate-oidc-issuer https://token.actions.githubusercontent.com \
               --certificate-identity-regexp https://github.com/home-assistant/core/.* \
-              "ghcr.io/home-assistant/${arch}-homeassistant:${VERSION}"
+              "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
           done
           echo "✓ All images verified successfully"
 
@@ -384,7 +402,7 @@ jobs:
       #   2025.12.0.dev202511250240 -> tags: 2025.12.0.dev202511250240, dev
       - name: Generate Docker metadata
         id: meta
-        uses: docker/metadata-action@030e881283bb7a6894de51c315a6bfe6a94e05cf # v6.0.0
+        uses: docker/metadata-action@c299e40c65443455700f0fdfc63efafe5b349051 # v5.10.0
         with:
           images: ${{ matrix.registry }}/home-assistant
           sep-tags: ","
@@ -398,24 +416,21 @@ jobs:
             type=semver,pattern={{major}}.{{minor}},value=${{ needs.init.outputs.version }},enable=${{ !contains(needs.init.outputs.version, 'd') && !contains(needs.init.outputs.version, 'b') }}
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@4d04d5d9486b7bd6fa91e7baf45bbb4f8b9deedd # v3.7.1
+        uses: docker/setup-buildx-action@8d2750c68a42422c14e847fe6c8ac0403b4cbd6f # v3.7.1
 
       - name: Copy architecture images to DockerHub
         if: matrix.registry == 'docker.io/homeassistant'
         shell: bash
-        env:
-          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
-          VERSION: ${{ needs.init.outputs.version }}
         run: |
           # Use imagetools to copy image blobs directly between registries
           # This preserves provenance/attestations and seems to be much faster than pull/push
-          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
+          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
           for arch in $ARCHS; do
             echo "Copying ${arch} image to DockerHub..."
             for attempt in 1 2 3; do
               if docker buildx imagetools create \
-                --tag "docker.io/homeassistant/${arch}-homeassistant:${VERSION}" \
-                "ghcr.io/home-assistant/${arch}-homeassistant:${VERSION}"; then
+                --tag "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}" \
+                "ghcr.io/home-assistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"; then
                 break
               fi
               echo "Attempt ${attempt} failed, retrying in 10 seconds..."
@@ -425,28 +440,23 @@ jobs:
                 exit 1
               fi
             done
-            cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${VERSION}"
+            cosign sign --yes "docker.io/homeassistant/${arch}-homeassistant:${{ needs.init.outputs.version }}"
           done
 
       - name: Create and push multi-arch manifests
         shell: bash
-        env:
-          ARCHITECTURES: ${{ needs.init.outputs.architectures }}
-          REGISTRY: ${{ matrix.registry }}
-          VERSION: ${{ needs.init.outputs.version }}
-          META_TAGS: ${{ steps.meta.outputs.tags }}
         run: |
           # Build list of architecture images dynamically
-          ARCHS=$(echo "${ARCHITECTURES}" | jq -r '.[]')
+          ARCHS=$(echo '${{ needs.init.outputs.architectures }}' | jq -r '.[]')
           ARCH_IMAGES=()
           for arch in $ARCHS; do
-            ARCH_IMAGES+=("${REGISTRY}/${arch}-homeassistant:${VERSION}")
+            ARCH_IMAGES+=("${{ matrix.registry }}/${arch}-homeassistant:${{ needs.init.outputs.version }}")
           done
 
           # Build list of all tags for single manifest creation
           # Note: Using sep-tags=',' in metadata-action for easier parsing
           TAG_ARGS=()
-          IFS=',' read -ra TAGS <<< "${META_TAGS}"
+          IFS=',' read -ra TAGS <<< "${{ steps.meta.outputs.tags }}"
           for tag in "${TAGS[@]}"; do
             TAG_ARGS+=("--tag" "${tag}")
           done
@@ -470,8 +480,8 @@ jobs:
     needs: ["init", "build_base"]
     runs-on: ubuntu-latest
     permissions:
-      contents: read # To check out the repository
-      id-token: write # For PyPI trusted publishing
+      contents: read
+      id-token: write
     if: github.repository_owner == 'home-assistant' && needs.init.outputs.publish == 'true'
     steps:
       - name: Checkout the repository
@@ -479,13 +489,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@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: translations
 
@@ -511,10 +521,10 @@ jobs:
     name: Build and test hassfest image
     runs-on: ubuntu-latest
     permissions:
-      contents: read # To check out the repository
-      packages: write # To push to GHCR
-      attestations: write # For build provenance attestation
-      id-token: write # For build provenance attestation
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
     needs: ["init"]
     if: github.repository_owner == 'home-assistant'
     env:
@@ -527,14 +537,14 @@ jobs:
           persist-credentials: false
 
       - name: Login to GitHub Container Registry
-        uses: docker/login-action@b45d80f862d83dbcd57f89517bcf500b2ab88fb2 # v4.0.0
+        uses: docker/login-action@c94ce9fb468520275223c153574b00df6fe4bcc9 # v3.7.0
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build Docker image
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -542,12 +552,12 @@ jobs:
           tags: ${{ env.HASSFEST_IMAGE_TAG }}
 
       - name: Run hassfest against core
-        run: docker run --rm -v "${GITHUB_WORKSPACE}":/github/workspace "${HASSFEST_IMAGE_TAG}" --core-path=/github/workspace
+        run: docker run --rm -v ${{ github.workspace }}:/github/workspace ${{ env.HASSFEST_IMAGE_TAG }} --core-path=/github/workspace
 
       - name: Push Docker image
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
         id: push
-        uses: docker/build-push-action@d08e5c354a6adb9ed34480a06d141179aa583294 # v7.0.0
+        uses: docker/build-push-action@10e90e3645eae34f1e60eeb005ba3a3d33f178e8 # v6.19.2
         with:
           context: . # So action will not pull the repository again
           file: ./script/hassfest/docker/Dockerfile
@@ -556,7 +566,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest@59d89421af93a897026c735860bf21b6eb4f7b26 # 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/codeql.yml

@@ -5,8 +5,6 @@ on:
   schedule:
     - cron: "30 18 * * 4"
 
-permissions: {}
-
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref }}
   cancel-in-progress: true
@@ -17,9 +15,9 @@ jobs:
     runs-on: ubuntu-latest
     timeout-minutes: 360
     permissions:
-      actions: read # To read workflow information for CodeQL
-      contents: read # To check out the repository
-      security-events: write # To upload CodeQL results
+      actions: read
+      contents: read
+      security-events: write
 
     steps:
       - name: Check out code from GitHub
@@ -28,11 +26,11 @@ jobs:
           persist-credentials: false
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/init@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@0d579ffd059c29b07949a3cce3983f0780820c98 # v4.32.6
+        uses: github/codeql-action/analyze@45cbd0c69e560cd9e7cd7f8c32362050c9b7ded2 # v4.32.2
         with:
           category: "/language:python"

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

@@ -5,18 +5,13 @@ on:
   issues:
     types: [labeled]
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+permissions:
+  issues: write
+  models: read
 
 jobs:
   detect-duplicates:
-    name: Detect duplicate issues
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # To comment on and label issues
-      models: read # For AI-based duplicate detection
 
     steps:
       - name: Check if integration label was added and extract details
@@ -236,7 +231,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

@@ -5,18 +5,13 @@ on:
   issues:
     types: [opened]
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
+permissions:
+  issues: write
+  models: read
 
 jobs:
   detect-language:
-    name: Detect non-English issues
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # To comment on, label, and close issues
-      models: read # For AI-based language detection
 
     steps:
       - name: Check issue language
@@ -62,7 +57,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/lock.yml

@@ -5,20 +5,10 @@ on:
   schedule:
     - cron: "0 * * * *"
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   lock:
-    name: Lock inactive threads
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # To lock issues
-      pull-requests: write # To lock pull requests
     steps:
       - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
         with:

.github/workflows/restrict-task-creation.yml

@@ -5,39 +5,9 @@ on:
   issues:
     types: [opened]
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}-${{ github.event.issue.number }}
-
 jobs:
-  add-no-stale:
-    name: Add no-stale label
-    runs-on: ubuntu-latest
-    permissions:
-      issues: write # To add labels to issues
-    if: >-
-      github.event.issue.type.name == 'Task'
-      || github.event.issue.type.name == 'Epic'
-      || github.event.issue.type.name == 'Opportunity'
-    steps:
-      - name: Add no-stale label
-        uses: actions/github-script@ed597411d8f924073f98dfc5c65a23a2325f34cd # v8.0.0
-        with:
-          script: |
-            await github.rest.issues.addLabels({
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              issue_number: context.issue.number,
-              labels: ['no-stale']
-            });
-
   check-authorization:
-    name: Check authorization
     runs-on: ubuntu-latest
-    permissions:
-      contents: read # To read CODEOWNERS file
-      issues: write # To comment on, label, and close issues
     # Only run if this is a Task issue type (from the issue form)
     if: github.event.issue.type.name == 'Task'
     steps:

.github/workflows/stale.yml

@@ -6,20 +6,10 @@ on:
     - cron: "0 * * * *"
   workflow_dispatch:
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
-
 jobs:
   stale:
-    name: Mark stale issues and PRs
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
-    permissions:
-      issues: write # To label and close stale issues
-      pull-requests: write # To label and close stale PRs
     steps:
       # The 60 day stale policy for PRs
       # Used for:
@@ -27,7 +17,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
@@ -58,8 +48,8 @@ jobs:
         # v1.7.0
         uses: tibdex/github-app-token@3beb63f4bd073e61482598c45c71c1019b59b73a
         with:
-          app_id: ${{ secrets.ISSUE_TRIAGE_APP_ID }} # zizmor: ignore[secrets-outside-env]
-          private_key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }} # zizmor: ignore[secrets-outside-env]
+          app_id: ${{ secrets.ISSUE_TRIAGE_APP_ID }}
+          private_key: ${{ secrets.ISSUE_TRIAGE_APP_PEM }}
 
       # The 90 day stale policy for issues
       # Used for:
@@ -67,7 +57,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 +87,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

@@ -9,11 +9,8 @@ on:
     paths:
       - "**strings.json"
 
-permissions: {}
-
-concurrency:
-  group: ${{ github.workflow }}
-  cancel-in-progress: true
+env:
+  DEFAULT_PYTHON: "3.14.2"
 
 jobs:
   upload:
@@ -26,13 +23,12 @@ 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:
-          LOKALISE_TOKEN: ${{ secrets.LOKALISE_TOKEN }} # zizmor: ignore[secrets-outside-env]
         run: |
+          export LOKALISE_TOKEN="${{ secrets.LOKALISE_TOKEN }}"
           python3 -m script.translations upload

.github/workflows/wheels.yml

@@ -16,7 +16,8 @@ on:
       - "requirements.txt"
       - "script/gen_requirements_all.py"
 
-permissions: {}
+env:
+  DEFAULT_PYTHON: "3.14.2"
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.ref_name}}
@@ -33,11 +34,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
@@ -50,7 +51,7 @@ jobs:
 
       - name: Create requirements_diff file
         run: |
-          if [[ "${GITHUB_EVENT_NAME}" =~ (schedule|workflow_dispatch) ]]; then
+          if [[ ${{ github.event_name }} =~ (schedule|workflow_dispatch) ]]; then
             touch requirements_diff.txt
           else
             curl -s -o requirements_diff.txt https://raw.githubusercontent.com/home-assistant/core/master/requirements.txt
@@ -74,7 +75,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 +83,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 +95,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 +108,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
         arch: ["amd64", "aarch64"]
         include:
           - arch: amd64
@@ -121,12 +122,12 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
@@ -142,7 +143,7 @@ jobs:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }} # zizmor: ignore[secrets-outside-env]
+          wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "libffi-dev;openssl-dev;yaml-dev;nasm;zlib-ng-dev"
           skip-binary: aiohttp;multidict;propcache;yarl;SQLAlchemy
@@ -158,7 +159,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
         arch: ["amd64", "aarch64"]
         include:
           - arch: amd64
@@ -172,17 +173,17 @@ jobs:
           persist-credentials: false
 
       - name: Download env_file
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: env_file
 
       - name: Download requirements_diff
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_diff
 
       - name: Download requirements_all_wheels
-        uses: actions/download-artifact@3e5f45b2cfb9172054b4087a40e8e0b5a5461e7c # v8.0.1
+        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
         with:
           name: requirements_all_wheels
 
@@ -200,10 +201,10 @@ jobs:
           abi: ${{ matrix.abi }}
           tag: musllinux_1_2
           arch: ${{ matrix.arch }}
-          wheels-key: ${{ secrets.WHEELS_KEY }} # zizmor: ignore[secrets-outside-env]
+          wheels-key: ${{ secrets.WHEELS_KEY }}
           env-file: true
           apk: "bluez-dev;libffi-dev;openssl-dev;glib-dev;eudev-dev;libxml2-dev;libxslt-dev;libpng-dev;libjpeg-turbo-dev;tiff-dev;gmp-dev;mpfr-dev;mpc1-dev;ffmpeg-dev;yaml-dev;openblas-dev;fftw-dev;lapack-dev;gfortran;blas-dev;eigen-dev;freetype-dev;glew-dev;harfbuzz-dev;hdf5-dev;libdc1394-dev;libtbb-dev;mesa-dev;openexr-dev;openjpeg-dev;uchardet-dev;nasm;zlib-ng-dev"
           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"

.pre-commit-config.yaml

@@ -17,12 +17,6 @@ repos:
           - --quiet-level=2
         exclude_types: [csv, json, html]
         exclude: ^tests/fixtures/|homeassistant/generated/|tests/components/.*/snapshots/
-  - repo: https://github.com/zizmorcore/zizmor-pre-commit
-    rev: v1.23.1
-    hooks:
-      - id: zizmor
-        args:
-          - --pedantic
   - repo: https://github.com/pre-commit/pre-commit-hooks
     rev: v6.0.0
     hooks:

.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.*
@@ -123,6 +122,7 @@ homeassistant.components.blueprint.*
 homeassistant.components.bluesound.*
 homeassistant.components.bluetooth.*
 homeassistant.components.bluetooth_adapters.*
+homeassistant.components.bmw_connected_drive.*
 homeassistant.components.bond.*
 homeassistant.components.bosch_alarm.*
 homeassistant.components.braviatv.*
@@ -130,14 +130,12 @@ 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.*
 homeassistant.components.cambridge_audio.*
 homeassistant.components.camera.*
 homeassistant.components.canary.*
-homeassistant.components.casper_glow.*
 homeassistant.components.cert_expiry.*
 homeassistant.components.clickatell.*
 homeassistant.components.clicksend.*
@@ -211,9 +209,7 @@ 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.freshr.*
 homeassistant.components.fritz.*
 homeassistant.components.fritzbox.*
 homeassistant.components.fritzbox_callmonitor.*
@@ -273,15 +269,12 @@ homeassistant.components.homekit_controller.storage
 homeassistant.components.homekit_controller.utils
 homeassistant.components.homewizard.*
 homeassistant.components.homeworks.*
-homeassistant.components.hr_energy_qube.*
 homeassistant.components.http.*
 homeassistant.components.huawei_lte.*
 homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
-homeassistant.components.huum.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
-homeassistant.components.hypontech.*
 homeassistant.components.ibeacon.*
 homeassistant.components.idasen_desk.*
 homeassistant.components.image.*
@@ -292,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.*
@@ -305,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.*
@@ -316,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.*
@@ -328,7 +318,6 @@ homeassistant.components.ld2410_ble.*
 homeassistant.components.led_ble.*
 homeassistant.components.lektrico.*
 homeassistant.components.letpot.*
-homeassistant.components.lg_infrared.*
 homeassistant.components.libre_hardware_monitor.*
 homeassistant.components.lidarr.*
 homeassistant.components.lifx.*
@@ -346,7 +335,6 @@ homeassistant.components.lookin.*
 homeassistant.components.lovelace.*
 homeassistant.components.luftdaten.*
 homeassistant.components.lunatone.*
-homeassistant.components.lutron.*
 homeassistant.components.madvr.*
 homeassistant.components.manual.*
 homeassistant.components.mastodon.*
@@ -378,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.*
@@ -414,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.*
@@ -431,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.*
@@ -450,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.*
@@ -487,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.*
@@ -514,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.*
@@ -539,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.*
@@ -550,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.*
@@ -574,25 +553,21 @@ homeassistant.components.trafikverket_train.*
 homeassistant.components.trafikverket_weatherstation.*
 homeassistant.components.transmission.*
 homeassistant.components.trend.*
-homeassistant.components.trmnl.*
 homeassistant.components.tts.*
 homeassistant.components.twentemilieu.*
 homeassistant.components.unifi.*
-homeassistant.components.unifi_access.*
 homeassistant.components.unifiprotect.*
 homeassistant.components.upcloud.*
 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.*
@@ -605,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.*
@@ -622,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,22 +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`
 
-## Testing
+### 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
+  ```
 
-When writing or modifying tests, ensure all test function parameters have type annotations.
-Prefer concrete types (for example, `HomeAssistant`, `MockConfigEntry`, etc.) over `Any`.
+### Translations
+- **Update translations after strings.json changes**:
+  ```bash
+  python -m script.translations develop --all
+  ```
 
-## Good practices
+### Project Validation
+- **Run hassfest** (checks project structure and updates generated files):
+  ```bash
+  python -m script.hassfest
+  ```
 
-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.
+## 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

@@ -186,8 +186,6 @@ build.json @home-assistant/supervisor
 /tests/components/auth/ @home-assistant/core
 /homeassistant/components/automation/ @home-assistant/core
 /tests/components/automation/ @home-assistant/core
-/homeassistant/components/autoskope/ @mcisk
-/tests/components/autoskope/ @mcisk
 /homeassistant/components/avea/ @pattyland
 /homeassistant/components/awair/ @ahayworth @ricohageman
 /tests/components/awair/ @ahayworth @ricohageman
@@ -214,16 +212,14 @@ build.json @home-assistant/supervisor
 /tests/components/balboa/ @garbled1 @natekspencer
 /homeassistant/components/bang_olufsen/ @mj23000
 /tests/components/bang_olufsen/ @mj23000
-/homeassistant/components/battery/ @home-assistant/core
-/tests/components/battery/ @home-assistant/core
 /homeassistant/components/bayesian/ @HarvsG
 /tests/components/bayesian/ @HarvsG
 /homeassistant/components/beewi_smartclim/ @alemuro
 /homeassistant/components/binary_sensor/ @home-assistant/core
 /tests/components/binary_sensor/ @home-assistant/core
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
-/homeassistant/components/blebox/ @bbx-a @swistakm @bkobus-bbx
-/tests/components/blebox/ @bbx-a @swistakm @bkobus-bbx
+/homeassistant/components/blebox/ @bbx-a @swistakm
+/tests/components/blebox/ @bbx-a @swistakm
 /homeassistant/components/blink/ @fronzbot
 /tests/components/blink/ @fronzbot
 /homeassistant/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
@@ -238,14 +234,14 @@ build.json @home-assistant/supervisor
 /tests/components/bluetooth/ @bdraco
 /homeassistant/components/bluetooth_adapters/ @bdraco
 /tests/components/bluetooth_adapters/ @bdraco
+/homeassistant/components/bmw_connected_drive/ @gerard33 @rikroe
+/tests/components/bmw_connected_drive/ @gerard33 @rikroe
 /homeassistant/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
 /tests/components/bond/ @bdraco @prystupa @joshs85 @marciogranzotto
 /homeassistant/components/bosch_alarm/ @mag1024 @sanjay900
 /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
@@ -275,8 +271,6 @@ build.json @home-assistant/supervisor
 /tests/components/cambridge_audio/ @noahhusby
 /homeassistant/components/camera/ @home-assistant/core
 /tests/components/camera/ @home-assistant/core
-/homeassistant/components/casper_glow/ @mikeodr
-/tests/components/casper_glow/ @mikeodr
 /homeassistant/components/cast/ @emontnemery
 /tests/components/cast/ @emontnemery
 /homeassistant/components/ccm15/ @ocalvo
@@ -285,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
@@ -389,8 +381,6 @@ build.json @home-assistant/supervisor
 /tests/components/dlna_dms/ @chishm
 /homeassistant/components/dnsip/ @gjohansson-ST
 /tests/components/dnsip/ @gjohansson-ST
-/homeassistant/components/door/ @home-assistant/core
-/tests/components/door/ @home-assistant/core
 /homeassistant/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /tests/components/doorbird/ @oblogic7 @bdraco @flacjacket
 /homeassistant/components/dormakaba_dkey/ @emontnemery
@@ -409,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,14 +549,14 @@ build.json @home-assistant/supervisor
 /tests/components/freebox/ @hacf-fr @Quentame
 /homeassistant/components/freedompro/ @stefano055415
 /tests/components/freedompro/ @stefano055415
-/homeassistant/components/freshr/ @SierraNL
-/tests/components/freshr/ @SierraNL
 /homeassistant/components/fressnapf_tracker/ @eifinger
 /tests/components/fressnapf_tracker/ @eifinger
 /homeassistant/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /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
@@ -577,14 +569,10 @@ build.json @home-assistant/supervisor
 /tests/components/fully_kiosk/ @cgarwood
 /homeassistant/components/fyta/ @dontinelli
 /tests/components/fyta/ @dontinelli
-/homeassistant/components/garage_door/ @home-assistant/core
-/tests/components/garage_door/ @home-assistant/core
 /homeassistant/components/garages_amsterdam/ @klaasnicolaas
 /tests/components/garages_amsterdam/ @klaasnicolaas
 /homeassistant/components/gardena_bluetooth/ @elupus
 /tests/components/gardena_bluetooth/ @elupus
-/homeassistant/components/gate/ @home-assistant/core
-/tests/components/gate/ @home-assistant/core
 /homeassistant/components/gdacs/ @exxamalte
 /tests/components/gdacs/ @exxamalte
 /homeassistant/components/generic/ @davet2001
@@ -731,16 +719,14 @@ 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
 /tests/components/honeywell/ @rdfurman @mkmer
-/homeassistant/components/hr_energy_qube/ @MattieGit
-/tests/components/hr_energy_qube/ @MattieGit
-/homeassistant/components/html5/ @alexyao2015 @tr4nt0r
-/tests/components/html5/ @alexyao2015 @tr4nt0r
+/homeassistant/components/html5/ @alexyao2015
+/tests/components/html5/ @alexyao2015
 /homeassistant/components/http/ @home-assistant/core
 /tests/components/http/ @home-assistant/core
 /homeassistant/components/huawei_lte/ @scop @fphammerle
@@ -753,8 +739,6 @@ build.json @home-assistant/supervisor
 /tests/components/huisbaasje/ @dennisschroer
 /homeassistant/components/humidifier/ @home-assistant/core @Shulyaka
 /tests/components/humidifier/ @home-assistant/core @Shulyaka
-/homeassistant/components/humidity/ @home-assistant/core
-/tests/components/humidity/ @home-assistant/core
 /homeassistant/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /tests/components/hunterdouglas_powerview/ @bdraco @kingy444 @trullock
 /homeassistant/components/husqvarna_automower/ @Thomas55555
@@ -769,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
@@ -786,8 +768,6 @@ build.json @home-assistant/supervisor
 /tests/components/igloohome/ @keithle888
 /homeassistant/components/ign_sismologia/ @exxamalte
 /tests/components/ign_sismologia/ @exxamalte
-/homeassistant/components/illuminance/ @home-assistant/core
-/tests/components/illuminance/ @home-assistant/core
 /homeassistant/components/image/ @home-assistant/core
 /tests/components/image/ @home-assistant/core
 /homeassistant/components/image_processing/ @home-assistant/core
@@ -806,14 +786,10 @@ build.json @home-assistant/supervisor
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
 /tests/components/incomfort/ @jbouwh
-/homeassistant/components/indevolt/ @xirt
-/tests/components/indevolt/ @xirt
 /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
@@ -947,16 +923,12 @@ build.json @home-assistant/supervisor
 /tests/components/lektrico/ @lektrico
 /homeassistant/components/letpot/ @jpelgrom
 /tests/components/letpot/ @jpelgrom
-/homeassistant/components/lg_infrared/ @home-assistant/core
-/tests/components/lg_infrared/ @home-assistant/core
 /homeassistant/components/lg_netcast/ @Drafteed @splinter98
 /tests/components/lg_netcast/ @Drafteed @splinter98
 /homeassistant/components/lg_thinq/ @LG-ThinQ-Integration
 /tests/components/lg_thinq/ @LG-ThinQ-Integration
 /homeassistant/components/libre_hardware_monitor/ @Sab44
 /tests/components/libre_hardware_monitor/ @Sab44
-/homeassistant/components/lichess/ @aryanhasgithub
-/tests/components/lichess/ @aryanhasgithub
 /homeassistant/components/lidarr/ @tkdrob
 /tests/components/lidarr/ @tkdrob
 /homeassistant/components/liebherr/ @mettolen
@@ -986,8 +958,6 @@ build.json @home-assistant/supervisor
 /tests/components/logbook/ @home-assistant/core
 /homeassistant/components/logger/ @home-assistant/core
 /tests/components/logger/ @home-assistant/core
-/homeassistant/components/lojack/ @devinslick
-/tests/components/lojack/ @devinslick
 /homeassistant/components/london_underground/ @jpbede
 /tests/components/london_underground/ @jpbede
 /homeassistant/components/lookin/ @ANMalko @bdraco
@@ -1077,8 +1047,6 @@ build.json @home-assistant/supervisor
 /tests/components/modern_forms/ @wonderslug
 /homeassistant/components/moehlenhoff_alpha2/ @j-a-n
 /tests/components/moehlenhoff_alpha2/ @j-a-n
-/homeassistant/components/moisture/ @home-assistant/core
-/tests/components/moisture/ @home-assistant/core
 /homeassistant/components/monarch_money/ @jeeftor
 /tests/components/monarch_money/ @jeeftor
 /homeassistant/components/monoprice/ @etsinko @OnFreund
@@ -1089,8 +1057,6 @@ build.json @home-assistant/supervisor
 /tests/components/moon/ @fabaff @frenck
 /homeassistant/components/mopeka/ @bdraco
 /tests/components/mopeka/ @bdraco
-/homeassistant/components/motion/ @home-assistant/core
-/tests/components/motion/ @home-assistant/core
 /homeassistant/components/motion_blinds/ @starkillerOG
 /tests/components/motion_blinds/ @starkillerOG
 /homeassistant/components/motionblinds_ble/ @LennP @jerrybboy
@@ -1102,8 +1068,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/mqtt/ @emontnemery @jbouwh @bdraco
 /tests/components/mqtt/ @emontnemery @jbouwh @bdraco
 /homeassistant/components/msteams/ @peroyvind
-/homeassistant/components/mta/ @OnFreund
-/tests/components/mta/ @OnFreund
 /homeassistant/components/mullvad/ @meichthys
 /tests/components/mullvad/ @meichthys
 /homeassistant/components/music_assistant/ @music-assistant @arturpragacz
@@ -1112,8 +1076,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
@@ -1130,8 +1092,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
@@ -1204,8 +1166,6 @@ build.json @home-assistant/supervisor
 /tests/components/nzbget/ @chriscla
 /homeassistant/components/obihai/ @dshokouhi @ejpenney
 /tests/components/obihai/ @dshokouhi @ejpenney
-/homeassistant/components/occupancy/ @home-assistant/core
-/tests/components/occupancy/ @home-assistant/core
 /homeassistant/components/octoprint/ @rfleming71
 /tests/components/octoprint/ @rfleming71
 /homeassistant/components/ohmconnect/ @robbiet480
@@ -1226,14 +1186,12 @@ build.json @home-assistant/supervisor
 /tests/components/onewire/ @garbled1 @epenet
 /homeassistant/components/onkyo/ @arturpragacz @eclair4151
 /tests/components/onkyo/ @arturpragacz @eclair4151
-/homeassistant/components/onvif/ @jterrace
-/tests/components/onvif/ @jterrace
+/homeassistant/components/onvif/ @hunterjm @jterrace
+/tests/components/onvif/ @hunterjm @jterrace
 /homeassistant/components/open_meteo/ @frenck
 /tests/components/open_meteo/ @frenck
-/homeassistant/components/open_router/ @joostlek @ab3lson
-/tests/components/open_router/ @joostlek @ab3lson
-/homeassistant/components/opendisplay/ @g4bri3lDev
-/tests/components/opendisplay/ @g4bri3lDev
+/homeassistant/components/open_router/ @joostlek
+/tests/components/open_router/ @joostlek
 /homeassistant/components/openerz/ @misialq
 /tests/components/openerz/ @misialq
 /homeassistant/components/openevse/ @c00w @firstof9
@@ -1317,12 +1275,8 @@ build.json @home-assistant/supervisor
 /tests/components/poolsense/ @haemishkyd
 /homeassistant/components/portainer/ @erwindouna
 /tests/components/portainer/ @erwindouna
-/homeassistant/components/power/ @home-assistant/core
-/tests/components/power/ @home-assistant/core
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
-/homeassistant/components/powerfox_local/ @klaasnicolaas
-/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
@@ -1341,8 +1295,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
@@ -1577,8 +1531,8 @@ build.json @home-assistant/supervisor
 /tests/components/sma/ @kellerza @rklomp @erwindouna
 /homeassistant/components/smappee/ @bsmappee
 /tests/components/smappee/ @bsmappee
-/homeassistant/components/smarla/ @explicatis @johannes-exp
-/tests/components/smarla/ @explicatis @johannes-exp
+/homeassistant/components/smarla/ @explicatis @rlint-explicatis
+/tests/components/smarla/ @explicatis @rlint-explicatis
 /homeassistant/components/smart_meter_texas/ @grahamwetzler
 /tests/components/smart_meter_texas/ @grahamwetzler
 /homeassistant/components/smartthings/ @joostlek
@@ -1604,8 +1558,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/solaredge_local/ @drobtravels @scheric
 /homeassistant/components/solarlog/ @Ernst79 @dontinelli
 /tests/components/solarlog/ @Ernst79 @dontinelli
-/homeassistant/components/solarman/ @solarmanpv
-/tests/components/solarman/ @solarmanpv
 /homeassistant/components/solax/ @squishykid @Darsstar
 /tests/components/solax/ @squishykid @Darsstar
 /homeassistant/components/soma/ @ratsept
@@ -1634,6 +1586,8 @@ build.json @home-assistant/supervisor
 /tests/components/srp_energy/ @briglx
 /homeassistant/components/starline/ @anonym-tsk
 /tests/components/starline/ @anonym-tsk
+/homeassistant/components/starlink/ @boswelja
+/tests/components/starlink/ @boswelja
 /homeassistant/components/statistics/ @ThomDietrich @gjohansson-ST
 /tests/components/statistics/ @ThomDietrich @gjohansson-ST
 /homeassistant/components/steam_online/ @tkdrob
@@ -1686,8 +1640,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
@@ -1713,10 +1665,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/temperature/ @home-assistant/core
-/tests/components/temperature/ @home-assistant/core
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1729,6 +1677,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
@@ -1762,8 +1711,6 @@ build.json @home-assistant/supervisor
 /tests/components/tomorrowio/ @raman325 @lymanepp
 /homeassistant/components/totalconnect/ @austinmroczek
 /tests/components/totalconnect/ @austinmroczek
-/homeassistant/components/touchline/ @mnordseth
-/tests/components/touchline/ @mnordseth
 /homeassistant/components/touchline_sl/ @jnsgruk
 /tests/components/touchline_sl/ @jnsgruk
 /homeassistant/components/tplink/ @rytilahti @bdraco @sdb9696
@@ -1784,16 +1731,12 @@ 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
 /tests/components/trend/ @jpbede
 /homeassistant/components/triggercmd/ @rvmey
 /tests/components/triggercmd/ @rvmey
-/homeassistant/components/trmnl/ @joostlek
-/tests/components/trmnl/ @joostlek
 /homeassistant/components/tts/ @home-assistant/core
 /tests/components/tts/ @home-assistant/core
 /homeassistant/components/tuya/ @Tuya @zlinoliver
@@ -1810,8 +1753,6 @@ build.json @home-assistant/supervisor
 /tests/components/ukraine_alarm/ @PaulAnnekov
 /homeassistant/components/unifi/ @Kane610
 /tests/components/unifi/ @Kane610
-/homeassistant/components/unifi_access/ @imhotep @RaHehl
-/tests/components/unifi_access/ @imhotep @RaHehl
 /homeassistant/components/unifi_direct/ @tofuSCHNITZEL
 /homeassistant/components/unifiled/ @florisvdk
 /homeassistant/components/unifiprotect/ @RaHehl
@@ -1851,8 +1792,8 @@ build.json @home-assistant/supervisor
 /tests/components/vegehub/ @thulrus
 /homeassistant/components/velbus/ @Cereal2nd @brefra
 /tests/components/velbus/ @Cereal2nd @brefra
-/homeassistant/components/velux/ @Julius2342 @pawlizio @wollew
-/tests/components/velux/ @Julius2342 @pawlizio @wollew
+/homeassistant/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
+/tests/components/velux/ @Julius2342 @DeerMaximum @pawlizio @wollew
 /homeassistant/components/venstar/ @garbled1 @jhollowe
 /tests/components/venstar/ @garbled1 @jhollowe
 /homeassistant/components/versasense/ @imstevenxyz
@@ -1925,8 +1866,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
@@ -1935,19 +1876,15 @@ build.json @home-assistant/supervisor
 /tests/components/whois/ @frenck
 /homeassistant/components/wiffi/ @mampfes
 /tests/components/wiffi/ @mampfes
-/homeassistant/components/wiim/ @Linkplay2020
-/tests/components/wiim/ @Linkplay2020
 /homeassistant/components/wilight/ @leofig-rj
 /tests/components/wilight/ @leofig-rj
-/homeassistant/components/window/ @home-assistant/core
-/tests/components/window/ @home-assistant/core
 /homeassistant/components/wirelesstag/ @sergeymaysak
 /homeassistant/components/withings/ @joostlek
 /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
@@ -2008,14 +1945,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

@@ -10,6 +10,7 @@ LABEL \
     org.opencontainers.image.description="Open-source home automation platform running on Python 3" \
     org.opencontainers.image.documentation="https://www.home-assistant.io/docs/" \
     org.opencontainers.image.licenses="Apache-2.0" \
+    org.opencontainers.image.source="https://github.com/home-assistant/core" \
     org.opencontainers.image.title="Home Assistant" \
     org.opencontainers.image.url="https://www.home-assistant.io/"
 
@@ -29,7 +30,7 @@ RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.11.1
+    && pip3 install uv==0.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,31 +235,9 @@ DEFAULT_INTEGRATIONS = {
     "input_text",
     "schedule",
     "timer",
-    #
-    # Base platforms:
-    # Note: Calendar and todo are not included to prevent them from registering
-    # their frontend panels when there are no calendar or todo integrations.
-    *(BASE_PLATFORMS - {"calendar", "todo"}),
-    #
-    # Integrations providing triggers and conditions for base platforms:
-    "air_quality",
-    "battery",
-    "door",
-    "garage_door",
-    "gate",
-    "humidity",
-    "illuminance",
-    "moisture",
-    "motion",
-    "occupancy",
-    "power",
-    "temperature",
-    "window",
 }
 DEFAULT_INTEGRATIONS_RECOVERY_MODE = {
     # These integrations are set up if recovery mode is activated.
-    "backup",
-    "cloud",
     "frontend",
 }
 DEFAULT_INTEGRATIONS_SUPERVISOR = {
@@ -455,57 +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
-    device_registry.async_setup(hass)
-    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(
@@ -522,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/bega.json

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

homeassistant/brands/lg.json

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

homeassistant/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/ubiquiti.json

@@ -1,12 +1,5 @@
 {
   "domain": "ubiquiti",
   "name": "Ubiquiti",
-  "integrations": [
-    "airos",
-    "unifi",
-    "unifi_access",
-    "unifi_direct",
-    "unifiled",
-    "unifiprotect"
-  ]
+  "integrations": ["airos", "unifi", "unifi_direct", "unifiled", "unifiprotect"]
 }

homeassistant/brands/ubisys.json

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

homeassistant/components/abode/manifest.json

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

homeassistant/components/abode/sensor.py

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

homeassistant/components/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/actiontec/__init__.py

@@ -1 +1 @@
-"""The Actiontec integration."""
+"""The actiontec component."""

homeassistant/components/actron_air/config_flow.py

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

homeassistant/components/actron_air/manifest.json

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

homeassistant/components/actron_air/quality_scale.yaml

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

homeassistant/components/adax/climate.py

@@ -168,57 +168,29 @@ class LocalAdaxDevice(CoordinatorEntity[AdaxLocalCoordinator], ClimateEntity):
         if hvac_mode == HVACMode.HEAT:
             temperature = self._attr_target_temperature or self._attr_min_temp
             await self._adax_data_handler.set_target_temperature(temperature)
-            self._attr_target_temperature = temperature
-            self._attr_icon = "mdi:radiator"
         elif hvac_mode == HVACMode.OFF:
             await self._adax_data_handler.set_target_temperature(0)
-            self._attr_icon = "mdi:radiator-off"
-        else:
-            # Ignore unsupported HVAC modes to avoid desynchronizing entity state
-            # from the physical device.
-            return
-
-        self._attr_hvac_mode = hvac_mode
-        self.async_write_ha_state()
 
     async def async_set_temperature(self, **kwargs: Any) -> None:
         """Set new target temperature."""
         if (temperature := kwargs.get(ATTR_TEMPERATURE)) is None:
             return
-        if self._attr_hvac_mode == HVACMode.HEAT:
-            await self._adax_data_handler.set_target_temperature(temperature)
+        await self._adax_data_handler.set_target_temperature(temperature)
 
-        self._attr_target_temperature = temperature
-        self.async_write_ha_state()
-
-    def _update_hvac_attributes(self) -> None:
-        """Update hvac mode and temperatures from coordinator data.
-
-        The coordinator reports a target temperature of 0 when the heater is
-        turned off. In that case, only the hvac mode and icon are updated and
-        the previous non-zero target temperature is preserved. When the
-        reported target temperature is non-zero, the stored target temperature
-        is updated to match the coordinator value.
-        """
+    @callback
+    def _handle_coordinator_update(self) -> None:
+        """Handle updated data from the coordinator."""
         if data := self.coordinator.data:
             self._attr_current_temperature = data["current_temperature"]
+            self._attr_available = self._attr_current_temperature is not None
             if (target_temp := data["target_temperature"]) == 0:
                 self._attr_hvac_mode = HVACMode.OFF
                 self._attr_icon = "mdi:radiator-off"
-                if self._attr_target_temperature is None:
+                if target_temp == 0:
                     self._attr_target_temperature = self._attr_min_temp
             else:
                 self._attr_hvac_mode = HVACMode.HEAT
                 self._attr_icon = "mdi:radiator"
                 self._attr_target_temperature = target_temp
 
-    @callback
-    def _handle_coordinator_update(self) -> None:
-        """Handle updated data from the coordinator."""
-        self._update_hvac_attributes()
         super()._handle_coordinator_update()
-
-    async def async_added_to_hass(self) -> None:
-        """When entity is added to hass."""
-        await super().async_added_to_hass()
-        self._update_hvac_attributes()

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,99 +0,0 @@
-rules:
-  # Bronze
-  action-setup: done
-  appropriate-polling: done
-  brands: done
-  common-modules: done
-  config-flow-test-coverage:
-    status: todo
-    comment: |
-      Add mock_setup_entry common fixture.
-      Test unique_id of the entry in happy flow.
-      Split duplicate entry test from happy flow, use mock_config_entry.
-      Error flow should end in CREATE_ENTRY to test recovery.
-      Add data_description for ip_address (and port) to strings.json - tests fail with:
-      "Translation not found for advantage_air: config.step.user.data_description.ip_address"
-  config-flow:
-    status: todo
-    comment: Data descriptions missing
-  dependency-transparency: done
-  docs-actions: done
-  docs-high-level-description: done
-  docs-installation-instructions: todo
-  docs-removal-instructions: todo
-  entity-event-setup:
-    status: exempt
-    comment: Entities do not explicitly subscribe to events.
-  entity-unique-id: done
-  has-entity-name: done
-  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
-  unique-config-entry: done
-
-  # Silver
-  action-exceptions: done
-  config-entry-unloading: done
-  docs-configuration-parameters:
-    status: exempt
-    comment: No options to be set.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: todo
-    comment: MyZone temp entity should be unavailable when MyZone is disabled rather than returning None.
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates: todo
-  reauthentication-flow:
-    status: exempt
-    comment: Integration connects to local device without authentication.
-  test-coverage:
-    status: todo
-    comment: |
-      Patch the library instead of mocking at integration level.
-      Split binary sensor tests into multiple tests (enable entities etc).
-      Split tests into Creation (right entities with right values), Actions (right library calls), and Other behaviors.
-
-  # Gold
-  devices:
-    status: todo
-    comment: Consider making every zone its own device for better naming and room assignment. Breaking change to split cover entities to separate devices.
-  diagnostics: done
-  discovery-update-info:
-    status: exempt
-    comment: Device is a generic Android device (android-xxxxxxxx) indistinguishable from other Android devices, not discoverable.
-  discovery:
-    status: exempt
-    comment: Check mDNS, DHCP, SSDP confirmed not feasible. Device is a generic Android device (android-xxxxxxxx) indistinguishable from other Android devices.
-  docs-data-update: todo
-  docs-examples: todo
-  docs-known-limitations: todo
-  docs-supported-devices: todo
-  docs-supported-functions: done
-  docs-troubleshooting: todo
-  docs-use-cases: todo
-  dynamic-devices:
-    status: exempt
-    comment: AC zones are static per unit and configured on the device itself.
-  entity-category: done
-  entity-device-class:
-    status: todo
-    comment: Consider using UPDATE device class for app update binary sensor instead of custom.
-  entity-disabled-by-default: done
-  entity-translations: todo
-  exception-translations:
-    status: todo
-    comment: HomeAssistantError in entity.py and ServiceValidationError in climate.py
-  icon-translations: todo
-  reconfiguration-flow: todo
-  repair-issues:
-    status: exempt
-    comment: Integration does not raise repair issues.
-  stale-devices:
-    status: exempt
-    comment: Zones are part of the AC unit, not separate removable devices.
-
-  # Platinum
-  async-dependency: done
-  inject-websession: done
-  strict-typing: todo

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/air_quality/condition.py

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

homeassistant/components/air_quality/conditions.yaml

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

homeassistant/components/air_quality/icons.json

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

homeassistant/components/air_quality/strings.json

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

homeassistant/components/air_quality/trigger.py

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

homeassistant/components/air_quality/triggers.yaml

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

homeassistant/components/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:
@@ -87,7 +80,7 @@ class AirQConfigFlow(ConfigFlow, domain=DOMAIN):
             _LOGGER.debug("Successfully connected to %s", user_input[CONF_IP_ADDRESS])
 
             device_info = await airq.fetch_device_info()
-            await self.async_set_unique_id(device_info["id"], raise_on_progress=False)
+            await self.async_set_unique_id(device_info["id"])
             self._abort_if_unique_id_configured()
 
             _LOGGER.debug("Creating an entry for %s", device_info["name"])
@@ -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/diagnostics.py

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

homeassistant/components/airq/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,24 +1,14 @@
 {
   "config": {
     "abort": {
-      "already_configured": "[%key:common::config_flow::abort::already_configured_device%]",
-      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
-      "incomplete_discovery": "The discovered air-Q device did not provide a device ID. Ensure the firmware is up to date."
+      "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/airtouch5/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["airtouch5py"],
-  "requirements": ["airtouch5py==0.4.0"]
+  "requirements": ["airtouch5py==0.3.0"]
 }

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)