add turned_off and turned_on triggers

.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
 

.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@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        uses: github/codeql-action/init@cf1bb45a277cb3c205638b2cd5c984db1c46a412 # v4.31.7
         with:
           languages: python
 
       - name: Perform CodeQL Analysis
-        uses: github/codeql-action/analyze@1b168cd39490f61582a9beae412bb7057a6b2c4e # v4.31.8
+        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
 

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
@@ -665,7 +665,6 @@ build.json @home-assistant/supervisor
 /homeassistant/components/here_travel_time/ @eifinger
 /tests/components/here_travel_time/ @eifinger
 /homeassistant/components/hikvision/ @mezz64
-/tests/components/hikvision/ @mezz64
 /homeassistant/components/hikvisioncam/ @fbradyirl
 /homeassistant/components/hisense_aehw4a1/ @bannhead
 /tests/components/hisense_aehw4a1/ @bannhead

Dockerfile

@@ -30,7 +30,7 @@ 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/components/actron_air/__init__.py

@@ -9,9 +9,8 @@ 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,
@@ -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:

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
-
         self.status = self.api.state_manager.get_status(self.serial_number)
         self.last_seen = dt_util.utcnow()
         return self.status

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.2.0"]
+  "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,23 +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"
       }
     }
-  },
-  "exceptions": {
-    "auth_error": {
-      "message": "Authentication failed, please reauthenticate"
-    }
   }
 }

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/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/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,7 +38,7 @@ 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):
@@ -52,7 +52,7 @@ def make_entity_state_trigger_required_features(
 
 
 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/manifest.json

@@ -4,9 +4,8 @@
   "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/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,7 +4,6 @@
   "codeowners": ["@klaasnicolaas"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/autarco",
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "requirements": ["autarco==3.2.0"]
 }

homeassistant/components/automation/__init__.py

@@ -125,17 +125,15 @@ _EXPERIMENTAL_TRIGGER_PLATFORMS = {
     "alarm_control_panel",
     "assist_satellite",
     "binary_sensor",
-    "button",
     "climate",
     "cover",
-    "device_tracker",
     "fan",
+    "input_boolean",
     "lawn_mower",
     "light",
     "media_player",
     "switch",
     "text",
-    "update",
     "vacuum",
 }
 

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/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

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/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/trigger.py

@@ -3,22 +3,22 @@
 from homeassistant.core import HomeAssistant
 from homeassistant.helpers.trigger import (
     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
 
 TRIGGERS: dict[str, type[Trigger]] = {
-    "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
     ),
-    "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,
@@ -32,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/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/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@OnFreund"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/coolmaster",
-  "integration_type": "hub",
   "iot_class": "local_polling",
   "loggers": ["pycoolmasternet_async"],
   "requirements": ["pycoolmasternet-async==0.2.2"]

homeassistant/components/daikin/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@fredrike"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/daikin",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pydaikin"],
   "requirements": ["pydaikin==2.17.1"],

homeassistant/components/datadog/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": [],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/datadog",
-  "integration_type": "service",
   "iot_class": "local_push",
   "loggers": ["datadog"],
   "quality_scale": "legacy",

homeassistant/components/device_automation/condition.py

@@ -2,7 +2,7 @@
 
 from __future__ import annotations
 
-from typing import Any, Protocol
+from typing import TYPE_CHECKING, Any, Protocol
 
 import voluptuous as vol
 
@@ -11,15 +11,18 @@ from homeassistant.core import HomeAssistant
 from homeassistant.helpers import config_validation as cv
 from homeassistant.helpers.condition import (
     Condition,
-    ConditionChecker,
     ConditionCheckerType,
     ConditionConfig,
+    trace_condition_function,
 )
-from homeassistant.helpers.typing import ConfigType, TemplateVarsType
+from homeassistant.helpers.typing import ConfigType
 
 from . import DeviceAutomationType, async_get_device_automation_platform
 from .helpers import async_validate_device_automation_config
 
+if TYPE_CHECKING:
+    from homeassistant.helpers import condition
+
 
 class DeviceAutomationConditionProtocol(Protocol):
     """Define the format of device_condition modules.
@@ -87,21 +90,15 @@ class DeviceCondition(Condition):
         assert config.options is not None
         self._config = config.options
 
-    async def async_get_checker(self) -> ConditionChecker:
+    async def async_get_checker(self) -> condition.ConditionCheckerType:
         """Test a device condition."""
         platform = await async_get_device_automation_platform(
             self._hass, self._config[CONF_DOMAIN], DeviceAutomationType.CONDITION
         )
-        platform_checker = platform.async_condition_from_config(
-            self._hass, self._config
+        return trace_condition_function(
+            platform.async_condition_from_config(self._hass, self._config)
         )
 
-        def checker(variables: TemplateVarsType = None, **kwargs: Any) -> bool:
-            result = platform_checker(self._hass, variables)
-            return result is not False
-
-        return checker
-
 
 CONDITIONS: dict[str, type[Condition]] = {
     "_device": DeviceCondition,

homeassistant/components/device_tracker/icons.json

@@ -11,13 +11,5 @@
     "see": {
       "service": "mdi:account-eye"
     }
-  },
-  "triggers": {
-    "entered_home": {
-      "trigger": "mdi:account-arrow-left"
-    },
-    "left_home": {
-      "trigger": "mdi:account-arrow-right"
-    }
   }
 }

homeassistant/components/device_tracker/strings.json

@@ -1,8 +1,4 @@
 {
-  "common": {
-    "trigger_behavior_description": "The behavior of the targeted device trackers to trigger on.",
-    "trigger_behavior_name": "Behavior"
-  },
   "device_automation": {
     "condition_type": {
       "is_home": "{entity_name} is home",
@@ -48,15 +44,6 @@
       }
     }
   },
-  "selector": {
-    "trigger_behavior": {
-      "options": {
-        "any": "Any",
-        "first": "First",
-        "last": "Last"
-      }
-    }
-  },
   "services": {
     "see": {
       "description": "Manually update the records of a seen legacy device tracker in the known_devices.yaml file.",
@@ -93,27 +80,5 @@
       "name": "See"
     }
   },
-  "title": "Device tracker",
-  "triggers": {
-    "entered_home": {
-      "description": "Triggers when one or more device trackers enter home.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
-          "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Entered home"
-    },
-    "left_home": {
-      "description": "Triggers when one or more device trackers leave home.",
-      "fields": {
-        "behavior": {
-          "description": "[%key:component::device_tracker::common::trigger_behavior_description%]",
-          "name": "[%key:component::device_tracker::common::trigger_behavior_name%]"
-        }
-      },
-      "name": "Left home"
-    }
-  }
+  "title": "Device tracker"
 }

homeassistant/components/device_tracker/trigger.py

@@ -1,21 +0,0 @@
-"""Provides triggers for device_trackers."""
-
-from homeassistant.const import STATE_HOME
-from homeassistant.core import HomeAssistant
-from homeassistant.helpers.trigger import (
-    Trigger,
-    make_entity_origin_state_trigger,
-    make_entity_target_state_trigger,
-)
-
-from .const import DOMAIN
-
-TRIGGERS: dict[str, type[Trigger]] = {
-    "entered_home": make_entity_target_state_trigger(DOMAIN, STATE_HOME),
-    "left_home": make_entity_origin_state_trigger(DOMAIN, from_state=STATE_HOME),
-}
-
-
-async def async_get_triggers(hass: HomeAssistant) -> dict[str, type[Trigger]]:
-    """Return the triggers for device trackers."""
-    return TRIGGERS

homeassistant/components/device_tracker/triggers.yaml

@@ -1,18 +0,0 @@
-.trigger_common: &trigger_common
-  target:
-    entity:
-      domain: device_tracker
-  fields:
-    behavior:
-      required: true
-      default: any
-      selector:
-        select:
-          options:
-            - first
-            - last
-            - any
-          translation_key: trigger_behavior
-
-entered_home: *trigger_common
-left_home: *trigger_common

homeassistant/components/dexcom/manifest.json

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

homeassistant/components/directv/manifest.json

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

homeassistant/components/dnsip/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@gjohansson-ST"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/dnsip",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
-  "requirements": ["aiodns==3.6.1"]
+  "requirements": ["aiodns==3.6.0"]
 }

homeassistant/components/doorbird/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["http", "repairs"],
   "documentation": "https://www.home-assistant.io/integrations/doorbird",
-  "integration_type": "device",
   "iot_class": "local_push",
   "loggers": ["doorbirdpy"],
   "requirements": ["DoorBirdPy==3.0.11"],

homeassistant/components/drop_connect/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["mqtt"],
   "documentation": "https://www.home-assistant.io/integrations/drop_connect",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "mqtt": ["drop_connect/discovery/#"],
   "requirements": ["dropmqttapi==1.0.3"]

homeassistant/components/droplet/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@sarahseidman"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/droplet",
-  "integration_type": "device",
   "iot_class": "local_push",
   "quality_scale": "bronze",
   "requirements": ["pydroplet==2.3.4"],

homeassistant/components/duke_energy/manifest.json

@@ -5,7 +5,6 @@
   "config_flow": true,
   "dependencies": ["recorder"],
   "documentation": "https://www.home-assistant.io/integrations/duke_energy",
-  "integration_type": "service",
   "iot_class": "cloud_polling",
   "requirements": ["aiodukeenergy==0.3.0"]
 }

homeassistant/components/dunehd/manifest.json

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

homeassistant/components/duotecno/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@cereal2nd"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/duotecno",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "loggers": ["pyduotecno", "pyduotecno-node", "pyduotecno-unit"],
   "requirements": ["pyDuotecno==2024.10.1"],

homeassistant/components/eafm/manifest.json

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

homeassistant/components/ecobee/manifest.json

@@ -7,7 +7,6 @@
   "homekit": {
     "models": ["EB", "ecobee*"]
   },
-  "integration_type": "hub",
   "iot_class": "cloud_polling",
   "loggers": ["pyecobee"],
   "requirements": ["python-ecobee-api==0.3.2"],

homeassistant/components/ecoforest/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@pjanuario"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/ecoforest",
-  "integration_type": "device",
   "iot_class": "local_polling",
   "loggers": ["pyecoforest"],
   "requirements": ["pyecoforest==0.4.0"]

homeassistant/components/econet/manifest.json

@@ -4,7 +4,6 @@
   "codeowners": ["@w1ll1am23"],
   "config_flow": true,
   "documentation": "https://www.home-assistant.io/integrations/econet",
-  "integration_type": "hub",
   "iot_class": "cloud_push",
   "loggers": ["paho_mqtt", "pyeconet"],
   "requirements": ["pyeconet==0.1.28"]

homeassistant/components/ekeybionyx/event.py

@@ -1,7 +1,5 @@
 """Event platform for ekey bionyx integration."""
 
-from http import HTTPStatus
-
 from aiohttp.hdrs import METH_POST
 from aiohttp.web import Request, Response
 
@@ -54,17 +52,7 @@ class EkeyEvent(EventEntity):
         async def async_webhook_handler(
             hass: HomeAssistant, webhook_id: str, request: Request
         ) -> Response | None:
-            try:
-                payload = await request.json()
-            except ValueError:
-                return Response(status=HTTPStatus.BAD_REQUEST)
-            auth = payload.get("auth")
-
-            if auth is None:
-                return Response(status=HTTPStatus.BAD_REQUEST)
-            if auth != self._auth:
-                return Response(status=HTTPStatus.UNAUTHORIZED)
-
+            if (await request.json())["auth"] == self._auth:
                 self._async_handle_event()
             return None
 

homeassistant/components/ekeybionyx/manifest.json

@@ -5,8 +5,7 @@
   "config_flow": true,
   "dependencies": ["application_credentials", "http"],
   "documentation": "https://www.home-assistant.io/integrations/ekeybionyx",
-  "integration_type": "hub",
   "iot_class": "local_push",
   "quality_scale": "bronze",
-  "requirements": ["ekey-bionyxpy==1.0.1"]
+  "requirements": ["ekey-bionyxpy==1.0.0"]
 }