Account for empty strings in base entity

Also for entity name
Move default value to schema
2026-02-27 20:41:44 +01:00 · 2026-02-18 13:20:53 +01:00 · 2026-02-18 12:39:59 +01:00 · 2026-02-18 12:35:06 +01:00 · 2026-02-18 12:30:34 +01:00 · 2026-02-16 22:36:30 +01:00
1843 changed files with 11876 additions and 96796 deletions
--- a/.agent/skills
+++ b/.agent/skills
@@ -1 +0,0 @@
-../.claude/skills/
--- a/.core_files.yaml
+++ b/.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/**
--- a/.gemini/skills
+++ b/.gemini/skills
@@ -1 +0,0 @@
-../.claude/skills
--- a/.github/workflows/builder.yml
+++ b/.github/workflows/builder.yml
@@ -272,7 +272,7 @@ jobs:
    name: Build ${{ matrix.machine }} machine core image
    if: github.repository_owner == 'home-assistant'
    needs: ["init", "build_base"]
-    runs-on: ${{ matrix.runs-on }}
+    runs-on: ubuntu-latest
    permissions:
      contents: read # To check out the repository
      packages: write # To push to GHCR
@@ -294,21 +294,6 @@ jobs:
          - raspberrypi5-64
          - yellow
          - green
-        include:
-          # Default: aarch64 on native ARM runner
-          - arch: aarch64
-            runs-on: ubuntu-24.04-arm
-          # Overrides for amd64 machines
-          - machine: generic-x86-64
-            arch: amd64
-            runs-on: ubuntu-24.04
-          - machine: qemux86-64
-            arch: amd64
-            runs-on: ubuntu-24.04
-          # TODO: remove, intel-nuc is a legacy name for x86-64, renamed in 2021
-          - machine: intel-nuc
-            arch: amd64
-            runs-on: ubuntu-24.04
    steps:
      - name: Checkout the repository
        uses: actions/checkout@de0fac2e4500dabe0009e67214ff5f5447ce83dd # v6.0.2
@@ -336,9 +321,8 @@ jobs:
          password: ${{ secrets.GITHUB_TOKEN }}

      - name: Build base image
-        uses: home-assistant/builder@6cb4fd3d1338b6e22d0958a4bcb53e0965ea63b4 # 2026.02.1
+        uses: home-assistant/builder@21bc64d76dad7a5184c67826aab41c6b6f89023a # 2025.11.0
        with:
-          image: ${{ matrix.arch }}
          args: |
            $BUILD_ARGS \
            --target /data/machine \
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -37,10 +37,10 @@ on:
        type: boolean

 env:
-  CACHE_VERSION: 3
+  CACHE_VERSION: 2
  UV_CACHE_VERSION: 1
  MYPY_CACHE_VERSION: 1
-  HA_SHORT_VERSION: "2026.4"
+  HA_SHORT_VERSION: "2026.3"
  DEFAULT_PYTHON: "3.14.2"
  ALL_PYTHON_VERSIONS: "['3.14.2']"
  # 10.3 is the oldest supported version
--- a/.github/workflows/stale.yml
+++ b/.github/workflows/stale.yml
@@ -27,7 +27,7 @@ jobs:
      # - No PRs marked as no-stale
      # - No issues (-1)
      - name: 60 days stale PRs policy
-        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
        with:
          repo-token: ${{ secrets.GITHUB_TOKEN }}
          days-before-stale: 60
@@ -67,7 +67,7 @@ jobs:
      # - No issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: 90 days stale issues
-        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
        with:
          repo-token: ${{ steps.token.outputs.token }}
          days-before-stale: 90
@@ -97,7 +97,7 @@ jobs:
      # - No Issues marked as no-stale or help-wanted
      # - No PRs (-1)
      - name: Needs more information stale issues policy
-        uses: actions/stale@b5d41d4e1d5dceea10e7104786b73624c18a190f # v10.2.0
+        uses: actions/stale@997185467fa4f803885201cee163a9f38240193d # v10.1.1
        with:
          repo-token: ${{ steps.token.outputs.token }}
          only-labels: "needs-more-information"
--- a/.github/workflows/wheels.yml
+++ b/.github/workflows/wheels.yml
@@ -110,7 +110,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
        arch: ["amd64", "aarch64"]
        include:
          - arch: amd64
@@ -161,7 +161,7 @@ jobs:
    strategy:
      fail-fast: false
      matrix:
-        abi: ["cp314"]
+        abi: ["cp313", "cp314"]
        arch: ["amd64", "aarch64"]
        include:
          - arch: amd64
--- a/.strict-typing
+++ b/.strict-typing
@@ -49,7 +49,6 @@ homeassistant.components.actiontec.*
 homeassistant.components.adax.*
 homeassistant.components.adguard.*
 homeassistant.components.aftership.*
-homeassistant.components.ai_task.*
 homeassistant.components.air_quality.*
 homeassistant.components.airgradient.*
 homeassistant.components.airly.*
@@ -131,7 +130,6 @@ homeassistant.components.bring.*
 homeassistant.components.brother.*
 homeassistant.components.browser.*
 homeassistant.components.bryant_evolution.*
-homeassistant.components.bsblan.*
 homeassistant.components.bthome.*
 homeassistant.components.button.*
 homeassistant.components.calendar.*
@@ -211,7 +209,6 @@ homeassistant.components.firefly_iii.*
 homeassistant.components.fitbit.*
 homeassistant.components.flexit_bacnet.*
 homeassistant.components.flux_led.*
-homeassistant.components.folder_watcher.*
 homeassistant.components.forecast_solar.*
 homeassistant.components.fritz.*
 homeassistant.components.fritzbox.*
@@ -278,7 +275,6 @@ homeassistant.components.humidifier.*
 homeassistant.components.husqvarna_automower.*
 homeassistant.components.hydrawise.*
 homeassistant.components.hyperion.*
-homeassistant.components.hypontech.*
 homeassistant.components.ibeacon.*
 homeassistant.components.idasen_desk.*
 homeassistant.components.image.*
@@ -289,7 +285,6 @@ homeassistant.components.imgw_pib.*
 homeassistant.components.immich.*
 homeassistant.components.incomfort.*
 homeassistant.components.inels.*
-homeassistant.components.infrared.*
 homeassistant.components.input_button.*
 homeassistant.components.input_select.*
 homeassistant.components.input_text.*
@@ -302,7 +297,6 @@ homeassistant.components.iotty.*
 homeassistant.components.ipp.*
 homeassistant.components.iqvia.*
 homeassistant.components.iron_os.*
-homeassistant.components.isal.*
 homeassistant.components.islamic_prayer_times.*
 homeassistant.components.isy994.*
 homeassistant.components.jellyfin.*
@@ -313,7 +307,6 @@ homeassistant.components.knocki.*
 homeassistant.components.knx.*
 homeassistant.components.kraken.*
 homeassistant.components.kulersky.*
-homeassistant.components.labs.*
 homeassistant.components.lacrosse.*
 homeassistant.components.lacrosse_view.*
 homeassistant.components.lamarzocco.*
@@ -373,7 +366,6 @@ homeassistant.components.my.*
 homeassistant.components.mysensors.*
 homeassistant.components.myuplink.*
 homeassistant.components.nam.*
-homeassistant.components.namecheapdns.*
 homeassistant.components.nasweb.*
 homeassistant.components.neato.*
 homeassistant.components.nest.*
@@ -409,7 +401,6 @@ homeassistant.components.opnsense.*
 homeassistant.components.opower.*
 homeassistant.components.oralb.*
 homeassistant.components.otbr.*
-homeassistant.components.otp.*
 homeassistant.components.overkiz.*
 homeassistant.components.overseerr.*
 homeassistant.components.p1_monitor.*
@@ -426,7 +417,6 @@ homeassistant.components.plugwise.*
 homeassistant.components.pooldose.*
 homeassistant.components.portainer.*
 homeassistant.components.powerfox.*
-homeassistant.components.powerfox_local.*
 homeassistant.components.powerwall.*
 homeassistant.components.private_ble_device.*
 homeassistant.components.prometheus.*
@@ -445,12 +435,10 @@ homeassistant.components.radarr.*
 homeassistant.components.radio_browser.*
 homeassistant.components.rainforest_raven.*
 homeassistant.components.rainmachine.*
-homeassistant.components.random.*
 homeassistant.components.raspberry_pi.*
 homeassistant.components.rdw.*
 homeassistant.components.recollect_waste.*
 homeassistant.components.recorder.*
-homeassistant.components.recovery_mode.*
 homeassistant.components.redgtech.*
 homeassistant.components.remember_the_milk.*
 homeassistant.components.remote.*
@@ -482,7 +470,6 @@ homeassistant.components.schlage.*
 homeassistant.components.scrape.*
 homeassistant.components.script.*
 homeassistant.components.search.*
-homeassistant.components.season.*
 homeassistant.components.select.*
 homeassistant.components.sensibo.*
 homeassistant.components.sensirion_ble.*
@@ -534,7 +521,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.*
@@ -577,14 +563,12 @@ homeassistant.components.update.*
 homeassistant.components.uptime.*
 homeassistant.components.uptime_kuma.*
 homeassistant.components.uptimerobot.*
-homeassistant.components.usage_prediction.*
 homeassistant.components.usb.*
 homeassistant.components.uvc.*
 homeassistant.components.vacuum.*
 homeassistant.components.vallox.*
 homeassistant.components.valve.*
 homeassistant.components.velbus.*
-homeassistant.components.velux.*
 homeassistant.components.vivotek.*
 homeassistant.components.vlc_telnet.*
 homeassistant.components.vodafone_station.*
@@ -597,7 +581,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.*
@@ -614,7 +597,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.*
--- a/43
+++ b/43
@@ -242,8 +242,6 @@ build.json @home-assistant/supervisor
 /tests/components/bosch_alarm/ @mag1024 @sanjay900
 /homeassistant/components/bosch_shc/ @tschamm
 /tests/components/bosch_shc/ @tschamm
-/homeassistant/components/brands/ @home-assistant/core
-/tests/components/brands/ @home-assistant/core
 /homeassistant/components/braviatv/ @bieniu @Drafteed
 /tests/components/braviatv/ @bieniu @Drafteed
 /homeassistant/components/bring/ @miaucl @tr4nt0r
@@ -405,8 +403,8 @@ build.json @home-assistant/supervisor
 /tests/components/duke_energy/ @hunterjm
 /homeassistant/components/duotecno/ @cereal2nd
 /tests/components/duotecno/ @cereal2nd
-/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192
-/tests/components/dwd_weather_warnings/ @runningman84 @stephan192
+/homeassistant/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
+/tests/components/dwd_weather_warnings/ @runningman84 @stephan192 @andarotajo
 /homeassistant/components/dynalite/ @ziv1234
 /tests/components/dynalite/ @ziv1234
 /homeassistant/components/eafm/ @Jc2k
@@ -557,6 +555,8 @@ build.json @home-assistant/supervisor
 /tests/components/fritz/ @AaronDavidSchneider @chemelli74 @mib1185
 /homeassistant/components/fritzbox/ @mib1185 @flabbamann
 /tests/components/fritzbox/ @mib1185 @flabbamann
+/homeassistant/components/fritzbox_callmonitor/ @cdce8p
+/tests/components/fritzbox_callmonitor/ @cdce8p
 /homeassistant/components/fronius/ @farmio
 /tests/components/fronius/ @farmio
 /homeassistant/components/frontend/ @home-assistant/frontend
@@ -719,8 +719,8 @@ build.json @home-assistant/supervisor
 /tests/components/homematic/ @pvizeli
 /homeassistant/components/homematicip_cloud/ @hahn-th @lackas
 /tests/components/homematicip_cloud/ @hahn-th @lackas
-/homeassistant/components/homevolt/ @danielhiversen @liudger
-/tests/components/homevolt/ @danielhiversen @liudger
+/homeassistant/components/homevolt/ @danielhiversen
+/tests/components/homevolt/ @danielhiversen
 /homeassistant/components/homewizard/ @DCSBL
 /tests/components/homewizard/ @DCSBL
 /homeassistant/components/honeywell/ @rdfurman @mkmer
@@ -753,8 +753,6 @@ build.json @home-assistant/supervisor
 /tests/components/hydrawise/ @dknowles2 @thomaskistler @ptcryan
 /homeassistant/components/hyperion/ @dermotduffy
 /tests/components/hyperion/ @dermotduffy
-/homeassistant/components/hypontech/ @jcisio
-/tests/components/hypontech/ @jcisio
 /homeassistant/components/ialarm/ @RyuzakiKK
 /tests/components/ialarm/ @RyuzakiKK
 /homeassistant/components/iammeter/ @lewei50
@@ -788,14 +786,10 @@ build.json @home-assistant/supervisor
 /tests/components/improv_ble/ @emontnemery
 /homeassistant/components/incomfort/ @jbouwh
 /tests/components/incomfort/ @jbouwh
-/homeassistant/components/indevolt/ @xirtnl
-/tests/components/indevolt/ @xirtnl
 /homeassistant/components/inels/ @epdevlab
 /tests/components/inels/ @epdevlab
-/homeassistant/components/influxdb/ @mdegat01 @Robbie1221
-/tests/components/influxdb/ @mdegat01 @Robbie1221
-/homeassistant/components/infrared/ @home-assistant/core
-/tests/components/infrared/ @home-assistant/core
+/homeassistant/components/influxdb/ @mdegat01
+/tests/components/influxdb/ @mdegat01
 /homeassistant/components/inkbird/ @bdraco
 /tests/components/inkbird/ @bdraco
 /homeassistant/components/input_boolean/ @home-assistant/core
@@ -1084,8 +1078,6 @@ build.json @home-assistant/supervisor
 /tests/components/mutesync/ @currentoor
 /homeassistant/components/my/ @home-assistant/core
 /tests/components/my/ @home-assistant/core
-/homeassistant/components/myneomitis/ @l-pr
-/tests/components/myneomitis/ @l-pr
 /homeassistant/components/mysensors/ @MartinHjelmare @functionpointer
 /tests/components/mysensors/ @MartinHjelmare @functionpointer
 /homeassistant/components/mystrom/ @fabaff
@@ -1102,8 +1094,8 @@ build.json @home-assistant/supervisor
 /tests/components/nasweb/ @nasWebio
 /homeassistant/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
 /tests/components/nederlandse_spoorwegen/ @YarmoM @heindrichpaul
-/homeassistant/components/ness_alarm/ @nickw444 @poshy163
-/tests/components/ness_alarm/ @nickw444 @poshy163
+/homeassistant/components/ness_alarm/ @nickw444
+/tests/components/ness_alarm/ @nickw444
 /homeassistant/components/nest/ @allenporter
 /tests/components/nest/ @allenporter
 /homeassistant/components/netatmo/ @cgtobi
@@ -1287,8 +1279,6 @@ build.json @home-assistant/supervisor
 /tests/components/portainer/ @erwindouna
 /homeassistant/components/powerfox/ @klaasnicolaas
 /tests/components/powerfox/ @klaasnicolaas
-/homeassistant/components/powerfox_local/ @klaasnicolaas
-/tests/components/powerfox_local/ @klaasnicolaas
 /homeassistant/components/powerwall/ @bdraco @jrester @daniel-simpson
 /tests/components/powerwall/ @bdraco @jrester @daniel-simpson
 /homeassistant/components/prana/ @prana-dev-official
@@ -1652,8 +1642,6 @@ build.json @home-assistant/supervisor
 /tests/components/system_bridge/ @timmo001
 /homeassistant/components/systemmonitor/ @gjohansson-ST
 /tests/components/systemmonitor/ @gjohansson-ST
-/homeassistant/components/systemnexa2/ @konsulten @slangstrom
-/tests/components/systemnexa2/ @konsulten @slangstrom
 /homeassistant/components/tado/ @erwindouna
 /tests/components/tado/ @erwindouna
 /homeassistant/components/tag/ @home-assistant/core
@@ -1679,8 +1667,6 @@ build.json @home-assistant/supervisor
 /tests/components/telegram_bot/ @hanwg
 /homeassistant/components/tellduslive/ @fredrike
 /tests/components/tellduslive/ @fredrike
-/homeassistant/components/teltonika/ @karlbeecken
-/tests/components/teltonika/ @karlbeecken
 /homeassistant/components/template/ @Petro31 @home-assistant/core
 /tests/components/template/ @Petro31 @home-assistant/core
 /homeassistant/components/tesla_fleet/ @Bre77
@@ -1747,8 +1733,6 @@ build.json @home-assistant/supervisor
 /tests/components/trafikverket_train/ @gjohansson-ST
 /homeassistant/components/trafikverket_weatherstation/ @gjohansson-ST
 /tests/components/trafikverket_weatherstation/ @gjohansson-ST
-/homeassistant/components/trane/ @bdraco
-/tests/components/trane/ @bdraco
 /homeassistant/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /tests/components/transmission/ @engrbm87 @JPHutchins @andrew-codechimp
 /homeassistant/components/trend/ @jpbede
@@ -1884,8 +1868,8 @@ build.json @home-assistant/supervisor
 /tests/components/webostv/ @thecode
 /homeassistant/components/websocket_api/ @home-assistant/core
 /tests/components/websocket_api/ @home-assistant/core
-/homeassistant/components/weheat/ @barryvdh
-/tests/components/weheat/ @barryvdh
+/homeassistant/components/weheat/ @jesperraemaekers
+/tests/components/weheat/ @jesperraemaekers
 /homeassistant/components/wemo/ @esev
 /tests/components/wemo/ @esev
 /homeassistant/components/whirlpool/ @abmantis @mkmer
@@ -1963,14 +1947,11 @@ build.json @home-assistant/supervisor
 /tests/components/zha/ @dmulcahey @adminiuga @puddly @TheJulianJES
 /homeassistant/components/zimi/ @markhannon
 /tests/components/zimi/ @markhannon
-/homeassistant/components/zinvolt/ @joostlek
-/tests/components/zinvolt/ @joostlek
 /homeassistant/components/zodiac/ @JulienTant
 /tests/components/zodiac/ @JulienTant
 /homeassistant/components/zone/ @home-assistant/core
 /tests/components/zone/ @home-assistant/core
 /homeassistant/components/zoneminder/ @rohankapoorcom @nabbi
-/tests/components/zoneminder/ @rohankapoorcom @nabbi
 /homeassistant/components/zwave_js/ @home-assistant/z-wave
 /tests/components/zwave_js/ @home-assistant/z-wave
 /homeassistant/components/zwave_me/ @lawfulchaos @Z-Wave-Me @PoltoS
--- a/2
+++ b/2
@@ -30,7 +30,7 @@ RUN \
    # Verify go2rtc can be executed
    go2rtc --version \
    # Install uv
-    && pip3 install uv==0.10.6
+    && pip3 install uv==0.9.26

 WORKDIR /usr/src

--- a/codecov.yml
+++ b/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
--- a/homeassistant/backup_restore.py
+++ b/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"),
--- a/homeassistant/bootstrap.py
+++ b/homeassistant/bootstrap.py
@@ -210,7 +210,6 @@ DEFAULT_INTEGRATIONS = {
    "analytics",  # Needed for onboarding
    "application_credentials",
    "backup",
-    "brands",
    "frontend",
    "hardware",
    "labs",
--- a/homeassistant/brands/american_standard.json
+++ b/homeassistant/brands/american_standard.json
@@ -1,5 +0,0 @@
-{
-  "domain": "american_standard",
-  "name": "American Standard",
-  "integrations": ["nexia", "trane"]
-}
--- a/homeassistant/brands/powerfox.json
+++ b/homeassistant/brands/powerfox.json
@@ -1,5 +0,0 @@
-{
-  "domain": "powerfox",
-  "name": "Powerfox",
-  "integrations": ["powerfox", "powerfox_local"]
-}
--- a/homeassistant/brands/trane.json
+++ b/homeassistant/brands/trane.json
@@ -1,5 +0,0 @@
-{
-  "domain": "trane",
-  "name": "Trane",
-  "integrations": ["nexia", "trane"]
-}
--- a/homeassistant/brands/ubisys.json
+++ b/homeassistant/brands/ubisys.json
@@ -1,5 +0,0 @@
-{
-  "domain": "ubisys",
-  "name": "Ubisys",
-  "iot_standards": ["zigbee"]
-}
--- a/homeassistant/components/abode/services.py
+++ b/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,
    )
--- a/homeassistant/components/accuweather/init.py
+++ b/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)

--- a/homeassistant/components/accuweather/manifest.json
+++ b/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"]
 }
--- a/homeassistant/components/accuweather/system_health.py
+++ b/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,
    }
--- a/homeassistant/components/ads/light.py
+++ b/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)
--- a/homeassistant/components/advantage_air/init.py
+++ b/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)

--- a/homeassistant/components/advantage_air/binary_sensor.py
+++ b/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"

--- a/homeassistant/components/advantage_air/climate.py
+++ b/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
--- a/homeassistant/components/advantage_air/coordinator.py
+++ b/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
--- a/homeassistant/components/advantage_air/cover.py
+++ b/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
--- a/homeassistant/components/advantage_air/diagnostics.py
+++ b/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 {
--- a/homeassistant/components/advantage_air/entity.py
+++ b/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

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

--- a/homeassistant/components/advantage_air/services.py
+++ b/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",
--- a/homeassistant/components/advantage_air/strings.json
+++ b/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.",
--- a/homeassistant/components/advantage_air/switch.py
+++ b/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
--- a/homeassistant/components/advantage_air/update.py
+++ b/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",
--- a/homeassistant/components/aemet/weather.py
+++ b/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])
--- a/homeassistant/components/agent_dvr/services.py
+++ b/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",
 }


--- a/homeassistant/components/airly/init.py
+++ b/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)

--- a/homeassistant/components/airos/init.py
+++ b/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
--- a/homeassistant/components/airos/binary_sensor.py
+++ b/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):
--- a/homeassistant/components/airos/button.py
+++ b/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
--- a/homeassistant/components/airos/config_flow.py
+++ b/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")
--- a/homeassistant/components/airos/const.py
+++ b/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"
--- a/homeassistant/components/airos/coordinator.py
+++ b/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,
--- a/homeassistant/components/airos/manifest.json
+++ b/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"]
 }
--- a/homeassistant/components/airos/quality_scale.yaml
+++ b/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
--- a/homeassistant/components/airos/sensor.py
+++ b/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):
--- a/homeassistant/components/airos/strings.json
+++ b/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."
    }
  }
 }
--- a/homeassistant/components/aladdin_connect/init.py
+++ b/homeassistant/components/aladdin_connect/init.py
@@ -2,12 +2,10 @@

 from __future__ import annotations

-import aiohttp
 from genie_partner_sdk.client import AladdinConnectClient

 from homeassistant.const import Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 from homeassistant.helpers import (
    aiohttp_client,
    config_entry_oauth2_flow,
@@ -33,27 +31,11 @@ async def async_setup_entry(

    session = config_entry_oauth2_flow.OAuth2Session(hass, entry, implementation)

-    try:
-        await session.async_ensure_token_valid()
-    except aiohttp.ClientResponseError as err:
-        if 400 <= err.status < 500:
-            raise ConfigEntryAuthFailed(err) from err
-        raise ConfigEntryNotReady from err
-    except aiohttp.ClientError as err:
-        raise ConfigEntryNotReady from err
-
    client = AladdinConnectClient(
        api.AsyncConfigEntryAuth(aiohttp_client.async_get_clientsession(hass), session)
    )

-    try:
-        doors = await client.get_doors()
-    except aiohttp.ClientResponseError as err:
-        if 400 <= err.status < 500:
-            raise ConfigEntryAuthFailed(err) from err
-        raise ConfigEntryNotReady from err
-    except aiohttp.ClientError as err:
-        raise ConfigEntryNotReady from err
+    doors = await client.get_doors()

    entry.runtime_data = {
        door.unique_id: AladdinConnectCoordinator(hass, entry, client, door)
--- a/homeassistant/components/aladdin_connect/api.py
+++ b/homeassistant/components/aladdin_connect/api.py
@@ -11,18 +11,6 @@ API_URL = "https://twdvzuefzh.execute-api.us-east-2.amazonaws.com/v1"
 API_KEY = "k6QaiQmcTm2zfaNns5L1Z8duBtJmhDOW8JawlCC3"


-class AsyncConfigFlowAuth(Auth):
-    """Provide Aladdin Connect Genie authentication for config flow validation."""
-
-    def __init__(self, websession: ClientSession, access_token: str) -> None:
-        """Initialize Aladdin Connect Genie auth."""
-        super().__init__(websession, API_URL, access_token, API_KEY)
-
-    async def async_get_access_token(self) -> str:
-        """Return the access token."""
-        return self.access_token
-
-
 class AsyncConfigEntryAuth(Auth):
    """Provide Aladdin Connect Genie authentication tied to an OAuth2 based config entry."""

--- a/homeassistant/components/aladdin_connect/config_flow.py
+++ b/homeassistant/components/aladdin_connect/config_flow.py
@@ -4,14 +4,12 @@ from collections.abc import Mapping
 import logging
 from typing import Any

-from genie_partner_sdk.client import AladdinConnectClient
 import jwt
 import voluptuous as vol

 from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlowResult
-from homeassistant.helpers import aiohttp_client, config_entry_oauth2_flow
+from homeassistant.helpers import config_entry_oauth2_flow

-from .api import AsyncConfigFlowAuth
 from .const import CONFIG_FLOW_MINOR_VERSION, CONFIG_FLOW_VERSION, DOMAIN


@@ -54,25 +52,11 @@ class OAuth2FlowHandler(

    async def async_oauth_create_entry(self, data: dict) -> ConfigFlowResult:
        """Create an oauth config entry or update existing entry for reauth."""
-        try:
-            token = jwt.decode(
-                data["token"]["access_token"], options={"verify_signature": False}
-            )
-            user_id = token["sub"]
-        except jwt.DecodeError, KeyError:
-            return self.async_abort(reason="oauth_error")
-
-        client = AladdinConnectClient(
-            AsyncConfigFlowAuth(
-                aiohttp_client.async_get_clientsession(self.hass),
-                data["token"]["access_token"],
-            )
+        # Extract the user ID from the JWT token's 'sub' field
+        token = jwt.decode(
+            data["token"]["access_token"], options={"verify_signature": False}
        )
-        try:
-            await client.get_doors()
-        except Exception:  # noqa: BLE001
-            return self.async_abort(reason="cannot_connect")
-
+        user_id = token["sub"]
        await self.async_set_unique_id(user_id)

        if self.source == SOURCE_REAUTH:
--- a/homeassistant/components/aladdin_connect/coordinator.py
+++ b/homeassistant/components/aladdin_connect/coordinator.py
@@ -5,13 +5,12 @@ from __future__ import annotations
 from datetime import timedelta
 import logging

-import aiohttp
 from genie_partner_sdk.client import AladdinConnectClient
 from genie_partner_sdk.model import GarageDoor

 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
+from homeassistant.helpers.update_coordinator import DataUpdateCoordinator

 _LOGGER = logging.getLogger(__name__)
 type AladdinConnectConfigEntry = ConfigEntry[dict[str, AladdinConnectCoordinator]]
@@ -41,10 +40,7 @@ class AladdinConnectCoordinator(DataUpdateCoordinator[GarageDoor]):

    async def _async_update_data(self) -> GarageDoor:
        """Fetch data from the Aladdin Connect API."""
-        try:
-            await self.client.update_door(self.data.device_id, self.data.door_number)
-        except aiohttp.ClientError as err:
-            raise UpdateFailed(f"Error communicating with API: {err}") from err
+        await self.client.update_door(self.data.device_id, self.data.door_number)
        self.data.status = self.client.get_door_status(
            self.data.device_id, self.data.door_number
        )
--- a/homeassistant/components/aladdin_connect/cover.py
+++ b/homeassistant/components/aladdin_connect/cover.py
@@ -4,19 +4,14 @@ from __future__ import annotations

 from typing import Any

-import aiohttp
-
 from homeassistant.components.cover import CoverDeviceClass, CoverEntity
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback

-from .const import DOMAIN, SUPPORTED_FEATURES
+from .const import SUPPORTED_FEATURES
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity

-PARALLEL_UPDATES = 1
-

 async def async_setup_entry(
    hass: HomeAssistant,
@@ -45,23 +40,11 @@ class AladdinCoverEntity(AladdinConnectEntity, CoverEntity):

    async def async_open_cover(self, **kwargs: Any) -> None:
        """Issue open command to cover."""
-        try:
-            await self.client.open_door(self._device_id, self._number)
-        except aiohttp.ClientError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="open_door_failed",
-            ) from err
+        await self.client.open_door(self._device_id, self._number)

    async def async_close_cover(self, **kwargs: Any) -> None:
        """Issue close command to cover."""
-        try:
-            await self.client.close_door(self._device_id, self._number)
-        except aiohttp.ClientError as err:
-            raise HomeAssistantError(
-                translation_domain=DOMAIN,
-                translation_key="close_door_failed",
-            ) from err
+        await self.client.close_door(self._device_id, self._number)

    @property
    def is_closed(self) -> bool | None:
--- a/homeassistant/components/aladdin_connect/diagnostics.py
+++ b/homeassistant/components/aladdin_connect/diagnostics.py
@@ -1,32 +0,0 @@
-"""Diagnostics support for Aladdin Connect."""
-
-from __future__ import annotations
-
-from typing import Any
-
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .coordinator import AladdinConnectConfigEntry
-
-TO_REDACT = {"access_token", "refresh_token"}
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant, config_entry: AladdinConnectConfigEntry
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    return {
-        "config_entry": async_redact_data(config_entry.as_dict(), TO_REDACT),
-        "doors": {
-            uid: {
-                "device_id": coordinator.data.device_id,
-                "door_number": coordinator.data.door_number,
-                "name": coordinator.data.name,
-                "status": coordinator.data.status,
-                "link_status": coordinator.data.link_status,
-                "battery_level": coordinator.data.battery_level,
-            }
-            for uid, coordinator in config_entry.runtime_data.items()
-        },
-    }
--- a/homeassistant/components/aladdin_connect/quality_scale.yaml
+++ b/homeassistant/components/aladdin_connect/quality_scale.yaml
@@ -7,56 +7,74 @@ rules:
  brands: done
  common-modules: done
  config-flow: done
-  config-flow-test-coverage: done
+  config-flow-test-coverage: todo
  dependency-transparency: done
  docs-actions:
    status: exempt
    comment: Integration does not register any service actions.
  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
+  docs-installation-instructions:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-removal-instructions:
+    status: todo
+    comment: Documentation needs to be created.
  entity-event-setup:
    status: exempt
    comment: Integration does not subscribe to external events.
  entity-unique-id: done
  has-entity-name: done
  runtime-data: done
-  test-before-configure: done
-  test-before-setup: done
+  test-before-configure:
+    status: todo
+    comment: Config flow does not currently test connection during setup.
+  test-before-setup: todo
  unique-config-entry: done

  # Silver
-  action-exceptions: done
+  action-exceptions: todo
  config-entry-unloading: done
  docs-configuration-parameters:
-    status: exempt
-    comment: Integration does not have an options flow.
-  docs-installation-parameters: done
-  entity-unavailable:
-    status: done
-    comment: Handled by the coordinator.
+    status: todo
+    comment: Documentation needs to be created.
+  docs-installation-parameters:
+    status: todo
+    comment: Documentation needs to be created.
+  entity-unavailable: todo
  integration-owner: done
-  log-when-unavailable:
-    status: done
-    comment: Handled by the coordinator.
-  parallel-updates: done
+  log-when-unavailable: todo
+  parallel-updates: todo
  reauthentication-flow: done
-  test-coverage: done
+  test-coverage:
+    status: todo
+    comment: Platform tests for cover and sensor need to be implemented to reach 95% coverage.

  # Gold
  devices: done
-  diagnostics: done
-  discovery: done
-  discovery-update-info:
-    status: exempt
-    comment: Integration connects via the cloud and not locally.
-  docs-data-update: done
-  docs-examples: done
-  docs-known-limitations: done
-  docs-supported-devices: done
-  docs-supported-functions: done
-  docs-troubleshooting: done
-  docs-use-cases: done
+  diagnostics: todo
+  discovery: todo
+  discovery-update-info: todo
+  docs-data-update:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-examples:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-known-limitations:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-supported-devices:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-supported-functions:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-troubleshooting:
+    status: todo
+    comment: Documentation needs to be created.
+  docs-use-cases:
+    status: todo
+    comment: Documentation needs to be created.
  dynamic-devices: todo
  entity-category: done
  entity-device-class: done
@@ -68,7 +86,7 @@ rules:
  repair-issues: todo
  stale-devices:
    status: todo
-    comment: We can automatically remove removed devices
+    comment: Stale devices can be done dynamically

  # Platinum
  async-dependency: todo
--- a/homeassistant/components/aladdin_connect/sensor.py
+++ b/homeassistant/components/aladdin_connect/sensor.py
@@ -20,8 +20,6 @@ from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from .coordinator import AladdinConnectConfigEntry, AladdinConnectCoordinator
 from .entity import AladdinConnectEntity

-PARALLEL_UPDATES = 0
-

@dataclass(frozen=True, kw_only=True)
 class AladdinConnectSensorEntityDescription(SensorEntityDescription):
--- a/homeassistant/components/aladdin_connect/strings.json
+++ b/homeassistant/components/aladdin_connect/strings.json
@@ -4,7 +4,6 @@
      "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
      "already_in_progress": "[%key:common::config_flow::abort::already_in_progress%]",
      "authorize_url_timeout": "[%key:common::config_flow::abort::oauth2_authorize_url_timeout%]",
-      "cannot_connect": "[%key:common::config_flow::error::cannot_connect%]",
      "cloud_not_enabled": "Please make sure you run Home Assistant with `{default_config}` enabled in your configuration.yaml.",
      "missing_configuration": "[%key:common::config_flow::abort::oauth2_missing_configuration%]",
      "no_url_available": "[%key:common::config_flow::abort::oauth2_no_url_available%]",
@@ -32,13 +31,5 @@
        "title": "[%key:common::config_flow::title::reauth%]"
      }
    }
-  },
-  "exceptions": {
-    "close_door_failed": {
-      "message": "Failed to close the garage door"
-    },
-    "open_door_failed": {
-      "message": "Failed to open the garage door"
-    }
  }
 }
--- a/homeassistant/components/alarmdecoder/services.py
+++ b/homeassistant/components/alarmdecoder/services.py
@@ -13,6 +13,9 @@ from homeassistant.helpers import config_validation as cv, service

 from .const import DOMAIN

+SERVICE_ALARM_TOGGLE_CHIME = "alarm_toggle_chime"
+
+SERVICE_ALARM_KEYPRESS = "alarm_keypress"
 ATTR_KEYPRESS = "keypress"


@@ -23,7 +26,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "alarm_toggle_chime",
+        SERVICE_ALARM_TOGGLE_CHIME,
        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
        schema={
            vol.Required(ATTR_CODE): cv.string,
@@ -34,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "alarm_keypress",
+        SERVICE_ALARM_KEYPRESS,
        entity_domain=ALARM_CONTROL_PANEL_DOMAIN,
        schema={
            vol.Required(ATTR_KEYPRESS): cv.string,
--- a/homeassistant/components/alert/entity.py
+++ b/homeassistant/components/alert/entity.py
@@ -13,7 +13,7 @@ from homeassistant.components.notify import (
    ATTR_DATA,
    ATTR_MESSAGE,
    ATTR_TITLE,
-    DOMAIN as NOTIFY_DOMAIN,
+    DOMAIN as DOMAIN_NOTIFY,
 )
 from homeassistant.const import STATE_IDLE, STATE_OFF, STATE_ON
 from homeassistant.core import Event, EventStateChangedData, HassJob, HomeAssistant
@@ -185,7 +185,7 @@ class AlertEntity(Entity):
        for target in self._notifiers:
            try:
                await self.hass.services.async_call(
-                    NOTIFY_DOMAIN, target, msg_payload, context=self._context
+                    DOMAIN_NOTIFY, target, msg_payload, context=self._context
                )
            except ServiceNotFound:
                LOGGER.error(
--- a/homeassistant/components/alexa_devices/services.py
+++ b/homeassistant/components/alexa_devices/services.py
@@ -16,6 +16,9 @@ from .coordinator import AmazonConfigEntry
 ATTR_TEXT_COMMAND = "text_command"
 ATTR_SOUND = "sound"
 ATTR_INFO_SKILL = "info_skill"
+SERVICE_TEXT_COMMAND = "send_text_command"
+SERVICE_SOUND_NOTIFICATION = "send_sound"
+SERVICE_INFO_SKILL = "send_info_skill"

 SCHEMA_SOUND_SERVICE = vol.Schema(
    {
@@ -125,17 +128,17 @@ def async_setup_services(hass: HomeAssistant) -> None:
    """Set up the services for the Amazon Devices integration."""
    for service_name, method, schema in (
        (
-            "send_sound",
+            SERVICE_SOUND_NOTIFICATION,
            async_send_sound_notification,
            SCHEMA_SOUND_SERVICE,
        ),
        (
-            "send_text_command",
+            SERVICE_TEXT_COMMAND,
            async_send_text_command,
            SCHEMA_CUSTOM_COMMAND,
        ),
        (
-            "send_info_skill",
+            SERVICE_INFO_SKILL,
            async_send_info_skill,
            SCHEMA_INFO_SKILL,
        ),
--- a/homeassistant/components/amberelectric/const.py
+++ b/homeassistant/components/amberelectric/const.py
@@ -16,6 +16,8 @@ ATTRIBUTION = "Data provided by Amber Electric"
 LOGGER = logging.getLogger(__package__)
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.SENSOR]

+SERVICE_GET_FORECASTS = "get_forecasts"
+
 GENERAL_CHANNEL = "general"
 CONTROLLED_LOAD_CHANNEL = "controlled_load"
 FEED_IN_CHANNEL = "feed_in"
--- a/homeassistant/components/amberelectric/services.py
+++ b/homeassistant/components/amberelectric/services.py
@@ -22,6 +22,7 @@ from .const import (
    DOMAIN,
    FEED_IN_CHANNEL,
    GENERAL_CHANNEL,
+    SERVICE_GET_FORECASTS,
 )
 from .coordinator import AmberConfigEntry
 from .helpers import format_cents_to_dollars, normalize_descriptor
@@ -100,7 +101,7 @@ def async_setup_services(hass: HomeAssistant) -> None:

    hass.services.async_register(
        DOMAIN,
-        "get_forecasts",
+        SERVICE_GET_FORECASTS,
        handle_get_forecasts,
        GET_FORECASTS_SCHEMA,
        supports_response=SupportsResponse.ONLY,
--- a/homeassistant/components/amcrest/camera.py
+++ b/homeassistant/components/amcrest/camera.py
@@ -49,6 +49,18 @@ SCAN_INTERVAL = timedelta(seconds=15)

 STREAM_SOURCE_LIST = ["snapshot", "mjpeg", "rtsp"]

+_SRV_EN_REC = "enable_recording"
+_SRV_DS_REC = "disable_recording"
+_SRV_EN_AUD = "enable_audio"
+_SRV_DS_AUD = "disable_audio"
+_SRV_EN_MOT_REC = "enable_motion_recording"
+_SRV_DS_MOT_REC = "disable_motion_recording"
+_SRV_GOTO = "goto_preset"
+_SRV_CBW = "set_color_bw"
+_SRV_TOUR_ON = "start_tour"
+_SRV_TOUR_OFF = "stop_tour"
+
+_SRV_PTZ_CTRL = "ptz_control"
 _ATTR_PTZ_TT = "travel_time"
 _ATTR_PTZ_MOV = "movement"
 _MOV = [
@@ -91,17 +103,17 @@ _SRV_PTZ_SCHEMA = _SRV_SCHEMA.extend(
 )

 CAMERA_SERVICES = {
-    "enable_recording": (_SRV_SCHEMA, "async_enable_recording", ()),
-    "disable_recording": (_SRV_SCHEMA, "async_disable_recording", ()),
-    "enable_audio": (_SRV_SCHEMA, "async_enable_audio", ()),
-    "disable_audio": (_SRV_SCHEMA, "async_disable_audio", ()),
-    "enable_motion_recording": (_SRV_SCHEMA, "async_enable_motion_recording", ()),
-    "disable_motion_recording": (_SRV_SCHEMA, "async_disable_motion_recording", ()),
-    "goto_preset": (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
-    "set_color_bw": (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
-    "start_tour": (_SRV_SCHEMA, "async_start_tour", ()),
-    "stop_tour": (_SRV_SCHEMA, "async_stop_tour", ()),
-    "ptz_control": (
+    _SRV_EN_REC: (_SRV_SCHEMA, "async_enable_recording", ()),
+    _SRV_DS_REC: (_SRV_SCHEMA, "async_disable_recording", ()),
+    _SRV_EN_AUD: (_SRV_SCHEMA, "async_enable_audio", ()),
+    _SRV_DS_AUD: (_SRV_SCHEMA, "async_disable_audio", ()),
+    _SRV_EN_MOT_REC: (_SRV_SCHEMA, "async_enable_motion_recording", ()),
+    _SRV_DS_MOT_REC: (_SRV_SCHEMA, "async_disable_motion_recording", ()),
+    _SRV_GOTO: (_SRV_GOTO_SCHEMA, "async_goto_preset", (_ATTR_PRESET,)),
+    _SRV_CBW: (_SRV_CBW_SCHEMA, "async_set_color_bw", (_ATTR_COLOR_BW,)),
+    _SRV_TOUR_ON: (_SRV_SCHEMA, "async_start_tour", ()),
+    _SRV_TOUR_OFF: (_SRV_SCHEMA, "async_stop_tour", ()),
+    _SRV_PTZ_CTRL: (
        _SRV_PTZ_SCHEMA,
        "async_ptz_control",
        (_ATTR_PTZ_MOV, _ATTR_PTZ_TT),
--- a/homeassistant/components/amcrest/strings.json
+++ b/homeassistant/components/amcrest/strings.json
@@ -75,7 +75,7 @@
      "name": "Go to preset"
    },
    "ptz_control": {
-      "description": "Moves (pan/tilt) and/or zooms a PTZ camera.",
+      "description": "Moves (pan/tilt) and/or zoom a PTZ camera.",
      "fields": {
        "entity_id": {
          "description": "[%key:component::amcrest::services::enable_recording::fields::entity_id::description%]",
--- a/homeassistant/components/analytics/analytics.py
+++ b/homeassistant/components/analytics/analytics.py
@@ -534,10 +534,6 @@ class Analytics:

        payload = await _async_snapshot_payload(self._hass)

-        if not payload:
-            LOGGER.info("Skipping snapshot submission, no data to send")
-            return
-
        headers = {
            "Content-Type": "application/json",
            "User-Agent": f"home-assistant/{HA_VERSION}",
--- a/homeassistant/components/analytics_insights/sensor.py
+++ b/homeassistant/components/analytics_insights/sensor.py
@@ -38,6 +38,7 @@ def get_app_entity_description(
        translation_key="apps",
        name=name_slug,
        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.apps.get(name_slug),
    )

@@ -51,6 +52,7 @@ def get_core_integration_entity_description(
        translation_key="core_integrations",
        name=name,
        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.core_integrations.get(domain),
    )

@@ -64,6 +66,7 @@ def get_custom_integration_entity_description(
        translation_key="custom_integrations",
        translation_placeholders={"custom_integration_domain": domain},
        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.custom_integrations.get(domain),
    )

@@ -74,6 +77,7 @@ GENERAL_SENSORS = [
        translation_key="total_active_installations",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.active_installations,
    ),
    AnalyticsSensorEntityDescription(
@@ -81,6 +85,7 @@ GENERAL_SENSORS = [
        translation_key="total_reports_integrations",
        entity_registry_enabled_default=False,
        state_class=SensorStateClass.TOTAL,
+        native_unit_of_measurement="active installations",
        value_fn=lambda data: data.reports_integrations,
    ),
 ]
--- a/homeassistant/components/analytics_insights/strings.json
+++ b/homeassistant/components/analytics_insights/strings.json
@@ -24,23 +24,14 @@
  },
  "entity": {
    "sensor": {
-      "apps": {
-        "unit_of_measurement": "active installations"
-      },
-      "core_integrations": {
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
-      },
      "custom_integrations": {
-        "name": "{custom_integration_domain} (custom)",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "{custom_integration_domain} (custom)"
      },
      "total_active_installations": {
-        "name": "Total active installations",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "Total active installations"
      },
      "total_reports_integrations": {
-        "name": "Total reported integrations",
-        "unit_of_measurement": "[%key:component::analytics_insights::entity::sensor::apps::unit_of_measurement%]"
+        "name": "Total reported integrations"
      }
    }
  },
--- a/homeassistant/components/androidtv/media_player.py
+++ b/homeassistant/components/androidtv/media_player.py
@@ -36,7 +36,7 @@ from .const import (
    SIGNAL_CONFIG_ENTITY,
 )
 from .entity import AndroidTVEntity, adb_decorator
-from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT
+from .services import ATTR_ADB_RESPONSE, ATTR_HDMI_INPUT, SERVICE_LEARN_SENDEVENT

 _LOGGER = logging.getLogger(__name__)

@@ -271,7 +271,7 @@ class ADBDevice(AndroidTVEntity, MediaPlayerEntity):
            self.async_write_ha_state()

            msg = (
-                f"Output from service 'learn_sendevent' from"
+                f"Output from service '{SERVICE_LEARN_SENDEVENT}' from"
                f" {self.entity_id}: '{output}'"
            )
            persistent_notification.async_create(
--- a/homeassistant/components/androidtv/services.py
+++ b/homeassistant/components/androidtv/services.py
@@ -16,6 +16,11 @@ ATTR_DEVICE_PATH = "device_path"
 ATTR_HDMI_INPUT = "hdmi_input"
 ATTR_LOCAL_PATH = "local_path"

+SERVICE_ADB_COMMAND = "adb_command"
+SERVICE_DOWNLOAD = "download"
+SERVICE_LEARN_SENDEVENT = "learn_sendevent"
+SERVICE_UPLOAD = "upload"
+

@callback
 def async_setup_services(hass: HomeAssistant) -> None:
@@ -24,7 +29,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "adb_command",
+        SERVICE_ADB_COMMAND,
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={vol.Required(ATTR_COMMAND): cv.string},
        func="adb_command",
@@ -32,7 +37,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "learn_sendevent",
+        SERVICE_LEARN_SENDEVENT,
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema=None,
        func="learn_sendevent",
@@ -40,7 +45,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "download",
+        SERVICE_DOWNLOAD,
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={
            vol.Required(ATTR_DEVICE_PATH): cv.string,
@@ -51,7 +56,7 @@ def async_setup_services(hass: HomeAssistant) -> None:
    service.async_register_platform_entity_service(
        hass,
        DOMAIN,
-        "upload",
+        SERVICE_UPLOAD,
        entity_domain=MEDIA_PLAYER_DOMAIN,
        schema={
            vol.Required(ATTR_DEVICE_PATH): cv.string,
--- a/homeassistant/components/anthropic/init.py
+++ b/homeassistant/components/anthropic/init.py
@@ -19,6 +19,7 @@ from homeassistant.helpers.typing import ConfigType

 from .const import (
    CONF_CHAT_MODEL,
+    DATA_REPAIR_DEFER_RELOAD,
    DEFAULT_CONVERSATION_NAME,
    DEPRECATED_MODELS,
    DOMAIN,
@@ -33,6 +34,7 @@ type AnthropicConfigEntry = ConfigEntry[anthropic.AsyncClient]

 async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    """Set up Anthropic."""
+    hass.data.setdefault(DOMAIN, {}).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
    await async_migrate_integration(hass)
    return True

@@ -83,6 +85,11 @@ async def async_update_options(
    hass: HomeAssistant, entry: AnthropicConfigEntry
 ) -> None:
    """Update options."""
+    defer_reload_entries: set[str] = hass.data.setdefault(DOMAIN, {}).setdefault(
+        DATA_REPAIR_DEFER_RELOAD, set()
+    )
+    if entry.entry_id in defer_reload_entries:
+        return
    await hass.config_entries.async_reload(entry.entry_id)


--- a/homeassistant/components/anthropic/ai_task.py
+++ b/homeassistant/components/anthropic/ai_task.py
@@ -46,7 +46,6 @@ class AnthropicTaskEntity(
        ai_task.AITaskEntityFeature.GENERATE_DATA
        | ai_task.AITaskEntityFeature.SUPPORT_ATTACHMENTS
    )
-    _attr_translation_key = "ai_task_data"

    async def _async_generate_data(
        self,
--- a/homeassistant/components/anthropic/config_flow.py
+++ b/homeassistant/components/anthropic/config_flow.py
@@ -43,9 +43,7 @@ from homeassistant.helpers.selector import (
 from homeassistant.helpers.typing import VolDictType

 from .const import (
-    CODE_EXECUTION_UNSUPPORTED_MODELS,
    CONF_CHAT_MODEL,
-    CONF_CODE_EXECUTION,
    CONF_MAX_TOKENS,
    CONF_PROMPT,
    CONF_RECOMMENDED,
@@ -114,12 +112,19 @@ async def get_model_list(client: anthropic.AsyncAnthropic) -> list[SelectOptionD
        # Resolve alias from versioned model name:
        model_alias = (
            model_info.id[:-9]
-            if model_info.id != "claude-3-haiku-20240307"
+            if model_info.id
+            not in (
+                "claude-3-haiku-20240307",
+                "claude-3-5-haiku-20241022",
+                "claude-3-opus-20240229",
+            )
            and model_info.id[-2:-1] != "-"
            else model_info.id
        )
        if short_form.search(model_alias):
            model_alias += "-0"
+        if model_alias.endswith(("haiku", "opus", "sonnet")):
+            model_alias += "-latest"
        model_options.append(
            SelectOptionDict(
                label=model_info.display_name,
@@ -417,16 +422,6 @@ class ConversationSubentryFlowHandler(ConfigSubentryFlow):
        else:
            self.options.pop(CONF_THINKING_EFFORT, None)

-        if not model.startswith(tuple(CODE_EXECUTION_UNSUPPORTED_MODELS)):
-            step_schema[
-                vol.Optional(
-                    CONF_CODE_EXECUTION,
-                    default=DEFAULT[CONF_CODE_EXECUTION],
-                )
-            ] = bool
-        else:
-            self.options.pop(CONF_CODE_EXECUTION, None)
-
        if not model.startswith(tuple(WEB_SEARCH_UNSUPPORTED_MODELS)):
            step_schema.update(
                {
--- a/homeassistant/components/anthropic/const.py
+++ b/homeassistant/components/anthropic/const.py
@@ -11,7 +11,6 @@ DEFAULT_AI_TASK_NAME = "Claude AI Task"
 CONF_RECOMMENDED = "recommended"
 CONF_PROMPT = "prompt"
 CONF_CHAT_MODEL = "chat_model"
-CONF_CODE_EXECUTION = "code_execution"
 CONF_MAX_TOKENS = "max_tokens"
 CONF_TEMPERATURE = "temperature"
 CONF_THINKING_BUDGET = "thinking_budget"
@@ -24,9 +23,10 @@ CONF_WEB_SEARCH_REGION = "region"
 CONF_WEB_SEARCH_COUNTRY = "country"
 CONF_WEB_SEARCH_TIMEZONE = "timezone"

+DATA_REPAIR_DEFER_RELOAD = "repair_defer_reload"
+
 DEFAULT = {
    CONF_CHAT_MODEL: "claude-haiku-4-5",
-    CONF_CODE_EXECUTION: False,
    CONF_MAX_TOKENS: 3000,
    CONF_TEMPERATURE: 1.0,
    CONF_THINKING_BUDGET: 0,
@@ -39,6 +39,8 @@ DEFAULT = {
 MIN_THINKING_BUDGET = 1024

 NON_THINKING_MODELS = [
+    "claude-3-5",  # Both sonnet and haiku
+    "claude-3-opus",
    "claude-3-haiku",
 ]

@@ -51,7 +53,7 @@ NON_ADAPTIVE_THINKING_MODELS = [
    "claude-opus-4-20250514",
    "claude-sonnet-4-0",
    "claude-sonnet-4-20250514",
-    "claude-3-haiku",
+    "claude-3",
 ]

 UNSUPPORTED_STRUCTURED_OUTPUT_MODELS = [
@@ -60,17 +62,19 @@ UNSUPPORTED_STRUCTURED_OUTPUT_MODELS = [
    "claude-opus-4-20250514",
    "claude-sonnet-4-0",
    "claude-sonnet-4-20250514",
-    "claude-3-haiku",
+    "claude-3",
 ]

 WEB_SEARCH_UNSUPPORTED_MODELS = [
    "claude-3-haiku",
-]
-
-CODE_EXECUTION_UNSUPPORTED_MODELS = [
-    "claude-3-haiku",
+    "claude-3-opus",
+    "claude-3-5-sonnet-20240620",
+    "claude-3-5-sonnet-20241022",
 ]

 DEPRECATED_MODELS = [
-    "claude-3",
+    "claude-3-5-haiku",
+    "claude-3-7-sonnet",
+    "claude-3-5-sonnet",
+    "claude-3-opus",
 ]
--- a/homeassistant/components/anthropic/conversation.py
+++ b/homeassistant/components/anthropic/conversation.py
@@ -37,7 +37,6 @@ class AnthropicConversationEntity(
    """Anthropic conversation agent."""

    _attr_supports_streaming = True
-    _attr_translation_key = "conversation"

    def __init__(self, entry: AnthropicConfigEntry, subentry: ConfigSubentry) -> None:
        """Initialize the agent."""
--- a/homeassistant/components/anthropic/entity.py
+++ b/homeassistant/components/anthropic/entity.py
@@ -3,23 +3,19 @@
 import base64
 from collections.abc import AsyncGenerator, Callable, Iterable
 from dataclasses import dataclass, field
-from datetime import UTC, datetime
 import json
 from mimetypes import guess_file_type
 from pathlib import Path
-from typing import Any, Literal, cast
+from typing import Any

 import anthropic
 from anthropic import AsyncStream
 from anthropic.types import (
    Base64ImageSourceParam,
    Base64PDFSourceParam,
-    BashCodeExecutionToolResultBlock,
    CitationsDelta,
    CitationsWebSearchResultLocation,
    CitationWebSearchResultLocationParam,
-    CodeExecutionTool20250825Param,
-    Container,
    ContentBlockParam,
    DocumentBlockParam,
    ImageBlockParam,
@@ -45,7 +41,6 @@ from anthropic.types import (
    TextCitation,
    TextCitationParam,
    TextDelta,
-    TextEditorCodeExecutionToolResultBlock,
    ThinkingBlock,
    ThinkingBlockParam,
    ThinkingConfigAdaptiveParam,
@@ -56,21 +51,18 @@ from anthropic.types import (
    ToolChoiceAutoParam,
    ToolChoiceToolParam,
    ToolParam,
+    ToolResultBlockParam,
    ToolUnionParam,
    ToolUseBlock,
    ToolUseBlockParam,
    Usage,
    WebSearchTool20250305Param,
+    WebSearchToolRequestErrorParam,
    WebSearchToolResultBlock,
-    WebSearchToolResultBlockParamContentParam,
-)
-from anthropic.types.bash_code_execution_tool_result_block_param import (
-    Content as BashCodeExecutionToolResultContentParam,
+    WebSearchToolResultBlockParam,
+    WebSearchToolResultError,
 )
 from anthropic.types.message_create_params import MessageCreateParamsStreaming
-from anthropic.types.text_editor_code_execution_tool_result_block_param import (
-    Content as TextEditorCodeExecutionToolResultContentParam,
-)
 import voluptuous as vol
 from voluptuous_openapi import convert

@@ -82,12 +74,10 @@ from homeassistant.helpers import device_registry as dr, llm
 from homeassistant.helpers.entity import Entity
 from homeassistant.helpers.json import json_dumps
 from homeassistant.util import slugify
-from homeassistant.util.json import JsonObjectType

 from . import AnthropicConfigEntry
 from .const import (
    CONF_CHAT_MODEL,
-    CONF_CODE_EXECUTION,
    CONF_MAX_TOKENS,
    CONF_TEMPERATURE,
    CONF_THINKING_BUDGET,
@@ -142,23 +132,11 @@ class ContentDetails:
    """Native data for AssistantContent."""

    citation_details: list[CitationDetails] = field(default_factory=list)
-    thinking_signature: str | None = None
-    redacted_thinking: str | None = None
-    container: Container | None = None

    def has_content(self) -> bool:
-        """Check if there is any text content."""
+        """Check if there is any content."""
        return any(detail.length > 0 for detail in self.citation_details)

-    def __bool__(self) -> bool:
-        """Check if there is any thinking content or citations."""
-        return (
-            self.thinking_signature is not None
-            or self.redacted_thinking is not None
-            or self.container is not None
-            or self.has_citations()
-        )
-
    def has_citations(self) -> bool:
        """Check if there are any citations."""
        return any(detail.citations for detail in self.citation_details)
@@ -200,53 +178,30 @@ class ContentDetails:

 def _convert_content(
    chat_content: Iterable[conversation.Content],
-) -> tuple[list[MessageParam], str | None]:
+) -> list[MessageParam]:
    """Transform HA chat_log content into Anthropic API format."""
    messages: list[MessageParam] = []
-    container_id: str | None = None

    for content in chat_content:
        if isinstance(content, conversation.ToolResultContent):
-            external_tool = True
            if content.tool_name == "web_search":
-                tool_result_block: ContentBlockParam = {
-                    "type": "web_search_tool_result",
-                    "tool_use_id": content.tool_call_id,
-                    "content": cast(
-                        WebSearchToolResultBlockParamContentParam,
-                        content.tool_result["content"]
-                        if "content" in content.tool_result
-                        else {
-                            "type": "web_search_tool_result_error",
-                            "error_code": content.tool_result.get(
-                                "error_code", "unavailable"
-                            ),
-                        },
+                tool_result_block: ContentBlockParam = WebSearchToolResultBlockParam(
+                    type="web_search_tool_result",
+                    tool_use_id=content.tool_call_id,
+                    content=content.tool_result["content"]
+                    if "content" in content.tool_result
+                    else WebSearchToolRequestErrorParam(
+                        type="web_search_tool_result_error",
+                        error_code=content.tool_result.get("error_code", "unavailable"),  # type: ignore[typeddict-item]
                    ),
-                }
-            elif content.tool_name == "bash_code_execution":
-                tool_result_block = {
-                    "type": "bash_code_execution_tool_result",
-                    "tool_use_id": content.tool_call_id,
-                    "content": cast(
-                        BashCodeExecutionToolResultContentParam, content.tool_result
-                    ),
-                }
-            elif content.tool_name == "text_editor_code_execution":
-                tool_result_block = {
-                    "type": "text_editor_code_execution_tool_result",
-                    "tool_use_id": content.tool_call_id,
-                    "content": cast(
-                        TextEditorCodeExecutionToolResultContentParam,
-                        content.tool_result,
-                    ),
-                }
+                )
+                external_tool = True
            else:
-                tool_result_block = {
-                    "type": "tool_result",
-                    "tool_use_id": content.tool_call_id,
-                    "content": json_dumps(content.tool_result),
-                }
+                tool_result_block = ToolResultBlockParam(
+                    type="tool_result",
+                    tool_use_id=content.tool_call_id,
+                    content=json_dumps(content.tool_result),
+                )
                external_tool = False
            if not messages or messages[-1]["role"] != (
                "assistant" if external_tool else "user"
@@ -291,33 +246,29 @@ def _convert_content(
                        content=[],
                    )
                )
-            elif isinstance(messages[-1]["content"], str):
-                messages[-1]["content"] = [
-                    TextBlockParam(type="text", text=messages[-1]["content"]),
-                ]

-            if isinstance(content.native, ContentDetails):
-                if content.native.thinking_signature:
-                    messages[-1]["content"].append(  # type: ignore[union-attr]
-                        ThinkingBlockParam(
-                            type="thinking",
-                            thinking=content.thinking_content or "",
-                            signature=content.native.thinking_signature,
-                        )
+            if isinstance(content.native, ThinkingBlock):
+                messages[-1]["content"].append(  # type: ignore[union-attr]
+                    ThinkingBlockParam(
+                        type="thinking",
+                        thinking=content.thinking_content or "",
+                        signature=content.native.signature,
                    )
-                if content.native.redacted_thinking:
-                    messages[-1]["content"].append(  # type: ignore[union-attr]
-                        RedactedThinkingBlockParam(
-                            type="redacted_thinking",
-                            data=content.native.redacted_thinking,
-                        )
+                )
+            elif isinstance(content.native, RedactedThinkingBlock):
+                redacted_thinking_block = RedactedThinkingBlockParam(
+                    type="redacted_thinking",
+                    data=content.native.data,
+                )
+                if isinstance(messages[-1]["content"], str):
+                    messages[-1]["content"] = [
+                        TextBlockParam(type="text", text=messages[-1]["content"]),
+                        redacted_thinking_block,
+                    ]
+                else:
+                    messages[-1]["content"].append(  # type: ignore[attr-defined]
+                        redacted_thinking_block
                    )
-                if (
-                    content.native.container is not None
-                    and content.native.container.expires_at > datetime.now(UTC)
-                ):
-                    container_id = content.native.container.id
-
            if content.content:
                current_index = 0
                for detail in (
@@ -358,30 +309,16 @@ def _convert_content(
                            text=content.content[current_index:],
                        )
                    )
-
            if content.tool_calls:
                messages[-1]["content"].extend(  # type: ignore[union-attr]
                    [
                        ServerToolUseBlockParam(
                            type="server_tool_use",
                            id=tool_call.id,
-                            name=cast(
-                                Literal[
-                                    "web_search",
-                                    "bash_code_execution",
-                                    "text_editor_code_execution",
-                                ],
-                                tool_call.tool_name,
-                            ),
+                            name="web_search",
                            input=tool_call.tool_args,
                        )
-                        if tool_call.external
-                        and tool_call.tool_name
-                        in [
-                            "web_search",
-                            "bash_code_execution",
-                            "text_editor_code_execution",
-                        ]
+                        if tool_call.external and tool_call.tool_name == "web_search"
                        else ToolUseBlockParam(
                            type="tool_use",
                            id=tool_call.id,
@@ -391,19 +328,11 @@ def _convert_content(
                        for tool_call in content.tool_calls
                    ]
                )
-
-            if (
-                isinstance(messages[-1]["content"], list)
-                and len(messages[-1]["content"]) == 1
-                and messages[-1]["content"][0]["type"] == "text"
-            ):
-                # If there is only one text block, simplify the content to a string
-                messages[-1]["content"] = messages[-1]["content"][0]["text"]
        else:
            # Note: We don't pass SystemContent here as its passed to the API as the prompt
            raise TypeError(f"Unexpected content type: {type(content)}")

-    return messages, container_id
+    return messages


 async def _transform_stream(  # noqa: C901 - This is complex, but better to have it in one place
@@ -450,7 +379,8 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
    content_details = ContentDetails()
    content_details.add_citation_detail()
    input_usage: Usage | None = None
-    first_block: bool = True
+    has_native = False
+    first_block: bool

    async for response in stream:
        LOGGER.debug("Received response: %s", response)
@@ -471,12 +401,13 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                current_tool_args = ""
                if response.content_block.name == output_tool:
                    if first_block or content_details.has_content():
-                        if content_details:
+                        if content_details.has_citations():
                            content_details.delete_empty()
                            yield {"native": content_details}
                        content_details = ContentDetails()
                        content_details.add_citation_detail()
                        yield {"role": "assistant"}
+                        has_native = False
                        first_block = False
            elif isinstance(response.content_block, TextBlock):
                if (  # Do not start a new assistant content just for citations, concatenate consecutive blocks with citations instead.
@@ -487,11 +418,12 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                        and content_details.has_content()
                    )
                ):
-                    if content_details:
+                    if content_details.has_citations():
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    yield {"role": "assistant"}
+                    has_native = False
                    first_block = False
                content_details.add_citation_detail()
                if response.content_block.text:
@@ -500,13 +432,14 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    )
                    yield {"content": response.content_block.text}
            elif isinstance(response.content_block, ThinkingBlock):
-                if first_block or content_details.thinking_signature:
-                    if content_details:
+                if first_block or has_native:
+                    if content_details.has_citations():
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    content_details.add_citation_detail()
                    yield {"role": "assistant"}
+                    has_native = False
                    first_block = False
            elif isinstance(response.content_block, RedactedThinkingBlock):
                LOGGER.debug(
@@ -514,15 +447,17 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    "encrypted for safety reasons. This doesn’t affect the quality of "
                    "responses"
                )
-                if first_block or content_details.redacted_thinking:
-                    if content_details:
+                if has_native:
+                    if content_details.has_citations():
                        content_details.delete_empty()
                        yield {"native": content_details}
                    content_details = ContentDetails()
                    content_details.add_citation_detail()
                    yield {"role": "assistant"}
+                    has_native = False
                    first_block = False
-                content_details.redacted_thinking = response.content_block.data
+                yield {"native": response.content_block}
+                has_native = True
            elif isinstance(response.content_block, ServerToolUseBlock):
                current_tool_block = ServerToolUseBlockParam(
                    type="server_tool_use",
@@ -531,15 +466,8 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                    input={},
                )
                current_tool_args = ""
-            elif isinstance(
-                response.content_block,
-                (
-                    WebSearchToolResultBlock,
-                    BashCodeExecutionToolResultBlock,
-                    TextEditorCodeExecutionToolResultBlock,
-                ),
-            ):
-                if content_details:
+            elif isinstance(response.content_block, WebSearchToolResultBlock):
+                if content_details.has_citations():
                    content_details.delete_empty()
                    yield {"native": content_details}
                content_details = ContentDetails()
@@ -547,16 +475,26 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                yield {
                    "role": "tool_result",
                    "tool_call_id": response.content_block.tool_use_id,
-                    "tool_name": response.content_block.type.removesuffix(
-                        "_tool_result"
-                    ),
+                    "tool_name": "web_search",
                    "tool_result": {
-                        "content": cast(
-                            JsonObjectType, response.content_block.to_dict()["content"]
-                        )
+                        "type": "web_search_tool_result_error",
+                        "error_code": response.content_block.content.error_code,
                    }
-                    if isinstance(response.content_block.content, list)
-                    else cast(JsonObjectType, response.content_block.content.to_dict()),
+                    if isinstance(
+                        response.content_block.content, WebSearchToolResultError
+                    )
+                    else {
+                        "content": [
+                            {
+                                "type": "web_search_result",
+                                "encrypted_content": block.encrypted_content,
+                                "page_age": block.page_age,
+                                "title": block.title,
+                                "url": block.url,
+                            }
+                            for block in response.content_block.content
+                        ]
+                    },
                }
                first_block = True
        elif isinstance(response, RawContentBlockDeltaEvent):
@@ -572,16 +510,19 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
                else:
                    current_tool_args += response.delta.partial_json
            elif isinstance(response.delta, TextDelta):
-                if response.delta.text:
-                    content_details.citation_details[-1].length += len(
-                        response.delta.text
-                    )
-                    yield {"content": response.delta.text}
+                content_details.citation_details[-1].length += len(response.delta.text)
+                yield {"content": response.delta.text}
            elif isinstance(response.delta, ThinkingDelta):
-                if response.delta.thinking:
-                    yield {"thinking_content": response.delta.thinking}
+                yield {"thinking_content": response.delta.thinking}
            elif isinstance(response.delta, SignatureDelta):
-                content_details.thinking_signature = response.delta.signature
+                yield {
+                    "native": ThinkingBlock(
+                        type="thinking",
+                        thinking="",
+                        signature=response.delta.signature,
+                    )
+                }
+                has_native = True
            elif isinstance(response.delta, CitationsDelta):
                content_details.add_citation(response.delta.citation)
        elif isinstance(response, RawContentBlockStopEvent):
@@ -605,11 +546,10 @@ async def _transform_stream(  # noqa: C901 - This is complex, but better to have
        elif isinstance(response, RawMessageDeltaEvent):
            if (usage := response.usage) is not None:
                chat_log.async_trace(_create_token_stats(input_usage, usage))
-            content_details.container = response.delta.container
            if response.delta.stop_reason == "refusal":
                raise HomeAssistantError("Potential policy violation detected")
        elif isinstance(response, RawMessageStopEvent):
-            if content_details:
+            if content_details.has_citations():
                content_details.delete_empty()
                yield {"native": content_details}
            content_details = ContentDetails()
@@ -677,7 +617,7 @@ class AnthropicBaseLLMEntity(Entity):
            )
        ]

-        messages, container_id = _convert_content(chat_log.content[1:])
+        messages = _convert_content(chat_log.content[1:])

        model = options.get(CONF_CHAT_MODEL, DEFAULT[CONF_CHAT_MODEL])

@@ -687,7 +627,6 @@ class AnthropicBaseLLMEntity(Entity):
            max_tokens=options.get(CONF_MAX_TOKENS, DEFAULT[CONF_MAX_TOKENS]),
            system=system_prompt,
            stream=True,
-            container=container_id,
        )

        if not model.startswith(tuple(NON_ADAPTIVE_THINKING_MODELS)):
@@ -726,14 +665,6 @@ class AnthropicBaseLLMEntity(Entity):
                for tool in chat_log.llm_api.tools
            ]

-        if options.get(CONF_CODE_EXECUTION):
-            tools.append(
-                CodeExecutionTool20250825Param(
-                    name="code_execution",
-                    type="code_execution_20250825",
-                ),
-            )
-
        if options.get(CONF_WEB_SEARCH):
            web_search = WebSearchTool20250305Param(
                name="web_search",
@@ -844,25 +775,21 @@ class AnthropicBaseLLMEntity(Entity):
            try:
                stream = await client.messages.create(**model_args)

-                new_messages, model_args["container"] = _convert_content(
-                    [
-                        content
-                        async for content in chat_log.async_add_delta_content_stream(
-                            self.entity_id,
-                            _transform_stream(
-                                chat_log,
-                                stream,
-                                output_tool=structure_name or None,
-                            ),
-                        )
-                    ]
+                messages.extend(
+                    _convert_content(
+                        [
+                            content
+                            async for content in chat_log.async_add_delta_content_stream(
+                                self.entity_id,
+                                _transform_stream(
+                                    chat_log,
+                                    stream,
+                                    output_tool=structure_name or None,
+                                ),
+                            )
+                        ]
+                    )
                )
-                messages.extend(new_messages)
-            except anthropic.AuthenticationError as err:
-                self.entry.async_start_reauth(self.hass)
-                raise HomeAssistantError(
-                    "Authentication error with Anthropic API, reauthentication required"
-                ) from err
            except anthropic.AnthropicError as err:
                raise HomeAssistantError(
                    f"Sorry, I had a problem talking to Anthropic: {err}"
--- a/homeassistant/components/anthropic/icons.json
+++ b/homeassistant/components/anthropic/icons.json
@@ -1,14 +0,0 @@
-{
-  "entity": {
-    "ai_task": {
-      "ai_task_data": {
-        "default": "mdi:asterisk"
-      }
-    },
-    "conversation": {
-      "conversation": {
-        "default": "mdi:asterisk"
-      }
-    }
-  }
-}
--- a/homeassistant/components/anthropic/manifest.json
+++ b/homeassistant/components/anthropic/manifest.json
@@ -1,6 +1,6 @@
 {
  "domain": "anthropic",
-  "name": "Anthropic",
+  "name": "Anthropic Conversation",
  "after_dependencies": ["assist_pipeline", "intent"],
  "codeowners": ["@Shulyaka"],
  "config_flow": true,
@@ -8,6 +8,5 @@
  "documentation": "https://www.home-assistant.io/integrations/anthropic",
  "integration_type": "service",
  "iot_class": "cloud_polling",
-  "quality_scale": "bronze",
-  "requirements": ["anthropic==0.83.0"]
+  "requirements": ["anthropic==0.78.0"]
 }
--- a/homeassistant/components/anthropic/quality_scale.yaml
+++ b/homeassistant/components/anthropic/quality_scale.yaml
@@ -1,108 +0,0 @@
-rules:
-  # Bronze
-  action-setup:
-    status: exempt
-    comment: |
-      Integration has no actions.
-  appropriate-polling:
-    status: exempt
-    comment: |
-      Integration does not poll.
-  brands: done
-  common-modules: done
-  config-flow-test-coverage: done
-  config-flow: done
-  dependency-transparency: done
-  docs-actions:
-    status: exempt
-    comment: |
-      Integration has no actions.
-  docs-high-level-description: done
-  docs-installation-instructions: done
-  docs-removal-instructions: done
-  entity-event-setup:
-    status: exempt
-    comment: |
-      Integration does not 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:
-    status: todo
-    comment: |
-      Reevaluate exceptions for entity services.
-  config-entry-unloading: done
-  docs-configuration-parameters: done
-  docs-installation-parameters: done
-  entity-unavailable: todo
-  integration-owner: done
-  log-when-unavailable: todo
-  parallel-updates:
-    status: exempt
-    comment: |
-      The API does not limit parallel updates.
-  reauthentication-flow: done
-  test-coverage: done
-  # Gold
-  devices: done
-  diagnostics: todo
-  discovery-update-info:
-    status: exempt
-    comment: |
-      Service integration, no discovery.
-  discovery:
-    status: exempt
-    comment: |
-      Service integration, no discovery.
-  docs-data-update:
-    status: exempt
-    comment: |
-      No data updates.
-  docs-examples:
-    status: todo
-    comment: |
-      To give examples of how people use the integration
-  docs-known-limitations: done
-  docs-supported-devices:
-    status: todo
-    comment: |
-      To write something about what models we support.
-  docs-supported-functions: done
-  docs-troubleshooting: todo
-  docs-use-cases: done
-  dynamic-devices:
-    status: exempt
-    comment: |
-      Service integration, no devices.
-  entity-category:
-    status: exempt
-    comment: |
-      No entities with categories.
-  entity-device-class:
-    status: exempt
-    comment: |
-      No entities with device classes.
-  entity-disabled-by-default:
-    status: exempt
-    comment: |
-      No entities disabled by default.
-  entity-translations: todo
-  exception-translations: todo
-  icon-translations: done
-  reconfiguration-flow: done
-  repair-issues: done
-  stale-devices:
-    status: exempt
-    comment: |
-      Service integration, no devices.
-  # Platinum
-  async-dependency: done
-  inject-websession:
-    status: done
-    comment: |
-      Uses `httpx` session.
-  strict-typing: done
--- a/homeassistant/components/anthropic/repairs.py
+++ b/homeassistant/components/anthropic/repairs.py
@@ -3,7 +3,7 @@
 from __future__ import annotations

 from collections.abc import Iterator
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, cast

 import voluptuous as vol

@@ -12,14 +12,16 @@ from homeassistant.components.repairs import RepairsFlow
 from homeassistant.config_entries import ConfigEntryState, ConfigSubentry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
-from homeassistant.helpers.selector import (
-    SelectOptionDict,
-    SelectSelector,
-    SelectSelectorConfig,
-)
+from homeassistant.helpers.selector import SelectSelector, SelectSelectorConfig

 from .config_flow import get_model_list
-from .const import CONF_CHAT_MODEL, DEPRECATED_MODELS, DOMAIN
+from .const import (
+    CONF_CHAT_MODEL,
+    DATA_REPAIR_DEFER_RELOAD,
+    DEFAULT,
+    DEPRECATED_MODELS,
+    DOMAIN,
+)

 if TYPE_CHECKING:
    from . import AnthropicConfigEntry
@@ -31,7 +33,8 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
    _subentry_iter: Iterator[tuple[str, str]] | None
    _current_entry_id: str | None
    _current_subentry_id: str | None
-    _model_list_cache: dict[str, list[SelectOptionDict]] | None
+    _reload_pending: set[str]
+    _pending_updates: dict[str, dict[str, str]]

    def __init__(self) -> None:
        """Initialize the flow."""
@@ -39,51 +42,42 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
        self._subentry_iter = None
        self._current_entry_id = None
        self._current_subentry_id = None
-        self._model_list_cache = None
+        self._reload_pending = set()
+        self._pending_updates = {}

    async def async_step_init(
-        self, user_input: dict[str, str]
+        self, user_input: dict[str, str] | None = None
    ) -> data_entry_flow.FlowResult:
-        """Handle the steps of a fix flow."""
-        if user_input.get(CONF_CHAT_MODEL):
-            self._async_update_current_subentry(user_input)
+        """Handle the first step of a fix flow."""
+        previous_entry_id: str | None = None
+        if user_input is not None:
+            previous_entry_id = self._async_update_current_subentry(user_input)
+            self._clear_current_target()

        target = await self._async_next_target()
+        next_entry_id = target[0].entry_id if target else None
+        if previous_entry_id and previous_entry_id != next_entry_id:
+            await self._async_apply_pending_updates(previous_entry_id)
        if target is None:
+            await self._async_apply_all_pending_updates()
            return self.async_create_entry(data={})

        entry, subentry, model = target
-        if self._model_list_cache is None:
-            self._model_list_cache = {}
-        if entry.entry_id in self._model_list_cache:
-            model_list = self._model_list_cache[entry.entry_id]
-        else:
-            client = entry.runtime_data
-            model_list = [
-                model_option
-                for model_option in await get_model_list(client)
-                if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
-            ]
-            self._model_list_cache[entry.entry_id] = model_list
+        client = entry.runtime_data
+        model_list = [
+            model_option
+            for model_option in await get_model_list(client)
+            if not model_option["value"].startswith(tuple(DEPRECATED_MODELS))
+        ]

        if "opus" in model:
-            family = "claude-opus"
+            suggested_model = "claude-opus-4-5"
+        elif "haiku" in model:
+            suggested_model = "claude-haiku-4-5"
        elif "sonnet" in model:
-            family = "claude-sonnet"
+            suggested_model = "claude-sonnet-4-5"
        else:
-            family = "claude-haiku"
-
-        suggested_model = next(
-            (
-                model_option["value"]
-                for model_option in sorted(
-                    (m for m in model_list if family in m["value"]),
-                    key=lambda x: x["value"],
-                    reverse=True,
-                )
-            ),
-            vol.UNDEFINED,
-        )
+            suggested_model = cast(str, DEFAULT[CONF_CHAT_MODEL])

        schema = vol.Schema(
            {
@@ -130,8 +124,6 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            except StopIteration:
                return None

-            # Verify that the entry/subentry still exists and the model is still
-            # deprecated. This may have changed since we started the repair flow.
            entry = self.hass.config_entries.async_get_entry(entry_id)
            if entry is None:
                continue
@@ -140,7 +132,9 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            if subentry is None:
                continue

-            model = subentry.data.get(CONF_CHAT_MODEL)
+            model = self._pending_model(entry_id, subentry_id)
+            if model is None:
+                model = subentry.data.get(CONF_CHAT_MODEL)
            if not model or not model.startswith(tuple(DEPRECATED_MODELS)):
                continue

@@ -148,30 +142,36 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            self._current_subentry_id = subentry_id
            return entry, subentry, model

-    def _async_update_current_subentry(self, user_input: dict[str, str]) -> None:
+    def _async_update_current_subentry(self, user_input: dict[str, str]) -> str | None:
        """Update the currently selected subentry."""
-        if (
-            self._current_entry_id is None
-            or self._current_subentry_id is None
-            or (
-                entry := self.hass.config_entries.async_get_entry(
-                    self._current_entry_id
-                )
-            )
-            is None
-            or (subentry := entry.subentries.get(self._current_subentry_id)) is None
-        ):
-            raise HomeAssistantError("Subentry not found")
+        if not self._current_entry_id or not self._current_subentry_id:
+            return None
+
+        entry = self.hass.config_entries.async_get_entry(self._current_entry_id)
+        if entry is None:
+            return None
+
+        subentry = entry.subentries.get(self._current_subentry_id)
+        if subentry is None:
+            return None

        updated_data = {
            **subentry.data,
            CONF_CHAT_MODEL: user_input[CONF_CHAT_MODEL],
        }
-        self.hass.config_entries.async_update_subentry(
-            entry,
-            subentry,
-            data=updated_data,
+        if updated_data == subentry.data:
+            return entry.entry_id
+        self._queue_pending_update(
+            entry.entry_id,
+            subentry.subentry_id,
+            updated_data[CONF_CHAT_MODEL],
        )
+        return entry.entry_id
+
+    def _clear_current_target(self) -> None:
+        """Clear current target tracking."""
+        self._current_entry_id = None
+        self._current_subentry_id = None

    def _format_subentry_type(self, subentry_type: str) -> str:
        """Return a user-friendly subentry type label."""
@@ -181,6 +181,91 @@ class ModelDeprecatedRepairFlow(RepairsFlow):
            return "AI task"
        return subentry_type

+    def _queue_pending_update(
+        self, entry_id: str, subentry_id: str, model: str
+    ) -> None:
+        """Store a pending model update for a subentry."""
+        self._pending_updates.setdefault(entry_id, {})[subentry_id] = model
+
+    def _pending_model(self, entry_id: str, subentry_id: str) -> str | None:
+        """Return a pending model update if one exists."""
+        return self._pending_updates.get(entry_id, {}).get(subentry_id)
+
+    def _mark_entry_for_reload(self, entry_id: str) -> None:
+        """Prevent reload until repairs are complete for the entry."""
+        self._reload_pending.add(entry_id)
+        defer_reload_entries: set[str] = self.hass.data.setdefault(
+            DOMAIN, {}
+        ).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
+        defer_reload_entries.add(entry_id)
+
+    async def _async_reload_entry(self, entry_id: str) -> None:
+        """Reload an entry once all repairs are completed."""
+        if entry_id not in self._reload_pending:
+            return
+
+        entry = self.hass.config_entries.async_get_entry(entry_id)
+        if entry is not None and entry.state is not ConfigEntryState.LOADED:
+            self._clear_defer_reload(entry_id)
+            self._reload_pending.discard(entry_id)
+            return
+
+        if entry is not None:
+            await self.hass.config_entries.async_reload(entry_id)
+
+        self._clear_defer_reload(entry_id)
+        self._reload_pending.discard(entry_id)
+
+    def _clear_defer_reload(self, entry_id: str) -> None:
+        """Remove entry from the deferred reload set."""
+        defer_reload_entries: set[str] = self.hass.data.setdefault(
+            DOMAIN, {}
+        ).setdefault(DATA_REPAIR_DEFER_RELOAD, set())
+        defer_reload_entries.discard(entry_id)
+
+    async def _async_apply_pending_updates(self, entry_id: str) -> None:
+        """Apply pending subentry updates for a single entry."""
+        updates = self._pending_updates.pop(entry_id, None)
+        if not updates:
+            return
+
+        entry = self.hass.config_entries.async_get_entry(entry_id)
+        if entry is None or entry.state is not ConfigEntryState.LOADED:
+            return
+
+        changed = False
+        for subentry_id, model in updates.items():
+            subentry = entry.subentries.get(subentry_id)
+            if subentry is None:
+                continue
+
+            updated_data = {
+                **subentry.data,
+                CONF_CHAT_MODEL: model,
+            }
+            if updated_data == subentry.data:
+                continue
+
+            if not changed:
+                self._mark_entry_for_reload(entry_id)
+                changed = True
+
+            self.hass.config_entries.async_update_subentry(
+                entry,
+                subentry,
+                data=updated_data,
+            )
+
+        if not changed:
+            return
+
+        await self._async_reload_entry(entry_id)
+
+    async def _async_apply_all_pending_updates(self) -> None:
+        """Apply all pending updates across entries."""
+        for entry_id in list(self._pending_updates):
+            await self._async_apply_pending_updates(entry_id)
+

 async def async_create_fix_flow(
    hass: HomeAssistant,
--- a/homeassistant/components/anthropic/strings.json
+++ b/homeassistant/components/anthropic/strings.json
@@ -69,7 +69,6 @@
        },
        "model": {
          "data": {
-            "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data::code_execution%]",
            "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_budget%]",
            "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data::thinking_effort%]",
            "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data::user_location%]",
@@ -77,7 +76,6 @@
            "web_search_max_uses": "[%key:component::anthropic::config_subentries::conversation::step::model::data::web_search_max_uses%]"
          },
          "data_description": {
-            "code_execution": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::code_execution%]",
            "thinking_budget": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_budget%]",
            "thinking_effort": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::thinking_effort%]",
            "user_location": "[%key:component::anthropic::config_subentries::conversation::step::model::data_description::user_location%]",
@@ -129,7 +127,6 @@
        },
        "model": {
          "data": {
-            "code_execution": "Code execution",
            "thinking_budget": "Thinking budget",
            "thinking_effort": "Thinking effort",
            "user_location": "Include home location",
@@ -137,7 +134,6 @@
            "web_search_max_uses": "Maximum web searches"
          },
          "data_description": {
-            "code_execution": "Allow the model to execute code in a secure sandbox environment, enabling it to analyze data and perform complex calculations.",
            "thinking_budget": "The number of tokens the model can use to think about the response out of the total maximum number of tokens. Set to 1024 or greater to enable extended thinking.",
            "thinking_effort": "Control how many tokens Claude uses when responding, trading off between response thoroughness and token efficiency",
            "user_location": "Localize search results based on home location",
--- a/homeassistant/components/atag/sensor.py
+++ b/homeassistant/components/atag/sensor.py
@@ -64,6 +64,6 @@ class AtagSensor(AtagEntity, SensorEntity):
        return self.coordinator.atag.report[self._id].state

    @property
-    def icon(self) -> str:
+    def icon(self):
        """Return icon."""
        return self.coordinator.atag.report[self._id].icon
--- a/homeassistant/components/automation/init.py
+++ b/homeassistant/components/automation/init.py
@@ -363,7 +363,8 @@ async def async_setup(hass: HomeAssistant, config: ConfigType) -> bool:
    async def reload_service_handler(service_call: ServiceCall) -> None:
        """Remove all automations and load new ones from config."""
        await async_get_blueprints(hass).async_reset_cache()
-        conf = await component.async_prepare_reload(skip_reset=True)
+        if (conf := await component.async_prepare_reload(skip_reset=True)) is None:
+            return
        if automation_id := service_call.data.get(CONF_ID):
            await _async_process_single_config(hass, conf, component, automation_id)
        else:
--- a/homeassistant/components/aws_s3/init.py
+++ b/homeassistant/components/aws_s3/init.py
@@ -5,10 +5,11 @@ from __future__ import annotations
 import logging
 from typing import cast

+from aiobotocore.client import AioBaseClient as S3Client
 from aiobotocore.session import AioSession
 from botocore.exceptions import ClientError, ConnectionError, ParamValidationError

-from homeassistant.const import Platform
+from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryError, ConfigEntryNotReady

@@ -20,9 +21,9 @@ from .const import (
    DATA_BACKUP_AGENT_LISTENERS,
    DOMAIN,
 )
-from .coordinator import S3ConfigEntry, S3DataUpdateCoordinator

-_PLATFORMS = (Platform.SENSOR,)
+type S3ConfigEntry = ConfigEntry[S3Client]
+

 _LOGGER = logging.getLogger(__name__)

@@ -63,13 +64,7 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
            translation_key="cannot_connect",
        ) from err

-    coordinator = S3DataUpdateCoordinator(
-        hass,
-        entry=entry,
-        client=client,
-    )
-    await coordinator.async_config_entry_first_refresh()
-    entry.runtime_data = coordinator
+    entry.runtime_data = client

    def notify_backup_listeners() -> None:
        for listener in hass.data.get(DATA_BACKUP_AGENT_LISTENERS, []):
@@ -77,16 +72,11 @@ async def async_setup_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:

    entry.async_on_unload(entry.async_on_state_change(notify_backup_listeners))

-    await hass.config_entries.async_forward_entry_setups(entry, _PLATFORMS)
-
    return True


 async def async_unload_entry(hass: HomeAssistant, entry: S3ConfigEntry) -> bool:
    """Unload a config entry."""
-    unload_ok = await hass.config_entries.async_unload_platforms(entry, _PLATFORMS)
-    if not unload_ok:
-        return False
-    coordinator = entry.runtime_data
-    await coordinator.client.__aexit__(None, None, None)
+    client = entry.runtime_data
+    await client.__aexit__(None, None, None)
    return True
--- a/homeassistant/components/aws_s3/backup.py
+++ b/homeassistant/components/aws_s3/backup.py
@@ -19,8 +19,7 @@ from homeassistant.components.backup import (
 from homeassistant.core import HomeAssistant, callback

 from . import S3ConfigEntry
-from .const import CONF_BUCKET, CONF_PREFIX, DATA_BACKUP_AGENT_LISTENERS, DOMAIN
-from .helpers import async_list_backups_from_s3
+from .const import CONF_BUCKET, DATA_BACKUP_AGENT_LISTENERS, DOMAIN

 _LOGGER = logging.getLogger(__name__)
 CACHE_TTL = 300
@@ -94,19 +93,12 @@ class S3BackupAgent(BackupAgent):
    def __init__(self, hass: HomeAssistant, entry: S3ConfigEntry) -> None:
        """Initialize the S3 agent."""
        super().__init__()
-        self._client = entry.runtime_data.client
+        self._client = entry.runtime_data
        self._bucket: str = entry.data[CONF_BUCKET]
        self.name = entry.title
        self.unique_id = entry.entry_id
        self._backup_cache: dict[str, AgentBackup] = {}
        self._cache_expiration = time()
-        self._prefix: str = entry.data.get(CONF_PREFIX, "")
-
-    def _with_prefix(self, key: str) -> str:
-        """Add prefix to a key if configured."""
-        if not self._prefix:
-            return key
-        return f"{self._prefix}/{key}"

    @handle_boto_errors
    async def async_download_backup(
@@ -122,9 +114,7 @@ class S3BackupAgent(BackupAgent):
        backup = await self._find_backup_by_id(backup_id)
        tar_filename, _ = suggested_filenames(backup)

-        response = await self._client.get_object(
-            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
-        )
+        response = await self._client.get_object(Bucket=self._bucket, Key=tar_filename)
        return response["Body"].iter_chunks()

    async def async_upload_backup(
@@ -151,7 +141,7 @@ class S3BackupAgent(BackupAgent):
            metadata_content = json.dumps(backup.as_dict())
            await self._client.put_object(
                Bucket=self._bucket,
-                Key=self._with_prefix(metadata_filename),
+                Key=metadata_filename,
                Body=metadata_content,
            )
        except BotoCoreError as err:
@@ -178,7 +168,7 @@ class S3BackupAgent(BackupAgent):

        await self._client.put_object(
            Bucket=self._bucket,
-            Key=self._with_prefix(tar_filename),
+            Key=tar_filename,
            Body=bytes(file_data),
        )

@@ -195,7 +185,7 @@ class S3BackupAgent(BackupAgent):
        _LOGGER.debug("Starting multipart upload for %s", tar_filename)
        multipart_upload = await self._client.create_multipart_upload(
            Bucket=self._bucket,
-            Key=self._with_prefix(tar_filename),
+            Key=tar_filename,
        )
        upload_id = multipart_upload["UploadId"]
        try:
@@ -225,7 +215,7 @@ class S3BackupAgent(BackupAgent):
                        )
                        part = await cast(Any, self._client).upload_part(
                            Bucket=self._bucket,
-                            Key=self._with_prefix(tar_filename),
+                            Key=tar_filename,
                            PartNumber=part_number,
                            UploadId=upload_id,
                            Body=part_data.tobytes(),
@@ -253,7 +243,7 @@ class S3BackupAgent(BackupAgent):
                )
                part = await cast(Any, self._client).upload_part(
                    Bucket=self._bucket,
-                    Key=self._with_prefix(tar_filename),
+                    Key=tar_filename,
                    PartNumber=part_number,
                    UploadId=upload_id,
                    Body=remaining_data.tobytes(),
@@ -262,7 +252,7 @@ class S3BackupAgent(BackupAgent):

            await cast(Any, self._client).complete_multipart_upload(
                Bucket=self._bucket,
-                Key=self._with_prefix(tar_filename),
+                Key=tar_filename,
                UploadId=upload_id,
                MultipartUpload={"Parts": parts},
            )
@@ -271,7 +261,7 @@ class S3BackupAgent(BackupAgent):
            try:
                await self._client.abort_multipart_upload(
                    Bucket=self._bucket,
-                    Key=self._with_prefix(tar_filename),
+                    Key=tar_filename,
                    UploadId=upload_id,
                )
            except BotoCoreError:
@@ -292,12 +282,8 @@ class S3BackupAgent(BackupAgent):
        tar_filename, metadata_filename = suggested_filenames(backup)

        # Delete both the backup file and its metadata file
-        await self._client.delete_object(
-            Bucket=self._bucket, Key=self._with_prefix(tar_filename)
-        )
-        await self._client.delete_object(
-            Bucket=self._bucket, Key=self._with_prefix(metadata_filename)
-        )
+        await self._client.delete_object(Bucket=self._bucket, Key=tar_filename)
+        await self._client.delete_object(Bucket=self._bucket, Key=metadata_filename)

        # Reset cache after successful deletion
        self._cache_expiration = time()
@@ -330,10 +316,35 @@ class S3BackupAgent(BackupAgent):
        if time() <= self._cache_expiration:
            return self._backup_cache

-        backups_list = await async_list_backups_from_s3(
-            self._client, self._bucket, self._prefix
-        )
-        self._backup_cache = {b.backup_id: b for b in backups_list}
+        backups = {}
+        paginator = self._client.get_paginator("list_objects_v2")
+        metadata_files: list[dict[str, Any]] = []
+        async for page in paginator.paginate(Bucket=self._bucket):
+            metadata_files.extend(
+                obj
+                for obj in page.get("Contents", [])
+                if obj["Key"].endswith(".metadata.json")
+            )
+
+        for metadata_file in metadata_files:
+            try:
+                # Download and parse metadata file
+                metadata_response = await self._client.get_object(
+                    Bucket=self._bucket, Key=metadata_file["Key"]
+                )
+                metadata_content = await metadata_response["Body"].read()
+                metadata_json = json.loads(metadata_content)
+            except (BotoCoreError, json.JSONDecodeError) as err:
+                _LOGGER.warning(
+                    "Failed to process metadata file %s: %s",
+                    metadata_file["Key"],
+                    err,
+                )
+                continue
+            backup = AgentBackup.from_dict(metadata_json)
+            backups[backup.backup_id] = backup
+
+        self._backup_cache = backups
        self._cache_expiration = time() + CACHE_TTL

        return self._backup_cache
--- a/homeassistant/components/aws_s3/config_flow.py
+++ b/homeassistant/components/aws_s3/config_flow.py
@@ -22,7 +22,6 @@ from .const import (
    CONF_ACCESS_KEY_ID,
    CONF_BUCKET,
    CONF_ENDPOINT_URL,
-    CONF_PREFIX,
    CONF_SECRET_ACCESS_KEY,
    DEFAULT_ENDPOINT_URL,
    DESCRIPTION_AWS_S3_DOCS_URL,
@@ -40,7 +39,6 @@ STEP_USER_DATA_SCHEMA = vol.Schema(
        vol.Required(CONF_ENDPOINT_URL, default=DEFAULT_ENDPOINT_URL): TextSelector(
            config=TextSelectorConfig(type=TextSelectorType.URL)
        ),
-        vol.Optional(CONF_PREFIX, default=""): cv.string,
    }
 )

@@ -55,20 +53,16 @@ class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
        errors: dict[str, str] = {}

        if user_input is not None:
-            normalized_prefix = user_input.get(CONF_PREFIX, "").strip("/")
-            # Check for existing entries, treating missing prefix as empty
-            for entry in self._async_current_entries(include_ignore=False):
-                entry_prefix = (entry.data.get(CONF_PREFIX) or "").strip("/")
-                if (
-                    entry.data.get(CONF_BUCKET) == user_input[CONF_BUCKET]
-                    and entry.data.get(CONF_ENDPOINT_URL)
-                    == user_input[CONF_ENDPOINT_URL]
-                    and entry_prefix == normalized_prefix
-                ):
-                    return self.async_abort(reason="already_configured")
+            self._async_abort_entries_match(
+                {
+                    CONF_BUCKET: user_input[CONF_BUCKET],
+                    CONF_ENDPOINT_URL: user_input[CONF_ENDPOINT_URL],
+                }
+            )

-            hostname = urlparse(user_input[CONF_ENDPOINT_URL]).hostname
-            if not hostname or not hostname.endswith(AWS_DOMAIN):
+            if not urlparse(user_input[CONF_ENDPOINT_URL]).hostname.endswith(
+                AWS_DOMAIN
+            ):
                errors[CONF_ENDPOINT_URL] = "invalid_endpoint_url"
            else:
                try:
@@ -90,18 +84,9 @@ class S3ConfigFlow(ConfigFlow, domain=DOMAIN):
                except ConnectionError:
                    errors[CONF_ENDPOINT_URL] = "cannot_connect"
                else:
-                    data = dict(user_input)
-                    if not normalized_prefix:
-                        # Do not persist empty optional values
-                        data.pop(CONF_PREFIX, None)
-                    else:
-                        data[CONF_PREFIX] = normalized_prefix
-
-                    title = user_input[CONF_BUCKET]
-                    if normalized_prefix:
-                        title = f"{title} - {normalized_prefix}"
-
-                    return self.async_create_entry(title=title, data=data)
+                    return self.async_create_entry(
+                        title=user_input[CONF_BUCKET], data=user_input
+                    )

        return self.async_show_form(
            step_id="user",
--- a/homeassistant/components/aws_s3/const.py
+++ b/homeassistant/components/aws_s3/const.py
@@ -11,7 +11,6 @@ CONF_ACCESS_KEY_ID = "access_key_id"
 CONF_SECRET_ACCESS_KEY = "secret_access_key"
 CONF_ENDPOINT_URL = "endpoint_url"
 CONF_BUCKET = "bucket"
-CONF_PREFIX = "prefix"

 AWS_DOMAIN = "amazonaws.com"
 DEFAULT_ENDPOINT_URL = f"https://s3.eu-central-1.{AWS_DOMAIN}/"
--- a/homeassistant/components/aws_s3/coordinator.py
+++ b/homeassistant/components/aws_s3/coordinator.py
@@ -1,73 +0,0 @@
-"""DataUpdateCoordinator for AWS S3."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-from datetime import timedelta
-import logging
-
-from aiobotocore.client import AioBaseClient as S3Client
-from botocore.exceptions import BotoCoreError
-
-from homeassistant.config_entries import ConfigEntry
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-
-from .const import CONF_BUCKET, CONF_PREFIX, DOMAIN
-from .helpers import async_list_backups_from_s3
-
-SCAN_INTERVAL = timedelta(hours=6)
-
-type S3ConfigEntry = ConfigEntry[S3DataUpdateCoordinator]
-
-_LOGGER = logging.getLogger(__name__)
-
-
-@dataclass
-class SensorData:
-    """Class to represent sensor data."""
-
-    all_backups_size: int
-
-
-class S3DataUpdateCoordinator(DataUpdateCoordinator[SensorData]):
-    """Class to manage fetching AWS S3 data from single endpoint."""
-
-    config_entry: S3ConfigEntry
-    client: S3Client
-
-    def __init__(
-        self,
-        hass: HomeAssistant,
-        *,
-        entry: S3ConfigEntry,
-        client: S3Client,
-    ) -> None:
-        """Initialize AWS S3 data updater."""
-        super().__init__(
-            hass,
-            _LOGGER,
-            config_entry=entry,
-            name=DOMAIN,
-            update_interval=SCAN_INTERVAL,
-        )
-        self.client = client
-        self._bucket: str = entry.data[CONF_BUCKET]
-        self._prefix: str = entry.data.get(CONF_PREFIX, "")
-
-    async def _async_update_data(self) -> SensorData:
-        """Fetch data from AWS S3."""
-        try:
-            backups = await async_list_backups_from_s3(
-                self.client, self._bucket, self._prefix
-            )
-        except BotoCoreError as error:
-            raise UpdateFailed(
-                translation_domain=DOMAIN,
-                translation_key="error_fetching_data",
-            ) from error
-
-        all_backups_size = sum(b.size for b in backups)
-        return SensorData(
-            all_backups_size=all_backups_size,
-        )
--- a/homeassistant/components/aws_s3/diagnostics.py
+++ b/homeassistant/components/aws_s3/diagnostics.py
@@ -1,55 +0,0 @@
-"""Diagnostics support for AWS S3."""
-
-from __future__ import annotations
-
-import dataclasses
-from typing import Any
-
-from homeassistant.components.backup import (
-    DATA_MANAGER as BACKUP_DATA_MANAGER,
-    BackupManager,
-)
-from homeassistant.components.diagnostics import async_redact_data
-from homeassistant.core import HomeAssistant
-
-from .const import (
-    CONF_ACCESS_KEY_ID,
-    CONF_BUCKET,
-    CONF_PREFIX,
-    CONF_SECRET_ACCESS_KEY,
-    DOMAIN,
-)
-from .coordinator import S3ConfigEntry
-from .helpers import async_list_backups_from_s3
-
-TO_REDACT = (CONF_ACCESS_KEY_ID, CONF_SECRET_ACCESS_KEY)
-
-
-async def async_get_config_entry_diagnostics(
-    hass: HomeAssistant,
-    entry: S3ConfigEntry,
-) -> dict[str, Any]:
-    """Return diagnostics for a config entry."""
-    coordinator = entry.runtime_data
-    backup_manager: BackupManager = hass.data[BACKUP_DATA_MANAGER]
-    backups = await async_list_backups_from_s3(
-        coordinator.client,
-        bucket=entry.data[CONF_BUCKET],
-        prefix=entry.data.get(CONF_PREFIX, ""),
-    )
-
-    data = {
-        "coordinator_data": dataclasses.asdict(coordinator.data),
-        "config": {
-            **entry.data,
-            **entry.options,
-        },
-        "backup_agents": [
-            {"name": agent.name}
-            for agent in backup_manager.backup_agents.values()
-            if agent.domain == DOMAIN
-        ],
-        "backup": [backup.as_dict() for backup in backups],
-    }
-
-    return async_redact_data(data, TO_REDACT)
--- a/homeassistant/components/aws_s3/entity.py
+++ b/homeassistant/components/aws_s3/entity.py
@@ -1,33 +0,0 @@
-"""Define the AWS S3 entity."""
-
-from homeassistant.helpers.device_registry import DeviceEntryType, DeviceInfo
-from homeassistant.helpers.entity import EntityDescription
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import CONF_BUCKET, DOMAIN
-from .coordinator import S3DataUpdateCoordinator
-
-
-class S3Entity(CoordinatorEntity[S3DataUpdateCoordinator]):
-    """Defines a base AWS S3 entity."""
-
-    _attr_has_entity_name = True
-
-    def __init__(
-        self, coordinator: S3DataUpdateCoordinator, description: EntityDescription
-    ) -> None:
-        """Initialize an AWS S3 entity."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.config_entry.entry_id}_{description.key}"
-
-    @property
-    def device_info(self) -> DeviceInfo:
-        """Return device information about this AWS S3 device."""
-        return DeviceInfo(
-            identifiers={(DOMAIN, self.coordinator.config_entry.entry_id)},
-            name=f"Bucket {self.coordinator.config_entry.data[CONF_BUCKET]}",
-            manufacturer="AWS",
-            model="AWS S3",
-            entry_type=DeviceEntryType.SERVICE,
-        )
--- a/homeassistant/components/aws_s3/helpers.py
+++ b/homeassistant/components/aws_s3/helpers.py
@@ -1,63 +0,0 @@
-"""Helpers for the AWS S3 integration."""
-
-from __future__ import annotations
-
-import json
-import logging
-from typing import Any
-
-from aiobotocore.client import AioBaseClient as S3Client
-from botocore.exceptions import BotoCoreError
-
-from homeassistant.components.backup import AgentBackup
-
-_LOGGER = logging.getLogger(__name__)
-
-
-async def async_list_backups_from_s3(
-    client: S3Client,
-    bucket: str,
-    prefix: str,
-) -> list[AgentBackup]:
-    """List backups from an S3 bucket by reading metadata files."""
-    paginator = client.get_paginator("list_objects_v2")
-    metadata_files: list[dict[str, Any]] = []
-
-    list_kwargs: dict[str, Any] = {"Bucket": bucket}
-    if prefix:
-        list_kwargs["Prefix"] = prefix + "/"
-
-    async for page in paginator.paginate(**list_kwargs):
-        metadata_files.extend(
-            obj
-            for obj in page.get("Contents", [])
-            if obj["Key"].endswith(".metadata.json")
-        )
-
-    backups: list[AgentBackup] = []
-    for metadata_file in metadata_files:
-        try:
-            metadata_response = await client.get_object(
-                Bucket=bucket, Key=metadata_file["Key"]
-            )
-            metadata_content = await metadata_response["Body"].read()
-            metadata_json = json.loads(metadata_content)
-        except (BotoCoreError, json.JSONDecodeError) as err:
-            _LOGGER.warning(
-                "Failed to process metadata file %s: %s",
-                metadata_file["Key"],
-                err,
-            )
-            continue
-        try:
-            backup = AgentBackup.from_dict(metadata_json)
-        except (KeyError, TypeError, ValueError) as err:
-            _LOGGER.warning(
-                "Failed to parse metadata in file %s: %s",
-                metadata_file["Key"],
-                err,
-            )
-            continue
-        backups.append(backup)
-
-    return backups
--- a/homeassistant/components/aws_s3/manifest.json
+++ b/homeassistant/components/aws_s3/manifest.json
@@ -3,10 +3,9 @@
  "name": "AWS S3",
  "codeowners": ["@tomasbedrich"],
  "config_flow": true,
-  "dependencies": ["backup"],
  "documentation": "https://www.home-assistant.io/integrations/aws_s3",
  "integration_type": "service",
-  "iot_class": "cloud_polling",
+  "iot_class": "cloud_push",
  "loggers": ["aiobotocore"],
  "quality_scale": "bronze",
  "requirements": ["aiobotocore==2.21.1"]
--- a/homeassistant/components/aws_s3/quality_scale.yaml
+++ b/homeassistant/components/aws_s3/quality_scale.yaml
@@ -3,7 +3,9 @@ rules:
  action-setup:
    status: exempt
    comment: Integration does not register custom actions.
-  appropriate-polling: done
+  appropriate-polling:
+    status: exempt
+    comment: This integration does not poll.
  brands: done
  common-modules: done
  config-flow-test-coverage: done
@@ -18,14 +20,16 @@ rules:
  entity-event-setup:
    status: exempt
    comment: Entities of this integration does not explicitly subscribe to events.
-  entity-unique-id: done
-  has-entity-name: done
+  entity-unique-id:
+    status: exempt
+    comment: This integration does not have entities.
+  has-entity-name:
+    status: exempt
+    comment: This integration does not have entities.
  runtime-data: done
  test-before-configure: done
  test-before-setup: done
-  unique-config-entry:
-    status: exempt
-    comment: Hassfest does not recognize the duplicate prevention logic. Duplicate entries are prevented by checking bucket, endpoint URL, and prefix in the config flow.
+  unique-config-entry: done

  # Silver
  action-exceptions:
@@ -36,27 +40,37 @@ rules:
    status: exempt
    comment: This integration does not have an options flow.
  docs-installation-parameters: done
-  entity-unavailable: done
+  entity-unavailable:
+    status: exempt
+    comment: This integration does not have entities.
  integration-owner: done
-  log-when-unavailable: done
-  parallel-updates: done
+  log-when-unavailable: todo
+  parallel-updates:
+    status: exempt
+    comment: This integration does not poll.
  reauthentication-flow: todo
  test-coverage: done

  # Gold
-  devices: done
-  diagnostics: done
+  devices:
+    status: exempt
+    comment: This integration does not have entities.
+  diagnostics: todo
  discovery-update-info:
    status: exempt
    comment: S3 is a cloud service that is not discovered on the network.
  discovery:
    status: exempt
    comment: S3 is a cloud service that is not discovered on the network.
-  docs-data-update: done
+  docs-data-update:
+    status: exempt
+    comment: This integration does not poll.
  docs-examples:
    status: exempt
    comment: The integration extends core functionality and does not require examples.
-  docs-known-limitations: done
+  docs-known-limitations:
+    status: exempt
+    comment: No known limitations.
  docs-supported-devices:
    status: exempt
    comment: This integration does not support physical devices.
@@ -67,11 +81,19 @@ rules:
  docs-use-cases: done
  dynamic-devices:
    status: exempt
-    comment: This integration has a fixed set of devices.
-  entity-category: done
-  entity-device-class: done
-  entity-disabled-by-default: done
-  entity-translations: done
+    comment: This integration does not have devices.
+  entity-category:
+    status: exempt
+    comment: This integration does not have entities.
+  entity-device-class:
+    status: exempt
+    comment: This integration does not have entities.
+  entity-disabled-by-default:
+    status: exempt
+    comment: This integration does not have entities.
+  entity-translations:
+    status: exempt
+    comment: This integration does not have entities.
  exception-translations: done
  icon-translations:
    status: exempt
@@ -82,7 +104,7 @@ rules:
    comment: There are no issues which can be repaired.
  stale-devices:
    status: exempt
-    comment: This is a service type integration with a single device.
+    comment: This integration does not have devices.

  # Platinum
  async-dependency: done
--- a/homeassistant/components/aws_s3/sensor.py
+++ b/homeassistant/components/aws_s3/sensor.py
@@ -1,66 +0,0 @@
-"""Support for AWS S3 sensors."""
-
-from __future__ import annotations
-
-from collections.abc import Callable
-from dataclasses import dataclass
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-)
-from homeassistant.const import EntityCategory, UnitOfInformation
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.typing import StateType
-
-from .coordinator import S3ConfigEntry, SensorData
-from .entity import S3Entity
-
-# Coordinator is used to centralize the data updates
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class S3SensorEntityDescription(SensorEntityDescription):
-    """Describes an AWS S3 sensor entity."""
-
-    value_fn: Callable[[SensorData], StateType]
-
-
-SENSORS: tuple[S3SensorEntityDescription, ...] = (
-    S3SensorEntityDescription(
-        key="backups_size",
-        translation_key="backups_size",
-        native_unit_of_measurement=UnitOfInformation.BYTES,
-        suggested_unit_of_measurement=UnitOfInformation.MEBIBYTES,
-        suggested_display_precision=0,
-        device_class=SensorDeviceClass.DATA_SIZE,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda data: data.all_backups_size,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: S3ConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up AWS S3 sensor based on a config entry."""
-    coordinator = entry.runtime_data
-    async_add_entities(
-        S3SensorEntity(coordinator, description) for description in SENSORS
-    )
-
-
-class S3SensorEntity(S3Entity, SensorEntity):
-    """Defines an AWS S3 sensor entity."""
-
-    entity_description: S3SensorEntityDescription
-
-    @property
-    def native_value(self) -> StateType:
-        """Return the state of the sensor."""
-        return self.entity_description.value_fn(self.coordinator.data)
--- a/homeassistant/components/aws_s3/strings.json
+++ b/homeassistant/components/aws_s3/strings.json
@@ -15,34 +15,22 @@
          "access_key_id": "Access key ID",
          "bucket": "Bucket name",
          "endpoint_url": "Endpoint URL",
-          "prefix": "Prefix",
          "secret_access_key": "Secret access key"
        },
        "data_description": {
          "access_key_id": "Access key ID to connect to AWS S3 API",
          "bucket": "Bucket must already exist and be writable by the provided credentials.",
          "endpoint_url": "Endpoint URL provided to [Boto3 Session]({boto3_docs_url}). Region-specific [AWS S3 endpoints]({aws_s3_docs_url}) are available in their docs.",
-          "prefix": "Folder or prefix to store backups in, for example `backups`",
          "secret_access_key": "Secret access key to connect to AWS S3 API"
        },
        "title": "Add AWS S3 bucket"
      }
    }
  },
-  "entity": {
-    "sensor": {
-      "backups_size": {
-        "name": "Total size of backups"
-      }
-    }
-  },
  "exceptions": {
    "cannot_connect": {
      "message": "Cannot connect to endpoint"
    },
-    "error_fetching_data": {
-      "message": "Error fetching data"
-    },
    "invalid_bucket_name": {
      "message": "Invalid bucket name"
    },
--- a/homeassistant/components/backup/const.py
+++ b/homeassistant/components/backup/const.py
@@ -33,5 +33,3 @@ EXCLUDE_DATABASE_FROM_BACKUP = [
    "home-assistant_v2.db",
    "home-assistant_v2.db-wal",
 ]
-
-SECURETAR_CREATE_VERSION = 2
--- a/homeassistant/components/backup/manager.py
+++ b/homeassistant/components/backup/manager.py
@@ -20,9 +20,13 @@ import time
 from typing import IO, TYPE_CHECKING, Any, Protocol, TypedDict, cast

 import aiohttp
-from securetar import SecureTarArchive, atomic_contents_add
+from securetar import SecureTarFile, atomic_contents_add

-from homeassistant.backup_restore import RESTORE_BACKUP_FILE, RESTORE_BACKUP_RESULT_FILE
+from homeassistant.backup_restore import (
+    RESTORE_BACKUP_FILE,
+    RESTORE_BACKUP_RESULT_FILE,
+    password_to_key,
+)
 from homeassistant.const import __version__ as HAVERSION
 from homeassistant.core import HomeAssistant, callback
 from homeassistant.helpers import (
@@ -56,7 +60,6 @@ from .const import (
    EXCLUDE_DATABASE_FROM_BACKUP,
    EXCLUDE_FROM_BACKUP,
    LOGGER,
-    SECURETAR_CREATE_VERSION,
 )
 from .models import (
    AddonInfo,
@@ -1855,22 +1858,20 @@ class CoreBackupReaderWriter(BackupReaderWriter):

            return False

-        with SecureTarArchive(
-            tar_file_path,
-            "w",
-            bufsize=BUF_SIZE,
-            create_version=SECURETAR_CREATE_VERSION,
-            password=password,
-        ) as outer_secure_tarfile:
+        outer_secure_tarfile = SecureTarFile(
+            tar_file_path, "w", gzip=False, bufsize=BUF_SIZE
+        )
+        with outer_secure_tarfile as outer_secure_tarfile_tarfile:
            raw_bytes = json_bytes(backup_data)
            fileobj = io.BytesIO(raw_bytes)
            tar_info = tarfile.TarInfo(name="./backup.json")
            tar_info.size = len(raw_bytes)
            tar_info.mtime = int(time.time())
-            outer_secure_tarfile.tar.addfile(tar_info, fileobj=fileobj)
-            with outer_secure_tarfile.create_tar(
+            outer_secure_tarfile_tarfile.addfile(tar_info, fileobj=fileobj)
+            with outer_secure_tarfile.create_inner_tar(
                "./homeassistant.tar.gz",
                gzip=True,
+                key=password_to_key(password) if password is not None else None,
            ) as core_tar:
                atomic_contents_add(
                    tar_file=core_tar,
--- a/homeassistant/components/backup/manifest.json
+++ b/homeassistant/components/backup/manifest.json
@@ -8,6 +8,6 @@
  "integration_type": "service",
  "iot_class": "calculated",
  "quality_scale": "internal",
-  "requirements": ["cronsim==2.7", "securetar==2026.2.0"],
+  "requirements": ["cronsim==2.7", "securetar==2025.2.1"],
  "single_config_entry": true
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
farmio	33236ce11a	Account for empty strings in base entity	2026-02-18 13:20:53 +01:00
farmio	e5b2eb05d2	Also for entity name	2026-02-18 12:39:59 +01:00
farmio	3bee2ce6c7	Move default value to schema	2026-02-18 12:35:06 +01:00
farmio	b423495d42	Use empty string as default in number	2026-02-18 12:30:34 +01:00
farmio	285ef803e7	Update schema.py	2026-02-16 22:36:30 +01:00
farmio	11f58e482e	clean up name config for yaml entities	2026-02-16 22:33:05 +01:00