adjust switch platform

.github/copilot-instructions.md

@@ -51,9 +51,6 @@ rules:
 - **Missing imports** - We use static analysis tooling to catch that
 - **Code formatting** - We have ruff as a formatting tool that will catch those if needed (unless specifically instructed otherwise in these instructions)
 
-**Git commit practices during review:**
-- **Do NOT amend, squash, or rebase commits after review has started** - Reviewers need to see what changed since their last review
-
 ## Python Requirements
 
 - **Compatibility**: Python 3.13+

.github/workflows/builder.yml

@@ -15,7 +15,7 @@ env:
   UV_HTTP_TIMEOUT: 60
   UV_SYSTEM_PYTHON: "true"
   # Base image version from https://github.com/home-assistant/docker
-  BASE_IMAGE_VERSION: "2025.12.0"
+  BASE_IMAGE_VERSION: "2025.11.3"
   ARCHITECTURES: '["amd64", "aarch64"]'
 
 jobs:
@@ -70,7 +70,7 @@ jobs:
         run: find ./homeassistant/components/*/translations -name "*.json" | tar zcvf translations.tar.gz -T -
 
       - name: Upload translations
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: translations
           path: translations.tar.gz
@@ -169,7 +169,7 @@ jobs:
           fi
 
       - name: Download translations
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: translations
 
@@ -482,7 +482,7 @@ jobs:
           python-version: ${{ env.DEFAULT_PYTHON }}
 
       - name: Download translations
-        uses: actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: translations
 
@@ -551,7 +551,7 @@ jobs:
 
       - name: Generate artifact attestation
         if: needs.init.outputs.channel != 'dev' && needs.init.outputs.publish == 'true'
-        uses: actions/attest-build-provenance@00014ed6ed5efc5b1ab7f7f34a39eb55d41aa4f8 # v3.1.0
+        uses: actions/attest-build-provenance@977bb373ede98d70efdf65b84cb5f73e068dcc2a # v3.0.0
         with:
           subject-name: ${{ env.HASSFEST_IMAGE_NAME }}
           subject-digest: ${{ steps.push.outputs.digest }}

.github/workflows/ci.yaml

@@ -263,7 +263,7 @@ jobs:
           check-latest: true
       - name: Restore base Python virtual environment
         id: cache-venv
-        uses: &actions-cache actions/cache@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache actions/cache@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
         with:
           path: venv
           key: &key-pre-commit-venv >-
@@ -304,7 +304,7 @@ jobs:
       - &cache-restore-pre-commit-venv
         name: Restore base Python virtual environment
         id: cache-venv
-        uses: &actions-cache-restore actions/cache/restore@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache-restore actions/cache/restore@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
         with:
           path: venv
           fail-on-cache-miss: true
@@ -511,7 +511,7 @@ jobs:
           fi
       - name: Save apt cache
         if: steps.cache-apt-check.outputs.cache-hit != 'true'
-        uses: &actions-cache-save actions/cache/save@9255dc7a253b0ccc959486e2bca901246202afeb # v5.0.1
+        uses: &actions-cache-save actions/cache/save@a7833574556fa59680c1b7cb190c1735db73ebf0 # v5.0.0
         with:
           path: *path-apt-cache
           key: *key-apt-cache
@@ -534,7 +534,7 @@ jobs:
           python --version
           uv pip freeze >> pip_freeze.txt
       - name: Upload pip_freeze artifact
-        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: pip-freeze-${{ matrix.python-version }}
           path: pip_freeze.txt
@@ -864,7 +864,7 @@ jobs:
         run: |
           echo "::add-matcher::.github/workflows/matchers/pytest-slow.json"
       - name: Download pytest_buckets
-        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: pytest_buckets
       - &compile-english-translations

.github/workflows/codeql.yml

@@ -24,11 +24,11 @@ jobs:
         uses: actions/checkout@8e8c483db84b4bee98b60c0593521ed34d9990e8 # v6.0.1
 
       - name: Initialize CodeQL
-        uses: github/codeql-action/init@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@5d4e8d1aca955e8d8589aabd499c5cae939e33c7 # v4.31.9
+        uses: github/codeql-action/analyze@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           category: "/language:python"

.github/workflows/lock.yml

@@ -10,7 +10,7 @@ jobs:
     if: github.repository_owner == 'home-assistant'
     runs-on: ubuntu-latest
     steps:
-      - uses: dessant/lock-threads@7266a7ce5c1df01b1c6db85bf8cd86c737dadbe7 # v6.0.0
+      - uses: dessant/lock-threads@1bf7ec25051fe7c00bdd17e6a7cf3d7bfb7dc771 # v5.0.1
         with:
           github-token: ${{ github.token }}
           issue-inactive-days: "30"

.github/workflows/wheels.yml

@@ -74,7 +74,7 @@ jobs:
           ) > .env_file
 
       - name: Upload env_file
-        uses: &actions-upload-artifact actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6.0.0
+        uses: &actions-upload-artifact actions/upload-artifact@330a01c490aca151604b8cf639adc76d48f6c5d4 # v5.0.0
         with:
           name: env_file
           path: ./.env_file
@@ -119,7 +119,7 @@ jobs:
 
       - &download-env-file
         name: Download env_file
-        uses: &actions-download-artifact actions/download-artifact@37930b1c2abaa49bbe596cd826c3c89aef350131 # v7.0.0
+        uses: &actions-download-artifact actions/download-artifact@018cc2cf5baa6db3ef3c5f8a56943fffe632ef53 # v6.0.0
         with:
           name: env_file
 

.strict-typing

@@ -567,7 +567,6 @@ homeassistant.components.wake_word.*
 homeassistant.components.wallbox.*
 homeassistant.components.waqi.*
 homeassistant.components.water_heater.*
-homeassistant.components.watts.*
 homeassistant.components.watttime.*
 homeassistant.components.weather.*
 homeassistant.components.webhook.*

CODEOWNERS

@@ -220,8 +220,8 @@ build.json @home-assistant/supervisor
 /homeassistant/components/bizkaibus/ @UgaitzEtxebarria
 /homeassistant/components/blebox/ @bbx-a @swistakm
 /tests/components/blebox/ @bbx-a @swistakm
-/homeassistant/components/blink/ @fronzbot
-/tests/components/blink/ @fronzbot
+/homeassistant/components/blink/ @fronzbot @mkmer
+/tests/components/blink/ @fronzbot @mkmer
 /homeassistant/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
 /tests/components/blue_current/ @gleeuwen @NickKoepr @jtodorova23
 /homeassistant/components/bluemaestro/ @bdraco
@@ -308,8 +308,8 @@ build.json @home-assistant/supervisor
 /tests/components/config/ @home-assistant/core
 /homeassistant/components/configurator/ @home-assistant/core
 /tests/components/configurator/ @home-assistant/core
-/homeassistant/components/control4/ @lawtancool @davidrecordon
-/tests/components/control4/ @lawtancool @davidrecordon
+/homeassistant/components/control4/ @lawtancool
+/tests/components/control4/ @lawtancool
 /homeassistant/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /tests/components/conversation/ @home-assistant/core @synesthesiam @arturpragacz
 /homeassistant/components/cookidoo/ @miaucl
@@ -664,8 +664,7 @@ build.json @home-assistant/supervisor
 /tests/components/heos/ @andrewsayre
 /homeassistant/components/here_travel_time/ @eifinger
 /tests/components/here_travel_time/ @eifinger
-/homeassistant/components/hikvision/ @mezz64 @ptarjan
-/tests/components/hikvision/ @mezz64 @ptarjan
+/homeassistant/components/hikvision/ @mezz64
 /homeassistant/components/hikvisioncam/ @fbradyirl
 /homeassistant/components/hisense_aehw4a1/ @bannhead
 /tests/components/hisense_aehw4a1/ @bannhead
@@ -1195,8 +1194,8 @@ build.json @home-assistant/supervisor
 /tests/components/ourgroceries/ @OnFreund
 /homeassistant/components/overkiz/ @imicknl
 /tests/components/overkiz/ @imicknl
-/homeassistant/components/overseerr/ @joostlek @AmGarera
-/tests/components/overseerr/ @joostlek @AmGarera
+/homeassistant/components/overseerr/ @joostlek
+/tests/components/overseerr/ @joostlek
 /homeassistant/components/ovo_energy/ @timmo001
 /tests/components/ovo_energy/ @timmo001
 /homeassistant/components/p1_monitor/ @klaasnicolaas
@@ -1798,8 +1797,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/watergate/ @adam-the-hero
 /tests/components/watergate/ @adam-the-hero
 /homeassistant/components/watson_tts/ @rutkai
-/homeassistant/components/watts/ @theobld-ww @devender-verma-ww @ssi-spyro
-/tests/components/watts/ @theobld-ww @devender-verma-ww @ssi-spyro
 /homeassistant/components/watttime/ @bachya
 /tests/components/watttime/ @bachya
 /homeassistant/components/waze_travel_time/ @eifinger

Dockerfile

@@ -24,13 +24,13 @@ ENV \
 COPY rootfs /
 
 # Add go2rtc binary
-COPY --from=ghcr.io/alexxit/go2rtc@sha256:f394f6329f5389a4c9a7fc54b09fdec9621bbb78bf7a672b973440bbdfb02241 /usr/local/bin/go2rtc /bin/go2rtc
+COPY --from=ghcr.io/alexxit/go2rtc@sha256:baef0aa19d759fcfd31607b34ce8eaf039d496282bba57731e6ae326896d7640 /usr/local/bin/go2rtc /bin/go2rtc
 
 RUN \
     # Verify go2rtc can be executed
     go2rtc --version \
     # Install uv
-    && pip3 install uv==0.9.17
+    && pip3 install uv==0.9.6
 
 WORKDIR /usr/src
 

homeassistant/auth/__init__.py

@@ -402,8 +402,6 @@ class AuthManager:
         if user.is_owner:
             raise ValueError("Unable to deactivate the owner")
         await self._store.async_deactivate_user(user)
-        for refresh_token in list(user.refresh_tokens.values()):
-            self.async_remove_refresh_token(refresh_token)
 
     async def async_remove_credentials(self, credentials: models.Credentials) -> None:
         """Remove credentials."""

homeassistant/bootstrap.py

@@ -624,16 +624,13 @@ async def async_enable_logging(
 
     if log_file is None:
         default_log_path = hass.config.path(ERROR_LOG_FILENAME)
-        if "SUPERVISOR" in os.environ and "HA_DUPLICATE_LOG_FILE" not in os.environ:
+        if "SUPERVISOR" in os.environ:
+            _LOGGER.info("Running in Supervisor, not logging to file")
             # Rename the default log file if it exists, since previous versions created
             # it even on Supervisor
-            def rename_old_file() -> None:
-                """Rename old log file in executor."""
-                if os.path.isfile(default_log_path):
-                    with contextlib.suppress(OSError):
-                        os.rename(default_log_path, f"{default_log_path}.old")
-
-            await hass.async_add_executor_job(rename_old_file)
+            if os.path.isfile(default_log_path):
+                with contextlib.suppress(OSError):
+                    os.rename(default_log_path, f"{default_log_path}.old")
             err_log_path = None
         else:
             err_log_path = default_log_path

homeassistant/components/actron_air/__init__.py

@@ -9,16 +9,15 @@ from actron_neo_api import (
 
 from homeassistant.const import CONF_API_TOKEN, Platform
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed, ConfigEntryNotReady
 
-from .const import _LOGGER, DOMAIN
+from .const import _LOGGER
 from .coordinator import (
     ActronAirConfigEntry,
     ActronAirRuntimeData,
     ActronAirSystemCoordinator,
 )
 
-PLATFORMS = [Platform.CLIMATE, Platform.SWITCH]
+PLATFORM = [Platform.CLIMATE]
 
 
 async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) -> bool:
@@ -30,13 +29,12 @@ async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) ->
     try:
         systems = await api.get_ac_systems()
         await api.update_status()
-    except ActronAirAuthError as err:
-        raise ConfigEntryAuthFailed(
-            translation_domain=DOMAIN,
-            translation_key="auth_error",
-        ) from err
+    except ActronAirAuthError:
+        _LOGGER.error("Authentication error while setting up Actron Air integration")
+        raise
     except ActronAirAPIError as err:
-        raise ConfigEntryNotReady from err
+        _LOGGER.error("API error while setting up Actron Air integration: %s", err)
+        raise
 
     system_coordinators: dict[str, ActronAirSystemCoordinator] = {}
     for system in systems:
@@ -50,10 +48,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) ->
         system_coordinators=system_coordinators,
     )
 
-    await hass.config_entries.async_forward_entry_setups(entry, PLATFORMS)
+    await hass.config_entries.async_forward_entry_setups(entry, PLATFORM)
     return True
 
 
 async def async_unload_entry(hass: HomeAssistant, entry: ActronAirConfigEntry) -> bool:
     """Unload a config entry."""
-    return await hass.config_entries.async_unload_platforms(entry, PLATFORMS)
+    return await hass.config_entries.async_unload_platforms(entry, PLATFORM)

homeassistant/components/actron_air/climate.py

@@ -148,7 +148,7 @@ class ActronSystemClimate(BaseClimateEntity):
     @property
     def fan_mode(self) -> str | None:
         """Return the current fan mode."""
-        fan_mode = self._status.user_aircon_settings.base_fan_mode
+        fan_mode = self._status.user_aircon_settings.fan_mode
         return FAN_MODE_MAPPING_ACTRONAIR_TO_HA.get(fan_mode)
 
     @property

homeassistant/components/actron_air/config_flow.py

@@ -1,12 +1,11 @@
 """Setup config flow for Actron Air integration."""
 
 import asyncio
-from collections.abc import Mapping
 from typing import Any
 
 from actron_neo_api import ActronAirAPI, ActronAirAuthError
 
-from homeassistant.config_entries import SOURCE_REAUTH, ConfigFlow, ConfigFlowResult
+from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_API_TOKEN
 from homeassistant.exceptions import HomeAssistantError
 
@@ -96,16 +95,8 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
 
         unique_id = str(user_data["id"])
         await self.async_set_unique_id(unique_id)
-
-        # Check if this is a reauth flow
-        if self.source == SOURCE_REAUTH:
-            self._abort_if_unique_id_mismatch(reason="wrong_account")
-            return self.async_update_reload_and_abort(
-                self._get_reauth_entry(),
-                data_updates={CONF_API_TOKEN: self._api.refresh_token_value},
-            )
-
         self._abort_if_unique_id_configured()
+
         return self.async_create_entry(
             title=user_data["email"],
             data={CONF_API_TOKEN: self._api.refresh_token_value},
@@ -123,21 +114,6 @@ class ActronAirConfigFlow(ConfigFlow, domain=DOMAIN):
         del self.login_task
         return await self.async_step_user()
 
-    async def async_step_reauth(
-        self, entry_data: Mapping[str, Any]
-    ) -> ConfigFlowResult:
-        """Handle reauthentication request."""
-        return await self.async_step_reauth_confirm()
-
-    async def async_step_reauth_confirm(
-        self, user_input: dict[str, Any] | None = None
-    ) -> ConfigFlowResult:
-        """Confirm reauth dialog."""
-        if user_input is not None:
-            return await self.async_step_user()
-
-        return self.async_show_form(step_id="reauth_confirm")
-
     async def async_step_connection_error(
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:

homeassistant/components/actron_air/coordinator.py

@@ -5,23 +5,16 @@ from __future__ import annotations
 from dataclasses import dataclass
 from datetime import timedelta
 
-from actron_neo_api import (
-    ActronAirACSystem,
-    ActronAirAPI,
-    ActronAirAuthError,
-    ActronAirStatus,
-)
+from actron_neo_api import ActronAirACSystem, ActronAirAPI, ActronAirStatus
 
 from homeassistant.config_entries import ConfigEntry
 from homeassistant.core import HomeAssistant
-from homeassistant.exceptions import ConfigEntryAuthFailed
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator
 from homeassistant.util import dt as dt_util
 
-from .const import _LOGGER, DOMAIN
+from .const import _LOGGER
 
-SCAN_INTERVAL = timedelta(seconds=30)
-STALE_DEVICE_TIMEOUT = timedelta(minutes=5)
+STALE_DEVICE_TIMEOUT = timedelta(hours=24)
 ERROR_NO_SYSTEMS_FOUND = "no_systems_found"
 ERROR_UNKNOWN = "unknown_error"
 
@@ -36,6 +29,9 @@ class ActronAirRuntimeData:
 
 type ActronAirConfigEntry = ConfigEntry[ActronAirRuntimeData]
 
+AUTH_ERROR_THRESHOLD = 3
+SCAN_INTERVAL = timedelta(seconds=30)
+
 
 class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
     """System coordinator for Actron Air integration."""
@@ -63,14 +59,7 @@ class ActronAirSystemCoordinator(DataUpdateCoordinator[ActronAirACSystem]):
 
     async def _async_update_data(self) -> ActronAirStatus:
         """Fetch updates and merge incremental changes into the full state."""
-        try:
-            await self.api.update_status()
-        except ActronAirAuthError as err:
-            raise ConfigEntryAuthFailed(
-                translation_domain=DOMAIN,
-                translation_key="auth_error",
-            ) from err
-
+        await self.api.update_status()
         self.status = self.api.state_manager.get_status(self.serial_number)
         self.last_seen = dt_util.utcnow()
         return self.status

homeassistant/components/actron_air/icons.json

@@ -1,30 +0,0 @@
-{
-  "entity": {
-    "switch": {
-      "away_mode": {
-        "default": "mdi:home-export-outline",
-        "state": {
-          "off": "mdi:home-import-outline"
-        }
-      },
-      "continuous_fan": {
-        "default": "mdi:fan",
-        "state": {
-          "off": "mdi:fan-off"
-        }
-      },
-      "quiet_mode": {
-        "default": "mdi:volume-low",
-        "state": {
-          "off": "mdi:volume-high"
-        }
-      },
-      "turbo_mode": {
-        "default": "mdi:fan-plus",
-        "state": {
-          "off": "mdi:fan"
-        }
-      }
-    }
-  }
-}

homeassistant/components/actron_air/manifest.json

@@ -13,5 +13,5 @@
   "integration_type": "hub",
   "iot_class": "cloud_polling",
   "quality_scale": "bronze",
-  "requirements": ["actron-neo-api==0.4.1"]
+  "requirements": ["actron-neo-api==0.1.87"]
 }

homeassistant/components/actron_air/quality_scale.yaml

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

homeassistant/components/actron_air/strings.json

@@ -2,12 +2,10 @@
   "config": {
     "abort": {
       "already_configured": "[%key:common::config_flow::abort::already_configured_account%]",
-      "oauth2_error": "Failed to start authentication flow",
-      "reauth_successful": "[%key:common::config_flow::abort::reauth_successful%]",
-      "wrong_account": "You must reauthenticate with the same Actron Air account that was originally configured."
+      "oauth2_error": "Failed to start OAuth2 flow"
     },
     "error": {
-      "oauth2_error": "Failed to start authentication flow. Please try again later."
+      "oauth2_error": "Failed to start OAuth2 flow. Please try again later."
     },
     "progress": {
       "wait_for_authorization": "To authenticate, open the following URL and login at Actron Air:\n{verification_uri}\nIf the code is not automatically copied, paste the following code to authorize the integration:\n\n```{user_code}```\n\n\nThe login attempt will time out after {expires_minutes} minutes."
@@ -18,39 +16,14 @@
         "description": "Failed to connect to Actron Air. Please check your internet connection and try again.",
         "title": "Connection error"
       },
-      "reauth_confirm": {
-        "description": "Your Actron Air authentication has expired. Select continue to reauthenticate with your Actron Air account. You will be prompted to log in again to restore the connection.",
-        "title": "Authentication expired"
-      },
       "timeout": {
         "data": {},
-        "description": "The authentication process timed out. Please try again.",
-        "title": "Authentication timeout"
+        "description": "The authorization process timed out. Please try again.",
+        "title": "Authorization timeout"
       },
       "user": {
-        "title": "Actron Air Authentication"
+        "title": "Actron Air OAuth2 Authorization"
       }
     }
-  },
-  "entity": {
-    "switch": {
-      "away_mode": {
-        "name": "Away mode"
-      },
-      "continuous_fan": {
-        "name": "Continuous fan"
-      },
-      "quiet_mode": {
-        "name": "Quiet mode"
-      },
-      "turbo_mode": {
-        "name": "Turbo mode"
-      }
-    }
-  },
-  "exceptions": {
-    "auth_error": {
-      "message": "Authentication failed, please reauthenticate"
-    }
   }
 }

homeassistant/components/actron_air/switch.py

@@ -1,110 +0,0 @@
-"""Switch platform for Actron Air integration."""
-
-from collections.abc import Awaitable, Callable
-from dataclasses import dataclass
-from typing import Any
-
-from homeassistant.components.switch import SwitchEntity, SwitchEntityDescription
-from homeassistant.const import EntityCategory
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.device_registry import DeviceInfo
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-from homeassistant.helpers.update_coordinator import CoordinatorEntity
-
-from .const import DOMAIN
-from .coordinator import ActronAirConfigEntry, ActronAirSystemCoordinator
-
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class ActronAirSwitchEntityDescription(SwitchEntityDescription):
-    """Class describing Actron Air switch entities."""
-
-    is_on_fn: Callable[[ActronAirSystemCoordinator], bool]
-    set_fn: Callable[[ActronAirSystemCoordinator, bool], Awaitable[None]]
-    is_supported_fn: Callable[[ActronAirSystemCoordinator], bool] = lambda _: True
-
-
-SWITCHES: tuple[ActronAirSwitchEntityDescription, ...] = (
-    ActronAirSwitchEntityDescription(
-        key="away_mode",
-        translation_key="away_mode",
-        is_on_fn=lambda coordinator: coordinator.data.user_aircon_settings.away_mode,
-        set_fn=lambda coordinator,
-        enabled: coordinator.data.user_aircon_settings.set_away_mode(enabled),
-    ),
-    ActronAirSwitchEntityDescription(
-        key="continuous_fan",
-        translation_key="continuous_fan",
-        is_on_fn=lambda coordinator: coordinator.data.user_aircon_settings.continuous_fan_enabled,
-        set_fn=lambda coordinator,
-        enabled: coordinator.data.user_aircon_settings.set_continuous_mode(enabled),
-    ),
-    ActronAirSwitchEntityDescription(
-        key="quiet_mode",
-        translation_key="quiet_mode",
-        is_on_fn=lambda coordinator: coordinator.data.user_aircon_settings.quiet_mode_enabled,
-        set_fn=lambda coordinator,
-        enabled: coordinator.data.user_aircon_settings.set_quiet_mode(enabled),
-    ),
-    ActronAirSwitchEntityDescription(
-        key="turbo_mode",
-        translation_key="turbo_mode",
-        is_on_fn=lambda coordinator: coordinator.data.user_aircon_settings.turbo_enabled,
-        set_fn=lambda coordinator,
-        enabled: coordinator.data.user_aircon_settings.set_turbo_mode(enabled),
-        is_supported_fn=lambda coordinator: coordinator.data.user_aircon_settings.turbo_supported,
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    entry: ActronAirConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up Actron Air switch entities."""
-    system_coordinators = entry.runtime_data.system_coordinators
-    async_add_entities(
-        ActronAirSwitch(coordinator, description)
-        for coordinator in system_coordinators.values()
-        for description in SWITCHES
-        if description.is_supported_fn(coordinator)
-    )
-
-
-class ActronAirSwitch(CoordinatorEntity[ActronAirSystemCoordinator], SwitchEntity):
-    """Actron Air switch."""
-
-    _attr_has_entity_name = True
-    _attr_entity_category = EntityCategory.CONFIG
-    entity_description: ActronAirSwitchEntityDescription
-
-    def __init__(
-        self,
-        coordinator: ActronAirSystemCoordinator,
-        description: ActronAirSwitchEntityDescription,
-    ) -> None:
-        """Initialize the switch."""
-        super().__init__(coordinator)
-        self.entity_description = description
-        self._attr_unique_id = f"{coordinator.serial_number}_{description.key}"
-        self._attr_device_info = DeviceInfo(
-            identifiers={(DOMAIN, coordinator.serial_number)},
-            manufacturer="Actron Air",
-            name=coordinator.data.ac_system.system_name,
-        )
-
-    @property
-    def is_on(self) -> bool:
-        """Return true if the switch is on."""
-        return self.entity_description.is_on_fn(self.coordinator)
-
-    async def async_turn_on(self, **kwargs: Any) -> None:
-        """Turn the switch on."""
-        await self.entity_description.set_fn(self.coordinator, True)
-
-    async def async_turn_off(self, **kwargs: Any) -> None:
-        """Turn the switch off."""
-        await self.entity_description.set_fn(self.coordinator, False)

homeassistant/components/advantage_air/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@Bre77"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/advantage_air",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["advantage_air"],
   "requirements": ["advantage-air==0.4.4"]

homeassistant/components/aemet/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@Noltari"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aemet",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aemet_opendata"],
   "requirements": ["AEMET-OpenData==0.6.4"]

homeassistant/components/aftership/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aftership",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "requirements": ["pyaftership==21.11.0"]
 }

homeassistant/components/agent_dvr/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@ispysoftware"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/agent_dvr",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["agent"],
   "requirements": ["agent-py==0.0.24"]

homeassistant/components/airnow/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@asymworks"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airnow",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["pyairnow"],
   "requirements": ["pyairnow==1.3.1"]

homeassistant/components/airobot/sensor.py

@@ -4,7 +4,6 @@ from __future__ import annotations
 
 from collections.abc import Callable
 from dataclasses import dataclass
-from datetime import datetime, timedelta
 
 from pyairobotrest.models import ThermostatStatus
 
@@ -24,8 +23,6 @@ from homeassistant.const import (
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
 from homeassistant.helpers.typing import StateType
-from homeassistant.util.dt import utcnow
-from homeassistant.util.variance import ignore_variance
 
 from . import AirobotConfigEntry
 from .entity import AirobotEntity
@@ -37,15 +34,10 @@ PARALLEL_UPDATES = 0
 class AirobotSensorEntityDescription(SensorEntityDescription):
     """Describes Airobot sensor entity."""
 
-    value_fn: Callable[[ThermostatStatus], StateType | datetime]
+    value_fn: Callable[[ThermostatStatus], StateType]
     supported_fn: Callable[[ThermostatStatus], bool] = lambda _: True
 
 
-uptime_to_stable_datetime = ignore_variance(
-    lambda value: utcnow().replace(microsecond=0) - timedelta(seconds=value),
-    timedelta(minutes=2),
-)
-
 SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
     AirobotSensorEntityDescription(
         key="air_temperature",
@@ -104,14 +96,6 @@ SENSOR_TYPES: tuple[AirobotSensorEntityDescription, ...] = (
         entity_category=EntityCategory.DIAGNOSTIC,
         value_fn=lambda status: status.errors,
     ),
-    AirobotSensorEntityDescription(
-        key="device_uptime",
-        translation_key="device_uptime",
-        device_class=SensorDeviceClass.TIMESTAMP,
-        entity_category=EntityCategory.DIAGNOSTIC,
-        value_fn=lambda status: uptime_to_stable_datetime(status.device_uptime),
-        entity_registry_enabled_default=False,
-    ),
 )
 
 
@@ -145,6 +129,6 @@ class AirobotSensor(AirobotEntity, SensorEntity):
         self._attr_unique_id = f"{coordinator.data.status.device_id}_{description.key}"
 
     @property
-    def native_value(self) -> StateType | datetime:
+    def native_value(self) -> StateType:
         """Return the state of the sensor."""
         return self.entity_description.value_fn(self.coordinator.data.status)

homeassistant/components/airpatrol/climate.py

@@ -88,11 +88,21 @@ class AirPatrolClimate(AirPatrolEntity, ClimateEntity):
         super().__init__(coordinator, unit_id)
         self._attr_unique_id = f"{coordinator.config_entry.unique_id}-{unit_id}"
 
+    @property
+    def climate_data(self) -> dict[str, Any]:
+        """Return the climate data."""
+        return self.device_data.get("climate") or {}
+
     @property
     def params(self) -> dict[str, Any]:
         """Return the current parameters for the climate entity."""
         return self.climate_data.get("ParametersData") or {}
 
+    @property
+    def available(self) -> bool:
+        """Return if entity is available."""
+        return super().available and bool(self.climate_data)
+
     @property
     def current_humidity(self) -> float | None:
         """Return the current humidity."""

homeassistant/components/airpatrol/const.py

@@ -10,7 +10,7 @@ from homeassistant.const import Platform
 DOMAIN = "airpatrol"
 
 LOGGER = logging.getLogger(__package__)
-PLATFORMS = [Platform.CLIMATE, Platform.SENSOR]
+PLATFORMS = [Platform.CLIMATE]
 SCAN_INTERVAL = timedelta(minutes=1)
 
 AIRPATROL_ERRORS = (AirPatrolAuthenticationError, AirPatrolError)

homeassistant/components/airpatrol/entity.py

@@ -38,17 +38,7 @@ class AirPatrolEntity(CoordinatorEntity[AirPatrolDataUpdateCoordinator]):
         """Return the device data."""
         return self.coordinator.data[self._unit_id]
 
-    @property
-    def climate_data(self) -> dict[str, Any]:
-        """Return the climate data for this unit."""
-        return self.device_data["climate"]
-
     @property
     def available(self) -> bool:
         """Return if entity is available."""
-        return (
-            super().available
-            and self._unit_id in self.coordinator.data
-            and "climate" in self.device_data
-            and self.climate_data is not None
-        )
+        return super().available and self._unit_id in self.coordinator.data

homeassistant/components/airpatrol/sensor.py

@@ -1,89 +0,0 @@
-"""Sensors for AirPatrol integration."""
-
-from __future__ import annotations
-
-from dataclasses import dataclass
-
-from homeassistant.components.sensor import (
-    SensorDeviceClass,
-    SensorEntity,
-    SensorEntityDescription,
-    SensorStateClass,
-)
-from homeassistant.const import PERCENTAGE, UnitOfTemperature
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.entity_platform import AddConfigEntryEntitiesCallback
-
-from . import AirPatrolConfigEntry
-from .coordinator import AirPatrolDataUpdateCoordinator
-from .entity import AirPatrolEntity
-
-PARALLEL_UPDATES = 0
-
-
-@dataclass(frozen=True, kw_only=True)
-class AirPatrolSensorEntityDescription(SensorEntityDescription):
-    """Describes AirPatrol sensor entity."""
-
-    data_field: str
-
-
-SENSOR_DESCRIPTIONS = (
-    AirPatrolSensorEntityDescription(
-        key="temperature",
-        device_class=SensorDeviceClass.TEMPERATURE,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=UnitOfTemperature.CELSIUS,
-        data_field="RoomTemp",
-    ),
-    AirPatrolSensorEntityDescription(
-        key="humidity",
-        device_class=SensorDeviceClass.HUMIDITY,
-        state_class=SensorStateClass.MEASUREMENT,
-        native_unit_of_measurement=PERCENTAGE,
-        data_field="RoomHumidity",
-    ),
-)
-
-
-async def async_setup_entry(
-    hass: HomeAssistant,
-    config_entry: AirPatrolConfigEntry,
-    async_add_entities: AddConfigEntryEntitiesCallback,
-) -> None:
-    """Set up AirPatrol sensors."""
-    coordinator = config_entry.runtime_data
-    units = coordinator.data
-
-    async_add_entities(
-        AirPatrolSensor(coordinator, unit_id, description)
-        for unit_id, unit in units.items()
-        for description in SENSOR_DESCRIPTIONS
-        if "climate" in unit and unit["climate"] is not None
-    )
-
-
-class AirPatrolSensor(AirPatrolEntity, SensorEntity):
-    """AirPatrol sensor entity."""
-
-    entity_description: AirPatrolSensorEntityDescription
-
-    def __init__(
-        self,
-        coordinator: AirPatrolDataUpdateCoordinator,
-        unit_id: str,
-        description: AirPatrolSensorEntityDescription,
-    ) -> None:
-        """Initialize AirPatrol sensor."""
-        super().__init__(coordinator, unit_id)
-        self.entity_description = description
-        self._attr_unique_id = (
-            f"{coordinator.config_entry.unique_id}-{unit_id}-{description.key}"
-        )
-
-    @property
-    def native_value(self) -> float | None:
-        """Return the state of the sensor."""
-        if value := self.climate_data.get(self.entity_description.data_field):
-            return float(value)
-        return None

homeassistant/components/airthings/manifest.json

@@ -17,7 +17,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/airthings",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["airthings"],
   "requirements": ["airthings-cloud==0.2.0"]

homeassistant/components/airthings_ble/manifest.json

@@ -27,7 +27,6 @@
   "config_flow": true,
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/airthings_ble",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "requirements": ["airthings-ble==1.2.0"]
 }

homeassistant/components/airtouch4/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@samsinnamon"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airtouch4",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["airtouch4pyapi"],
   "requirements": ["airtouch4pyapi==1.0.5"]

homeassistant/components/airtouch5/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@danzel"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airtouch5",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["airtouch5py"],
   "requirements": ["airtouch5py==0.3.0"]

homeassistant/components/airzone/manifest.json

@@ -9,7 +9,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/airzone",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioairzone"],
   "requirements": ["aioairzone==1.0.4"]

homeassistant/components/airzone_cloud/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@Noltari"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/airzone_cloud",
-  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["aioairzone_cloud"],
   "requirements": ["aioairzone-cloud==0.7.2"]

homeassistant/components/alarm_control_panel/strings.json

@@ -78,9 +78,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/alarm_control_panel/trigger.py

@@ -4,10 +4,10 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import get_supported_features
 from homeassistant.helpers.trigger import (
-    EntityTargetStateTriggerBase,
+    EntityStateTriggerBase,
     Trigger,
-    make_entity_target_state_trigger,
-    make_entity_transition_trigger,
+    make_conditional_entity_state_trigger,
+    make_entity_state_trigger,
 )
 
 from .const import DOMAIN, AlarmControlPanelEntityFeature, AlarmControlPanelState
@@ -21,7 +21,7 @@ def supports_feature(hass: HomeAssistant, entity_id: str, features: int) -> bool
         return False
 
 
-class EntityStateTriggerRequiredFeatures(EntityTargetStateTriggerBase):
+class EntityStateTriggerRequiredFeatures(EntityStateTriggerBase):
     """Trigger for entity state changes."""
 
     _required_features: int
@@ -38,21 +38,21 @@ class EntityStateTriggerRequiredFeatures(EntityTargetStateTriggerBase):
 
 def make_entity_state_trigger_required_features(
     domain: str, to_state: str, required_features: int
-) -> type[EntityTargetStateTriggerBase]:
+) -> type[EntityStateTriggerBase]:
     """Create an entity state trigger class."""
 
     class CustomTrigger(EntityStateTriggerRequiredFeatures):
         """Trigger for entity state changes."""
 
         _domain = domain
-        _to_states = {to_state}
+        _to_state = to_state
         _required_features = required_features
 
     return CustomTrigger
 
 
 TRIGGERS: dict[str, type[Trigger]] = {
-    "armed": make_entity_transition_trigger(
+    "armed": make_conditional_entity_state_trigger(
         DOMAIN,
         from_states={
             AlarmControlPanelState.ARMING,
@@ -89,12 +89,8 @@ TRIGGERS: dict[str, type[Trigger]] = {
         AlarmControlPanelState.ARMED_VACATION,
         AlarmControlPanelEntityFeature.ARM_VACATION,
     ),
-    "disarmed": make_entity_target_state_trigger(
-        DOMAIN, AlarmControlPanelState.DISARMED
-    ),
-    "triggered": make_entity_target_state_trigger(
-        DOMAIN, AlarmControlPanelState.TRIGGERED
-    ),
+    "disarmed": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.DISARMED),
+    "triggered": make_entity_state_trigger(DOMAIN, AlarmControlPanelState.TRIGGERED),
 }
 
 

homeassistant/components/amberelectric/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@madpilot"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/amberelectric",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["amberelectric"],
   "requirements": ["amberelectric==2.0.12"]

homeassistant/components/android_ip_webcam/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@engrbm87"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/android_ip_webcam",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "requirements": ["pydroid-ipcam==3.0.0"]
 }

homeassistant/components/anglian_water/coordinator.py

@@ -4,28 +4,13 @@ from __future__ import annotations
 
 from datetime import timedelta
 import logging
-from typing import Any
 
 from pyanglianwater import AnglianWater
 from pyanglianwater.exceptions import ExpiredAccessTokenError, UnknownEndpointError
 
-from homeassistant.components.recorder import get_instance
-from homeassistant.components.recorder.models import (
-    StatisticData,
-    StatisticMeanType,
-    StatisticMetaData,
-)
-from homeassistant.components.recorder.statistics import (
-    async_add_external_statistics,
-    get_last_statistics,
-    statistics_during_period,
-)
 from homeassistant.config_entries import ConfigEntry
-from homeassistant.const import UnitOfVolume
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.update_coordinator import DataUpdateCoordinator, UpdateFailed
-from homeassistant.util import dt as dt_util
-from homeassistant.util.unit_conversion import VolumeConverter
 
 from .const import CONF_ACCOUNT_NUMBER, DOMAIN
 
@@ -59,107 +44,6 @@ class AnglianWaterUpdateCoordinator(DataUpdateCoordinator[None]):
     async def _async_update_data(self) -> None:
         """Update data from Anglian Water's API."""
         try:
-            await self.api.update(self.config_entry.data[CONF_ACCOUNT_NUMBER])
-            await self._insert_statistics()
+            return await self.api.update(self.config_entry.data[CONF_ACCOUNT_NUMBER])
         except (ExpiredAccessTokenError, UnknownEndpointError) as err:
             raise UpdateFailed from err
-
-    async def _insert_statistics(self) -> None:
-        """Insert statistics for water meters into Home Assistant."""
-        for meter in self.api.meters.values():
-            id_prefix = (
-                f"{self.config_entry.data[CONF_ACCOUNT_NUMBER]}_{meter.serial_number}"
-            )
-            usage_statistic_id = f"{DOMAIN}:{id_prefix}_usage".lower()
-            _LOGGER.debug("Updating statistics for meter %s", meter.serial_number)
-            name_prefix = (
-                f"Anglian Water {self.config_entry.data[CONF_ACCOUNT_NUMBER]} "
-                f"{meter.serial_number}"
-            )
-            usage_metadata = StatisticMetaData(
-                mean_type=StatisticMeanType.NONE,
-                has_sum=True,
-                name=f"{name_prefix} Usage",
-                source=DOMAIN,
-                statistic_id=usage_statistic_id,
-                unit_class=VolumeConverter.UNIT_CLASS,
-                unit_of_measurement=UnitOfVolume.CUBIC_METERS,
-            )
-            last_stat = await get_instance(self.hass).async_add_executor_job(
-                get_last_statistics, self.hass, 1, usage_statistic_id, True, set()
-            )
-            if not last_stat:
-                _LOGGER.debug("Updating statistics for the first time")
-                usage_sum = 0.0
-                last_stats_time = None
-            else:
-                if not meter.readings or len(meter.readings) == 0:
-                    _LOGGER.debug("No recent usage statistics found, skipping update")
-                    continue
-                # Anglian Water stats are hourly, the read_at time is the time that the meter took the reading
-                # We remove 1 hour from this so that the data is shown in the correct hour on the dashboards
-                parsed_read_at = dt_util.parse_datetime(meter.readings[0]["read_at"])
-                if not parsed_read_at:
-                    _LOGGER.debug(
-                        "Could not parse read_at time %s, skipping update",
-                        meter.readings[0]["read_at"],
-                    )
-                    continue
-                start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
-                _LOGGER.debug("Getting statistics at %s", start)
-                for end in (start + timedelta(seconds=1), None):
-                    stats = await get_instance(self.hass).async_add_executor_job(
-                        statistics_during_period,
-                        self.hass,
-                        start,
-                        end,
-                        {
-                            usage_statistic_id,
-                        },
-                        "hour",
-                        None,
-                        {"sum"},
-                    )
-                    if stats:
-                        break
-                    if end:
-                        _LOGGER.debug(
-                            "Not found, trying to find oldest statistic after %s",
-                            start,
-                        )
-                assert stats
-
-                def _safe_get_sum(records: list[Any]) -> float:
-                    if records and "sum" in records[0]:
-                        return float(records[0]["sum"])
-                    return 0.0
-
-                usage_sum = _safe_get_sum(stats.get(usage_statistic_id, []))
-                last_stats_time = stats[usage_statistic_id][0]["start"]
-
-            usage_statistics = []
-
-            for read in meter.readings:
-                parsed_read_at = dt_util.parse_datetime(read["read_at"])
-                if not parsed_read_at:
-                    _LOGGER.debug(
-                        "Could not parse read_at time %s, skipping reading",
-                        read["read_at"],
-                    )
-                    continue
-                start = dt_util.as_local(parsed_read_at) - timedelta(hours=1)
-                if last_stats_time is not None and start.timestamp() <= last_stats_time:
-                    continue
-                usage_state = max(0, read["consumption"] / 1000)
-                usage_sum = max(0, read["read"])
-                usage_statistics.append(
-                    StatisticData(
-                        start=start,
-                        state=usage_state,
-                        sum=usage_sum,
-                    )
-                )
-            _LOGGER.debug(
-                "Adding %s statistics for %s", len(usage_statistics), usage_statistic_id
-            )
-            async_add_external_statistics(self.hass, usage_metadata, usage_statistics)

homeassistant/components/anglian_water/manifest.json

@@ -1,13 +1,11 @@
 {
   "domain": "anglian_water",
   "name": "Anglian Water",
-  "after_dependencies": ["recorder"],
   "codeowners": ["@pantherale0"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/anglian_water",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["pyanglianwater"],
   "quality_scale": "bronze",
-  "requirements": ["pyanglianwater==3.1.0"]
+  "requirements": ["pyanglianwater==3.0.0"]
 }

homeassistant/components/anova/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@Lash-L"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/anova",
-  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["anova_wifi"],
   "requirements": ["anova-wifi==0.17.0"]

homeassistant/components/anthemav/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@hyralex"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/anthemav",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["anthemav"],
   "requirements": ["anthemav==1.4.1"]

homeassistant/components/aosmith/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@bdr99"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aosmith",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "requirements": ["py-aosmith==1.0.15"]
 }

homeassistant/components/apcupsd/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@yuxincs"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/apcupsd",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["apcaccess"],
   "quality_scale": "platinum",

homeassistant/components/arcam_fmj/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@elupus"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/arcam_fmj",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["arcam"],
   "requirements": ["arcam-fmj==1.8.2"],

homeassistant/components/arve/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@ikalnyi"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/arve",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "requirements": ["asyncarve==0.1.1"]
 }

homeassistant/components/aseko_pool_live/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@milanmeu"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aseko_pool_live",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["aioaseko"],
   "requirements": ["aioaseko==1.0.0"]

homeassistant/components/assist_satellite/strings.json

@@ -23,9 +23,9 @@
     },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/assist_satellite/trigger.py

@@ -1,22 +1,16 @@
 """Provides triggers for assist satellites."""
 
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import Trigger, make_entity_target_state_trigger
+from homeassistant.helpers.trigger import Trigger, make_entity_state_trigger
 
 from .const import DOMAIN
 from .entity import AssistSatelliteState
 
 TRIGGERS: dict[str, type[Trigger]] = {
-    "idle": make_entity_target_state_trigger(DOMAIN, AssistSatelliteState.IDLE),
-    "listening": make_entity_target_state_trigger(
-        DOMAIN, AssistSatelliteState.LISTENING
-    ),
-    "processing": make_entity_target_state_trigger(
-        DOMAIN, AssistSatelliteState.PROCESSING
-    ),
-    "responding": make_entity_target_state_trigger(
-        DOMAIN, AssistSatelliteState.RESPONDING
-    ),
+    "idle": make_entity_state_trigger(DOMAIN, AssistSatelliteState.IDLE),
+    "listening": make_entity_state_trigger(DOMAIN, AssistSatelliteState.LISTENING),
+    "processing": make_entity_state_trigger(DOMAIN, AssistSatelliteState.PROCESSING),
+    "responding": make_entity_state_trigger(DOMAIN, AssistSatelliteState.RESPONDING),
 }
 
 

homeassistant/components/asuswrt/manifest.json

@@ -7,5 +7,5 @@
   "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["aioasuswrt", "asusrouter", "asyncssh"],
-  "requirements": ["aioasuswrt==1.5.4", "asusrouter==1.21.3"]
+  "requirements": ["aioasuswrt==1.5.2", "asusrouter==1.21.3"]
 }

homeassistant/components/atag/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@MatsNL"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/atag",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pyatag"],
   "requirements": ["pyatag==0.3.5.3"]

homeassistant/components/august/manifest.json

@@ -27,7 +27,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/august",
-  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["pubnub", "yalexs"],
   "requirements": ["yalexs==9.2.0", "yalexs-ble==3.2.2"]

homeassistant/components/aurora/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@djtimca"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aurora",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["auroranoaa"],
   "requirements": ["auroranoaa==0.0.5"]

homeassistant/components/aussie_broadband/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@nickw444", "@Bre77"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/aussie_broadband",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aussiebb"],
   "requirements": ["pyaussiebb==0.1.5"]

homeassistant/components/autarco/manifest.json

@@ -4,8 +4,6 @@
   "codeowners": ["@klaasnicolaas"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/autarco",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
-  "quality_scale": "silver",
   "requirements": ["autarco==3.2.0"]
 }

homeassistant/components/automation/__init__.py

@@ -27,7 +27,6 @@ from homeassistant.const import (
     CONF_EVENT_DATA,
     CONF_ID,
     CONF_MODE,
-    CONF_OPTIONS,
     CONF_PATH,
     CONF_PLATFORM,
     CONF_TRIGGERS,
@@ -126,20 +125,14 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "binary_sensor",
-    "button",
     "climate",
     "cover",
-    "device_tracker",
     "fan",
-    "humidifier",
     "lawn_mower",
     "light",
-    "lock",
     "media_player",
-    "siren",
     "switch",
     "text",
-    "update",
     "vacuum",
 }
 
@@ -1218,7 +1211,7 @@ def _trigger_extract_entities(trigger_conf: dict) -> list[str]:
         return trigger_conf[CONF_ENTITY_ID]  # type: ignore[no-any-return]
 
     if trigger_conf[CONF_PLATFORM] == "calendar":
-        return [trigger_conf[CONF_OPTIONS][CONF_ENTITY_ID]]
+        return [trigger_conf[CONF_ENTITY_ID]]
 
     if trigger_conf[CONF_PLATFORM] == "zone":
         return trigger_conf[CONF_ENTITY_ID] + [trigger_conf[CONF_ZONE]]  # type: ignore[no-any-return]

homeassistant/components/azure_data_explorer/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@kaareseras"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/azure_data_explorer",
-  "integration_type": "service",
   "iot_class": "cloud_push",
   "loggers": ["azure"],
   "requirements": ["azure-kusto-ingest==4.5.1", "azure-kusto-data[aio]==4.5.1"]

homeassistant/components/azure_devops/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@timmo001"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/azure_devops",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["aioazuredevops"],
   "requirements": ["aioazuredevops==2.2.2"]

homeassistant/components/azure_event_hub/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@eavanvalkenburg"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/azure_event_hub",
-  "integration_type": "service",
   "iot_class": "cloud_push",
   "loggers": ["azure"],
   "requirements": ["azure-eventhub==5.11.1"],

homeassistant/components/baf/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@bdraco", "@jfroy"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/baf",
-  "integration_type": "device",
   "iot_class": "local_push",
   "requirements": ["aiobafi6==0.9.0"],
   "zeroconf": [

homeassistant/components/balboa/manifest.json

@@ -12,7 +12,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/balboa",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["pybalboa"],
   "requirements": ["pybalboa==1.1.3"]

homeassistant/components/binary_sensor/strings.json

@@ -324,9 +324,9 @@
   "selector": {
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },

homeassistant/components/binary_sensor/trigger.py

@@ -4,7 +4,7 @@ from homeassistant.const import STATE_OFF, STATE_ON
 from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers.entity import get_device_class
-from homeassistant.helpers.trigger import EntityTargetStateTriggerBase, Trigger
+from homeassistant.helpers.trigger import EntityStateTriggerBase, Trigger
 from homeassistant.helpers.typing import UNDEFINED, UndefinedType
 
 from . import DOMAIN, BinarySensorDeviceClass
@@ -20,7 +20,7 @@ def get_device_class_or_undefined(
         return UNDEFINED
 
 
-class BinarySensorOnOffTrigger(EntityTargetStateTriggerBase):
+class BinarySensorOnOffTrigger(EntityStateTriggerBase):
     """Class for binary sensor on/off triggers."""
 
     _device_class: BinarySensorDeviceClass | None
@@ -47,7 +47,7 @@ def make_binary_sensor_trigger(
         """Trigger for entity state changes."""
 
         _device_class = device_class
-        _to_states = {to_state}
+        _to_state = to_state
 
     return CustomTrigger
 

homeassistant/components/blackbird/manifest.json

@@ -2,7 +2,6 @@
   "domain": "blackbird",
   "name": "Monoprice Blackbird Matrix Switch",
   "codeowners": [],
-  "disabled": "This integration is disabled because it references pyserial-asyncio, which does blocking I/O in the asyncio loop and is not maintained.",
   "documentation": "https://www.home-assistant.io/integrations/blackbird",
   "iot_class": "local_polling",
   "loggers": ["pyblackbird"],

homeassistant/components/blebox/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@bbx-a", "@swistakm"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/blebox",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["blebox_uniapi"],
   "requirements": ["blebox-uniapi==2.5.0"],

homeassistant/components/blink/manifest.json

@@ -1,7 +1,7 @@
 {
   "domain": "blink",
   "name": "Blink",
-  "codeowners": ["@fronzbot"],
+  "codeowners": ["@fronzbot", "@mkmer"],
   "config_flow": true,
   "dhcp": [
     {
@@ -18,8 +18,7 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/blink",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["blinkpy"],
-  "requirements": ["blinkpy==0.25.2"]
+  "requirements": ["blinkpy==0.25.1"]
 }

homeassistant/components/blue_current/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@gleeuwen", "@NickKoepr", "@jtodorova23"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/blue_current",
-  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["bluecurrent_api"],
   "requirements": ["bluecurrent-api==1.3.2"]

homeassistant/components/bluemaestro/manifest.json

@@ -11,7 +11,6 @@
   "config_flow": true,
   "dependencies": ["bluetooth_adapters"],
   "documentation": "https://www.home-assistant.io/integrations/bluemaestro",
-  "integration_type": "device",
   "iot_class": "local_push",
   "requirements": ["bluemaestro-ble==0.4.1"]
 }

homeassistant/components/bluesound/manifest.json

@@ -5,7 +5,6 @@
   "codeowners": ["@thrawnarn", "@LouisChrist"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bluesound",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "requirements": ["pyblu==2.0.5"],
   "zeroconf": [

homeassistant/components/bmw_connected_drive/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@gerard33", "@rikroe"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bmw_connected_drive",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["bimmer_connected"],
   "requirements": ["bimmer-connected[china]==0.17.3"]

homeassistant/components/bond/manifest.json

@@ -14,7 +14,6 @@
     }
   ],
   "documentation": "https://www.home-assistant.io/integrations/bond",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["bond_async"],
   "requirements": ["bond-async==0.2.1"],

homeassistant/components/bosch_shc/manifest.json

@@ -5,7 +5,6 @@
   "codeowners": ["@tschamm"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/bosch_shc",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["boschshcpy"],
   "requirements": ["boschshcpy==0.2.107"],

homeassistant/components/brottsplatskartan/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@gjohansson-ST"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/brottsplatskartan",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["brottsplatskartan"],
   "requirements": ["brottsplatskartan==1.0.5"]

homeassistant/components/brunt/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@eavanvalkenburg"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/brunt",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["brunt"],
   "requirements": ["brunt==1.2.0"]

homeassistant/components/buienradar/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@mjj4791", "@ties", "@Robbie1221"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/buienradar",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["buienradar", "vincenty"],
   "requirements": ["buienradar==1.0.6"]

homeassistant/components/button/icons.json

@@ -17,10 +17,5 @@
     "press": {
       "service": "mdi:gesture-tap-button"
     }
-  },
-  "triggers": {
-    "pressed": {
-      "trigger": "mdi:gesture-tap-button"
-    }
   }
 }

homeassistant/components/button/strings.json

@@ -27,11 +27,5 @@
       "name": "Press"
     }
   },
-  "title": "Button",
-  "triggers": {
-    "pressed": {
-      "description": "Triggers when a button was pressed",
-      "name": "Button pressed"
-    }
-  }
+  "title": "Button"
 }

homeassistant/components/button/trigger.py

@@ -1,42 +0,0 @@
-"""Provides triggers for buttons."""
-
-from homeassistant.const import STATE_UNAVAILABLE, STATE_UNKNOWN
-from homeassistant.core import HomeAssistant, State
-from homeassistant.helpers.trigger import (
-    ENTITY_STATE_TRIGGER_SCHEMA,
-    EntityTriggerBase,
-    Trigger,
-)
-
-from . import DOMAIN
-
-
-class ButtonPressedTrigger(EntityTriggerBase):
-    """Trigger for button entity presses."""
-
-    _domain = DOMAIN
-    _schema = ENTITY_STATE_TRIGGER_SCHEMA
-
-    def is_valid_transition(self, from_state: State, to_state: State) -> bool:
-        """Check if the origin state is valid and different from the current state."""
-
-        # UNKNOWN is a valid from_state, otherwise the first time the button is pressed
-        # would not trigger
-        if from_state.state == STATE_UNAVAILABLE:
-            return False
-
-        return from_state.state != to_state.state
-
-    def is_valid_state(self, state: State) -> bool:
-        """Check if the new state is not invalid."""
-        return state.state not in (STATE_UNAVAILABLE, STATE_UNKNOWN)
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "pressed": ButtonPressedTrigger,
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for buttons."""
-    return TRIGGERS

homeassistant/components/button/triggers.yaml

@@ -1,4 +0,0 @@
-pressed:
-  target:
-    entity:
-      domain: button

homeassistant/components/caldav/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/caldav",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["caldav", "vobject"],
   "requirements": ["caldav==2.1.0", "icalendar==6.3.1", "vobject==0.9.9"]

homeassistant/components/calendar/trigger.py

@@ -2,30 +2,29 @@
 
 from __future__ import annotations
 
-from collections.abc import Awaitable, Callable
+from collections.abc import Awaitable, Callable, Coroutine
 from dataclasses import dataclass
 import datetime
 import logging
-from typing import TYPE_CHECKING, Any, cast
+from typing import Any
 
 import voluptuous as vol
 
-from homeassistant.const import CONF_ENTITY_ID, CONF_EVENT, CONF_OFFSET, CONF_OPTIONS
-from homeassistant.core import CALLBACK_TYPE, HomeAssistant, callback
+from homeassistant.const import CONF_ENTITY_ID, CONF_EVENT, CONF_OFFSET, CONF_PLATFORM
+from homeassistant.core import CALLBACK_TYPE, HassJob, HomeAssistant, callback
 from homeassistant.exceptions import HomeAssistantError
 from homeassistant.helpers import config_validation as cv
-from homeassistant.helpers.automation import move_top_level_schema_fields_to_options
 from homeassistant.helpers.entity_component import EntityComponent
 from homeassistant.helpers.event import (
     async_track_point_in_time,
     async_track_time_interval,
 )
-from homeassistant.helpers.trigger import Trigger, TriggerActionRunner, TriggerConfig
+from homeassistant.helpers.trigger import TriggerActionType, TriggerInfo
 from homeassistant.helpers.typing import ConfigType
 from homeassistant.util import dt as dt_util
 
 from . import CalendarEntity, CalendarEvent
-from .const import DATA_COMPONENT
+from .const import DATA_COMPONENT, DOMAIN
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -33,17 +32,13 @@ EVENT_START = "start"
 EVENT_END = "end"
 UPDATE_INTERVAL = datetime.timedelta(minutes=15)
 
-
-_OPTIONS_SCHEMA_DICT = {
-    vol.Required(CONF_ENTITY_ID): cv.entity_id,
-    vol.Optional(CONF_EVENT, default=EVENT_START): vol.In({EVENT_START, EVENT_END}),
-    vol.Optional(CONF_OFFSET, default=datetime.timedelta(0)): cv.time_period,
-}
-
-_CONFIG_SCHEMA = vol.Schema(
+TRIGGER_SCHEMA = cv.TRIGGER_BASE_SCHEMA.extend(
     {
-        vol.Required(CONF_OPTIONS): _OPTIONS_SCHEMA_DICT,
-    },
+        vol.Required(CONF_PLATFORM): DOMAIN,
+        vol.Required(CONF_ENTITY_ID): cv.entity_id,
+        vol.Optional(CONF_EVENT, default=EVENT_START): vol.In({EVENT_START, EVENT_END}),
+        vol.Optional(CONF_OFFSET, default=datetime.timedelta(0)): cv.time_period,
+    }
 )
 
 # mypy: disallow-any-generics
@@ -174,14 +169,14 @@ class CalendarEventListener:
     def __init__(
         self,
         hass: HomeAssistant,
-        action_runner: TriggerActionRunner,
-        trigger_payload: dict[str, Any],
+        job: HassJob[..., Coroutine[Any, Any, None] | Any],
+        trigger_data: dict[str, Any],
         fetcher: QueuedEventFetcher,
     ) -> None:
         """Initialize CalendarEventListener."""
         self._hass = hass
-        self._action_runner = action_runner
-        self._trigger_payload = trigger_payload
+        self._job = job
+        self._trigger_data = trigger_data
         self._unsub_event: CALLBACK_TYPE | None = None
         self._unsub_refresh: CALLBACK_TYPE | None = None
         self._fetcher = fetcher
@@ -238,11 +233,15 @@ class CalendarEventListener:
         while self._events and self._events[0].trigger_time <= now:
             queued_event = self._events.pop(0)
             _LOGGER.debug("Dispatching event: %s", queued_event.event)
-            payload = {
-                **self._trigger_payload,
-                "calendar_event": queued_event.event.as_dict(),
-            }
-            self._action_runner(payload, "calendar event state change")
+            self._hass.async_run_hass_job(
+                self._job,
+                {
+                    "trigger": {
+                        **self._trigger_data,
+                        "calendar_event": queued_event.event.as_dict(),
+                    }
+                },
+            )
 
     async def _handle_refresh(self, now_utc: datetime.datetime) -> None:
         """Handle core config update."""
@@ -260,69 +259,31 @@ class CalendarEventListener:
         self._listen_next_calendar_event()
 
 
-class EventTrigger(Trigger):
-    """Calendar event trigger."""
+async def async_attach_trigger(
+    hass: HomeAssistant,
+    config: ConfigType,
+    action: TriggerActionType,
+    trigger_info: TriggerInfo,
+) -> CALLBACK_TYPE:
+    """Attach trigger for the specified calendar."""
+    entity_id = config[CONF_ENTITY_ID]
+    event_type = config[CONF_EVENT]
+    offset = config[CONF_OFFSET]
 
-    _options: dict[str, Any]
+    # Validate the entity id is valid
+    get_entity(hass, entity_id)
 
-    @classmethod
-    async def async_validate_complete_config(
-        cls, hass: HomeAssistant, complete_config: ConfigType
-    ) -> ConfigType:
-        """Validate complete config."""
-        complete_config = move_top_level_schema_fields_to_options(
-            complete_config, _OPTIONS_SCHEMA_DICT
-        )
-        return await super().async_validate_complete_config(hass, complete_config)
-
-    @classmethod
-    async def async_validate_config(
-        cls, hass: HomeAssistant, config: ConfigType
-    ) -> ConfigType:
-        """Validate config."""
-        return cast(ConfigType, _CONFIG_SCHEMA(config))
-
-    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
-        """Initialize trigger."""
-        super().__init__(hass, config)
-
-        if TYPE_CHECKING:
-            assert config.options is not None
-        self._options = config.options
-
-    async def async_attach_runner(
-        self, run_action: TriggerActionRunner
-    ) -> CALLBACK_TYPE:
-        """Attach a trigger."""
-
-        entity_id = self._options[CONF_ENTITY_ID]
-        event_type = self._options[CONF_EVENT]
-        offset = self._options[CONF_OFFSET]
-
-        # Validate the entity id is valid
-        get_entity(self._hass, entity_id)
-
-        trigger_data = {
-            "event": event_type,
-            "offset": offset,
-        }
-        listener = CalendarEventListener(
-            self._hass,
-            run_action,
-            trigger_data,
-            queued_event_fetcher(
-                event_fetcher(self._hass, entity_id), event_type, offset
-            ),
-        )
-        await listener.async_attach()
-        return listener.async_detach
-
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "_": EventTrigger,
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for calendars."""
-    return TRIGGERS
+    trigger_data = {
+        **trigger_info["trigger_data"],
+        "platform": DOMAIN,
+        "event": event_type,
+        "offset": offset,
+    }
+    listener = CalendarEventListener(
+        hass,
+        HassJob(action),
+        trigger_data,
+        queued_event_fetcher(event_fetcher(hass, entity_id), event_type, offset),
+    )
+    await listener.async_attach()
+    return listener.async_detach

homeassistant/components/canary/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["ffmpeg"],
   "documentation": "https://www.home-assistant.io/integrations/canary",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["canary"],
   "requirements": ["py-canary==0.5.4"],

homeassistant/components/ccm15/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@ocalvo"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/ccm15",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "requirements": ["py_ccm15==0.1.2"]
 }

homeassistant/components/cert_expiry/manifest.json

@@ -4,6 +4,5 @@
   "codeowners": ["@jjlawren"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/cert_expiry",
-  "integration_type": "service",
   "iot_class": "cloud_polling"
 }

homeassistant/components/climate/icons.json

@@ -98,9 +98,6 @@
     }
   },
   "triggers": {
-    "hvac_mode_changed": {
-      "trigger": "mdi:thermostat"
-    },
     "started_cooling": {
       "trigger": "mdi:snowflake"
     },
@@ -110,12 +107,6 @@
     "started_heating": {
       "trigger": "mdi:fire"
     },
-    "target_temperature_changed": {
-      "trigger": "mdi:thermometer"
-    },
-    "target_temperature_crossed_threshold": {
-      "trigger": "mdi:thermometer"
-    },
     "turned_off": {
       "trigger": "mdi:power-off"
     },

homeassistant/components/climate/strings.json

@@ -192,25 +192,11 @@
         "off": "[%key:common::state::off%]"
       }
     },
-    "number_or_entity": {
-      "choices": {
-        "entity": "Entity",
-        "number": "Number"
-      }
-    },
     "trigger_behavior": {
       "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    },
-    "trigger_threshold_type": {
-      "options": {
-        "above": "Above a value",
-        "below": "Below a value",
-        "between": "In a range",
-        "outside": "Outside a range"
+        "any": "[%key:common::selector::trigger_behavior::options::any%]",
+        "first": "[%key:common::selector::trigger_behavior::options::first%]",
+        "last": "[%key:common::selector::trigger_behavior::options::last%]"
       }
     }
   },
@@ -312,20 +298,6 @@
   },
   "title": "Climate",
   "triggers": {
-    "hvac_mode_changed": {
-      "description": "Triggers after the mode of one or more climate-control devices changes.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        },
-        "hvac_mode": {
-          "description": "The HVAC modes to trigger on.",
-          "name": "Modes"
-        }
-      },
-      "name": "Climate-control device mode changed"
-    },
     "started_cooling": {
       "description": "Triggers after one or more climate-control devices start cooling.",
       "fields": {
@@ -356,42 +328,6 @@
       },
       "name": "Climate-control device started heating"
     },
-    "target_temperature_changed": {
-      "description": "Triggers after the temperature setpoint of one or more climate-control devices changes.",
-      "fields": {
-        "above": {
-          "description": "Trigger when the target temperature is above this value.",
-          "name": "Above"
-        },
-        "below": {
-          "description": "Trigger when the target temperature is below this value.",
-          "name": "Below"
-        }
-      },
-      "name": "Climate-control device target temperature changed"
-    },
-    "target_temperature_crossed_threshold": {
-      "description": "Triggers after the temperature setpoint of one or more climate-control devices crosses a threshold.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::climate::common::trigger_behavior_description%]",
-          "name": "[%key:component::climate::common::trigger_behavior_name%]"
-        },
-        "lower_limit": {
-          "description": "Lower threshold limit.",
-          "name": "Lower threshold"
-        },
-        "threshold_type": {
-          "description": "Type of threshold crossing to trigger on.",
-          "name": "Threshold type"
-        },
-        "upper_limit": {
-          "description": "Upper threshold limit.",
-          "name": "Upper threshold"
-        }
-      },
-      "name": "Climate-control device target temperature crossed threshold"
-    },
     "turned_off": {
       "description": "Triggers after one or more climate-control devices turn off.",
       "fields": {

homeassistant/components/climate/trigger.py

@@ -1,65 +1,24 @@
 """Provides triggers for climates."""
 
-import voluptuous as vol
-
-from homeassistant.const import ATTR_TEMPERATURE, CONF_OPTIONS
 from homeassistant.core import HomeAssistant
-from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.trigger import (
-    ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST,
-    EntityTargetStateTriggerBase,
     Trigger,
-    TriggerConfig,
-    make_entity_numerical_state_attribute_changed_trigger,
-    make_entity_numerical_state_attribute_crossed_threshold_trigger,
-    make_entity_target_state_attribute_trigger,
-    make_entity_target_state_trigger,
-    make_entity_transition_trigger,
+    make_conditional_entity_state_trigger,
+    make_entity_state_attribute_trigger,
+    make_entity_state_trigger,
 )
 
 from .const import ATTR_HVAC_ACTION, DOMAIN, HVACAction, HVACMode
 
-CONF_HVAC_MODE = "hvac_mode"
-
-HVAC_MODE_CHANGED_TRIGGER_SCHEMA = ENTITY_STATE_TRIGGER_SCHEMA_FIRST_LAST.extend(
-    {
-        vol.Required(CONF_OPTIONS): {
-            vol.Required(CONF_HVAC_MODE): vol.All(
-                cv.ensure_list, vol.Length(min=1), [HVACMode]
-            ),
-        },
-    }
-)
-
-
-class HVACModeChangedTrigger(EntityTargetStateTriggerBase):
-    """Trigger for entity state changes."""
-
-    _domain = DOMAIN
-    _schema = HVAC_MODE_CHANGED_TRIGGER_SCHEMA
-
-    def __init__(self, hass: HomeAssistant, config: TriggerConfig) -> None:
-        """Initialize the state trigger."""
-        super().__init__(hass, config)
-        self._to_states = set(self._options[CONF_HVAC_MODE])
-
-
 TRIGGERS: dict[str, type[Trigger]] = {
-    "hvac_mode_changed": HVACModeChangedTrigger,
-    "started_cooling": make_entity_target_state_attribute_trigger(
+    "started_cooling": make_entity_state_attribute_trigger(
         DOMAIN, ATTR_HVAC_ACTION, HVACAction.COOLING
     ),
-    "started_drying": make_entity_target_state_attribute_trigger(
+    "started_drying": make_entity_state_attribute_trigger(
         DOMAIN, ATTR_HVAC_ACTION, HVACAction.DRYING
     ),
-    "target_temperature_changed": make_entity_numerical_state_attribute_changed_trigger(
-        DOMAIN, ATTR_TEMPERATURE
-    ),
-    "target_temperature_crossed_threshold": make_entity_numerical_state_attribute_crossed_threshold_trigger(
-        DOMAIN, ATTR_TEMPERATURE
-    ),
-    "turned_off": make_entity_target_state_trigger(DOMAIN, HVACMode.OFF),
-    "turned_on": make_entity_transition_trigger(
+    "turned_off": make_entity_state_trigger(DOMAIN, HVACMode.OFF),
+    "turned_on": make_conditional_entity_state_trigger(
         DOMAIN,
         from_states={
             HVACMode.OFF,
@@ -73,7 +32,7 @@ TRIGGERS: dict[str, type[Trigger]] = {
             HVACMode.HEAT_COOL,
         },
     ),
-    "started_heating": make_entity_target_state_attribute_trigger(
+    "started_heating": make_entity_state_attribute_trigger(
         DOMAIN, ATTR_HVAC_ACTION, HVACAction.HEATING
     ),
 }

homeassistant/components/climate/triggers.yaml

@@ -1,9 +1,9 @@
 .trigger_common: &trigger_common
-  target: &trigger_climate_target
+  target:
     entity:
       domain: climate
   fields:
-    behavior: &trigger_behavior
+    behavior:
       required: true
       default: any
       selector:
@@ -14,67 +14,8 @@
             - last
             - any
 
-.number_or_entity: &number_or_entity
-  required: false
-  selector:
-    choose:
-      choices:
-        entity:
-          selector:
-            entity:
-              filter:
-                domain:
-                  - input_number
-                  - number
-                  - sensor
-        number:
-          selector:
-            number:
-              mode: box
-      translation_key: number_or_entity
-
-.trigger_threshold_type: &trigger_threshold_type
-  required: true
-  selector:
-    select:
-      options:
-        - above
-        - below
-        - between
-        - outside
-      translation_key: trigger_threshold_type
-
 started_cooling: *trigger_common
 started_drying: *trigger_common
 started_heating: *trigger_common
 turned_off: *trigger_common
 turned_on: *trigger_common
-
-hvac_mode_changed:
-  target: *trigger_climate_target
-  fields:
-    behavior: *trigger_behavior
-    hvac_mode:
-      context:
-        filter_target: target
-      required: true
-      selector:
-        state:
-          hide_states:
-            - unavailable
-            - unknown
-          multiple: true
-
-target_temperature_changed:
-  target: *trigger_climate_target
-  fields:
-    above: *number_or_entity
-    below: *number_or_entity
-
-target_temperature_crossed_threshold:
-  target: *trigger_climate_target
-  fields:
-    behavior: *trigger_behavior
-    threshold_type: *trigger_threshold_type
-    lower_limit: *number_or_entity
-    upper_limit: *number_or_entity

homeassistant/components/cloudflare/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@ludeeus", "@ctalkington"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/cloudflare",
-  "integration_type": "service",
   "iot_class": "cloud_push",
   "loggers": ["pycfdns"],
   "requirements": ["pycfdns==3.0.0"],

homeassistant/components/coinbase/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@tombrien"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/coinbase",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "loggers": ["coinbase"],
   "requirements": ["coinbase-advanced-py==1.2.2"]

homeassistant/components/compit/manifest.json

@@ -8,5 +8,5 @@
   "iot_class": "cloud_polling",
   "loggers": ["compit"],
   "quality_scale": "bronze",
-  "requirements": ["compit-inext-api==0.3.4"]
+  "requirements": ["compit-inext-api==0.3.1"]
 }

homeassistant/components/config/area_registry.py

@@ -65,10 +65,8 @@ def websocket_create_area(
     data.pop("id")
 
     if "aliases" in data:
-        # Create a set for the aliases without:
-        #   - Empty strings
-        #   - Trailing and leading whitespace characters in the individual aliases
-        data["aliases"] = {s_strip for s in data["aliases"] if (s_strip := s.strip())}
+        # Convert aliases to a set
+        data["aliases"] = set(data["aliases"])
 
     if "labels" in data:
         # Convert labels to a set
@@ -135,10 +133,8 @@ def websocket_update_area(
     data.pop("id")
 
     if "aliases" in data:
-        # Create a set for the aliases without:
-        #   - Empty strings
-        #   - Trailing and leading whitespace characters in the individual aliases
-        data["aliases"] = {s_strip for s in data["aliases"] if (s_strip := s.strip())}
+        # Convert aliases to a set
+        data["aliases"] = set(data["aliases"])
 
     if "labels" in data:
         # Convert labels to a set

homeassistant/components/config/entity_registry.py

@@ -227,10 +227,8 @@ def websocket_update_entity(
             changes[key] = msg[key]
 
     if "aliases" in msg:
-        # Create a set for the aliases without:
-        #   - Empty strings
-        #   - Trailing and leading whitespace characters in the individual aliases
-        changes["aliases"] = {s_strip for s in msg["aliases"] if (s_strip := s.strip())}
+        # Convert aliases to a set
+        changes["aliases"] = set(msg["aliases"])
 
     if "labels" in msg:
         # Convert labels to a set

homeassistant/components/config/floor_registry.py

@@ -61,10 +61,8 @@ def websocket_create_floor(
     data.pop("id")
 
     if "aliases" in data:
-        # Create a set for the aliases without:
-        #   - Empty strings
-        #   - Trailing and leading whitespace characters in the individual aliases
-        data["aliases"] = {s_strip for s in data["aliases"] if (s_strip := s.strip())}
+        # Convert aliases to a set
+        data["aliases"] = set(data["aliases"])
 
     try:
         entry = registry.async_create(**data)
@@ -119,10 +117,8 @@ def websocket_update_floor(
     data.pop("id")
 
     if "aliases" in data:
-        # Create a set for the aliases without:
-        #   - Empty strings
-        #   - Trailing and leading whitespace characters in the individual aliases
-        data["aliases"] = {s_strip for s in data["aliases"] if (s_strip := s.strip())}
+        # Convert aliases to a set
+        data["aliases"] = set(data["aliases"])
 
     try:
         entry = registry.async_update(**data)

homeassistant/components/control4/manifest.json

@@ -1,10 +1,9 @@
 {
   "domain": "control4",
   "name": "Control4",
-  "codeowners": ["@lawtancool", "@davidrecordon"],
+  "codeowners": ["@lawtancool"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/control4",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pyControl4"],
   "requirements": ["pyControl4==1.5.0"],

homeassistant/components/coolmaster/__init__.py

@@ -7,7 +7,7 @@ from homeassistant.core import HomeAssistant
 from homeassistant.exceptions import ConfigEntryNotReady
 from homeassistant.helpers import device_registry as dr
 
-from .const import CONF_SEND_WAKEUP_PROMPT, CONF_SWING_SUPPORT, DOMAIN
+from .const import CONF_SWING_SUPPORT, DOMAIN
 from .coordinator import CoolmasterConfigEntry, CoolmasterDataUpdateCoordinator
 
 PLATFORMS = [Platform.BINARY_SENSOR, Platform.BUTTON, Platform.CLIMATE, Platform.SENSOR]
@@ -17,12 +17,10 @@ async def async_setup_entry(hass: HomeAssistant, entry: CoolmasterConfigEntry) -
     """Set up Coolmaster from a config entry."""
     host = entry.data[CONF_HOST]
     port = entry.data[CONF_PORT]
-    send_wakeup_prompt = entry.data.get(CONF_SEND_WAKEUP_PROMPT, False)
     if not entry.data.get(CONF_SWING_SUPPORT):
         coolmaster = CoolMasterNet(
             host,
             port,
-            send_initial_line_feed=send_wakeup_prompt,
         )
     else:
         # Swing support adds an additional request per unit. The requests are
@@ -31,7 +29,6 @@ async def async_setup_entry(hass: HomeAssistant, entry: CoolmasterConfigEntry) -
         coolmaster = CoolMasterNet(
             host,
             port,
-            send_initial_line_feed=send_wakeup_prompt,
             read_timeout=5,
             swing_support=True,
         )

homeassistant/components/coolmaster/config_flow.py

@@ -12,13 +12,7 @@ from homeassistant.config_entries import ConfigFlow, ConfigFlowResult
 from homeassistant.const import CONF_HOST, CONF_PORT
 from homeassistant.core import callback
 
-from .const import (
-    CONF_SEND_WAKEUP_PROMPT,
-    CONF_SUPPORTED_MODES,
-    CONF_SWING_SUPPORT,
-    DEFAULT_PORT,
-    DOMAIN,
-)
+from .const import CONF_SUPPORTED_MODES, CONF_SWING_SUPPORT, DEFAULT_PORT, DOMAIN
 
 AVAILABLE_MODES = [
     HVACMode.OFF.value,
@@ -31,15 +25,17 @@ AVAILABLE_MODES = [
 
 MODES_SCHEMA = {vol.Required(mode, default=True): bool for mode in AVAILABLE_MODES}
 
-DATA_SCHEMA = {
-    vol.Required(CONF_HOST): str,
-    **MODES_SCHEMA,
-    vol.Required(CONF_SWING_SUPPORT, default=False): bool,
-}
+DATA_SCHEMA = vol.Schema(
+    {
+        vol.Required(CONF_HOST): str,
+        **MODES_SCHEMA,
+        vol.Required(CONF_SWING_SUPPORT, default=False): bool,
+    }
+)
 
 
-async def _validate_connection(host: str, send_wakeup_prompt: bool) -> bool:
-    cool = CoolMasterNet(host, DEFAULT_PORT, send_initial_line_feed=send_wakeup_prompt)
+async def _validate_connection(host: str) -> bool:
+    cool = CoolMasterNet(host, DEFAULT_PORT)
     units = await cool.status()
     return bool(units)
 
@@ -49,14 +45,6 @@ class CoolmasterConfigFlow(ConfigFlow, domain=DOMAIN):
 
     VERSION = 1
 
-    def _get_data_schema(self) -> vol.Schema:
-        schema_dict = DATA_SCHEMA.copy()
-
-        if self.show_advanced_options:
-            schema_dict[vol.Required(CONF_SEND_WAKEUP_PROMPT, default=False)] = bool
-
-        return vol.Schema(schema_dict)
-
     @callback
     def _async_get_entry(self, data: dict[str, Any]) -> ConfigFlowResult:
         supported_modes = [
@@ -69,7 +57,6 @@ class CoolmasterConfigFlow(ConfigFlow, domain=DOMAIN):
                 CONF_PORT: DEFAULT_PORT,
                 CONF_SUPPORTED_MODES: supported_modes,
                 CONF_SWING_SUPPORT: data[CONF_SWING_SUPPORT],
-                CONF_SEND_WAKEUP_PROMPT: data.get(CONF_SEND_WAKEUP_PROMPT, False),
             },
         )
 
@@ -77,19 +64,15 @@ class CoolmasterConfigFlow(ConfigFlow, domain=DOMAIN):
         self, user_input: dict[str, Any] | None = None
     ) -> ConfigFlowResult:
         """Handle a flow initialized by the user."""
-        data_schema = self._get_data_schema()
-
         if user_input is None:
-            return self.async_show_form(step_id="user", data_schema=data_schema)
+            return self.async_show_form(step_id="user", data_schema=DATA_SCHEMA)
 
         errors = {}
 
         host = user_input[CONF_HOST]
 
         try:
-            result = await _validate_connection(
-                host, user_input.get(CONF_SEND_WAKEUP_PROMPT, False)
-            )
+            result = await _validate_connection(host)
             if not result:
                 errors["base"] = "no_units"
         except OSError:
@@ -97,7 +80,7 @@ class CoolmasterConfigFlow(ConfigFlow, domain=DOMAIN):
 
         if errors:
             return self.async_show_form(
-                step_id="user", data_schema=data_schema, errors=errors
+                step_id="user", data_schema=DATA_SCHEMA, errors=errors
             )
 
         return self._async_get_entry(user_input)

homeassistant/components/coolmaster/const.py

@@ -6,6 +6,5 @@ DEFAULT_PORT = 10102
 
 CONF_SUPPORTED_MODES = "supported_modes"
 CONF_SWING_SUPPORT = "swing_support"
-CONF_SEND_WAKEUP_PROMPT = "send_wakeup_prompt"
 MAX_RETRIES = 3
 BACKOFF_BASE_DELAY = 2